Merge "Rename the model object ResourceProviderTraits to ResourceProviderTrait"

This commit is contained in:
Jenkins 2017-04-03 16:03:40 +00:00 committed by Gerrit Code Review
commit bcd0221c46
2 changed files with 2 additions and 2 deletions

View File

@ -567,7 +567,7 @@ class Trait(API_BASE):
name = Column(Unicode(255), nullable=False)
class ResourceProviderTraits(API_BASE):
class ResourceProviderTrait(API_BASE):
"""Represents the relationship between traits and resource provider"""
__tablename__ = "resource_provider_traits"

View File

@ -1535,7 +1535,7 @@ class ResourceClassTestCase(ResourceProviderBaseCase):
'CUSTOM_IRON_NFV')
class ResourceProviderTraitsTestCase(ResourceProviderBaseCase):
class ResourceProviderTraitTestCase(ResourceProviderBaseCase):
def _assert_traits(self, expected_traits, traits_objs):
expected_traits.sort()