From 516c25f1abc0ea530ac7b43b357ae016e6dca29f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Fri, 13 Nov 2020 07:36:05 +0100 Subject: [PATCH] Use name_lower for network resource name Fixes an issue in the tripleo_composable_network module. It need to set the name of networks to the 'name_lower' value, not the 'name' value to keep naming convention compatible with tripleo-heat-templates. Change-Id: Iec06cf575d3cc45569dd761b49ade452b40a01b5 --- .../ansible_plugins/modules/tripleo_composable_network.py | 2 +- .../modules/tripleo_network_populate_environment.py | 2 +- .../tests/modules/test_network_populate_environment.py | 4 ++++ .../tests/modules/test_tripleo_composable_network.py | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tripleo_ansible/ansible_plugins/modules/tripleo_composable_network.py b/tripleo_ansible/ansible_plugins/modules/tripleo_composable_network.py index 8d870627f..624ce6a33 100644 --- a/tripleo_ansible/ansible_plugins/modules/tripleo_composable_network.py +++ b/tripleo_ansible/ansible_plugins/modules/tripleo_composable_network.py @@ -146,7 +146,7 @@ def create_net_spec(net_data, overcloud_domain_name): overcloud_domain_name]) ), 'mtu': net_data.get('mtu', DEFAULT_MTU), - 'name': net_data['name'], + 'name': name_lower, 'shared': net_data.get('shared', DEFAULT_SHARED), 'provider:physical_network': name_lower, 'provider:network_type': DEFAULT_NETWORK_TYPE, diff --git a/tripleo_ansible/ansible_plugins/modules/tripleo_network_populate_environment.py b/tripleo_ansible/ansible_plugins/modules/tripleo_network_populate_environment.py index 80ef19ab1..fe3057f9c 100644 --- a/tripleo_ansible/ansible_plugins/modules/tripleo_network_populate_environment.py +++ b/tripleo_ansible/ansible_plugins/modules/tripleo_network_populate_environment.py @@ -123,7 +123,7 @@ def get_subnets_attrs(subnets): def set_composable_network_attrs(module, conn, name_lower, net_data, attrs=None, cidr_map=None, ip_version_map=None): - net = conn.network.find_network(net_data['name']) + net = conn.network.find_network(name_lower) if net is None: msg = ('Failed crating deployed network environment. Network ' '{} not found'.format(net_data['name'])) diff --git a/tripleo_ansible/tests/modules/test_network_populate_environment.py b/tripleo_ansible/tests/modules/test_network_populate_environment.py index c2f0d5d70..92018234a 100644 --- a/tripleo_ansible/tests/modules/test_network_populate_environment.py +++ b/tripleo_ansible/tests/modules/test_network_populate_environment.py @@ -143,6 +143,10 @@ class TestNetworkPopulateEnvironment(tests_base.TestCase): plugin.set_composable_network_attrs( module, mock_conn, net_data['name'].lower(), net_data, attrs=attrs, cidr_map=cidr_map, ip_version_map=ip_version_map) + mock_conn.network.find_network.assert_called_with( + net_data['name'].lower()) + mock_conn.network.get_subnet.assert_has_calls( + [mock.call('subnet01_id'), mock.call('subnet02_id')]) self.assertEqual( {'network': {'dns_domain': 'netname.localdomain.', 'mtu': 1500, 'name': 'netname', 'tags': ['tripleo_vlan_id=100']}, diff --git a/tripleo_ansible/tests/modules/test_tripleo_composable_network.py b/tripleo_ansible/tests/modules/test_tripleo_composable_network.py index 0bee1a004..e8f194e91 100644 --- a/tripleo_ansible/tests/modules/test_tripleo_composable_network.py +++ b/tripleo_ansible/tests/modules/test_tripleo_composable_network.py @@ -57,7 +57,7 @@ class TestTripleoComposableNetwork(tests_base.TestCase): 'admin_state_up': plugin.DEFAULT_ADMIN_STATE, 'dns_domain': '.'.join(['netname', overcloud_domain_name]), 'mtu': plugin.DEFAULT_MTU, - 'name': 'NetName', + 'name': 'netname', 'shared': plugin.DEFAULT_SHARED, 'provider:physical_network': 'netname', 'provider:network_type': plugin.DEFAULT_NETWORK_TYPE,