openstack
/
nova
Code Issues Proposed changes

Merge "Remove the can_host column"

This commit is contained in:
Jenkins 2017-05-26 14:30:12 +00:00 committed by Gerrit Code Review
parent 0d3003405d fcfe28192e
commit 0cc730f186
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nova/db/sqlalchemy/api_models.py
View File

@ -300,7 +300,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):

2
nova/objects/resource_provider.py
View File

@ -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

3
nova/tests/functional/db/api/test_migrations.py
View File

@ -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:

3
nova/tests/functional/db/test_resource_provider.py
View File

@ -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))