diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-16 22:39:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-16 22:39:53 +0000 |
| commit | c471a97aef29f9ae9b74924f75eb313eb2bfa86e (patch) | |
| tree | 9de02827611ea6561d426065949f846d58606517 /openstackclient/network | |
| parent | 093f0ff003f493667c0c28854a07ce882d834e3f (diff) | |
| parent | 9f3fa5ee3bf87c47f7a38ef78f4022ac46b2f2f6 (diff) | |
| download | python-openstackclient-c471a97aef29f9ae9b74924f75eb313eb2bfa86e.tar.gz | |
Merge "Fix network router type display"
Diffstat (limited to 'openstackclient/network')
| -rw-r--r-- | openstackclient/network/v2/network.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/openstackclient/network/v2/network.py b/openstackclient/network/v2/network.py index 4b77971a..9fd7e28b 100644 --- a/openstackclient/network/v2/network.py +++ b/openstackclient/network/v2/network.py @@ -32,7 +32,7 @@ def _format_router_external(item): _formatters = { 'subnets': utils.format_list, 'admin_state_up': _format_admin_state, - 'router_external': _format_router_external, + 'router:external': _format_router_external, 'availability_zones': utils.format_list, 'availability_zone_hints': utils.format_list, } @@ -43,9 +43,6 @@ def _get_columns(item): if 'tenant_id' in columns: columns.remove('tenant_id') columns.append('project_id') - if 'router:external' in columns: - columns.remove('router:external') - columns.append('router_external') return tuple(sorted(columns)) @@ -290,7 +287,7 @@ class ListNetwork(common.NetworkAndComputeLister): 'shared', 'subnets', 'provider_network_type', - 'router_external', + 'router:external', 'availability_zones', ) column_headers = ( |