From fcfe28192eaa63d2ca000d38bc435a5e662ad8f5 Mon Sep 17 00:00:00 2001 From: EdLeafe Date: Mon, 1 May 2017 15:32:06 +0000 Subject: [PATCH] Remove the can_host column Originally it was felt that we would need this column to distinguish between compute nodes and non-compute providers. With the advent of traits, though, this column is no longer used or needed. Closes-Bug: #1648197 Change-Id: I614db98727f4737deb6728ee874ab0f68024ebe5 --- nova/db/sqlalchemy/api_models.py | 1 - nova/objects/resource_provider.py | 2 -- nova/tests/functional/db/api/test_migrations.py | 3 ++- nova/tests/functional/db/test_resource_provider.py | 3 --- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/nova/db/sqlalchemy/api_models.py b/nova/db/sqlalchemy/api_models.py index eb8ecfd61545..df590cbc241d 100644 --- a/nova/db/sqlalchemy/api_models.py +++ b/nova/db/sqlalchemy/api_models.py @@ -299,7 +299,6 @@ class ResourceProvider(API_BASE): uuid = Column(String(36), nullable=False) name = Column(Unicode(200), nullable=True) generation = Column(Integer, default=0) - can_host = Column(Integer, default=0) class Inventory(API_BASE): diff --git a/nova/objects/resource_provider.py b/nova/objects/resource_provider.py index 8620f36a7f54..bb8fefb0d3e4 100644 --- a/nova/objects/resource_provider.py +++ b/nova/objects/resource_provider.py @@ -736,7 +736,6 @@ class ResourceProviderList(base.ObjectListBase, base.NovaObject): filters = copy.deepcopy(filters) name = filters.pop('name', None) uuid = filters.pop('uuid', None) - can_host = filters.pop('can_host', 0) member_of = filters.pop('member_of', []) resources = filters.pop('resources', {}) @@ -749,7 +748,6 @@ class ResourceProviderList(base.ObjectListBase, base.NovaObject): query = query.filter(models.ResourceProvider.name == name) if uuid: query = query.filter(models.ResourceProvider.uuid == uuid) - query = query.filter(models.ResourceProvider.can_host == can_host) # If 'member_of' has values join with the PlacementAggregates to # get those resource providers that are associated with any of the diff --git a/nova/tests/functional/db/api/test_migrations.py b/nova/tests/functional/db/api/test_migrations.py index 3b5fa89d8ab3..55556e43fa51 100644 --- a/nova/tests/functional/db/api/test_migrations.py +++ b/nova/tests/functional/db/api/test_migrations.py @@ -90,7 +90,8 @@ class NovaAPIModelsSync(test_migrations.ModelsMigrationsSync): 'display_name', 'access_ip_v6', 'access_ip_v4', 'key_name', 'locked_by', 'image_ref', 'progress', 'request_spec_id', 'info_cache', 'user_id', 'task_state', 'security_groups', - 'config_drive'] + 'config_drive'], + 'resource_providers': ['can_host'], } for element in diff: diff --git a/nova/tests/functional/db/test_resource_provider.py b/nova/tests/functional/db/test_resource_provider.py index 8b9654547891..830d4d10ee30 100644 --- a/nova/tests/functional/db/test_resource_provider.py +++ b/nova/tests/functional/db/test_resource_provider.py @@ -586,9 +586,6 @@ class ResourceProviderListTestCase(ResourceProviderBaseCase): resource_providers = objects.ResourceProviderList.get_all_by_filters( self.context, filters={'name': u'rp_name_1'}) self.assertEqual(1, len(resource_providers)) - resource_providers = objects.ResourceProviderList.get_all_by_filters( - self.context, filters={'can_host': 1}) - self.assertEqual(0, len(resource_providers)) resource_providers = objects.ResourceProviderList.get_all_by_filters( self.context, filters={'uuid': getattr(uuidsentinel, 'rp_uuid_2')}) self.assertEqual(1, len(resource_providers))