From ba6e352929d63b0e1a765cb26c528c53dcc18a9a Mon Sep 17 00:00:00 2001 From: He Jie Xu Date: Thu, 30 Mar 2017 10:52:30 +0800 Subject: [PATCH] Rename the model object ResourceProviderTraits to ResourceProviderTrait The name of model object should be singular. This patch corrects it. Partial implement blueprint resource-provider-traits Change-Id: I7600d7e3775d237e0593ec52fbb474e1dad079c1 --- nova/db/sqlalchemy/api_models.py | 2 +- nova/tests/functional/db/test_resource_provider.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nova/db/sqlalchemy/api_models.py b/nova/db/sqlalchemy/api_models.py index cec76f02c6b7..eb8ecfd61545 100644 --- a/nova/db/sqlalchemy/api_models.py +++ b/nova/db/sqlalchemy/api_models.py @@ -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" diff --git a/nova/tests/functional/db/test_resource_provider.py b/nova/tests/functional/db/test_resource_provider.py index d9fd85412aaa..c9f1d271c639 100644 --- a/nova/tests/functional/db/test_resource_provider.py +++ b/nova/tests/functional/db/test_resource_provider.py @@ -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()