openstack/nova
Code Issues Proposed changes

Merge "consoliate set_availability_zones usage"

Browse Source
This commit is contained in:
Jenkins
2015-03-23 06:52:46 +00:00
committed by Gerrit Code Review
parent c550ad253e 3a915e37dc
commit 8ad220dd8e
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

8
nova/availability_zones.py
View File

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