Skip to content

Commit 8865a51

Browse files
committed
unit_tests: fix netaddr ipv6 checks
With netaddr version >=1.3.0, the checks for IP addresses contain a type check, this failing on sentinel values as the type is not supported. . Replace the sentinel values with string values. Change-Id: I1c6440e412919f38ee93dc9f361dc86a12ab605c
1 parent aeeca0a commit 8865a51

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

cloudbaseinit/tests/plugins/common/test_networkconfig.py

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ def test_execute_missing_address_netmask6(self):
297297
def test_execute_missing_gateway(self):
298298
self._test_execute_missing_smth(gateway=True)
299299

300-
def _get_network_details_v2(self):
300+
def _get_network_details_v2(self, dns1, dns3):
301301
links = []
302302
link1 = network_model.Link(
303303
id=mock.sentinel.link_id1,
@@ -359,7 +359,7 @@ def _get_network_details_v2(self):
359359

360360
services = []
361361
service1 = network_model.NameServerService(
362-
addresses=[mock.sentinel.dns1, mock.sentinel.dns3],
362+
addresses=[dns1, dns3],
363363
search=mock.sentinel.dns_search1)
364364
services.append(service1)
365365

@@ -377,27 +377,33 @@ def _test_execute_network_details_v2(self, mock_get_os_utils,
377377
mock.sentinel.network_cidr2 = u"172.16.0.0/16"
378378
mock.sentinel.gateway2 = u"172.16.1.1"
379379
mock.sentinel.address_cidr1 = u"10.0.0.1/24"
380-
mock.sentinel.dns1 = "10.0.0.1"
380+
dns1 = "10.0.0.1"
381+
dns3 = "10.0.0.3"
382+
dns3_ipv6 = "2001:db8::3"
383+
dns3_ipv6_v2 = "2001:db8::4"
384+
mock.sentinel.dns1 = dns1
381385
mock.sentinel.dns2 = "10.0.0.2"
382386
mock.sentinel.network_dns_list1 = []
383387

384388
if empty_network_dns_list:
385-
mock.sentinel.dns3 = "10.0.0.3"
389+
mock.sentinel.dns3 = dns3
386390
expected_dns_list = [mock.sentinel.dns1, mock.sentinel.dns3]
387391
elif both_ipv4_dns_list:
388-
mock.sentinel.dns3 = "2001:db8::3"
392+
mock.sentinel.dns3 = dns3_ipv6
389393
expected_dns_list = [mock.sentinel.dns1]
394+
dns3 = dns3_ipv6
390395
elif both_ipv6_dns_list:
391396
mock.sentinel.address_cidr1 = u"2001:db8::3/24"
392-
mock.sentinel.dns3 = "2001:db8::4"
397+
mock.sentinel.dns3 = dns3_ipv6_v2
398+
dns3 = dns3_ipv6_v2
393399
expected_dns_list = [mock.sentinel.dns3]
394400
else:
395401
mock.sentinel.network_dns_list1 = [
396402
mock.sentinel.dns1, mock.sentinel.dns2]
397403
expected_dns_list = mock.sentinel.network_dns_list1
398404

399405
service = mock.Mock()
400-
network_details = self._get_network_details_v2()
406+
network_details = self._get_network_details_v2(dns1, dns3)
401407
service.get_network_details_v2.return_value = network_details
402408

403409
mock_os_utils = mock.Mock()

0 commit comments

Comments
 (0)