diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-29 16:15:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-29 16:15:08 +0000 |
| commit | 2ca8bd8b350739b03d3d35151b6e350615e23841 (patch) | |
| tree | 8b652e51ab4e5ca9c1b23f03122cf01712d24b27 | |
| parent | a5265cfbe6d12d6edb12167cd55f527cd679d042 (diff) | |
| parent | 86a264488d670437ad77561019ecb1201ff8a31b (diff) | |
| download | nova-2ca8bd8b350739b03d3d35151b6e350615e23841.tar.gz nova-2ca8bd8b350739b03d3d35151b6e350615e23841.tar.xz nova-2ca8bd8b350739b03d3d35151b6e350615e23841.zip | |
Merge "Rename policy auth for V3 os-fixed-ips"
| -rw-r--r-- | etc/nova/policy.json | 1 | ||||
| -rw-r--r-- | nova/api/openstack/compute/plugins/v3/fixed_ips.py | 6 | ||||
| -rw-r--r-- | nova/tests/fake_policy.py | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/etc/nova/policy.json b/etc/nova/policy.json index 43f9c8b12..0bfffa7c4 100644 --- a/etc/nova/policy.json +++ b/etc/nova/policy.json @@ -50,6 +50,7 @@ "compute_extension:extended_ips_mac": "", "compute_extension:extended_vif_net": "", "compute_extension:fixed_ips": "rule:admin_api", + "compute_extension:v3:os-fixed-ips": "rule:admin_api", "compute_extension:flavor_access": "", "compute_extension:flavor_disabled": "", "compute_extension:flavor_rxtx": "", diff --git a/nova/api/openstack/compute/plugins/v3/fixed_ips.py b/nova/api/openstack/compute/plugins/v3/fixed_ips.py index dc22a83ea..e98b830bd 100644 --- a/nova/api/openstack/compute/plugins/v3/fixed_ips.py +++ b/nova/api/openstack/compute/plugins/v3/fixed_ips.py @@ -22,7 +22,9 @@ from nova import exception from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) -authorize = extensions.extension_authorizer('compute', 'fixed_ips') + +ALIAS = "os-fixed-ips" +authorize = extensions.extension_authorizer('compute', 'v3:' + ALIAS) class FixedIPController(object): @@ -82,7 +84,7 @@ class FixedIPs(extensions.V3APIExtensionBase): """Fixed IPs support.""" name = "FixedIPs" - alias = "os-fixed-ips" + alias = ALIAS namespace = "http://docs.openstack.org/compute/ext/fixed_ips/api/v3" version = 1 diff --git a/nova/tests/fake_policy.py b/nova/tests/fake_policy.py index 95dd470ab..64f91b1a2 100644 --- a/nova/tests/fake_policy.py +++ b/nova/tests/fake_policy.py @@ -129,6 +129,7 @@ policy_data = """ "compute_extension:extended_ips_mac": "", "compute_extension:extended_vif_net": "", "compute_extension:fixed_ips": "", + "compute_extension:v3:os-fixed-ips": "", "compute_extension:flavor_access": "", "compute_extension:flavor_disabled": "", "compute_extension:flavor_rxtx": "", |