openstack/nova
Code Issues Proposed changes

Refactor ComputeCapabilitiesFilter as bugfix preparation

Browse Source 
The ComputeCapabilitiesFilter filters hosts for multiple reasons.
The reasons for filtering are not logged. The code was convoluted.
This change prepares the bugfix by:
* adding unit tests to cover all possible code paths
* extract a part of the convoluted method

Partial-bug: #1370948

Change-Id: I4748b5bda21176df0cb7e0b166679f844e368717
This commit is contained in:
Markus Zoeller
2015-01-20 14:23:43 +01:00
parent 7e8ed8c6f7
commit 670647e718
2 changed files with 56 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
nova/scheduler/filters/compute_capabilities_filter.py
View File

@@ -30,6 +30,29 @@ class ComputeCapabilitiesFilter(filters.BaseHostFilter):
# Instance type and host capabilities do not change within a request
run_filter_once_per_request = True
def _get_capabilities(self, host_state, scope):
cap = host_state
for index in range(0, len(scope)):
try:
if isinstance(cap, six.string_types):
try:
cap = jsonutils.loads(cap)
except ValueError:
return None
if not isinstance(cap, dict):
if getattr(cap, scope[index], None) is None:
# If can't find, check stats dict
cap = cap.stats.get(scope[index], None)
else:
cap = getattr(cap, scope[index], None)
else:
cap = cap.get(scope[index], None)
except AttributeError:
return None
if cap is None:
return None
return cap
def _satisfies_extra_specs(self, host_state, instance_type):
"""Check that the host_state provided by the compute service
satisfy the extra specs associated with the instance type.
@@ -45,26 +68,11 @@ class ComputeCapabilitiesFilter(filters.BaseHostFilter):
continue
else:
del scope[0]
cap = host_state
for index in range(0, len(scope)):
try:
if isinstance(cap, six.string_types):
try:
cap = jsonutils.loads(cap)
except ValueError:
return False
if not isinstance(cap, dict):
if getattr(cap, scope[index], None) is None:
# If can't find, check stats dict
cap = cap.stats.get(scope[index], None)
else:
cap = getattr(cap, scope[index], None)
else:
cap = cap.get(scope[index], None)
except AttributeError:
return False
if cap is None:
return False
cap = self._get_capabilities(host_state, scope)
if cap is None:
return False
if not extra_specs_ops.match(str(cap), req):
LOG.debug("extra_spec requirement '%(req)s' does not match "
"'%(cap)s'", {'req': req, 'cap': cap})