openstack
/
nova
Code Issues Proposed changes

consoliate set_availability_zones usage 

set_availability_zones in availability_zone.py is used
at several place, actually, the param of object allows
it to be set inside object function. So switch to
object with param input to clean unnessary code.

Change-Id: I3fd8a661677d6bfee513512d2315e8daeb57d422
This commit is contained in:
jichenjc 2015-02-07 12:38:56 +08:00
parent d7d6f2cb34
commit 3a915e37dc
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nova/api/openstack/compute/contrib/availability_zone.py
View File

@ -64,9 +64,8 @@ class AvailabilityZoneController(wsgi.Controller):
availability_zones.get_availability_zones(ctxt)
# Available services
enabled_services = objects.ServiceList.get_all(context, disabled=False)
enabled_services = availability_zones.set_availability_zones(context,
enabled_services)
enabled_services = objects.ServiceList.get_all(context, disabled=False,
set_zones=True)
zone_hosts = {}
host_services = {}
for service in enabled_services:

5
nova/api/openstack/compute/plugins/v3/availability_zone.py
View File

@ -66,9 +66,8 @@ class AvailabilityZoneController(wsgi.Controller):
availability_zones.get_availability_zones(ctxt)
# Available services
enabled_services = objects.ServiceList.get_all(context, disabled=False)
enabled_services = availability_zones.set_availability_zones(context,
enabled_services)
enabled_services = objects.ServiceList.get_all(context, disabled=False,
set_zones=True)
zone_hosts = {}
host_services = {}
for service in enabled_services:

8
nova/availability_zones.py
View File

@ -140,8 +140,8 @@ def get_availability_zones(context, get_only_available=False,
:param with_hosts: whether to return hosts part of the AZs
:type with_hosts: bool
"""
enabled_services = objects.ServiceList.get_all(context, disabled=False)
enabled_services = set_availability_zones(context, enabled_services)
enabled_services = objects.ServiceList.get_all(context, disabled=False,
set_zones=True)
available_zones = []
for (zone, host) in [(service['availability_zone'], service['host'])
@ -156,8 +156,8 @@ def get_availability_zones(context, get_only_available=False,
available_zones = list(_available_zones.items())
if not get_only_available:
disabled_services = objects.ServiceList.get_all(context, disabled=True)
disabled_services = set_availability_zones(context, disabled_services)
disabled_services = objects.ServiceList.get_all(context, disabled=True,
set_zones=True)
not_available_zones = []
azs = available_zones if not with_hosts else dict(available_zones)
zones = [(service['availability_zone'], service['host'])