diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-19 19:35:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-19 19:35:26 +0000 |
| commit | ad56086663b2fe1dedb0f549a254a19e82b1d653 (patch) | |
| tree | 95619c475d6d56a97d7ed6f181083d46b768b113 /openstackclient/network | |
| parent | 44cf358a142ec1ead41cebe40fe2867483c3fc03 (diff) | |
| parent | e04e389da2e9d8ec96398356ceda2ab2388cdad5 (diff) | |
| download | python-openstackclient-ad56086663b2fe1dedb0f549a254a19e82b1d653.tar.gz | |
Merge "router list if availability_zone ext not enabled"
Diffstat (limited to 'openstackclient/network')
| -rw-r--r-- | openstackclient/network/v2/router.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/openstackclient/network/v2/router.py b/openstackclient/network/v2/router.py index f6d96d03..d30197cc 100644 --- a/openstackclient/network/v2/router.py +++ b/openstackclient/network/v2/router.py @@ -281,13 +281,20 @@ class ListRouter(command.Lister): columns = columns + ( 'routes', 'external_gateway_info', - 'availability_zones' ) column_headers = column_headers + ( 'Routes', 'External gateway info', - 'Availability zones' ) + # availability zone will be available only when + # router_availability_zone extension is enabled + if client.find_extension("router_availability_zone"): + columns = columns + ( + 'availability_zones', + ) + column_headers = column_headers + ( + 'Availability zones', + ) data = client.routers() return (column_headers, |