From 381b47ff05559113ae99f61f3c230b806dcaa9ca Mon Sep 17 00:00:00 2001
From: Steve Martinelli <stevemar@ca.ibm.com>
Date: Tue, 9 Dec 2014 14:47:51 -0500
Subject: [PATCH] list availability zones for compute
Adds the command `os availability zone list`
Change-Id: I77bf52a9b84a62c3771a4838c9ea0c3af03eedb2
Closes-Bug: #1400795
---
.../compute/v2/availability_zone.py | 102 ++++++++++++++++++
setup.cfg | 2 +
2 files changed, 104 insertions(+)
create mode 100644 openstackclient/compute/v2/availability_zone.py
diff --git a/openstackclient/compute/v2/availability_zone.py b/openstackclient/compute/v2/availability_zone.py
new file mode 100644
index 0000000000..c7c9241491
--- /dev/null
+++ b/openstackclient/compute/v2/availability_zone.py
@@ -0,0 +1,102 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+
+"""Compute v2 Availability Zone action implementations"""
+
+import copy
+import logging
+
+from cliff import lister
+from novaclient import exceptions as nova_exceptions
+import six
+
+from openstackclient.common import utils
+from openstackclient.i18n import _ # noqa
+
+
+def _xform_availability_zone(az, include_extra):
+ result = []
+ zone_info = {}
+ if hasattr(az, 'zoneState'):
+ zone_info['zone_status'] = ('available' if az.zoneState['available']
+ else 'not available')
+ if hasattr(az, 'zoneName'):
+ zone_info['zone_name'] = az.zoneName
+
+ if not include_extra:
+ result.append(zone_info)
+ return result
+
+ if hasattr(az, 'hosts') and az.hosts:
+ for host, services in six.iteritems(az.hosts):
+ host_info = copy.deepcopy(zone_info)
+ host_info['host_name'] = host
+
+ for svc, state in six.iteritems(services):
+ info = copy.deepcopy(host_info)
+ info['service_name'] = svc
+ info['service_status'] = '%s %s %s' % (
+ 'enabled' if state['active'] else 'disabled',
+ ':-)' if state['available'] else 'XXX',
+ state['updated_at'])
+ result.append(info)
+ else:
+ zone_info['host_name'] = ''
+ zone_info['service_name'] = ''
+ zone_info['service_status'] = ''
+ result.append(zone_info)
+ return result
+
+
+class ListAvailabilityZone(lister.Lister):
+ """List Availability Zones and their status"""
+
+ log = logging.getLogger(__name__ + '.ListAvailabilityZone')
+
+ def get_parser(self, prog_name):
+ parser = super(ListAvailabilityZone, self).get_parser(prog_name)
+ parser.add_argument(
+ '--long',
+ action='store_true',
+ default=False,
+ help=_('List additional fields in output'),
+ )
+ return parser
+
+ def take_action(self, parsed_args):
+ self.log.debug('take_action(%s)', parsed_args)
+
+ if parsed_args.long:
+ columns = ('Zone Name', 'Zone Status',
+ 'Host Name', 'Service Name', 'Service Status')
+ else:
+ columns = ('Zone Name', 'Zone Status')
+
+ compute_client = self.app.client_manager.compute
+ try:
+ data = compute_client.availability_zones.list()
+ except nova_exceptions.Forbidden as e: # policy doesn't allow
+ try:
+ data = compute_client.availability_zones.list(detailed=False)
+ except Exception:
+ raise e
+
+ # Argh, the availability zones are not iterable...
+ result = []
+ for zone in data:
+ result += _xform_availability_zone(zone, parsed_args.long)
+
+ return (columns,
+ (utils.get_dict_properties(
+ s, columns
+ ) for s in result))
diff --git a/setup.cfg b/setup.cfg
index 02b7751d43..e1e5a1ec4f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -49,6 +49,8 @@ openstack.common =
quota_show = openstackclient.common.quota:ShowQuota
openstack.compute.v2 =
+ availability_zone_list = openstackclient.compute.v2.availability_zone:ListAvailabilityZone
+
compute_agent_create = openstackclient.compute.v2.agent:CreateAgent
compute_agent_delete = openstackclient.compute.v2.agent:DeleteAgent
compute_agent_list = openstackclient.compute.v2.agent:ListAgent