Merge "Add flavor-manage to core for V3 API"

nova/api/openstack/__init__.py

@@ -63,7 +63,8 @@ CONF.register_opts(api_opts, api_opts_group)
 # TODO(cyeoh): Expand this list as the core APIs are ported to V3
 API_V3_CORE_EXTENSIONS = set(['consoles', 'extensions', 'flavors', 'ips',
                               'limits', 'servers', 'server-metadata',
-                              'keypairs', 'console-output', 'versions'])
+                              'keypairs', 'console-output', 'versions',
+                              'flavor-manage'])
 
 
 class FaultWrapper(base_wsgi.Middleware):

nova/tests/integrated/v3/test_flavor_access.py

@@ -18,7 +18,6 @@ from nova.tests.integrated.v3 import api_sample_base
 
 class FlavorAccessSampleJsonTests(api_sample_base.ApiSampleTestBaseV3):
     extension_name = 'os-flavor-access'
-    extra_extensions_to_load = ['flavor-manage']
 
     def _add_tenant(self):
         subs = {

nova/tests/integrated/v3/test_flavor_rxtx.py

@@ -19,7 +19,6 @@ from nova.tests.integrated.v3 import api_sample_base
 
 class FlavorRxtxJsonTest(api_sample_base.ApiSampleTestBaseV3):
     extension_name = 'os-flavor-rxtx'
-    extra_extensions_to_load = ['flavor-manage']
 
     def test_flavor_rxtx_get(self):
         flavor_id = 1