openstack/nova
Code Issues Proposed changes

Merge "Redundant parentheses removed"

Browse Source
This commit is contained in:
Jenkins 2016-03-16 12:52:26 +00:00 committed by Gerrit Code Review
commit b4444de5a1
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nova/compute/resource_tracker.py
View File

@ -370,7 +370,7 @@ class ResourceTracker(object):
instance_type = self._get_instance_type(ctxt, instance, prefix, instance_type = self._get_instance_type(ctxt, instance, prefix,
migration) migration)
if (instance_type is not None and instance_type.id == itype['id']): if instance_type is not None and instance_type.id == itype['id']:
numa_topology = self._get_migration_context_resource( numa_topology = self._get_migration_context_resource(
'numa_topology', instance) 'numa_topology', instance)
usage = self._get_usage_dict( usage = self._get_usage_dict(
@ -510,8 +510,7 @@ class ResourceTracker(object):
# We want the 'cpu_info' to be None from the POV of the # We want the 'cpu_info' to be None from the POV of the
# virt driver, but the DB requires it to be non-null so # virt driver, but the DB requires it to be non-null so
# just force it to empty string # just force it to empty string
if ("cpu_info" not in resources or if "cpu_info" not in resources or resources["cpu_info"] is None:
resources["cpu_info"] is None):
resources["cpu_info"] = '' resources["cpu_info"] = ''
self._verify_resources(resources) self._verify_resources(resources)