openstack/nova
Code Issues Proposed changes

Merge "Style improvements"

Browse Source
This commit is contained in:
Jenkins
2016-06-01 11:28:44 +00:00
committed by Gerrit Code Review
parent f59b2ba5f7 a572359efd
commit 3456216300
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
nova/scheduler/filters/affinity_filter.py
View File

@@ -25,8 +25,7 @@ LOG = logging.getLogger(__name__)
class DifferentHostFilter(filters.BaseHostFilter):
'''Schedule the instance on a different host from a set of instances.'''
"""Schedule the instance on a different host from a set of instances."""
# The hosts the instances are running on doesn't change within a request
run_filter_once_per_request = True
@@ -40,10 +39,9 @@ class DifferentHostFilter(filters.BaseHostFilter):
class SameHostFilter(filters.BaseHostFilter):
'''Schedule the instance on the same host as another instance in a set of
"""Schedule the instance on the same host as another instance in a set of
instances.
'''
"""
# The hosts the instances are running on doesn't change within a request
run_filter_once_per_request = True
@@ -57,9 +55,7 @@ class SameHostFilter(filters.BaseHostFilter):
class SimpleCIDRAffinityFilter(filters.BaseHostFilter):
'''Schedule the instance on a host with a particular cidr
'''
"""Schedule the instance on a host with a particular cidr"""
# The address of a host doesn't change within a request
run_filter_once_per_request = True
@@ -96,8 +92,8 @@ class _GroupAntiAffinityFilter(filters.BaseHostFilter):
group_hosts = (spec_obj.instance_group.hosts
if spec_obj.instance_group else [])
LOG.debug("Group anti affinity: check if %(host)s not "
"in %(configured)s", {'host': host_state.host,
'configured': group_hosts})
"in %(configured)s", {'host': host_state.host,
'configured': group_hosts})
if group_hosts:
return host_state.host not in group_hosts
@@ -124,8 +120,8 @@ class _GroupAffinityFilter(filters.BaseHostFilter):
group_hosts = (spec_obj.instance_group.hosts
if spec_obj.instance_group else [])
LOG.debug("Group affinity: check if %(host)s in "
"%(configured)s", {'host': host_state.host,
'configured': group_hosts})
"%(configured)s", {'host': host_state.host,
'configured': group_hosts})
if group_hosts:
return host_state.host in group_hosts