openstack/python-openstackclient
Code Issues Proposed changes

Merge "Refactor network AZ exception handling"

Browse Source
This commit is contained in:
Jenkins 2016-02-24 06:20:57 +00:00 committed by Gerrit Code Review
commit e5fe9a7071
1 changed files with 2 additions and 3 deletions

5
openstackclient/common/availability_zone.py

@ -146,21 +146,20 @@ class ListAvailabilityZone(command.Lister):
def _get_network_availability_zones(self, parsed_args): def _get_network_availability_zones(self, parsed_args):
network_client = self.app.client_manager.network network_client = self.app.client_manager.network
data = []
try: try:
# Verify that the extension exists. # Verify that the extension exists.
network_client.find_extension('Availability Zone', network_client.find_extension('Availability Zone',
ignore_missing=False) ignore_missing=False)
data = network_client.availability_zones()
except Exception as e: except Exception as e:
self.log.debug('Network availability zone exception: ' + str(e)) self.log.debug('Network availability zone exception: ' + str(e))
if parsed_args.network: if parsed_args.network:
message = "Availability zones list not supported by " \ message = "Availability zones list not supported by " \
"Network API" "Network API"
self.log.warning(message) self.log.warning(message)
return []
result = [] result = []
for zone in data: for zone in network_client.availability_zones():
result += _xform_network_availability_zone(zone) result += _xform_network_availability_zone(zone)
return result return result