From 2e77f1f238472df798d45a76bf53e3ee3e3295e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Sat, 21 Nov 2020 05:17:37 +0100 Subject: [PATCH] Add tag with network name on network resources The network name in uppercase is needed to write group_vars in ansible inventory. The name_lower value is used as the actual network resouce name in neutron. Change-Id: Id99aa83d3025202ffd27480157aaf3e101c2f471 --- .../ansible_plugins/modules/tripleo_composable_network.py | 2 +- .../tests/modules/test_tripleo_composable_network.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tripleo_ansible/ansible_plugins/modules/tripleo_composable_network.py b/tripleo_ansible/ansible_plugins/modules/tripleo_composable_network.py index 624ce6a33..3cf98fbbd 100644 --- a/tripleo_ansible/ansible_plugins/modules/tripleo_composable_network.py +++ b/tripleo_ansible/ansible_plugins/modules/tripleo_composable_network.py @@ -116,7 +116,7 @@ def get_overcloud_domain_name(conn, default_network): def build_network_tag_field(net_data): - tags = [] + tags = ['='.join(['tripleo_network_name', net_data['name']])] service_net_map_replace = net_data.get('service_net_map_replace') vip = net_data.get('vip') if service_net_map_replace: diff --git a/tripleo_ansible/tests/modules/test_tripleo_composable_network.py b/tripleo_ansible/tests/modules/test_tripleo_composable_network.py index e8f194e91..2954e6ff1 100644 --- a/tripleo_ansible/tests/modules/test_tripleo_composable_network.py +++ b/tripleo_ansible/tests/modules/test_tripleo_composable_network.py @@ -28,13 +28,14 @@ class TestTripleoComposableNetwork(tests_base.TestCase): net_data = {'name': 'foo', 'service_net_map_replace': 'replacement', 'vip': True} - expected = ['tripleo_service_net_map_replace=replacement', + expected = ['tripleo_network_name=foo', + 'tripleo_service_net_map_replace=replacement', 'tripleo_vip=true'] result = plugin.build_network_tag_field(net_data) self.assertEqual(expected, result) net_data = {'name': 'foo'} - expected = [] + expected = ['tripleo_network_name=foo'] result = plugin.build_network_tag_field(net_data) self.assertEqual(expected, result) @@ -61,7 +62,7 @@ class TestTripleoComposableNetwork(tests_base.TestCase): 'shared': plugin.DEFAULT_SHARED, 'provider:physical_network': 'netname', 'provider:network_type': plugin.DEFAULT_NETWORK_TYPE, - 'tags': [], + 'tags': ['tripleo_network_name=NetName'], } result = plugin.create_net_spec(net_data, overcloud_domain_name)