Skip to content

Commit b3a4b88

Browse files
committed
Refactor network AZ exception handling
Exceptions that occur while getting network availability zones should not be masked as if the extension does not exist. Change-Id: I07213ec6c4d83e97261b58bf8d42417c1cdfae6a Related-Bug: #1534202
1 parent 624c39a commit b3a4b88

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

openstackclient/common/availability_zone.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,21 +146,20 @@ def _get_volume_availability_zones(self, parsed_args):
146146

147147
def _get_network_availability_zones(self, parsed_args):
148148
network_client = self.app.client_manager.network
149-
data = []
150149
try:
151150
# Verify that the extension exists.
152151
network_client.find_extension('Availability Zone',
153152
ignore_missing=False)
154-
data = network_client.availability_zones()
155153
except Exception as e:
156154
self.log.debug('Network availability zone exception: ' + str(e))
157155
if parsed_args.network:
158156
message = "Availability zones list not supported by " \
159157
"Network API"
160158
self.log.warning(message)
159+
return []
161160

162161
result = []
163-
for zone in data:
162+
for zone in network_client.availability_zones():
164163
result += _xform_network_availability_zone(zone)
165164
return result
166165

0 commit comments

Comments
 (0)