From 1992d9aed31b6906806635687c2b2d2d52310990 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Tue, 26 Jan 2021 19:47:07 +0100 Subject: smoketest: dhcpc6: do not increase duid For a yet undetermined reason incrementing the duid dynamically in the test script leads to an error - for the time beeing work with a fixed duid. --- smoketest/scripts/cli/base_interfaces_test.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'smoketest/scripts/cli/base_interfaces_test.py') diff --git a/smoketest/scripts/cli/base_interfaces_test.py b/smoketest/scripts/cli/base_interfaces_test.py index 1426e80c2..8f21ec70e 100644 --- a/smoketest/scripts/cli/base_interfaces_test.py +++ b/smoketest/scripts/cli/base_interfaces_test.py @@ -402,13 +402,12 @@ class BasicInterfaceTest: tmp = read_file(f'/proc/sys/net/ipv6/conf/{interface}/dad_transmits') self.assertEqual(dad_transmits, tmp) - def test_dhcpv6_clinet_options(self): + def test_dhcpv6_client_options(self): if not self._test_ipv6_dhcpc6: self.skipTest('not supported') - duid_base = 10 + duid = '00:01:00:01:27:71:db:f0:00:50:00:00:00:10' for interface in self._interfaces: - duid = '00:01:00:01:27:71:db:f0:00:50:00:00:00:{}'.format(duid_base) path = self._base_path + [interface] for option in self._options.get(interface, []): self.session.set(path + option.split()) @@ -418,13 +417,10 @@ class BasicInterfaceTest: self.session.set(path + ['dhcpv6-options', 'rapid-commit']) self.session.set(path + ['dhcpv6-options', 'parameters-only']) self.session.set(path + ['dhcpv6-options', 'duid', duid]) - duid_base += 1 self.session.commit() - duid_base = 10 for interface in self._interfaces: - duid = '00:01:00:01:27:71:db:f0:00:50:00:00:00:{}'.format(duid_base) dhcpc6_config = read_file(f'/run/dhcp6c/dhcp6c.{interface}.conf') self.assertIn(f'interface {interface} ' + '{', dhcpc6_config) self.assertIn(f' request domain-name-servers;', dhcpc6_config) @@ -434,7 +430,6 @@ class BasicInterfaceTest: self.assertIn(f' send rapid-commit;', dhcpc6_config) self.assertIn(f' send client-id {duid};', dhcpc6_config) self.assertIn('};', dhcpc6_config) - duid_base += 1 # Check for running process self.assertTrue(process_named_running('dhcp6c')) -- cgit v1.2.3