From c45bffea08c370b3ee43b65f485dbf8a1da1d0e9 Mon Sep 17 00:00:00 2001
From: miaohb <miao.hongbao@zte.com.cn>
Date: Tue, 11 Jul 2017 08:52:29 +0800
Subject: [PATCH] Revise the policy data

1. Delete the duplicated "container:update" in etc/zun/policy.json and
zun/test/fake_policy
2. Delete the unused "container:detail" in zun/test/fake_policy.py
3. Delete "admin_or_user" in zun/test/fake_policy.py

Change-Id: Iaea9f0b0b072796cd31e75c6df8aededa7f6a5db
Closes-Bug: #1703293
---
 etc/zun/policy.json      | 1 -
 zun/tests/fake_policy.py | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/etc/zun/policy.json b/etc/zun/policy.json
index 2e031ad0b..31b74ca81 100644
--- a/etc/zun/policy.json
+++ b/etc/zun/policy.json
@@ -18,7 +18,6 @@
     "container:execute": "rule:default",
     "container:execute_resize": "rule:default",
     "container:kill": "rule:default",
-    "container:update": "rule:default",
     "container:rename": "rule:default",
     "container:attach": "rule:default",
     "container:resize": "rule:default",
diff --git a/zun/tests/fake_policy.py b/zun/tests/fake_policy.py
index 870751f43..011423f74 100644
--- a/zun/tests/fake_policy.py
+++ b/zun/tests/fake_policy.py
@@ -19,11 +19,9 @@ policy_data = """
     "admin_or_owner":  "is_admin:True or project_id:%(project_id)s",
     "default": "rule:admin_or_owner",
     "admin_api": "rule:context_is_admin",
-    "admin_or_user": "is_admin:True or user_id:%(user_id)s",
 
     "container:create": "",
     "container:delete": "",
-    "container:detail": "",
     "container:get": "",
     "container:get_all": "",
     "container:update": "",
@@ -36,7 +34,6 @@ policy_data = """
     "container:execute": "",
     "container:execute_resize": "",
     "container:kill": "",
-    "container:update": "",
     "container:rename": "",
     "container:attach": "",
     "container:resize": "",