diff --git a/nova/api/openstack/placement/handlers/resource_class.py b/nova/api/openstack/placement/handlers/resource_class.py index 32b56fe1aedb..e7c6c09eed12 100644 --- a/nova/api/openstack/placement/handlers/resource_class.py +++ b/nova/api/openstack/placement/handlers/resource_class.py @@ -23,6 +23,7 @@ from nova.api.openstack.placement import wsgi_wrapper from nova import exception from nova.i18n import _ from nova import objects +from nova.objects import resource_provider as rp_obj POST_RC_SCHEMA_V1_2 = { @@ -153,7 +154,7 @@ def list_resource_classes(req): a collection of resource classes. """ context = req.environ['placement.context'] - rcs = objects.ResourceClassList.get_all(context) + rcs = rp_obj.ResourceClassList.get_all(context) response = req.response response.body = encodeutils.to_utf8(jsonutils.dumps( diff --git a/nova/objects/resource_provider.py b/nova/objects/resource_provider.py index 339e5e611e84..5c922501f8e2 100644 --- a/nova/objects/resource_provider.py +++ b/nova/objects/resource_provider.py @@ -2153,11 +2153,8 @@ class ResourceClass(base.NovaObject): raise exception.ResourceClassExists(resource_class=name) -@base.NovaObjectRegistry.register +@base.NovaObjectRegistry.register_if(False) class ResourceClassList(base.ObjectListBase, base.NovaObject): - # Version 1.0: Initial version - # Version 1.1: Turn off remotable - VERSION = '1.1' fields = { 'objects': fields.ListOfObjectsField('ResourceClass'), diff --git a/nova/tests/functional/db/test_resource_provider.py b/nova/tests/functional/db/test_resource_provider.py index d5d41e618d6a..92df3dd9f46c 100644 --- a/nova/tests/functional/db/test_resource_provider.py +++ b/nova/tests/functional/db/test_resource_provider.py @@ -1433,7 +1433,7 @@ class ResourceClassListTestCase(ResourceProviderBaseCase): we only get a list of ResourceClass objects representing the standard classes. """ - rcs = objects.ResourceClassList.get_all(self.ctx) + rcs = rp_obj.ResourceClassList.get_all(self.ctx) self.assertEqual(len(fields.ResourceClass.STANDARD), len(rcs)) def test_get_all_with_custom(self): @@ -1451,7 +1451,7 @@ class ResourceClassListTestCase(ResourceProviderBaseCase): ins = rp_obj._RC_TBL.insert().values(id=c_id, name=c_name) conn.execute(ins) - rcs = objects.ResourceClassList.get_all(self.ctx) + rcs = rp_obj.ResourceClassList.get_all(self.ctx) expected_count = len(fields.ResourceClass.STANDARD) + len(customs) self.assertEqual(expected_count, len(rcs)) @@ -1590,7 +1590,7 @@ class ResourceClassTestCase(ResourceProviderBaseCase): name='CUSTOM_IRON_NFV', ) rc.create() - rc_list = objects.ResourceClassList.get_all(self.ctx) + rc_list = rp_obj.ResourceClassList.get_all(self.ctx) rc_ids = (r.id for r in rc_list) self.assertIn(rc.id, rc_ids) @@ -1600,7 +1600,7 @@ class ResourceClassTestCase(ResourceProviderBaseCase): ) rc.destroy() - rc_list = objects.ResourceClassList.get_all(self.ctx) + rc_list = rp_obj.ResourceClassList.get_all(self.ctx) rc_ids = (r.id for r in rc_list) self.assertNotIn(rc.id, rc_ids) @@ -1639,7 +1639,7 @@ class ResourceClassTestCase(ResourceProviderBaseCase): rp.set_inventory(objects.InventoryList(objects=[])) rc.destroy() - rc_list = objects.ResourceClassList.get_all(self.ctx) + rc_list = rp_obj.ResourceClassList.get_all(self.ctx) rc_ids = (r.id for r in rc_list) self.assertNotIn(rc.id, rc_ids) diff --git a/nova/tests/unit/objects/test_objects.py b/nova/tests/unit/objects/test_objects.py index d03e805e7da1..41aab0ce0b3c 100644 --- a/nova/tests/unit/objects/test_objects.py +++ b/nova/tests/unit/objects/test_objects.py @@ -1151,7 +1151,6 @@ object_data = { 'QuotasNoOp': '1.3-347a039fc7cfee7b225b68b5181e0733', 'RequestSpec': '1.8-35033ecef47a880f9a5e46e2269e2b97', 'ResourceClass': '1.0-e6b367e2cf1733c5f3526f20a3286fe9', - 'ResourceClassList': '1.1-15ecf022a68ddbb8c2a6739cfc9f8f5e', 'ResourceProvider': '1.4-35e8a41d2ece17a862fac5b07ca966af', 'ResourceProviderList': '1.1-15ecf022a68ddbb8c2a6739cfc9f8f5e', 'S3ImageMapping': '1.0-7dd7366a890d82660ed121de9092276e',