openstack
/
nova
Code Issues Proposed changes

Merge "Fix duplicate lines in policy.json" into stable/liberty

This commit is contained in:
Jenkins 2016-06-09 05:45:58 +00:00 committed by Gerrit Code Review
parent ebbbcc6b11 0e1bb7e36a
commit c55aacfbac
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/nova/policy.json
View File

@ -85,9 +85,6 @@
"compute:security_groups:add_to_instance": "",
"compute:security_groups:remove_from_instance": "",
"compute:delete": "",
"compute:soft_delete": "",
"compute:force_delete": "",
"compute:restore": "",
"compute:volume_snapshot_create": "",

6
nova/tests/unit/test_policy.py
View File

@ -368,6 +368,9 @@ class RealRolePolicyTestCase(test.NoDBTestCase):
"default",
"compute:start",
"compute:stop",
"compute:delete",
"compute:soft_delete",
"compute:force_delete",
"compute_extension:admin_actions:pause",
"compute_extension:admin_actions:unpause",
"compute_extension:admin_actions:suspend",
@ -405,8 +408,6 @@ class RealRolePolicyTestCase(test.NoDBTestCase):
"compute:create",
"compute:create:attach_network",
"compute:create:attach_volume",
"compute:delete",
"compute:force_delete",
"compute:get_all_instance_metadata",
"compute:get_all_instance_system_metadata",
"compute:get_console_output",
@ -452,7 +453,6 @@ class RealRolePolicyTestCase(test.NoDBTestCase):
"compute:security_groups:remove_from_instance",
"compute:set_admin_password",
"compute:snapshot",
"compute:soft_delete",
"compute:suspend",
"compute:swap_volume",
"compute:unlock",