From 3a915e37dc70992291635788979978f47a5e298f Mon Sep 17 00:00:00 2001 From: jichenjc Date: Sat, 7 Feb 2015 12:38:56 +0800 Subject: [PATCH] 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 --- nova/api/openstack/compute/contrib/availability_zone.py | 5 ++--- .../api/openstack/compute/plugins/v3/availability_zone.py | 5 ++--- nova/availability_zones.py | 8 ++++---- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/nova/api/openstack/compute/contrib/availability_zone.py b/nova/api/openstack/compute/contrib/availability_zone.py index 69f4a158583f..b44cc6afdd57 100644 --- a/nova/api/openstack/compute/contrib/availability_zone.py +++ b/nova/api/openstack/compute/contrib/availability_zone.py @@ -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: diff --git a/nova/api/openstack/compute/plugins/v3/availability_zone.py b/nova/api/openstack/compute/plugins/v3/availability_zone.py index f101fe7791da..5bbba4b8c3f9 100644 --- a/nova/api/openstack/compute/plugins/v3/availability_zone.py +++ b/nova/api/openstack/compute/plugins/v3/availability_zone.py @@ -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: diff --git a/nova/availability_zones.py b/nova/availability_zones.py index 7389605d68ec..ee0ff7a4ff75 100644 --- a/nova/availability_zones.py +++ b/nova/availability_zones.py @@ -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'])