Merge "Modify v21 alias name for compatible with v2"

9 files changed, 34 insertions, 30 deletions

diff --git a/doc/v3/api_samples/all_extensions/extensions-list-resp.json b/doc/v3/api_samples/all_extensions/extensions-list-resp.json
index ee42fb48de..fd75bf24e1 100644
--- a/doc/v3/api_samples/all_extensions/extensions-list-resp.json
+++ b/doc/v3/api_samples/all_extensions/extensions-list-resp.json
@@ -1,7 +1,7 @@
 {
     "extensions": [
         {
-            "alias": "consoles",
+            "alias": "os-consoles",
             "description": "Consoles.",
             "links": [],
             "name": "Consoles",
@@ -17,7 +17,7 @@
             "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "alias": "flavor-extra-specs",
+            "alias": "os-flavor-extra-specs",
             "description": "Flavors extra specs support.",
             "links": [],
             "name": "FlavorsExtraSpecs",
@@ -25,7 +25,7 @@
             "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "alias": "flavor-manage",
+            "alias": "os-flavor-manage",
             "description": "Flavor create/delete API support.",
             "links": [],
             "name": "FlavorManage",
diff --git a/etc/nova/policy.json b/etc/nova/policy.json
index 96f8fe2151..e6bebca825 100644
--- a/etc/nova/policy.json
+++ b/etc/nova/policy.json
@@ -88,7 +88,7 @@
     "compute_extension:v3:os-cloudpipe:discoverable": "",
     "compute_extension:cloudpipe_update": "rule:admin_api",
     "compute_extension:console_output": "",
-    "compute_extension:v3:consoles:discoverable": "",
+    "compute_extension:v3:os-consoles:discoverable": "",
     "compute_extension:v3:os-console-output:discoverable": "",
     "compute_extension:v3:os-console-output": "",
     "compute_extension:consoles": "",
@@ -147,15 +147,15 @@
     "compute_extension:flavorextraspecs:update": "rule:admin_api",
     "compute_extension:flavorextraspecs:delete": "rule:admin_api",
     "compute_extension:v3:flavors:discoverable": "",
-    "compute_extension:v3:flavor-extra-specs:discoverable": "",
-    "compute_extension:v3:flavor-extra-specs:index": "",
-    "compute_extension:v3:flavor-extra-specs:show": "",
-    "compute_extension:v3:flavor-extra-specs:create": "rule:admin_api",
-    "compute_extension:v3:flavor-extra-specs:update": "rule:admin_api",
-    "compute_extension:v3:flavor-extra-specs:delete": "rule:admin_api",
+    "compute_extension:v3:os-flavor-extra-specs:discoverable": "",
+    "compute_extension:v3:os-flavor-extra-specs:index": "",
+    "compute_extension:v3:os-flavor-extra-specs:show": "",
+    "compute_extension:v3:os-flavor-extra-specs:create": "rule:admin_api",
+    "compute_extension:v3:os-flavor-extra-specs:update": "rule:admin_api",
+    "compute_extension:v3:os-flavor-extra-specs:delete": "rule:admin_api",
     "compute_extension:flavormanage": "rule:admin_api",
-    "compute_extension:v3:flavor-manage:discoverable": "",
-    "compute_extension:v3:flavor-manage": "rule:admin_api",
+    "compute_extension:v3:os-flavor-manage:discoverable": "",
+    "compute_extension:v3:os-flavor-manage": "rule:admin_api",
     "compute_extension:floating_ip_dns": "",
     "compute_extension:v3:os-floating-ip-dns": "",
     "compute_extension:v3:os-floating-ip-dns:discoverable": "",
diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index e5494eafee..a31604eb65 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -63,10 +63,10 @@ CONF.register_opts(api_opts, api_opts_group)
 # List of v3 API extensions which are considered to form
 # the core API and so must be present
 # TODO(cyeoh): Expand this list as the core APIs are ported to V3
-API_V3_CORE_EXTENSIONS = set(['consoles',
+API_V3_CORE_EXTENSIONS = set(['os-consoles',
                               'extensions',
-                              'flavor-extra-specs',
-                              'flavor-manage',
+                              'os-flavor-extra-specs',
+                              'os-flavor-manage',
                               'flavors',
                               'ips',
                               'os-keypairs',
diff --git a/nova/api/openstack/compute/plugins/v3/consoles.py b/nova/api/openstack/compute/plugins/v3/consoles.py
index e9701bdc91..f0a624522e 100644
--- a/nova/api/openstack/compute/plugins/v3/consoles.py
+++ b/nova/api/openstack/compute/plugins/v3/consoles.py
@@ -21,6 +21,9 @@ from nova.console import api as console_api
 from nova import exception
 
 
+ALIAS = 'os-consoles'
+
+
 def _translate_keys(cons):
     """Coerces a console instance into proper dictionary format."""
     pool = cons['pool']
@@ -95,7 +98,7 @@ class Consoles(extensions.V3APIExtensionBase):
     """Consoles."""
 
     name = "Consoles"
-    alias = "consoles"
+    alias = ALIAS
     version = 1
 
     def get_resources(self):
diff --git a/nova/api/openstack/compute/plugins/v3/flavor_manage.py b/nova/api/openstack/compute/plugins/v3/flavor_manage.py
index e89d5effdf..0549cd281a 100644
--- a/nova/api/openstack/compute/plugins/v3/flavor_manage.py
+++ b/nova/api/openstack/compute/plugins/v3/flavor_manage.py
@@ -20,7 +20,7 @@ from nova.api import validation
 from nova.compute import flavors
 from nova import exception
 
-ALIAS = "flavor-manage"
+ALIAS = "os-flavor-manage"
 
 authorize = extensions.extension_authorizer('compute', 'v3:' + ALIAS)
 
diff --git a/nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py b/nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py
index ecc835b414..10c6bd6817 100644
--- a/nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py
+++ b/nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py
@@ -25,7 +25,7 @@ from nova.i18n import _
 from nova import objects
 from nova import utils
 
-ALIAS = 'flavor-extra-specs'
+ALIAS = 'os-flavor-extra-specs'
 authorize = extensions.extension_authorizer('compute', 'v3:' + ALIAS)
 
 
diff --git a/nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp.json.tpl b/nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp.json.tpl
index ee42fb48de..fd75bf24e1 100644
--- a/nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp.json.tpl
+++ b/nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp.json.tpl
@@ -1,7 +1,7 @@
 {
     "extensions": [
         {
-            "alias": "consoles",
+            "alias": "os-consoles",
             "description": "Consoles.",
             "links": [],
             "name": "Consoles",
@@ -17,7 +17,7 @@
             "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "alias": "flavor-extra-specs",
+            "alias": "os-flavor-extra-specs",
             "description": "Flavors extra specs support.",
             "links": [],
             "name": "FlavorsExtraSpecs",
@@ -25,7 +25,7 @@
             "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "alias": "flavor-manage",
+            "alias": "os-flavor-manage",
             "description": "Flavor create/delete API support.",
             "links": [],
             "name": "FlavorManage",
diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_flavor_manage.py b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_manage.py
index 20eb575d55..573f14847f 100644
--- a/nova/tests/unit/api/openstack/compute/contrib/test_flavor_manage.py
+++ b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_manage.py
@@ -123,7 +123,8 @@ class FlavorManageTestV21(test.NoDBTestCase):
         self.expected_flavor = self.request_body
 
     def _setup_app(self):
-        return fakes.wsgi_app_v21(init_only=('flavor-manage', 'os-flavor-rxtx',
+        return fakes.wsgi_app_v21(init_only=('os-flavor-manage',
+                                             'os-flavor-rxtx',
                                              'os-flavor-access', 'flavors',
                                              'os-flavor-extra-data'))
 
@@ -395,7 +396,7 @@ class PrivateFlavorManageTestV21(test.TestCase):
         }
 
     def _setup_app(self):
-        return fakes.wsgi_app_v21(init_only=('flavor-manage',
+        return fakes.wsgi_app_v21(init_only=('os-flavor-manage',
                                              'os-flavor-access',
                                              'os-flavor-rxtx', 'flavors',
                                              'os-flavor-extra-data'),
diff --git a/nova/tests/unit/fake_policy.py b/nova/tests/unit/fake_policy.py
index 23b9680e24..39db2320c5 100644
--- a/nova/tests/unit/fake_policy.py
+++ b/nova/tests/unit/fake_policy.py
@@ -205,14 +205,14 @@ policy_data = """
     "compute_extension:flavorextraspecs:create": "is_admin:True",
     "compute_extension:flavorextraspecs:update": "is_admin:True",
     "compute_extension:flavorextraspecs:delete": "is_admin:True",
-    "compute_extension:v3:flavor-extra-specs:index": "",
-    "compute_extension:v3:flavor-extra-specs:show": "",
-    "compute_extension:v3:flavor-extra-specs:create": "is_admin:True",
-    "compute_extension:v3:flavor-extra-specs:update": "is_admin:True",
-    "compute_extension:v3:flavor-extra-specs:delete": "is_admin:True",
+    "compute_extension:v3:os-flavor-extra-specs:index": "",
+    "compute_extension:v3:os-flavor-extra-specs:show": "",
+    "compute_extension:v3:os-flavor-extra-specs:create": "is_admin:True",
+    "compute_extension:v3:os-flavor-extra-specs:update": "is_admin:True",
+    "compute_extension:v3:os-flavor-extra-specs:delete": "is_admin:True",
     "compute_extension:flavormanage": "",
-    "compute_extension:v3:flavor-manage": "",
-    "compute_extension:v3:flavors:discoverable": "",
+    "compute_extension:v3:os-flavor-manage": "",
+    "compute_extension:v3:os-flavors:discoverable": "",
     "compute_extension:floating_ip_dns": "",
     "compute_extension:v3:os-floating-ip-dns": "",
     "compute_extension:floating_ip_pools": "",