From 5619caa7416460dda2854e5fc046b53ffbbc0ebb Mon Sep 17 00:00:00 2001 From: leizhang Date: Wed, 29 Mar 2017 09:16:01 +0800 Subject: [PATCH] Remove namespace check in creating traits Remove code of checking custom namespace in trait objects. The check logic will be implemented in api layer. This allows command line tools can use trait object code to sync os-traits library. Change-Id: Ia33ab4c6e7f7ca7d3ab04c854b65bd50460e31a4 Partially-Implements: blueprint resource-provider-traits --- nova/objects/resource_provider.py | 5 ----- nova/tests/functional/db/test_resource_provider.py | 5 ----- 2 files changed, 10 deletions(-) diff --git a/nova/objects/resource_provider.py b/nova/objects/resource_provider.py index 152cea203f..f958146d1d 100644 --- a/nova/objects/resource_provider.py +++ b/nova/objects/resource_provider.py @@ -1493,11 +1493,6 @@ class Trait(base.NovaObject): raise exception.ObjectActionError(action='create', reason='name is required') - if not self.name.startswith(self.CUSTOM_NAMESPACE): - raise exception.ObjectActionError( - action='create', - reason='name must start with %s' % self.CUSTOM_NAMESPACE) - updates = self.obj_get_changes() try: diff --git a/nova/tests/functional/db/test_resource_provider.py b/nova/tests/functional/db/test_resource_provider.py index d9fd85412a..63eb6b1241 100644 --- a/nova/tests/functional/db/test_resource_provider.py +++ b/nova/tests/functional/db/test_resource_provider.py @@ -1562,11 +1562,6 @@ class ResourceProviderTraitsTestCase(ResourceProviderBaseCase): t = objects.Trait(self.context) self.assertRaises(exception.ObjectActionError, t.create) - def test_trait_create_without_custom_prefix(self): - t = objects.Trait(self.context) - t.name = 'TRAIT_A' - self.assertRaises(exception.ObjectActionError, t.create) - def test_trait_create_duplicated_trait(self): trait = objects.Trait(self.context) trait.name = 'CUSTOM_TRAIT_A'