From 61497bf6c4910eedb64494599f7dde25f2500629 Mon Sep 17 00:00:00 2001 From: He Jie Xu Date: Wed, 3 Dec 2014 14:18:42 +0800 Subject: [PATCH] Remove the volume api related useless policy rules There are some old policy rules used by old nova volume, those are useless anymore, this patch clean them up. Change-Id: Ibcdba00652808158019600f8ad75e80c85f9423e Closes-Bug: #1398686 --- etc/nova/policy.json | 14 -------------- nova/tests/unit/fake_policy.py | 32 -------------------------------- 2 files changed, 46 deletions(-) diff --git a/etc/nova/policy.json b/etc/nova/policy.json index f00c622d0f01..96f8fe215107 100644 --- a/etc/nova/policy.json +++ b/etc/nova/policy.json @@ -330,20 +330,6 @@ "compute_extension:os-server-external-events:create": "rule:admin_api", "compute_extension:v3:os-server-external-events:create": "rule:admin_api", - "volume:create": "", - "volume:get_all": "", - "volume:get_volume_metadata": "", - "volume:get_snapshot": "", - "volume:get_all_snapshots": "", - - - "volume_extension:types_manage": "rule:admin_api", - "volume_extension:types_extra_specs": "rule:admin_api", - "volume_extension:volume_admin_actions:reset_status": "rule:admin_api", - "volume_extension:snapshot_admin_actions:reset_status": "rule:admin_api", - "volume_extension:volume_admin_actions:force_delete": "rule:admin_api", - - "network:get_all": "", "network:get": "", "network:create": "", diff --git a/nova/tests/unit/fake_policy.py b/nova/tests/unit/fake_policy.py index c1b3d808f97f..23b9680e245c 100644 --- a/nova/tests/unit/fake_policy.py +++ b/nova/tests/unit/fake_policy.py @@ -342,38 +342,6 @@ policy_data = """ "compute_extension:os-server-external-events:create": "rule:admin_api", "compute_extension:v3:os-server-external-events:create": "rule:admin_api", - "volume:create": "", - "volume:get": "", - "volume:get_all": "", - "volume:get_volume_metadata": "", - "volume:delete": "", - "volume:update": "", - "volume:delete_volume_metadata": "", - "volume:update_volume_metadata": "", - "volume:attach": "", - "volume:detach": "", - "volume:reserve_volume": "", - "volume:unreserve_volume": "", - "volume:begin_detaching": "", - "volume:roll_detaching": "", - "volume:check_attach": "", - "volume:check_detach": "", - "volume:initialize_connection": "", - "volume:terminate_connection": "", - "volume:create_snapshot": "", - "volume:delete_snapshot": "", - "volume:get_snapshot": "", - "volume:get_all_snapshots": "", - - - "volume_extension:volume_admin_actions:reset_status": "rule:admin_api", - "volume_extension:snapshot_admin_actions:reset_status": "rule:admin_api", - "volume_extension:volume_admin_actions:force_delete": "rule:admin_api", - "volume_extension:volume_actions:upload_image": "", - "volume_extension:types_manage": "", - "volume_extension:types_extra_specs": "", - - "network:get_all": "", "network:get": "", "network:create": "",