diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-16 12:52:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-16 12:52:27 +0000 |
| commit | b4444de5a1a50276bb484aee7d40bcf960051fa9 (patch) | |
| tree | fe0a3412a68a0ee2cd99931069dde23fa13a802c | |
| parent | 6e2d6f80ddd339486ebc31b1375bf298217fa207 (diff) | |
| parent | 1f55dbb9dd6c02fc46a1c2c44df11be9a031a7e3 (diff) | |
| download | nova-b4444de5a1a50276bb484aee7d40bcf960051fa9.tar.gz | |
Merge "Redundant parentheses removed"
| -rw-r--r-- | nova/compute/resource_tracker.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/compute/resource_tracker.py b/nova/compute/resource_tracker.py index e7829b1999..42ecd5fa37 100644 --- a/nova/compute/resource_tracker.py +++ b/nova/compute/resource_tracker.py @@ -370,7 +370,7 @@ class ResourceTracker(object): instance_type = self._get_instance_type(ctxt, instance, prefix, 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', instance) 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 # virt driver, but the DB requires it to be non-null so # just force it to empty string - if ("cpu_info" not in resources or - resources["cpu_info"] is None): + if "cpu_info" not in resources or resources["cpu_info"] is None: resources["cpu_info"] = '' self._verify_resources(resources) |