Merge "Use name_lower for network resource name"
This commit is contained in:
commit
a0abe84575
|
@ -146,7 +146,7 @@ def create_net_spec(net_data, overcloud_domain_name):
|
||||||
overcloud_domain_name])
|
overcloud_domain_name])
|
||||||
),
|
),
|
||||||
'mtu': net_data.get('mtu', DEFAULT_MTU),
|
'mtu': net_data.get('mtu', DEFAULT_MTU),
|
||||||
'name': net_data['name'],
|
'name': name_lower,
|
||||||
'shared': net_data.get('shared', DEFAULT_SHARED),
|
'shared': net_data.get('shared', DEFAULT_SHARED),
|
||||||
'provider:physical_network': name_lower,
|
'provider:physical_network': name_lower,
|
||||||
'provider:network_type': DEFAULT_NETWORK_TYPE,
|
'provider:network_type': DEFAULT_NETWORK_TYPE,
|
||||||
|
|
|
@ -123,7 +123,7 @@ def get_subnets_attrs(subnets):
|
||||||
|
|
||||||
def set_composable_network_attrs(module, conn, name_lower, net_data, attrs=None,
|
def set_composable_network_attrs(module, conn, name_lower, net_data, attrs=None,
|
||||||
cidr_map=None, ip_version_map=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:
|
if net is None:
|
||||||
msg = ('Failed crating deployed network environment. Network '
|
msg = ('Failed crating deployed network environment. Network '
|
||||||
'{} not found'.format(net_data['name']))
|
'{} not found'.format(net_data['name']))
|
||||||
|
|
|
@ -143,6 +143,10 @@ class TestNetworkPopulateEnvironment(tests_base.TestCase):
|
||||||
plugin.set_composable_network_attrs(
|
plugin.set_composable_network_attrs(
|
||||||
module, mock_conn, net_data['name'].lower(), net_data,
|
module, mock_conn, net_data['name'].lower(), net_data,
|
||||||
attrs=attrs, cidr_map=cidr_map, ip_version_map=ip_version_map)
|
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(
|
self.assertEqual(
|
||||||
{'network': {'dns_domain': 'netname.localdomain.', 'mtu': 1500,
|
{'network': {'dns_domain': 'netname.localdomain.', 'mtu': 1500,
|
||||||
'name': 'netname', 'tags': ['tripleo_vlan_id=100']},
|
'name': 'netname', 'tags': ['tripleo_vlan_id=100']},
|
||||||
|
|
|
@ -57,7 +57,7 @@ class TestTripleoComposableNetwork(tests_base.TestCase):
|
||||||
'admin_state_up': plugin.DEFAULT_ADMIN_STATE,
|
'admin_state_up': plugin.DEFAULT_ADMIN_STATE,
|
||||||
'dns_domain': '.'.join(['netname', overcloud_domain_name]),
|
'dns_domain': '.'.join(['netname', overcloud_domain_name]),
|
||||||
'mtu': plugin.DEFAULT_MTU,
|
'mtu': plugin.DEFAULT_MTU,
|
||||||
'name': 'NetName',
|
'name': 'netname',
|
||||||
'shared': plugin.DEFAULT_SHARED,
|
'shared': plugin.DEFAULT_SHARED,
|
||||||
'provider:physical_network': 'netname',
|
'provider:physical_network': 'netname',
|
||||||
'provider:network_type': plugin.DEFAULT_NETWORK_TYPE,
|
'provider:network_type': plugin.DEFAULT_NETWORK_TYPE,
|
||||||
|
|
Loading…
Reference in New Issue