From 9f3fa5ee3bf87c47f7a38ef78f4022ac46b2f2f6 Mon Sep 17 00:00:00 2001
From: Richard Theis <rtheis@us.ibm.com>
Date: Tue, 19 Apr 2016 14:42:01 -0500
Subject: Fix network router type display

The OpenStack SDK maps the network "router:external" field to
"is_router_external". However, OSC was using the incorrect
mapping, "router_external".  This caused OSC to display router
type as "Internal" for all networks.

Change-Id: Ifcd1349ab7c5881baee751936d076bf6aa058852
Closes-Bug: #1572228
---
 openstackclient/tests/network/v2/fakes.py        |  6 +++---
 openstackclient/tests/network/v2/test_network.py | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'openstackclient/tests')

diff --git a/openstackclient/tests/network/v2/fakes.py b/openstackclient/tests/network/v2/fakes.py
index 1989b515..97a7f84e 100644
--- a/openstackclient/tests/network/v2/fakes.py
+++ b/openstackclient/tests/network/v2/fakes.py
@@ -166,8 +166,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 {}
 
@@ -181,7 +180,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,
@@ -195,6 +194,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 a1b0aec9..72dc7ac2 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),
@@ -224,7 +224,7 @@ class TestCreateNetworkIdentityV2(TestNetwork):
         'name',
         'project_id',
         'provider_network_type',
-        'router_external',
+        'router:external',
         'shared',
         'status',
         'subnets',
@@ -239,7 +239,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),
@@ -391,7 +391,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),
         ))
 
@@ -566,7 +566,7 @@ class TestShowNetwork(TestNetwork):
         'name',
         'project_id',
         'provider_network_type',
-        'router_external',
+        'router:external',
         'shared',
         'status',
         'subnets',
@@ -581,7 +581,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),
-- 
cgit v1.2.1