Upstream merge

Moved instance type extra specs tests to extensions directory.

Added os- prefix to extra specs API alias.

Pegged pep8 venv version to 0.6.1

4 files changed, 24 insertions, 14 deletions

diff --git a/nova/api/openstack/contrib/flavorextraspecs.py b/nova/api/openstack/contrib/flavorextraspecs.py
index 8518bf2bd..2d897a1da 100644
--- a/nova/api/openstack/contrib/flavorextraspecs.py
+++ b/nova/api/openstack/contrib/flavorextraspecs.py
@@ -103,7 +103,7 @@ class Flavorextraspecs(extensions.ExtensionDescriptor):
         return "FlavorExtraSpecs"
 
     def get_alias(self):
-        return "flavor-extra-specs"
+        return "os-flavor-extra-specs"
 
     def get_description(self):
         return "Instance type (flavor) extra specs"
@@ -118,7 +118,7 @@ class Flavorextraspecs(extensions.ExtensionDescriptor):
     def get_resources(self):
         resources = []
         res = extensions.ResourceExtension(
-                'extra_specs',
+                'os-extra_specs',
                 FlavorExtraSpecsController(),
                 parent=dict(member_name='flavor', collection_name='flavors'))
 
diff --git a/nova/tests/api/openstack/test_flavors_extra_specs.py b/nova/tests/api/openstack/extensions/test_flavors_extra_specs.py
index 686e9cf55..2c1c335b0 100644
--- a/nova/tests/api/openstack/test_flavors_extra_specs.py
+++ b/nova/tests/api/openstack/extensions/test_flavors_extra_specs.py
@@ -84,7 +84,7 @@ class FlavorsExtraSpecsTest(unittest.TestCase):
     def test_index(self):
         self.stubs.Set(nova.db.api, 'instance_type_extra_specs_get',
                        return_flavor_extra_specs)
-        request = webob.Request.blank('/flavors/1/extra_specs')
+        request = webob.Request.blank('/flavors/1/os-extra_specs')
         res = request.get_response(self.mware)
         self.assertEqual(200, res.status_int)
         res_dict = json.loads(res.body)
@@ -94,7 +94,7 @@ class FlavorsExtraSpecsTest(unittest.TestCase):
     def test_index_no_data(self):
         self.stubs.Set(nova.db.api, 'instance_type_extra_specs_get',
                        return_empty_flavor_extra_specs)
-        req = webob.Request.blank('/flavors/1/extra_specs')
+        req = webob.Request.blank('/flavors/1/os-extra_specs')
         res = req.get_response(self.mware)
         res_dict = json.loads(res.body)
         self.assertEqual(200, res.status_int)
@@ -104,7 +104,7 @@ class FlavorsExtraSpecsTest(unittest.TestCase):
     def test_show(self):
         self.stubs.Set(nova.db.api, 'instance_type_extra_specs_get',
                        return_flavor_extra_specs)
-        req = webob.Request.blank('/flavors/1/extra_specs/key5')
+        req = webob.Request.blank('/flavors/1/os-extra_specs/key5')
         res = req.get_response(self.mware)
         self.assertEqual(200, res.status_int)
         res_dict = json.loads(res.body)
@@ -114,7 +114,7 @@ class FlavorsExtraSpecsTest(unittest.TestCase):
     def test_show_spec_not_found(self):
         self.stubs.Set(nova.db.api, 'instance_type_extra_specs_get',
                        return_empty_flavor_extra_specs)
-        req = webob.Request.blank('/flavors/1/extra_specs/key6')
+        req = webob.Request.blank('/flavors/1/os-extra_specs/key6')
         res = req.get_response(self.mware)
         res_dict = json.loads(res.body)
         self.assertEqual(404, res.status_int)
@@ -122,7 +122,7 @@ class FlavorsExtraSpecsTest(unittest.TestCase):
     def test_delete(self):
         self.stubs.Set(nova.db.api, 'instance_type_extra_specs_delete',
                        delete_flavor_extra_specs)
-        req = webob.Request.blank('/flavors/1/extra_specs/key5')
+        req = webob.Request.blank('/flavors/1/os-extra_specs/key5')
         req.method = 'DELETE'
         res = req.get_response(self.mware)
         self.assertEqual(200, res.status_int)
@@ -131,7 +131,7 @@ class FlavorsExtraSpecsTest(unittest.TestCase):
         self.stubs.Set(nova.db.api,
                        'instance_type_extra_specs_update_or_create',
                        return_create_flavor_extra_specs)
-        req = webob.Request.blank('/flavors/1/extra_specs')
+        req = webob.Request.blank('/flavors/1/os-extra_specs')
         req.method = 'POST'
         req.body = '{"extra_specs": {"key1": "value1"}}'
         req.headers["content-type"] = "application/json"
@@ -145,7 +145,7 @@ class FlavorsExtraSpecsTest(unittest.TestCase):
         self.stubs.Set(nova.db.api,
                        'instance_type_extra_specs_update_or_create',
                        return_create_flavor_extra_specs)
-        req = webob.Request.blank('/flavors/1/extra_specs')
+        req = webob.Request.blank('/flavors/1/os-extra_specs')
         req.method = 'POST'
         req.headers["content-type"] = "application/json"
         res = req.get_response(self.mware)
@@ -155,7 +155,7 @@ class FlavorsExtraSpecsTest(unittest.TestCase):
         self.stubs.Set(nova.db.api,
                        'instance_type_extra_specs_update_or_create',
                        return_create_flavor_extra_specs)
-        req = webob.Request.blank('/flavors/1/extra_specs/key1')
+        req = webob.Request.blank('/flavors/1/os-extra_specs/key1')
         req.method = 'PUT'
         req.body = '{"key1": "value1"}'
         req.headers["content-type"] = "application/json"
@@ -169,7 +169,7 @@ class FlavorsExtraSpecsTest(unittest.TestCase):
         self.stubs.Set(nova.db.api,
                        'instance_type_extra_specs_update_or_create',
                        return_create_flavor_extra_specs)
-        req = webob.Request.blank('/flavors/1/extra_specs/key1')
+        req = webob.Request.blank('/flavors/1/os-extra_specs/key1')
         req.method = 'PUT'
         req.headers["content-type"] = "application/json"
         res = req.get_response(self.mware)
@@ -179,7 +179,7 @@ class FlavorsExtraSpecsTest(unittest.TestCase):
         self.stubs.Set(nova.db.api,
                        'instance_type_extra_specs_update_or_create',
                        return_create_flavor_extra_specs)
-        req = webob.Request.blank('/flavors/1/extra_specs/key1')
+        req = webob.Request.blank('/flavors/1/os-extra_specs/key1')
         req.method = 'PUT'
         req.body = '{"key1": "value1", "key2": "value2"}'
         req.headers["content-type"] = "application/json"
@@ -190,7 +190,7 @@ class FlavorsExtraSpecsTest(unittest.TestCase):
         self.stubs.Set(nova.db.api,
                        'instance_type_extra_specs_update_or_create',
                        return_create_flavor_extra_specs)
-        req = webob.Request.blank('/flavors/1/extra_specs/bad')
+        req = webob.Request.blank('/flavors/1/os-extra_specs/bad')
         req.method = 'PUT'
         req.body = '{"key1": "value1"}'
         req.headers["content-type"] = "application/json"
diff --git a/nova/utils.py b/nova/utils.py
index e2ac16f31..6d8324e5b 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -526,6 +526,16 @@ def loads(s):
     return json.loads(s)
 
 
+try:
+    import anyjson
+except ImportError:
+    pass
+else:
+    anyjson._modules.append(("nova.utils", "dumps", TypeError,
+                                           "loads", ValueError))
+    anyjson.force_implementation("nova.utils")
+
+
 _semaphores = {}
 
 
diff --git a/tools/pip-requires b/tools/pip-requires
index 2aaffd9f3..99d737e9f 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -1,5 +1,5 @@
 SQLAlchemy==0.6.3
-pep8
+pep8==0.6.1
 pylint==0.19
 Cheetah==2.4.4
 M2Crypto==0.20.2