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
This commit is contained in:
Harald Jensås 2020-11-13 07:36:05 +01:00
parent 2ea8258dfb
commit 516c25f1ab
4 changed files with 7 additions and 3 deletions

View File

@ -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,

View File

@ -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']))

View File

@ -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']},

View File

@ -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,