Merge "Fix network router type display"

3 files changed, 12 insertions, 15 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 = (
diff --git a/openstackclient/tests/network/v2/fakes.py b/openstackclient/tests/network/v2/fakes.py
index a0baf784..84ede381 100644
--- a/openstackclient/tests/network/v2/fakes.py
+++ b/openstackclient/tests/network/v2/fakes.py
@@ -184,8 +184,7 @@ class FakeNetwork(object):
         :param Dictionary attrs:
             A dictionary with all attributes
         :return:
-            A FakeResource object, with id, name, admin_state_up,
-            router_external, status, subnets, tenant_id
+            A FakeResource object, with id, name, etc.
         """
         attrs = attrs or {}
 
@@ -199,7 +198,7 @@ class FakeNetwork(object):
             'shared': False,
             'subnets': ['a', 'b'],
             'provider_network_type': 'vlan',
-            'router_external': True,
+            'router:external': True,
             'availability_zones': [],
             'availability_zone_hints': [],
             'is_default': False,
@@ -213,6 +212,7 @@ class FakeNetwork(object):
 
         # Set attributes with special mapping in OpenStack SDK.
         network.project_id = network_attrs['tenant_id']
+        network.is_router_external = network_attrs['router:external']
 
         return network
 
diff --git a/openstackclient/tests/network/v2/test_network.py b/openstackclient/tests/network/v2/test_network.py
index 1269b0a1..8f91e20e 100644
--- a/openstackclient/tests/network/v2/test_network.py
+++ b/openstackclient/tests/network/v2/test_network.py
@@ -55,7 +55,7 @@ class TestCreateNetworkIdentityV3(TestNetwork):
         'name',
         'project_id',
         'provider_network_type',
-        'router_external',
+        'router:external',
         'shared',
         'status',
         'subnets',
@@ -70,7 +70,7 @@ class TestCreateNetworkIdentityV3(TestNetwork):
         _network.name,
         _network.project_id,
         _network.provider_network_type,
-        network._format_router_external(_network.router_external),
+        network._format_router_external(_network.is_router_external),
         _network.shared,
         _network.status,
         utils.format_list(_network.subnets),
@@ -223,7 +223,7 @@ class TestCreateNetworkIdentityV2(TestNetwork):
         'name',
         'project_id',
         'provider_network_type',
-        'router_external',
+        'router:external',
         'shared',
         'status',
         'subnets',
@@ -238,7 +238,7 @@ class TestCreateNetworkIdentityV2(TestNetwork):
         _network.name,
         _network.project_id,
         _network.provider_network_type,
-        network._format_router_external(_network.router_external),
+        network._format_router_external(_network.is_router_external),
         _network.shared,
         _network.status,
         utils.format_list(_network.subnets),
@@ -390,7 +390,7 @@ class TestListNetwork(TestNetwork):
             net.shared,
             utils.format_list(net.subnets),
             net.provider_network_type,
-            network._format_router_external(net.router_external),
+            network._format_router_external(net.is_router_external),
             utils.format_list(net.availability_zones),
         ))
 
@@ -565,7 +565,7 @@ class TestShowNetwork(TestNetwork):
         'name',
         'project_id',
         'provider_network_type',
-        'router_external',
+        'router:external',
         'shared',
         'status',
         'subnets',
@@ -580,7 +580,7 @@ class TestShowNetwork(TestNetwork):
         _network.name,
         _network.project_id,
         _network.provider_network_type,
-        network._format_router_external(_network.router_external),
+        network._format_router_external(_network.is_router_external),
         _network.shared,
         _network.status,
         utils.format_list(_network.subnets),