From 4c2eb2bd8b9ba16dba1eb3707f64c0ea4f447e91 Mon Sep 17 00:00:00 2001 From: M V P Nitesh Date: Thu, 22 Jun 2017 12:56:26 +0530 Subject: [PATCH] Show neutron tags in OSC network show Now tag information of the network is displayed when the user tries to see the network details using the command openstack network show Change-Id: I587d2bca37b8dbef4400db3d8ace3c81d87e2db3 Closes-Bug: #1695783 --- openstackclient/network/v2/network.py | 2 ++ openstackclient/tests/unit/network/v2/fakes.py | 2 ++ openstackclient/tests/unit/network/v2/test_network.py | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/openstackclient/network/v2/network.py b/openstackclient/network/v2/network.py index e4cf54bfb2..e3737895ba 100644 --- a/openstackclient/network/v2/network.py +++ b/openstackclient/network/v2/network.py @@ -39,6 +39,7 @@ _formatters = { 'is_router_external': _format_router_external, 'availability_zones': utils.format_list, 'availability_zone_hints': utils.format_list, + 'tags': utils.format_list, } @@ -55,6 +56,7 @@ def _get_columns_network(item): 'ipv4_address_scope_id': 'ipv4_address_scope', 'ipv6_address_scope_id': 'ipv6_address_scope', 'tenant_id': 'project_id', + 'tags': 'tags', } return sdk_utils.get_osc_show_columns_for_sdk_resource(item, column_map) diff --git a/openstackclient/tests/unit/network/v2/fakes.py b/openstackclient/tests/unit/network/v2/fakes.py index e736b0fdd1..69f28ee36d 100644 --- a/openstackclient/tests/unit/network/v2/fakes.py +++ b/openstackclient/tests/unit/network/v2/fakes.py @@ -346,6 +346,7 @@ class FakeNetwork(object): 'availability_zone_hints': [], 'is_default': False, 'port_security_enabled': True, + 'tags': ['test'], 'qos_policy_id': 'qos-policy-id-' + uuid.uuid4().hex, 'ipv4_address_scope': 'ipv4' + uuid.uuid4().hex, 'ipv6_address_scope': 'ipv6' + uuid.uuid4().hex, @@ -365,6 +366,7 @@ class FakeNetwork(object): network_attrs['port_security_enabled'] network.subnet_ids = network_attrs['subnets'] network.is_shared = network_attrs['shared'] + network.is_tags = network_attrs['tags'] network.provider_network_type = \ network_attrs['provider:network_type'] network.provider_physical_network = \ diff --git a/openstackclient/tests/unit/network/v2/test_network.py b/openstackclient/tests/unit/network/v2/test_network.py index 1bd7bac619..af2d08ba18 100644 --- a/openstackclient/tests/unit/network/v2/test_network.py +++ b/openstackclient/tests/unit/network/v2/test_network.py @@ -75,6 +75,7 @@ class TestCreateNetworkIdentityV3(TestNetwork): 'shared', 'status', 'subnets', + 'tags', ) data = ( @@ -97,6 +98,7 @@ class TestCreateNetworkIdentityV3(TestNetwork): _network.shared, _network.status, utils.format_list(_network.subnets), + utils.format_list(_network.tags), ) def setUp(self): @@ -255,6 +257,7 @@ class TestCreateNetworkIdentityV2(TestNetwork): 'shared', 'status', 'subnets', + 'tags', ) data = ( @@ -277,6 +280,7 @@ class TestCreateNetworkIdentityV2(TestNetwork): _network.shared, _network.status, utils.format_list(_network.subnets), + utils.format_list(_network.tags), ) def setUp(self): @@ -932,6 +936,7 @@ class TestShowNetwork(TestNetwork): 'shared', 'status', 'subnets', + 'tags', ) data = ( @@ -954,6 +959,7 @@ class TestShowNetwork(TestNetwork): _network.shared, _network.status, utils.format_list(_network.subnets), + utils.format_list(_network.tags), ) def setUp(self):