X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=test%2Ftest-network%2Fsystemd-networkd-tests.py;h=d809e72abc396942819a99219108bbfc2ae31ed9;hb=9f10126f3c10797335363e4c8de7e4be700a7ec0;hp=d9db9c1657de2ae21d5ab753d3866f728b460d7a;hpb=02849d8b4fa4199678182de0c9768ddbb94ae9e5;p=thirdparty%2Fsystemd.git diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index d9db9c1657d..d809e72abc3 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -100,17 +100,20 @@ class Utilities(): with open(os.path.join(path, attribute)) as f: return f.readline().strip() - def link_exits(self, link): + def link_exists(self, link): return os.path.exists(os.path.join('/sys/class/net', link)) + def check_link_exists(self, link): + self.assertTrue(self.link_exists(link)) + def link_remove(self, links): for link in links: - if os.path.exists(os.path.join('/sys/class/net', link)): + if self.link_exists(link): subprocess.call(['ip', 'link', 'del', 'dev', link]) time.sleep(1) def l2tp_tunnel_remove(self, tunnel_ids): - output = subprocess.check_output(['ip', 'l2tp', 'show', 'tunnel']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'l2tp', 'show', 'tunnel'], universal_newlines=True).rstrip() for tid in tunnel_ids: words='Tunnel ' + tid + ', encap' if words in output: @@ -139,8 +142,14 @@ class Utilities(): if (os.path.exists(os.path.join(network_unit_file_path, unit + '.d'))): shutil.rmtree(os.path.join(network_unit_file_path, unit + '.d')) - def start_dnsmasq(self, additional_options=''): - dnsmasq_command = 'dnsmasq -8 /var/run/networkd-ci/test-dnsmasq-log-file --log-queries=extra --log-dhcp --pid-file=/var/run/networkd-ci/test-test-dnsmasq.pid --conf-file=/dev/null --interface=veth-peer --enable-ra --dhcp-range=2600::10,2600::20 --dhcp-range=192.168.5.10,192.168.5.200 -R --dhcp-leasefile=/var/run/networkd-ci/lease --dhcp-option=26,1492 --dhcp-option=option:router,192.168.5.1 --dhcp-option=33,192.168.5.4,192.168.5.5 --port=0 ' + additional_options + def warn_about_firewalld(self): + rc = subprocess.call(['systemctl', '-q', 'is-active', 'firewalld.service']) + if rc == 0: + print('\nWARNING: firewalld.service is active. The test may fail.') + + def start_dnsmasq(self, additional_options='', ipv4_range='192.168.5.10,192.168.5.200', ipv6_range='2600::10,2600::20', lease_time='1h'): + self.warn_about_firewalld() + dnsmasq_command = f'dnsmasq -8 /var/run/networkd-ci/test-dnsmasq-log-file --log-queries=extra --log-dhcp --pid-file=/var/run/networkd-ci/test-test-dnsmasq.pid --conf-file=/dev/null --interface=veth-peer --enable-ra --dhcp-range={ipv6_range},{lease_time} --dhcp-range={ipv4_range},{lease_time} -R --dhcp-leasefile=/var/run/networkd-ci/lease --dhcp-option=26,1492 --dhcp-option=option:router,192.168.5.1 --dhcp-option=33,192.168.5.4,192.168.5.5 --port=0 ' + additional_options subprocess.check_call(dnsmasq_command, shell=True) time.sleep(10) @@ -159,7 +168,7 @@ class Utilities(): contents = in_file.read() if show_all: print(contents) - for line in contents.split('\n'): + for line in contents.splitlines(): if words in line: in_file.close() print("%s, %s" % (words, line)) @@ -189,7 +198,26 @@ class Utilities(): args = [wait_online_bin, f'--timeout={timeout}'] + [f'--interface={link}' for link in links_with_operstate] if bool_any: args += ['--any'] - subprocess.check_call(args) + try: + subprocess.check_call(args) + except subprocess.CalledProcessError: + for link in links_with_operstate: + output = subprocess.check_output(['networkctl', 'status', link.split(':')[0]], universal_newlines=True).rstrip() + print(output) + raise + + def get_operstate(self, link, show_status=True, setup_state='configured'): + output = subprocess.check_output(['networkctl', 'status', link], universal_newlines=True).rstrip() + if show_status: + print(output) + for line in output.splitlines(): + if 'State:' in line and (not setup_state or setup_state in line): + return line.split()[1] + return None + + def check_operstate(self, link, expected, show_status=True, setup_state='configured'): + self.assertRegex(self.get_operstate(link, show_status, setup_state), expected) + class NetworkdNetDevTests(unittest.TestCase, Utilities): @@ -222,6 +250,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): 'ipiptun98', 'ipiptun99', 'ipvlan99', + 'ipvtap99', 'isataptun99', 'macvlan99', 'macvtap99', @@ -242,6 +271,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): 'vtitun97', 'vtitun98', 'vtitun99', + 'vxcan99', 'vxlan99', 'wg98', 'wg99'] @@ -289,6 +319,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): '25-ipip-tunnel-remote-any.netdev', '25-ipip-tunnel.netdev', '25-ipvlan.netdev', + '25-ipvtap.netdev', '25-isatap-tunnel.netdev', '25-macsec.key', '25-macsec.netdev', @@ -298,6 +329,9 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): '25-sit-tunnel.netdev', '25-tap.netdev', '25-tun.netdev', + '25-tunnel-local-any.network', + '25-tunnel-remote-any.network', + '25-tunnel.network', '25-vcan.netdev', '25-veth.netdev', '25-vrf.netdev', @@ -307,6 +341,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): '25-vti-tunnel-local-any.netdev', '25-vti-tunnel-remote-any.netdev', '25-vti-tunnel.netdev', + '25-vxcan.netdev', '25-vxlan.netdev', '25-wireguard-23-peers.netdev', '25-wireguard-23-peers.network', @@ -324,13 +359,16 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): 'ip6tnl.network', 'ipip.network', 'ipvlan.network', + 'ipvtap.network', 'isatap.network', 'macsec.network', 'macvlan.network', 'macvtap.network', + 'netdev-link-local-addressing-yes.network', 'sit.network', 'vti6.network', 'vti.network', + 'vxlan-test1.network', 'vxlan.network'] def setUp(self): @@ -340,37 +378,37 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.link_remove(self.links) self.remove_unit_from_networkd_path(self.units) - def test_dropin(self): + def test_dropin_and_networkctl_glob(self): self.copy_unit_to_networkd_unit_path('10-dropin-test.netdev', '15-name-conflict-test.netdev') - self.start_networkd() + self.start_networkd(0) - self.assertTrue(self.link_exits('dropin-test')) + self.wait_online(['dropin-test:off']) # This also tests NetDev.Name= conflict and basic networkctl functionalities - output = subprocess.check_output(['ip', 'link', 'show', 'dropin-test']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'link', 'show', 'dropin-test'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '00:50:56:c0:00:28') - output = subprocess.check_output(['networkctl', 'list']).rstrip().decode('utf-8') + output = subprocess.check_output(['networkctl', 'list'], universal_newlines=True).rstrip() self.assertRegex(output, '1 lo ') self.assertRegex(output, 'dropin-test') - output = subprocess.check_output(['networkctl', 'list', 'dropin-test']).rstrip().decode('utf-8') + output = subprocess.check_output(['networkctl', 'list', 'dropin-test'], universal_newlines=True).rstrip() self.assertNotRegex(output, '1 lo ') self.assertRegex(output, 'dropin-test') - output = subprocess.check_output(['networkctl', 'list', 'dropin-*']).rstrip().decode('utf-8') + output = subprocess.check_output(['networkctl', 'list', 'dropin-*'], universal_newlines=True).rstrip() self.assertNotRegex(output, '1 lo ') self.assertRegex(output, 'dropin-test') - output = subprocess.check_output(['networkctl', 'status', 'dropin-*']).rstrip().decode('utf-8') + output = subprocess.check_output(['networkctl', 'status', 'dropin-*'], universal_newlines=True).rstrip() self.assertNotRegex(output, '1: lo ') self.assertRegex(output, 'dropin-test') - ret = subprocess.run(['ethtool', '--driver', 'dropin-test'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - print(ret.stdout.rstrip().decode('utf-8')) - if ret.returncode == 0 and re.search('driver: dummy', ret.stdout.rstrip().decode('utf-8')) != None: + ret = subprocess.run(['ethtool', '--driver', 'dropin-test'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True) + print(ret.stdout.rstrip()) + if ret.returncode == 0 and re.search('driver: dummy', ret.stdout.rstrip()) != None: self.assertRegex(output, 'Driver: dummy') else: print('ethtool does not support driver field at least for dummy interfaces, skipping test for Driver field of networkctl.') @@ -380,37 +418,31 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.start_networkd(0) self.wait_online(['bridge99', 'test1:degraded'], bool_any=True) - self.assertTrue(self.link_exits('bridge99')) - self.assertTrue(self.link_exits('test1')) - - output = subprocess.check_output(['networkctl', 'status', 'bridge99']).rstrip().decode('utf-8') - print(output) - self.assertRegex(output, 'State: (?:off|no-carrier) \(configuring\)') - output = subprocess.check_output(['networkctl', 'status', 'test1']).rstrip().decode('utf-8') - print(output) - self.assertRegex(output, 'State: degraded \(configured\)') + self.check_operstate('bridge99', '(?:off|no-carrier)', setup_state='configuring') + self.check_operstate('test1', 'degraded') def test_bridge(self): self.copy_unit_to_networkd_unit_path('25-bridge.netdev') - self.start_networkd() + self.start_networkd(0) - self.assertTrue(self.link_exits('bridge99')) + self.wait_online(['bridge99:off']) - self.assertEqual('900', self.read_link_attr('bridge99', 'bridge', 'hello_time')) - self.assertEqual('900', self.read_link_attr('bridge99', 'bridge', 'max_age')) - self.assertEqual('900', self.read_link_attr('bridge99', 'bridge','forward_delay')) - self.assertEqual('900', self.read_link_attr('bridge99', 'bridge','ageing_time')) - self.assertEqual('9', self.read_link_attr('bridge99', 'bridge','priority')) - self.assertEqual('1', self.read_link_attr('bridge99', 'bridge','multicast_querier')) - self.assertEqual('1', self.read_link_attr('bridge99', 'bridge','multicast_snooping')) - self.assertEqual('1', self.read_link_attr('bridge99', 'bridge','stp_state')) + tick = os.sysconf('SC_CLK_TCK') + self.assertEqual(9, round(float(self.read_link_attr('bridge99', 'bridge', 'hello_time')) / tick)) + self.assertEqual(9, round(float(self.read_link_attr('bridge99', 'bridge', 'max_age')) / tick)) + self.assertEqual(9, round(float(self.read_link_attr('bridge99', 'bridge','forward_delay')) / tick)) + self.assertEqual(9, round(float(self.read_link_attr('bridge99', 'bridge','ageing_time')) / tick)) + self.assertEqual(9, int(self.read_link_attr('bridge99', 'bridge','priority'))) + self.assertEqual(1, int(self.read_link_attr('bridge99', 'bridge','multicast_querier'))) + self.assertEqual(1, int(self.read_link_attr('bridge99', 'bridge','multicast_snooping'))) + self.assertEqual(1, int(self.read_link_attr('bridge99', 'bridge','stp_state'))) def test_bond(self): - self.copy_unit_to_networkd_unit_path('25-bond.netdev') - self.start_networkd() + self.copy_unit_to_networkd_unit_path('25-bond.netdev', '25-bond-balanced-tlb.netdev') + self.start_networkd(0) - self.assertTrue(self.link_exits('bond99')) + self.wait_online(['bond99:off', 'bond98:off']) self.assertEqual('802.3ad 4', self.read_link_attr('bond99', 'bonding', 'mode')) self.assertEqual('layer3+4 1', self.read_link_attr('bond99', 'bonding', 'xmit_hash_policy')) @@ -424,110 +456,168 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertEqual('811', self.read_link_attr('bond99', 'bonding', 'ad_user_port_key')) self.assertEqual('00:11:22:33:44:55', self.read_link_attr('bond99', 'bonding', 'ad_actor_system')) - def test_bond_balanced_tlb(self): - self.copy_unit_to_networkd_unit_path('25-bond-balanced-tlb.netdev') - self.start_networkd() - - self.assertTrue(self.link_exits('bond99')) - - self.assertEqual('balance-tlb 5', self.read_link_attr('bond99', 'bonding', 'mode')) - self.assertEqual('1', self.read_link_attr('bond99', 'bonding', 'tlb_dynamic_lb')) + self.assertEqual('balance-tlb 5', self.read_link_attr('bond98', 'bonding', 'mode')) + self.assertEqual('1', self.read_link_attr('bond98', 'bonding', 'tlb_dynamic_lb')) def test_vlan(self): self.copy_unit_to_networkd_unit_path('21-vlan.netdev', '11-dummy.netdev', '21-vlan.network', '21-vlan-test1.network') - self.start_networkd() + self.start_networkd(0) - self.assertTrue(self.link_exits('test1')) - self.assertTrue(self.link_exits('vlan99')) + self.wait_online(['test1:degraded', 'vlan99:routable']) - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'test1']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'test1'], universal_newlines=True).rstrip() print(output) - self.assertTrue(output, ' mtu 2004 ') + self.assertRegex(output, ' mtu 2000 ') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'vlan99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'vlan99'], universal_newlines=True).rstrip() print(output) - self.assertTrue(output, ' mtu 2000 ') - self.assertTrue(output, 'REORDER_HDR') - self.assertTrue(output, 'LOOSE_BINDING') - self.assertTrue(output, 'GVRP') - self.assertTrue(output, 'MVRP') - self.assertTrue(output, ' id 99 ') + self.assertRegex(output, ' mtu 2000 ') + self.assertRegex(output, 'REORDER_HDR') + self.assertRegex(output, 'LOOSE_BINDING') + self.assertRegex(output, 'GVRP') + self.assertRegex(output, 'MVRP') + self.assertRegex(output, ' id 99 ') - output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'test1']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'test1'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'inet 192.168.24.5/24 brd 192.168.24.255 scope global test1') self.assertRegex(output, 'inet 192.168.25.5/24 brd 192.168.25.255 scope global test1') - output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'vlan99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'vlan99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'inet 192.168.23.5/24 brd 192.168.23.255 scope global vlan99') def test_macvtap(self): - self.copy_unit_to_networkd_unit_path('21-macvtap.netdev', '11-dummy.netdev', 'macvtap.network') - self.start_networkd() - - self.assertTrue(self.link_exits('macvtap99')) + for mode in ['private', 'vepa', 'bridge', 'passthru']: + with self.subTest(mode=mode): + if mode != 'private': + self.tearDown() + self.copy_unit_to_networkd_unit_path('21-macvtap.netdev', 'netdev-link-local-addressing-yes.network', + '11-dummy.netdev', 'macvtap.network') + with open(os.path.join(network_unit_file_path, '21-macvtap.netdev'), mode='a') as f: + f.write('[MACVTAP]\nMode=' + mode) + self.start_networkd(0) + + self.wait_online(['macvtap99:degraded', 'test1:degraded']) + + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'macvtap99'], universal_newlines=True).rstrip() + print(output) + self.assertRegex(output, 'macvtap mode ' + mode + ' ') def test_macvlan(self): - self.copy_unit_to_networkd_unit_path('21-macvlan.netdev', '11-dummy.netdev', 'macvlan.network') - self.start_networkd() - - self.assertTrue(self.link_exits('test1')) - self.assertTrue(self.link_exits('macvlan99')) - - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'test1']).rstrip().decode('utf-8') - print(output) - self.assertTrue(output, ' mtu 2000 ') - - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'macvlan99']).rstrip().decode('utf-8') - print(output) - self.assertTrue(output, ' mtu 2000 ') + for mode in ['private', 'vepa', 'bridge', 'passthru']: + with self.subTest(mode=mode): + if mode != 'private': + self.tearDown() + self.copy_unit_to_networkd_unit_path('21-macvlan.netdev', 'netdev-link-local-addressing-yes.network', + '11-dummy.netdev', 'macvlan.network') + with open(os.path.join(network_unit_file_path, '21-macvlan.netdev'), mode='a') as f: + f.write('[MACVLAN]\nMode=' + mode) + self.start_networkd(0) + + self.wait_online(['macvlan99:degraded', 'test1:degraded']) + + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'test1'], universal_newlines=True).rstrip() + print(output) + self.assertRegex(output, ' mtu 2000 ') + + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'macvlan99'], universal_newlines=True).rstrip() + print(output) + self.assertRegex(output, ' mtu 2000 ') + self.assertRegex(output, 'macvlan mode ' + mode + ' ') @expectedFailureIfModuleIsNotAvailable('ipvlan') def test_ipvlan(self): - self.copy_unit_to_networkd_unit_path('25-ipvlan.netdev', '11-dummy.netdev', 'ipvlan.network') - self.start_networkd() - - self.assertTrue(self.link_exits('ipvlan99')) + for mode, flag in [['L2', 'private'], ['L3', 'vepa'], ['L3S', 'bridge']]: + with self.subTest(mode=mode, flag=flag): + if mode != 'L2': + self.tearDown() + self.copy_unit_to_networkd_unit_path('25-ipvlan.netdev', 'netdev-link-local-addressing-yes.network', + '11-dummy.netdev', 'ipvlan.network') + with open(os.path.join(network_unit_file_path, '25-ipvlan.netdev'), mode='a') as f: + f.write('[IPVLAN]\nMode=' + mode + '\nFlags=' + flag) + + self.start_networkd(0) + self.wait_online(['ipvlan99:degraded', 'test1:degraded']) + + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ipvlan99'], universal_newlines=True).rstrip() + print(output) + self.assertRegex(output, 'ipvlan *mode ' + mode.lower() + ' ' + flag) + + @expectedFailureIfModuleIsNotAvailable('ipvtap') + def test_ipvtap(self): + for mode, flag in [['L2', 'private'], ['L3', 'vepa'], ['L3S', 'bridge']]: + with self.subTest(mode=mode, flag=flag): + if mode != 'L2': + self.tearDown() + self.copy_unit_to_networkd_unit_path('25-ipvtap.netdev', 'netdev-link-local-addressing-yes.network', + '11-dummy.netdev', 'ipvtap.network') + with open(os.path.join(network_unit_file_path, '25-ipvtap.netdev'), mode='a') as f: + f.write('[IPVTAP]\nMode=' + mode + '\nFlags=' + flag) + + self.start_networkd(0) + self.wait_online(['ipvtap99:degraded', 'test1:degraded']) + + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ipvtap99'], universal_newlines=True).rstrip() + print(output) + self.assertRegex(output, 'ipvtap *mode ' + mode.lower() + ' ' + flag) def test_veth(self): - self.copy_unit_to_networkd_unit_path('25-veth.netdev') - self.start_networkd() - - self.assertTrue(self.link_exits('veth99')) + self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'netdev-link-local-addressing-yes.network') + self.start_networkd(0) - def test_dummy(self): - self.copy_unit_to_networkd_unit_path('11-dummy.netdev') - self.start_networkd() + self.wait_online(['veth99:degraded', 'veth-peer:degraded']) - self.assertTrue(self.link_exits('test1')) + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'veth99'], universal_newlines=True).rstrip() + print(output) + self.assertRegex(output, 'link/ether 12:34:56:78:9a:bc') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'veth-peer'], universal_newlines=True).rstrip() + print(output) + self.assertRegex(output, 'link/ether 12:34:56:78:9a:bd') def test_tun(self): self.copy_unit_to_networkd_unit_path('25-tun.netdev') - self.start_networkd() + self.start_networkd(0) + + self.wait_online(['tun99:off']) - self.assertTrue(self.link_exits('tun99')) + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'tun99'], universal_newlines=True).rstrip() + print(output) + # Old ip command does not support IFF_ flags + self.assertRegex(output, 'tun (?:type tun pi on vnet_hdr on multi_queue|addrgenmode) ') def test_tap(self): self.copy_unit_to_networkd_unit_path('25-tap.netdev') - self.start_networkd() + self.start_networkd(0) - self.assertTrue(self.link_exits('tap99')) + self.wait_online(['tap99:off']) + + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'tap99'], universal_newlines=True).rstrip() + print(output) + # Old ip command does not support IFF_ flags + self.assertRegex(output, 'tun (?:type tap pi on vnet_hdr on multi_queue|addrgenmode) ') @expectedFailureIfModuleIsNotAvailable('vrf') def test_vrf(self): - self.copy_unit_to_networkd_unit_path('25-vrf.netdev') - self.start_networkd() + self.copy_unit_to_networkd_unit_path('25-vrf.netdev', 'netdev-link-local-addressing-yes.network') + self.start_networkd(0) - self.assertTrue(self.link_exits('vrf99')) + self.wait_online(['vrf99:carrier']) @expectedFailureIfModuleIsNotAvailable('vcan') def test_vcan(self): - self.copy_unit_to_networkd_unit_path('25-vcan.netdev') - self.start_networkd() + self.copy_unit_to_networkd_unit_path('25-vcan.netdev', 'netdev-link-local-addressing-yes.network') + self.start_networkd(0) - self.assertTrue(self.link_exits('vcan99')) + self.wait_online(['vcan99:carrier']) + + @expectedFailureIfModuleIsNotAvailable('vxcan') + def test_vxcan(self): + self.copy_unit_to_networkd_unit_path('25-vxcan.netdev', 'netdev-link-local-addressing-yes.network') + self.start_networkd(0) + + self.wait_online(['vxcan99:carrier', 'vxcan-peer:carrier']) @expectedFailureIfModuleIsNotAvailable('wireguard') def test_wireguard(self): @@ -537,90 +627,83 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.start_networkd(0) self.wait_online(['wg99:carrier', 'wg98:routable']) - self.assertTrue(self.link_exits('wg99')) - self.assertTrue(self.link_exits('wg98')) - if shutil.which('wg'): subprocess.call('wg') - output = subprocess.check_output(['wg', 'show', 'wg99', 'listen-port']).rstrip().decode('utf-8') - self.assertTrue(output, '51820') - output = subprocess.check_output(['wg', 'show', 'wg99', 'fwmark']).rstrip().decode('utf-8') - self.assertTrue(output, '0x4d2') - output = subprocess.check_output(['wg', 'show', 'wg99', 'allowed-ips']).rstrip().decode('utf-8') - self.assertTrue(output, 'RDf+LSpeEre7YEIKaxg+wbpsNV7du+ktR99uBEtIiCA=\t192.168.26.0/24 fd31:bf08:57cb::/48') - self.assertTrue(output, 'lsDtM3AbjxNlauRKzHEPfgS1Zp7cp/VX5Use/P4PQSc=\tfdbc:bae2:7871:e1fe:793:8636::/96 fdbc:bae2:7871:500:e1fe:793:8636:dad1/128') - output = subprocess.check_output(['wg', 'show', 'wg99', 'persistent-keepalive']).rstrip().decode('utf-8') - self.assertTrue(output, 'RDf+LSpeEre7YEIKaxg+wbpsNV7du+ktR99uBEtIiCA=\t20') - output = subprocess.check_output(['wg', 'show', 'wg99', 'endpoints']).rstrip().decode('utf-8') - self.assertTrue(output, 'RDf+LSpeEre7YEIKaxg+wbpsNV7du+ktR99uBEtIiCA=\t192.168.27.3:51820') - output = subprocess.check_output(['wg', 'show', 'wg99', 'private-key']).rstrip().decode('utf-8') - self.assertTrue(output, 'EEGlnEPYJV//kbvvIqxKkQwOiS+UENyPncC4bF46ong=') - output = subprocess.check_output(['wg', 'show', 'wg99', 'preshared-keys']).rstrip().decode('utf-8') - self.assertTrue(output, 'RDf+LSpeEre7YEIKaxg+wbpsNV7du+ktR99uBEtIiCA= IIWIV17wutHv7t4cR6pOT91z6NSz/T8Arh0yaywhw3M=') - self.assertTrue(output, 'lsDtM3AbjxNlauRKzHEPfgS1Zp7cp/VX5Use/P4PQSc= cPLOy1YUrEI0EMMIycPJmOo0aTu3RZnw8bL5meVD6m0=') - - output = subprocess.check_output(['wg', 'show', 'wg98', 'private-key']).rstrip().decode('utf-8') - self.assertTrue(output, 'CJQUtcS9emY2fLYqDlpSZiE/QJyHkPWr+WHtZLZ90FU=') + output = subprocess.check_output(['wg', 'show', 'wg99', 'listen-port'], universal_newlines=True).rstrip() + self.assertRegex(output, '51820') + output = subprocess.check_output(['wg', 'show', 'wg99', 'fwmark'], universal_newlines=True).rstrip() + self.assertRegex(output, '0x4d2') + output = subprocess.check_output(['wg', 'show', 'wg99', 'allowed-ips'], universal_newlines=True).rstrip() + self.assertRegex(output, 'RDf\+LSpeEre7YEIKaxg\+wbpsNV7du\+ktR99uBEtIiCA=\t192.168.26.0/24 fd31:bf08:57cb::/48') + self.assertRegex(output, 'lsDtM3AbjxNlauRKzHEPfgS1Zp7cp/VX5Use/P4PQSc=\tfdbc:bae2:7871:e1fe:793:8636::/96 fdbc:bae2:7871:500:e1fe:793:8636:dad1/128') + output = subprocess.check_output(['wg', 'show', 'wg99', 'persistent-keepalive'], universal_newlines=True).rstrip() + self.assertRegex(output, 'RDf\+LSpeEre7YEIKaxg\+wbpsNV7du\+ktR99uBEtIiCA=\t20') + output = subprocess.check_output(['wg', 'show', 'wg99', 'endpoints'], universal_newlines=True).rstrip() + self.assertRegex(output, 'RDf\+LSpeEre7YEIKaxg\+wbpsNV7du\+ktR99uBEtIiCA=\t192.168.27.3:51820') + output = subprocess.check_output(['wg', 'show', 'wg99', 'private-key'], universal_newlines=True).rstrip() + self.assertRegex(output, 'EEGlnEPYJV//kbvvIqxKkQwOiS\+UENyPncC4bF46ong=') + output = subprocess.check_output(['wg', 'show', 'wg99', 'preshared-keys'], universal_newlines=True).rstrip() + self.assertRegex(output, 'RDf\+LSpeEre7YEIKaxg\+wbpsNV7du\+ktR99uBEtIiCA= IIWIV17wutHv7t4cR6pOT91z6NSz/T8Arh0yaywhw3M=') + self.assertRegex(output, 'lsDtM3AbjxNlauRKzHEPfgS1Zp7cp/VX5Use/P4PQSc= cPLOy1YUrEI0EMMIycPJmOo0aTu3RZnw8bL5meVD6m0=') + + output = subprocess.check_output(['wg', 'show', 'wg98', 'private-key'], universal_newlines=True).rstrip() + self.assertRegex(output, 'CJQUtcS9emY2fLYqDlpSZiE/QJyHkPWr\+WHtZLZ90FU=') def test_geneve(self): - self.copy_unit_to_networkd_unit_path('25-geneve.netdev') - self.start_networkd() + self.copy_unit_to_networkd_unit_path('25-geneve.netdev', 'netdev-link-local-addressing-yes.network') + self.start_networkd(0) - self.assertTrue(self.link_exits('geneve99')) + self.wait_online(['geneve99:degraded']) - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'geneve99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'geneve99'], universal_newlines=True).rstrip() print(output) - self.assertTrue(output, '192.168.22.1') - self.assertTrue(output, '6082') - self.assertTrue(output, 'udpcsum') - self.assertTrue(output, 'udp6zerocsumrx') + self.assertRegex(output, '192.168.22.1') + self.assertRegex(output, '6082') + self.assertRegex(output, 'udpcsum') + self.assertRegex(output, 'udp6zerocsumrx') def test_ipip_tunnel(self): - self.copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-ipip-tunnel.netdev', 'ipip.network', - '25-ipip-tunnel-local-any.netdev', '25-ipip-tunnel-remote-any.netdev') - self.start_networkd() - - self.assertTrue(self.link_exits('dummy98')) - self.assertTrue(self.link_exits('ipiptun99')) - self.assertTrue(self.link_exits('ipiptun98')) - self.assertTrue(self.link_exits('ipiptun97')) + self.copy_unit_to_networkd_unit_path('12-dummy.netdev', 'ipip.network', + '25-ipip-tunnel.netdev', '25-tunnel.network', + '25-ipip-tunnel-local-any.netdev', '25-tunnel-local-any.network', + '25-ipip-tunnel-remote-any.netdev', '25-tunnel-remote-any.network') + self.start_networkd(0) + self.wait_online(['ipiptun99:routable', 'ipiptun98:routable', 'ipiptun97:routable', 'dummy98:degraded']) - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ipiptun99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ipiptun99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'ipip (?:ipip |)remote 192.169.224.239 local 192.168.223.238 dev dummy98') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ipiptun98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ipiptun98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'ipip (?:ipip |)remote 192.169.224.239 local any dev dummy98') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ipiptun97']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ipiptun97'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'ipip (?:ipip |)remote any local 192.168.223.238 dev dummy98') def test_gre_tunnel(self): - self.copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-gre-tunnel.netdev', 'gretun.network', - '25-gre-tunnel-local-any.netdev', '25-gre-tunnel-remote-any.netdev') - self.start_networkd() - - self.assertTrue(self.link_exits('dummy98')) - self.assertTrue(self.link_exits('gretun99')) - self.assertTrue(self.link_exits('gretun98')) - self.assertTrue(self.link_exits('gretun97')) + self.copy_unit_to_networkd_unit_path('12-dummy.netdev', 'gretun.network', + '25-gre-tunnel.netdev', '25-tunnel.network', + '25-gre-tunnel-local-any.netdev', '25-tunnel-local-any.network', + '25-gre-tunnel-remote-any.netdev', '25-tunnel-remote-any.network') + self.start_networkd(0) + self.wait_online(['gretun99:routable', 'gretun98:routable', 'gretun97:routable', 'dummy98:degraded']) - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretun99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretun99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'gre remote 10.65.223.239 local 10.65.223.238 dev dummy98') self.assertRegex(output, 'ikey 1.2.3.103') self.assertRegex(output, 'okey 1.2.4.103') self.assertRegex(output, 'iseq') self.assertRegex(output, 'oseq') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretun98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretun98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'gre remote 10.65.223.239 local any dev dummy98') self.assertRegex(output, 'ikey 0.0.0.104') self.assertRegex(output, 'okey 0.0.0.104') self.assertNotRegex(output, 'iseq') self.assertNotRegex(output, 'oseq') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretun97']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretun97'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'gre remote any local 10.65.223.238 dev dummy98') self.assertRegex(output, 'ikey 0.0.0.105') @@ -629,42 +712,44 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertNotRegex(output, 'oseq') def test_ip6gre_tunnel(self): - self.copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-ip6gre-tunnel.netdev', 'ip6gretun.network', - '25-ip6gre-tunnel-local-any.netdev', '25-ip6gre-tunnel-remote-any.netdev') + self.copy_unit_to_networkd_unit_path('12-dummy.netdev', 'ip6gretun.network', + '25-ip6gre-tunnel.netdev', '25-tunnel.network', + '25-ip6gre-tunnel-local-any.netdev', '25-tunnel-local-any.network', + '25-ip6gre-tunnel-remote-any.netdev', '25-tunnel-remote-any.network') self.start_networkd() - self.assertTrue(self.link_exits('dummy98')) - self.assertTrue(self.link_exits('ip6gretun99')) - self.assertTrue(self.link_exits('ip6gretun98')) - self.assertTrue(self.link_exits('ip6gretun97')) + # Old kernels seem not to support IPv6LL address on ip6gre tunnel, So please do not use wait_online() here. + + self.check_link_exists('dummy98') + self.check_link_exists('ip6gretun99') + self.check_link_exists('ip6gretun98') + self.check_link_exists('ip6gretun97') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ip6gretun99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ip6gretun99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'ip6gre remote 2001:473:fece:cafe::5179 local 2a00:ffde:4567:edde::4987 dev dummy98') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ip6gretun98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ip6gretun98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'ip6gre remote 2001:473:fece:cafe::5179 local any dev dummy98') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ip6gretun97']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ip6gretun97'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'ip6gre remote any local 2a00:ffde:4567:edde::4987 dev dummy98') def test_gretap_tunnel(self): - self.copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-gretap-tunnel.netdev', 'gretap.network', - '25-gretap-tunnel-local-any.netdev') - self.start_networkd() - - self.assertTrue(self.link_exits('dummy98')) - self.assertTrue(self.link_exits('gretap99')) - self.assertTrue(self.link_exits('gretap98')) + self.copy_unit_to_networkd_unit_path('12-dummy.netdev', 'gretap.network', + '25-gretap-tunnel.netdev', '25-tunnel.network', + '25-gretap-tunnel-local-any.netdev', '25-tunnel-local-any.network') + self.start_networkd(0) + self.wait_online(['gretap99:routable', 'gretap98:routable', 'dummy98:degraded']) - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretap99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretap99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'gretap remote 10.65.223.239 local 10.65.223.238 dev dummy98') self.assertRegex(output, 'ikey 0.0.0.106') self.assertRegex(output, 'okey 0.0.0.106') self.assertRegex(output, 'iseq') self.assertRegex(output, 'oseq') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretap98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretap98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'gretap remote 10.65.223.239 local any dev dummy98') self.assertRegex(output, 'ikey 0.0.0.107') @@ -673,142 +758,127 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, 'oseq') def test_ip6gretap_tunnel(self): - self.copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-ip6gretap-tunnel.netdev', 'ip6gretap.network', - '25-ip6gretap-tunnel-local-any.netdev') - self.start_networkd() - - self.assertTrue(self.link_exits('dummy98')) - self.assertTrue(self.link_exits('ip6gretap99')) - self.assertTrue(self.link_exits('ip6gretap98')) + self.copy_unit_to_networkd_unit_path('12-dummy.netdev', 'ip6gretap.network', + '25-ip6gretap-tunnel.netdev', '25-tunnel.network', + '25-ip6gretap-tunnel-local-any.netdev', '25-tunnel-local-any.network') + self.start_networkd(0) + self.wait_online(['ip6gretap99:routable', 'ip6gretap98:routable', 'dummy98:degraded']) - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ip6gretap99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ip6gretap99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'ip6gretap remote 2001:473:fece:cafe::5179 local 2a00:ffde:4567:edde::4987 dev dummy98') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ip6gretap98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ip6gretap98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'ip6gretap remote 2001:473:fece:cafe::5179 local any dev dummy98') def test_vti_tunnel(self): - self.copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-vti-tunnel.netdev', 'vti.network', - '25-vti-tunnel-local-any.netdev', '25-vti-tunnel-remote-any.netdev') - self.start_networkd() - - self.assertTrue(self.link_exits('dummy98')) - self.assertTrue(self.link_exits('vtitun99')) - self.assertTrue(self.link_exits('vtitun98')) - self.assertTrue(self.link_exits('vtitun97')) + self.copy_unit_to_networkd_unit_path('12-dummy.netdev', 'vti.network', + '25-vti-tunnel.netdev', '25-tunnel.network', + '25-vti-tunnel-local-any.netdev', '25-tunnel-local-any.network', + '25-vti-tunnel-remote-any.netdev', '25-tunnel-remote-any.network') + self.start_networkd(0) + self.wait_online(['vtitun99:routable', 'vtitun98:routable', 'vtitun97:routable', 'dummy98:degraded']) - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'vtitun99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'vtitun99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'vti remote 10.65.223.239 local 10.65.223.238 dev dummy98') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'vtitun98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'vtitun98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'vti remote 10.65.223.239 local any dev dummy98') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'vtitun97']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'vtitun97'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'vti remote any local 10.65.223.238 dev dummy98') def test_vti6_tunnel(self): - self.copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-vti6-tunnel.netdev', 'vti6.network', - '25-vti6-tunnel-local-any.netdev', '25-vti6-tunnel-remote-any.netdev') - self.start_networkd() - - self.assertTrue(self.link_exits('dummy98')) - self.assertTrue(self.link_exits('vti6tun99')) - self.assertTrue(self.link_exits('vti6tun98')) - self.assertTrue(self.link_exits('vti6tun97')) + self.copy_unit_to_networkd_unit_path('12-dummy.netdev', 'vti6.network', + '25-vti6-tunnel.netdev', '25-tunnel.network', + '25-vti6-tunnel-local-any.netdev', '25-tunnel-local-any.network', + '25-vti6-tunnel-remote-any.netdev', '25-tunnel-remote-any.network') + self.start_networkd(0) + self.wait_online(['vti6tun99:routable', 'vti6tun98:routable', 'vti6tun97:routable', 'dummy98:degraded']) - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'vti6tun99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'vti6tun99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'vti6 remote 2001:473:fece:cafe::5179 local 2a00:ffde:4567:edde::4987 dev dummy98') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'vti6tun98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'vti6tun98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'vti6 remote 2001:473:fece:cafe::5179 local (?:any|::) dev dummy98') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'vti6tun97']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'vti6tun97'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'vti6 remote (?:any|::) local 2a00:ffde:4567:edde::4987 dev dummy98') def test_ip6tnl_tunnel(self): - self.copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-ip6tnl-tunnel.netdev', 'ip6tnl.network', - '25-ip6tnl-tunnel-local-any.netdev', '25-ip6tnl-tunnel-remote-any.netdev') - self.start_networkd() - - self.assertTrue(self.link_exits('dummy98')) - self.assertTrue(self.link_exits('ip6tnl99')) - self.assertTrue(self.link_exits('ip6tnl98')) - self.assertTrue(self.link_exits('ip6tnl97')) + self.copy_unit_to_networkd_unit_path('12-dummy.netdev', 'ip6tnl.network', + '25-ip6tnl-tunnel.netdev', '25-tunnel.network', + '25-ip6tnl-tunnel-local-any.netdev', '25-tunnel-local-any.network', + '25-ip6tnl-tunnel-remote-any.netdev', '25-tunnel-remote-any.network') + self.start_networkd(0) + self.wait_online(['ip6tnl99:routable', 'ip6tnl98:routable', 'ip6tnl97:routable', 'dummy98:degraded']) - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ip6tnl99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ip6tnl99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'ip6tnl ip6ip6 remote 2001:473:fece:cafe::5179 local 2a00:ffde:4567:edde::4987 dev dummy98') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ip6tnl98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ip6tnl98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'ip6tnl ip6ip6 remote 2001:473:fece:cafe::5179 local (?:any|::) dev dummy98') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ip6tnl97']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ip6tnl97'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'ip6tnl ip6ip6 remote (?:any|::) local 2a00:ffde:4567:edde::4987 dev dummy98') def test_sit_tunnel(self): - self.copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-sit-tunnel.netdev', 'sit.network', - '25-sit-tunnel-local-any.netdev', - '25-sit-tunnel-remote-any.netdev') - self.start_networkd() - - self.assertTrue(self.link_exits('dummy98')) - self.assertTrue(self.link_exits('sittun99')) - self.assertTrue(self.link_exits('sittun98')) - self.assertTrue(self.link_exits('sittun97')) + self.copy_unit_to_networkd_unit_path('12-dummy.netdev', 'sit.network', + '25-sit-tunnel.netdev', '25-tunnel.network', + '25-sit-tunnel-local-any.netdev', '25-tunnel-local-any.network', + '25-sit-tunnel-remote-any.netdev', '25-tunnel-remote-any.network') + self.start_networkd(0) + self.wait_online(['sittun99:routable', 'sittun98:routable', 'sittun97:routable', 'dummy98:degraded']) - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'sittun99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'sittun99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, "sit (?:ip6ip |)remote 10.65.223.239 local 10.65.223.238 dev dummy98") - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'sittun98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'sittun98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, "sit (?:ip6ip |)remote 10.65.223.239 local any dev dummy98") - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'sittun97']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'sittun97'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, "sit (?:ip6ip |)remote any local 10.65.223.238 dev dummy98") def test_isatap_tunnel(self): - self.copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-isatap-tunnel.netdev', 'isatap.network') - self.start_networkd() - - self.assertTrue(self.link_exits('dummy98')) - self.assertTrue(self.link_exits('isataptun99')) + self.copy_unit_to_networkd_unit_path('12-dummy.netdev', 'isatap.network', + '25-isatap-tunnel.netdev', '25-tunnel.network') + self.start_networkd(0) + self.wait_online(['isataptun99:routable', 'dummy98:degraded']) - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'isataptun99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'isataptun99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, "isatap ") def test_6rd_tunnel(self): - self.copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-6rd-tunnel.netdev', '6rd.network') - self.start_networkd() - - self.assertTrue(self.link_exits('dummy98')) - self.assertTrue(self.link_exits('sittun99')) + self.copy_unit_to_networkd_unit_path('12-dummy.netdev', '6rd.network', + '25-6rd-tunnel.netdev', '25-tunnel.network') + self.start_networkd(0) + self.wait_online(['sittun99:routable', 'dummy98:degraded']) - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'sittun99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'sittun99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '6rd-prefix 2602::/24') @expectedFailureIfERSPANModuleIsNotAvailable() def test_erspan_tunnel(self): self.copy_unit_to_networkd_unit_path('12-dummy.netdev', 'erspan.network', - '25-erspan-tunnel.netdev', '25-erspan-tunnel-local-any.netdev') - self.start_networkd() - - self.assertTrue(self.link_exits('dummy98')) - self.assertTrue(self.link_exits('erspan99')) - self.assertTrue(self.link_exits('erspan98')) + '25-erspan-tunnel.netdev', '25-tunnel.network', + '25-erspan-tunnel-local-any.netdev', '25-tunnel-local-any.network') + self.start_networkd(0) + self.wait_online(['erspan99:routable', 'erspan98:routable', 'dummy98:degraded']) - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'erspan99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'erspan99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'erspan remote 172.16.1.100 local 172.16.1.200') self.assertRegex(output, 'ikey 0.0.0.101') self.assertRegex(output, 'okey 0.0.0.101') self.assertRegex(output, 'iseq') self.assertRegex(output, 'oseq') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'erspan98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'erspan98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'erspan remote 172.16.1.100 local any') self.assertRegex(output, '102') @@ -818,10 +888,10 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, 'oseq') def test_tunnel_independent(self): - self.copy_unit_to_networkd_unit_path('25-ipip-tunnel-independent.netdev') - self.start_networkd() + self.copy_unit_to_networkd_unit_path('25-ipip-tunnel-independent.netdev', 'netdev-link-local-addressing-yes.network') + self.start_networkd(0) - self.assertTrue(self.link_exits('ipiptun99')) + self.wait_online(['ipiptun99:carrier']) @expectedFailureIfModuleIsNotAvailable('fou') def test_fou(self): @@ -832,28 +902,25 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('25-fou-ipproto-ipip.netdev', '25-fou-ipproto-gre.netdev', '25-fou-ipip.netdev', '25-fou-sit.netdev', '25-fou-gre.netdev', '25-fou-gretap.netdev') - self.start_networkd() + self.start_networkd(0) - self.assertTrue(self.link_exits('ipiptun96')) - self.assertTrue(self.link_exits('sittun96')) - self.assertTrue(self.link_exits('gretun96')) - self.assertTrue(self.link_exits('gretap96')) + self.wait_online(['ipiptun96:off', 'sittun96:off', 'gretun96:off', 'gretap96:off']) - output = subprocess.check_output(['ip', 'fou', 'show']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'fou', 'show'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'port 55555 ipproto 4') self.assertRegex(output, 'port 55556 ipproto 47') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ipiptun96']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ipiptun96'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'encap fou encap-sport auto encap-dport 55555') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'sittun96']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'sittun96'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'encap fou encap-sport auto encap-dport 55555') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretun96']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretun96'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'encap fou encap-sport 1001 encap-dport 55556') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretap96']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretap96'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'encap fou encap-sport auto encap-dport 55556') @@ -861,14 +928,15 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): subprocess.call(['ip', 'fou', 'del', 'port', '55556']) def test_vxlan(self): - self.copy_unit_to_networkd_unit_path('25-vxlan.netdev', 'vxlan.network', '11-dummy.netdev') - self.start_networkd() + self.copy_unit_to_networkd_unit_path('25-vxlan.netdev', 'vxlan.network', + '11-dummy.netdev', 'vxlan-test1.network') + self.start_networkd(0) - self.assertTrue(self.link_exits('vxlan99')) + self.wait_online(['test1:degraded', 'vxlan99:degraded']) - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'vxlan99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'vxlan99'], universal_newlines=True).rstrip() print(output) - self.assertRegex(output, "999") + self.assertRegex(output, '999') self.assertRegex(output, '5555') self.assertRegex(output, 'l2miss') self.assertRegex(output, 'l3miss') @@ -879,6 +947,12 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, 'remcsumrx') self.assertRegex(output, 'gbp') + output = subprocess.check_output(['bridge', 'fdb', 'show', 'dev', 'vxlan99'], universal_newlines=True).rstrip() + print(output) + self.assertRegex(output, '00:11:22:33:44:55 dst 10.0.0.5 self permanent') + self.assertRegex(output, '00:11:22:33:44:66 dst 10.0.0.6 self permanent') + self.assertRegex(output, '00:11:22:33:44:77 dst 10.0.0.7 self permanent') + def test_macsec(self): self.copy_unit_to_networkd_unit_path('25-macsec.netdev', '25-macsec.network', '25-macsec.key', 'macsec.network', '12-dummy.netdev') @@ -886,13 +960,13 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.wait_online(['dummy98:degraded', 'macsec99:routable']) - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'macsec99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'macsec99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'macsec99@dummy98') self.assertRegex(output, 'macsec sci [0-9a-f]*000b') self.assertRegex(output, 'encrypt on') - output = subprocess.check_output(['ip', 'macsec', 'show', 'macsec99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'macsec', 'show', 'macsec99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'encrypt on') self.assertRegex(output, 'TXSC: [0-9a-f]*000b on SA 1') @@ -937,13 +1011,11 @@ class NetworkdL2TPTests(unittest.TestCase, Utilities): @expectedFailureIfModuleIsNotAvailable('l2tp_eth') def test_l2tp_udp(self): self.copy_unit_to_networkd_unit_path('11-dummy.netdev', '25-l2tp-dummy.network', '25-l2tp-udp.netdev') - self.start_networkd() + self.start_networkd(0) - self.assertTrue(self.link_exits('test1')) - self.assertTrue(self.link_exits('l2tp-ses1')) - self.assertTrue(self.link_exits('l2tp-ses2')) + self.wait_online(['test1:routable', 'l2tp-ses1:off', 'l2tp-ses2:off']) - output = subprocess.check_output(['ip', 'l2tp', 'show', 'tunnel', 'tunnel_id', '10']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'l2tp', 'show', 'tunnel', 'tunnel_id', '10'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, "Tunnel 10, encap UDP") self.assertRegex(output, "From 192.168.30.100 to 192.168.30.101") @@ -951,13 +1023,13 @@ class NetworkdL2TPTests(unittest.TestCase, Utilities): self.assertRegex(output, "UDP source / dest ports: 3000/4000") self.assertRegex(output, "UDP checksum: enabled") - output = subprocess.check_output(['ip', 'l2tp', 'show', 'session', 'tid', '10', 'session_id', '15']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'l2tp', 'show', 'session', 'tid', '10', 'session_id', '15'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, "Session 15 in tunnel 10") self.assertRegex(output, "Peer session 16, tunnel 11") self.assertRegex(output, "interface name: l2tp-ses1") - output = subprocess.check_output(['ip', 'l2tp', 'show', 'session', 'tid', '10', 'session_id', '17']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'l2tp', 'show', 'session', 'tid', '10', 'session_id', '17'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, "Session 17 in tunnel 10") self.assertRegex(output, "Peer session 18, tunnel 11") @@ -966,25 +1038,23 @@ class NetworkdL2TPTests(unittest.TestCase, Utilities): @expectedFailureIfModuleIsNotAvailable('l2tp_ip') def test_l2tp_ip(self): self.copy_unit_to_networkd_unit_path('11-dummy.netdev', '25-l2tp-dummy.network', '25-l2tp-ip.netdev') - self.start_networkd() + self.start_networkd(0) - self.assertTrue(self.link_exits('test1')) - self.assertTrue(self.link_exits('l2tp-ses3')) - self.assertTrue(self.link_exits('l2tp-ses4')) + self.wait_online(['test1:routable', 'l2tp-ses3:off', 'l2tp-ses4:off']) - output = subprocess.check_output(['ip', 'l2tp', 'show', 'tunnel', 'tunnel_id', '10']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'l2tp', 'show', 'tunnel', 'tunnel_id', '10'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, "Tunnel 10, encap IP") self.assertRegex(output, "From 192.168.30.100 to 192.168.30.101") self.assertRegex(output, "Peer tunnel 12") - output = subprocess.check_output(['ip', 'l2tp', 'show', 'session', 'tid', '10', 'session_id', '25']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'l2tp', 'show', 'session', 'tid', '10', 'session_id', '25'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, "Session 25 in tunnel 10") self.assertRegex(output, "Peer session 26, tunnel 12") self.assertRegex(output, "interface name: l2tp-ses3") - output = subprocess.check_output(['ip', 'l2tp', 'show', 'session', 'tid', '10', 'session_id', '27']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'l2tp', 'show', 'session', 'tid', '10', 'session_id', '27'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, "Session 27 in tunnel 10") self.assertRegex(output, "Peer session 28, tunnel 12") @@ -1034,7 +1104,7 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): self.wait_online(['dummy98:routable']) - output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'dummy98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'dummy98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'inet 10.1.2.3/16 brd 10.1.255.255 scope global dummy98') self.assertRegex(output, 'inet 10.1.2.4/16 brd 10.1.255.255 scope global secondary dummy98') @@ -1044,19 +1114,19 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): self.assertNotRegex(output, '10.10.0.1/16') self.assertNotRegex(output, '10.10.0.2/16') - output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'dummy98', 'label', '32']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'dummy98', 'label', '32'], universal_newlines=True).rstrip() self.assertRegex(output, 'inet 10.3.2.3/16 brd 10.3.255.255 scope global 32') - output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'dummy98', 'label', '33']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'dummy98', 'label', '33'], universal_newlines=True).rstrip() self.assertRegex(output, 'inet 10.4.2.3 peer 10.4.2.4/16 scope global 33') - output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'dummy98', 'label', '34']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'dummy98', 'label', '34'], universal_newlines=True).rstrip() self.assertRegex(output, 'inet 192.168.[0-9]*.1/24 brd 192.168.[0-9]*.255 scope global 34') - output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'dummy98', 'label', '35']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'dummy98', 'label', '35'], universal_newlines=True).rstrip() self.assertRegex(output, 'inet 172.[0-9]*.0.1/16 brd 172.[0-9]*.255.255 scope global 35') - output = subprocess.check_output(['ip', '-6', 'address', 'show', 'dev', 'dummy98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-6', 'address', 'show', 'dev', 'dummy98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'inet6 2001:db8:0:f101::15/64 scope global') self.assertRegex(output, 'inet6 2001:db8:0:f101::16/64 scope global') @@ -1069,13 +1139,11 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('25-address-preferred-lifetime-zero-ipv6.network', '12-dummy.netdev') self.start_networkd() - self.assertTrue(self.link_exits('dummy98')) + self.check_link_exists('dummy98') - output = subprocess.check_output(['networkctl', 'status', 'dummy98']).rstrip().decode('utf-8') - print(output) - self.assertRegex(output, 'State: routable \(configuring\)') + self.check_operstate('dummy98', 'routable', setup_state='configuring') - output = subprocess.check_output(['ip', 'address', 'show', 'dummy98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'address', 'show', 'dummy98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'inet 10.2.3.4/16 brd 10.2.255.255 scope link deprecated dummy98') self.assertRegex(output, 'inet6 2001:db8:0:f101::1/64 scope global') @@ -1084,9 +1152,9 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('configure-without-carrier.network', '11-dummy.netdev') self.start_networkd() - self.assertTrue(self.link_exits('test1')) + self.check_link_exists('test1') - output = subprocess.check_output(['networkctl', 'status', 'test1']).rstrip().decode('utf-8') + output = subprocess.check_output(['networkctl', 'status', 'test1'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '192.168.0.15') self.assertRegex(output, '192.168.0.1') @@ -1099,9 +1167,9 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): self.start_networkd() - self.assertTrue(self.link_exits('test1')) + self.check_link_exists('test1') - output = subprocess.check_output(['ip', 'rule']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'rule'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '111') self.assertRegex(output, 'from 192.168.100.18') @@ -1123,14 +1191,14 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): # Remove state files only first time self.start_networkd(remove_state_files=(trial == 0)) - self.assertTrue(self.link_exits('test1')) - self.assertTrue(self.link_exits('dummy98')) + self.check_link_exists('test1') + self.check_link_exists('dummy98') - output = subprocess.check_output(['ip', 'rule', 'list', 'table', '7']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'rule', 'list', 'table', '7'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '111: from 192.168.100.18 tos (?:0x08|throughput) iif test1 oif test1 lookup 7') - output = subprocess.check_output(['ip', 'rule', 'list', 'table', '8']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'rule', 'list', 'table', '8'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '112: from 192.168.101.18 tos (?:0x08|throughput) iif dummy98 oif dummy98 lookup 8') @@ -1145,9 +1213,9 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): self.start_networkd() - self.assertTrue(self.link_exits('test1')) + self.check_link_exists('test1') - output = subprocess.check_output(['ip', 'rule']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'rule'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '111') self.assertRegex(output, 'from 192.168.100.18') @@ -1166,9 +1234,9 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): self.start_networkd() - self.assertTrue(self.link_exits('test1')) + self.check_link_exists('test1') - output = subprocess.check_output(['ip', 'rule']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'rule'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '111') self.assertRegex(output, 'not.*?from.*?192.168.100.18') @@ -1183,34 +1251,36 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): self.wait_online(['dummy98:routable']) - output = subprocess.check_output(['ip', '-6', 'route', 'show', 'dev', 'dummy98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-6', 'route', 'show', 'dev', 'dummy98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '2001:1234:5:8fff:ff:ff:ff:ff proto static') self.assertRegex(output, '2001:1234:5:8f63::1 proto kernel') - output = subprocess.check_output(['ip', '-6', 'route', 'show', 'dev', 'dummy98', 'default']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-6', 'route', 'show', 'dev', 'dummy98', 'default'], universal_newlines=True).rstrip() self.assertRegex(output, 'default via 2001:1234:5:8fff:ff:ff:ff:ff proto static metric 1024 pref medium') - output = subprocess.check_output(['ip', '-4', 'route', 'show', 'dev', 'dummy98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-4', 'route', 'show', 'dev', 'dummy98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '149.10.124.48/28 proto kernel scope link src 149.10.124.58') self.assertRegex(output, '149.10.124.64 proto static scope link') + self.assertRegex(output, '169.254.0.0/16 proto static scope link metric 2048') self.assertRegex(output, '192.168.1.1 proto static initcwnd 20') self.assertRegex(output, '192.168.1.2 proto static initrwnd 30') - output = subprocess.check_output(['ip', '-4', 'route', 'show', 'dev', 'dummy98', 'default']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-4', 'route', 'show', 'dev', 'dummy98', 'default'], universal_newlines=True).rstrip() self.assertRegex(output, 'default via 149.10.125.65 proto static onlink') self.assertRegex(output, 'default via 149.10.124.64 proto static') + self.assertRegex(output, 'default proto static') - output = subprocess.check_output(['ip', 'route', 'show', 'type', 'blackhole']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'route', 'show', 'type', 'blackhole'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'blackhole 202.54.1.2 proto static') - output = subprocess.check_output(['ip', 'route', 'show', 'type', 'unreachable']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'route', 'show', 'type', 'unreachable'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'unreachable 202.54.1.3 proto static') - output = subprocess.check_output(['ip', 'route', 'show', 'type', 'prohibit']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'route', 'show', 'type', 'prohibit'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'prohibit 202.54.1.4 proto static') @@ -1225,10 +1295,10 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('23-active-slave.network', '25-route-ipv6-src.network', '25-bond-active-backup-slave.netdev', '12-dummy.netdev') self.start_networkd() - self.assertTrue(self.link_exits('dummy98')) - self.assertTrue(self.link_exits('bond199')) + self.check_link_exists('dummy98') + self.check_link_exists('bond199') - output = subprocess.check_output(['ip', '-6', 'route', 'list', 'dev', 'bond199']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-6', 'route', 'list', 'dev', 'bond199'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'abcd::/16') self.assertRegex(output, 'src') @@ -1238,9 +1308,9 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('25-address-link-section.network', '12-dummy.netdev') self.start_networkd() - self.assertTrue(self.link_exits('dummy98')) + self.check_link_exists('dummy98') - output = subprocess.check_output(['ip', 'link', 'show', 'dummy98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'link', 'show', 'dummy98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '00:01:02:aa:bb:cc') @@ -1248,9 +1318,9 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('25-link-section-unmanaged.network', '12-dummy.netdev') self.start_networkd() - self.assertTrue(self.link_exits('dummy98')) + self.check_link_exists('dummy98') - output = subprocess.check_output(['networkctl', 'status', 'dummy98']).rstrip().decode('utf-8') + output = subprocess.check_output(['networkctl', 'status', 'dummy98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'unmanaged') @@ -1258,9 +1328,9 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('25-ipv6-address-label-section.network', '12-dummy.netdev') self.start_networkd() - self.assertTrue(self.link_exits('dummy98')) + self.check_link_exists('dummy98') - output = subprocess.check_output(['ip', 'addrlabel', 'list']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'addrlabel', 'list'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '2004:da8:1::/64') @@ -1268,9 +1338,9 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('25-neighbor-section.network', '12-dummy.netdev') self.start_networkd() - self.assertTrue(self.link_exits('dummy98')) + self.check_link_exists('dummy98') - output = subprocess.check_output(['ip', 'neigh', 'list']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'neigh', 'list'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '192.168.10.1.*00:00:5e:00:02:65.*PERMANENT') self.assertRegex(output, '2004:da8:1::1.*00:00:5e:00:02:66.*PERMANENT') @@ -1281,25 +1351,20 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): self.start_networkd(0) self.wait_online(['test1:degraded', 'dummy98:carrier']) - self.assertTrue(self.link_exits('test1')) - self.assertTrue(self.link_exits('dummy98')) + self.check_link_exists('test1') + self.check_link_exists('dummy98') - output = subprocess.check_output(['ip', 'address', 'show', 'dev', 'test1']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'address', 'show', 'dev', 'test1'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'inet .* scope link') self.assertRegex(output, 'inet6 .* scope link') - output = subprocess.check_output(['ip', 'address', 'show', 'dev', 'dummy98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'address', 'show', 'dev', 'dummy98'], universal_newlines=True).rstrip() print(output) self.assertNotRegex(output, 'inet6* .* scope link') - output = subprocess.check_output(['networkctl', 'status', 'test1']).rstrip().decode('utf-8') - print(output) - self.assertRegex(output, 'State: degraded \(configured\)') - - output = subprocess.check_output(['networkctl', 'status', 'dummy98']).rstrip().decode('utf-8') - print(output) - self.assertRegex(output, 'State: carrier \(configured\)') + self.check_operstate('test1', 'degraded') + self.check_operstate('dummy98', 'carrier') ''' Documentation/networking/ip-sysctl.txt @@ -1339,8 +1404,6 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): self.start_networkd(0) self.wait_online(['dummy98:degraded']) - self.assertTrue(self.link_exits('dummy98')) - self.assertEqual(self.read_ipv6_sysctl_attr('dummy98', 'forwarding'), '1') self.assertEqual(self.read_ipv6_sysctl_attr('dummy98', 'use_tempaddr'), '2') self.assertEqual(self.read_ipv6_sysctl_attr('dummy98', 'dad_transmits'), '3') @@ -1359,16 +1422,13 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): self.start_networkd(0) self.wait_online(['dummy98:routable']) - self.assertTrue(self.link_exits('dummy98')) - - output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dummy98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dummy98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'inet 10.2.3.4/16 brd 10.2.255.255 scope global dummy98') - output = subprocess.check_output(['ip', '-6', 'address', 'show', 'dummy98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-6', 'address', 'show', 'dummy98'], universal_newlines=True).rstrip() print(output) self.assertEqual(output, '') - output = subprocess.check_output(['networkctl', 'status', 'dummy98']).rstrip().decode('utf-8') - self.assertRegex(output, 'State: routable \(configured\)') + self.check_operstate('dummy98', 'routable') self.assertEqual(subprocess.call(['ip', 'link', 'del', 'dummy98']), 0) @@ -1379,71 +1439,63 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): self.start_networkd(0) self.wait_online(['dummy98:routable']) - self.assertTrue(self.link_exits('dummy98')) - - output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dummy98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dummy98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'inet 10.2.3.4/16 brd 10.2.255.255 scope global dummy98') - output = subprocess.check_output(['ip', '-6', 'address', 'show', 'dummy98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-6', 'address', 'show', 'dummy98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'inet6 .* scope link') - output = subprocess.check_output(['networkctl', 'status', 'dummy98']).rstrip().decode('utf-8') - self.assertRegex(output, 'State: routable \(configured\)') + self.check_operstate('dummy98', 'routable') def test_bind_carrier(self): self.copy_unit_to_networkd_unit_path('25-bind-carrier.network', '11-dummy.netdev') self.start_networkd() - self.assertTrue(self.link_exits('test1')) + self.check_link_exists('test1') self.assertEqual(subprocess.call(['ip', 'link', 'add', 'dummy98', 'type', 'dummy']), 0) self.assertEqual(subprocess.call(['ip', 'link', 'set', 'dummy98', 'up']), 0) time.sleep(2) - output = subprocess.check_output(['ip', 'address', 'show', 'test1']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'address', 'show', 'test1'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'UP,LOWER_UP') self.assertRegex(output, 'inet 192.168.10.30/24 brd 192.168.10.255 scope global test1') - output = subprocess.check_output(['networkctl', 'status', 'test1']).rstrip().decode('utf-8') - self.assertRegex(output, 'State: routable \(configured\)') + self.check_operstate('test1', 'routable') self.assertEqual(subprocess.call(['ip', 'link', 'add', 'dummy99', 'type', 'dummy']), 0) self.assertEqual(subprocess.call(['ip', 'link', 'set', 'dummy99', 'up']), 0) time.sleep(2) - output = subprocess.check_output(['ip', 'address', 'show', 'test1']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'address', 'show', 'test1'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'UP,LOWER_UP') self.assertRegex(output, 'inet 192.168.10.30/24 brd 192.168.10.255 scope global test1') - output = subprocess.check_output(['networkctl', 'status', 'test1']).rstrip().decode('utf-8') - self.assertRegex(output, 'State: routable \(configured\)') + self.check_operstate('test1', 'routable') self.assertEqual(subprocess.call(['ip', 'link', 'del', 'dummy98']), 0) time.sleep(2) - output = subprocess.check_output(['ip', 'address', 'show', 'test1']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'address', 'show', 'test1'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'UP,LOWER_UP') self.assertRegex(output, 'inet 192.168.10.30/24 brd 192.168.10.255 scope global test1') - output = subprocess.check_output(['networkctl', 'status', 'test1']).rstrip().decode('utf-8') - self.assertRegex(output, 'State: routable \(configured\)') + self.check_operstate('test1', 'routable') self.assertEqual(subprocess.call(['ip', 'link', 'del', 'dummy99']), 0) time.sleep(2) - output = subprocess.check_output(['ip', 'address', 'show', 'test1']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'address', 'show', 'test1'], universal_newlines=True).rstrip() print(output) self.assertNotRegex(output, 'UP,LOWER_UP') self.assertRegex(output, 'DOWN') self.assertNotRegex(output, '192.168.10') - output = subprocess.check_output(['networkctl', 'status', 'test1']).rstrip().decode('utf-8') - self.assertRegex(output, 'State: off \(configured\)') + self.check_operstate('test1', 'off') self.assertEqual(subprocess.call(['ip', 'link', 'add', 'dummy98', 'type', 'dummy']), 0) self.assertEqual(subprocess.call(['ip', 'link', 'set', 'dummy98', 'up']), 0) time.sleep(2) - output = subprocess.check_output(['ip', 'address', 'show', 'test1']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'address', 'show', 'test1'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'UP,LOWER_UP') self.assertRegex(output, 'inet 192.168.10.30/24 brd 192.168.10.255 scope global test1') - output = subprocess.check_output(['networkctl', 'status', 'test1']).rstrip().decode('utf-8') - self.assertRegex(output, 'State: routable \(configured\)') + self.check_operstate('test1', 'routable') class NetworkdNetWorkBondTests(unittest.TestCase, Utilities): links = [ @@ -1475,10 +1527,10 @@ class NetworkdNetWorkBondTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('23-active-slave.network', '23-bond199.network', '25-bond-active-backup-slave.netdev', '12-dummy.netdev') self.start_networkd() - self.assertTrue(self.link_exits('dummy98')) - self.assertTrue(self.link_exits('bond199')) + self.check_link_exists('dummy98') + self.check_link_exists('bond199') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'bond199']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'bond199'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'active_slave dummy98') @@ -1486,10 +1538,10 @@ class NetworkdNetWorkBondTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('23-primary-slave.network', '23-test1-bond199.network', '25-bond-active-backup-slave.netdev', '11-dummy.netdev') self.start_networkd() - self.assertTrue(self.link_exits('test1')) - self.assertTrue(self.link_exits('bond199')) + self.check_link_exists('test1') + self.check_link_exists('bond199') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'bond199']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'bond199'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'primary test1') @@ -1498,79 +1550,58 @@ class NetworkdNetWorkBondTests(unittest.TestCase, Utilities): 'bond99.network','bond-slave.network') self.start_networkd() - self.assertTrue(self.link_exits('bond99')) - self.assertTrue(self.link_exits('dummy98')) - self.assertTrue(self.link_exits('test1')) + self.check_link_exists('bond99') + self.check_link_exists('dummy98') + self.check_link_exists('test1') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'dummy98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'dummy98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'SLAVE,UP,LOWER_UP') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'test1']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'test1'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'SLAVE,UP,LOWER_UP') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'bond99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'bond99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'MASTER,UP,LOWER_UP') - output = subprocess.check_output(['networkctl', 'status', 'dummy98']).rstrip().decode('utf-8') - print(output) - self.assertRegex(output, 'State: enslaved \(configured\)') - - output = subprocess.check_output(['networkctl', 'status', 'test1']).rstrip().decode('utf-8') - print(output) - self.assertRegex(output, 'State: enslaved \(configured\)') - - output = subprocess.check_output(['networkctl', 'status', 'bond99']).rstrip().decode('utf-8') - print(output) - self.assertRegex(output, 'State: routable \(configured\)') + self.check_operstate('dummy98', 'enslaved') + self.check_operstate('test1', 'enslaved') + self.check_operstate('bond99', 'routable') self.assertEqual(subprocess.call(['ip', 'link', 'set', 'dummy98', 'down']), 0) time.sleep(2) - output = subprocess.check_output(['networkctl', 'status', 'dummy98']).rstrip().decode('utf-8') - print(output) - self.assertRegex(output, 'State: off \(configured\)') - - output = subprocess.check_output(['networkctl', 'status', 'test1']).rstrip().decode('utf-8') - print(output) - self.assertRegex(output, 'State: enslaved \(configured\)') - - output = subprocess.check_output(['networkctl', 'status', 'bond99']).rstrip().decode('utf-8') - print(output) - self.assertRegex(output, 'State: degraded-carrier \(configured\)') + self.check_operstate('dummy98', 'off') + self.check_operstate('test1', 'enslaved') + self.check_operstate('bond99', 'degraded-carrier') self.assertEqual(subprocess.call(['ip', 'link', 'set', 'dummy98', 'up']), 0) time.sleep(2) - output = subprocess.check_output(['networkctl', 'status', 'dummy98']).rstrip().decode('utf-8') - print(output) - self.assertRegex(output, 'State: enslaved \(configured\)') - - output = subprocess.check_output(['networkctl', 'status', 'test1']).rstrip().decode('utf-8') - print(output) - self.assertRegex(output, 'State: enslaved \(configured\)') - - output = subprocess.check_output(['networkctl', 'status', 'bond99']).rstrip().decode('utf-8') - print(output) - self.assertRegex(output, 'State: routable \(configured\)') + self.check_operstate('dummy98', 'enslaved') + self.check_operstate('test1', 'enslaved') + self.check_operstate('bond99', 'routable') self.assertEqual(subprocess.call(['ip', 'link', 'set', 'dummy98', 'down']), 0) self.assertEqual(subprocess.call(['ip', 'link', 'set', 'test1', 'down']), 0) - time.sleep(5) - - output = subprocess.check_output(['networkctl', 'status', 'dummy98']).rstrip().decode('utf-8') - print(output) - self.assertRegex(output, 'State: off \(configured\)') + time.sleep(2) - output = subprocess.check_output(['networkctl', 'status', 'test1']).rstrip().decode('utf-8') - print(output) - self.assertRegex(output, 'State: off \(configured\)') + self.check_operstate('dummy98', 'off') + self.check_operstate('test1', 'off') - output = subprocess.check_output(['networkctl', 'status', 'bond99']).rstrip().decode('utf-8') - print(output) - self.assertRegex(output, 'State: no-carrier \(configured\)') + for trial in range(30): + if trial > 0: + time.sleep(1) + output = subprocess.check_output(['ip', 'address', 'show', 'bond99'], universal_newlines=True).rstrip() + print(output) + if self.get_operstate('bond99') == 'no-carrier': + break + else: + # Huh? Kernel does not recognize that all slave interfaces are down? + # Let's confirm that networkd's operstate is consistent with ip's result. + self.assertNotRegex(output, 'NO-CARRIER') class NetworkdNetWorkBridgeTests(unittest.TestCase, Utilities): links = [ @@ -1600,25 +1631,25 @@ class NetworkdNetWorkBridgeTests(unittest.TestCase, Utilities): 'bridge99.network') self.start_networkd() - self.assertTrue(self.link_exits('dummy98')) - self.assertTrue(self.link_exits('test1')) - self.assertTrue(self.link_exits('bridge99')) + self.check_link_exists('dummy98') + self.check_link_exists('test1') + self.check_link_exists('bridge99') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'test1']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'test1'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'master') self.assertRegex(output, 'bridge') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'dummy98']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'dummy98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'master') self.assertRegex(output, 'bridge') - output = subprocess.check_output(['ip', 'addr', 'show', 'bridge99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'addr', 'show', 'bridge99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '192.168.0.15/24') - output = subprocess.check_output(['bridge', '-d', 'link', 'show', 'dummy98']).rstrip().decode('utf-8') + output = subprocess.check_output(['bridge', '-d', 'link', 'show', 'dummy98'], universal_newlines=True).rstrip() print(output) self.assertEqual(self.read_bridge_port_attr('bridge99', 'dummy98', 'hairpin_mode'), '1') self.assertEqual(self.read_bridge_port_attr('bridge99', 'dummy98', 'path_cost'), '400') @@ -1633,38 +1664,30 @@ class NetworkdNetWorkBridgeTests(unittest.TestCase, Utilities): if (os.path.exists('/sys/devices/virtual/net/bridge00/lower_dummy98/brport/multicast_to_unicast')): self.assertEqual(self.read_bridge_port_attr('bridge99', 'dummy98', 'multicast_to_unicast'), '1') - output = subprocess.check_output(['networkctl', 'status', 'test1']).rstrip().decode('utf-8') - self.assertRegex(output, 'State: enslaved \(configured\)') - - output = subprocess.check_output(['networkctl', 'status', 'dummy98']).rstrip().decode('utf-8') - self.assertRegex(output, 'State: enslaved \(configured\)') - - output = subprocess.check_output(['networkctl', 'status', 'bridge99']).rstrip().decode('utf-8') - self.assertRegex(output, 'State: routable \(configured\)') + self.check_operstate('test1', 'enslaved') + self.check_operstate('dummy98', 'enslaved') + self.check_operstate('bridge99', 'routable') self.assertEqual(subprocess.call(['ip', 'address', 'add', '192.168.0.16/24', 'dev', 'bridge99']), 0) time.sleep(1) - output = subprocess.check_output(['ip', 'addr', 'show', 'bridge99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'addr', 'show', 'bridge99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '192.168.0.16/24') - output = subprocess.check_output(['networkctl', 'status', 'bridge99']).rstrip().decode('utf-8') - self.assertRegex(output, 'State: routable \(configured\)') + self.check_operstate('bridge99', 'routable') self.assertEqual(subprocess.call(['ip', 'link', 'del', 'test1']), 0) time.sleep(3) - output = subprocess.check_output(['networkctl', 'status', 'bridge99']).rstrip().decode('utf-8') - self.assertRegex(output, 'State: degraded-carrier \(configured\)') + self.check_operstate('bridge99', 'degraded-carrier') self.assertEqual(subprocess.call(['ip', 'link', 'del', 'dummy98']), 0) time.sleep(3) - output = subprocess.check_output(['networkctl', 'status', 'bridge99']).rstrip().decode('utf-8') - self.assertRegex(output, 'State: no-carrier \(configured\)') + self.check_operstate('bridge99', 'no-carrier') - output = subprocess.check_output(['ip', 'address', 'show', 'bridge99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'address', 'show', 'bridge99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'NO-CARRIER') self.assertNotRegex(output, '192.168.0.15/24') @@ -1679,9 +1702,9 @@ class NetworkdNetWorkBridgeTests(unittest.TestCase, Utilities): self.start_networkd() - self.assertTrue(self.link_exits('dummy98')) - self.assertTrue(self.link_exits('test1')) - self.assertTrue(self.link_exits('bridge99')) + self.check_link_exists('dummy98') + self.check_link_exists('test1') + self.check_link_exists('bridge99') self.assertEqual(subprocess.call(['ip', 'address', 'add', '192.168.0.16/24', 'dev', 'bridge99']), 0) time.sleep(1) @@ -1690,7 +1713,7 @@ class NetworkdNetWorkBridgeTests(unittest.TestCase, Utilities): self.assertEqual(subprocess.call(['ip', 'link', 'del', 'dummy98']), 0) time.sleep(3) - output = subprocess.check_output(['ip', 'address', 'show', 'bridge99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'address', 'show', 'bridge99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'NO-CARRIER') self.assertRegex(output, 'inet 192.168.0.15/24 brd 192.168.0.255 scope global bridge99') @@ -1706,7 +1729,7 @@ class NetworkdNetWorkBridgeTests(unittest.TestCase, Utilities): self.start_networkd() - self.assertTrue(self.link_exits('bridge99')) + self.check_link_exists('bridge99') self.assertEqual(subprocess.call(['ip', 'link', 'add', 'dummy98', 'type', 'dummy']), 0) self.assertEqual(subprocess.call(['ip', 'link', 'set', 'dummy98', 'up']), 0) @@ -1723,19 +1746,19 @@ class NetworkdNetWorkBridgeTests(unittest.TestCase, Utilities): self.assertEqual(subprocess.call(['ip', 'link', 'add', 'dummy98', 'type', 'dummy']), 0) self.assertEqual(subprocess.call(['ip', 'link', 'set', 'dummy98', 'up']), 0) - time.sleep(3) + for trial in range(30): + if trial > 0: + time.sleep(1) + if self.get_operstate('bridge99') == 'routable' and self.get_operstate('dummy98') == 'enslaved': + break + else: + self.assertTrue(False) - output = subprocess.check_output(['ip', 'address', 'show', 'bridge99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'address', 'show', 'bridge99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'inet 192.168.0.15/24 brd 192.168.0.255 scope global bridge99') - output = subprocess.check_output(['networkctl', 'status', 'bridge99']).rstrip().decode('utf-8') - self.assertRegex(output, 'State: routable \(configured\)') - - output = subprocess.check_output(['networkctl', 'status', 'dummy98']).rstrip().decode('utf-8') - self.assertRegex(output, 'State: enslaved \(configured\)') - - output = subprocess.check_output(['ip', 'rule', 'list', 'table', '100']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'rule', 'list', 'table', '100'], universal_newlines=True).rstrip() print(output) self.assertEqual(output, '0: from all to 8.8.8.8 lookup 100') @@ -1760,9 +1783,9 @@ class NetworkdNetWorkLLDPTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('23-emit-lldp.network', '24-lldp.network', '25-veth.netdev') self.start_networkd() - self.assertTrue(self.link_exits('veth99')) + self.check_link_exists('veth99') - output = subprocess.check_output(['networkctl', 'lldp']).rstrip().decode('utf-8') + output = subprocess.check_output(['networkctl', 'lldp'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'veth-peer') self.assertRegex(output, 'veth99') @@ -1783,12 +1806,13 @@ class NetworkdNetworkRATests(unittest.TestCase, Utilities): self.remove_unit_from_networkd_path(self.units) def test_ipv6_prefix_delegation(self): + self.warn_about_firewalld() self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'ipv6-prefix.network', 'ipv6-prefix-veth.network') self.start_networkd() - self.assertTrue(self.link_exits('veth99')) + self.check_link_exists('veth99') - output = subprocess.check_output(['networkctl', 'status', 'veth99']).rstrip().decode('utf-8') + output = subprocess.check_output(['networkctl', 'status', 'veth99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '2002:da8:1:0') @@ -1814,12 +1838,13 @@ class NetworkdNetworkDHCPServerTests(unittest.TestCase, Utilities): self.remove_unit_from_networkd_path(self.units) def test_dhcp_server(self): + self.warn_about_firewalld() self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-client.network', 'dhcp-server.network') self.start_networkd() - self.assertTrue(self.link_exits('veth99')) + self.check_link_exists('veth99') - output = subprocess.check_output(['networkctl', 'status', 'veth99']).rstrip().decode('utf-8') + output = subprocess.check_output(['networkctl', 'status', 'veth99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '192.168.5.*') self.assertRegex(output, 'Gateway: 192.168.5.1') @@ -1830,21 +1855,22 @@ class NetworkdNetworkDHCPServerTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('12-dummy.netdev', '24-search-domain.network') self.start_networkd() - self.assertTrue(self.link_exits('dummy98')) + self.check_link_exists('dummy98') - output = subprocess.check_output(['networkctl', 'status', 'dummy98']).rstrip().decode('utf-8') + output = subprocess.check_output(['networkctl', 'status', 'dummy98'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'Address: 192.168.42.100') self.assertRegex(output, 'DNS: 192.168.42.1') self.assertRegex(output, 'Search Domains: one') def test_emit_router_timezone(self): + self.warn_about_firewalld() self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-client-timezone-router.network', 'dhcp-server-timezone-router.network') self.start_networkd() - self.assertTrue(self.link_exits('veth99')) + self.check_link_exists('veth99') - output = subprocess.check_output(['networkctl', 'status', 'veth99']).rstrip().decode('utf-8') + output = subprocess.check_output(['networkctl', 'status', 'veth99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'Gateway: 192.168.5.*') self.assertRegex(output, '192.168.5.*') @@ -1872,44 +1898,51 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities): 'dhcp-client-route-metric.network', 'dhcp-client-route-table.network', 'dhcp-client-vrf.network', + 'dhcp-client-with-ipv4ll-fallback-with-dhcp-server.network', + 'dhcp-client-with-ipv4ll-fallback-without-dhcp-server.network', 'dhcp-client.network', 'dhcp-server-veth-peer.network', 'dhcp-v4-server-veth-peer.network', 'static.network'] def setUp(self): - self.link_remove(self.links) self.stop_dnsmasq(dnsmasq_pid_file) + self.link_remove(self.links) def tearDown(self): - self.link_remove(self.links) - self.remove_unit_from_networkd_path(self.units) self.stop_dnsmasq(dnsmasq_pid_file) self.remove_lease_file() self.remove_log_file() + self.link_remove(self.links) + self.remove_unit_from_networkd_path(self.units) def test_dhcp_client_ipv6_only(self): self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-ipv6-only.network') - self.start_networkd() - - self.assertTrue(self.link_exits('veth99')) + self.start_networkd(0) + self.wait_online(['veth-peer:carrier']) self.start_dnsmasq() + self.wait_online(['veth99:routable', 'veth-peer:routable']) - output = subprocess.check_output(['networkctl', 'status', 'veth99']).rstrip().decode('utf-8') + output = subprocess.check_output(['networkctl', 'status', 'veth99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '2600::') self.assertNotRegex(output, '192.168.5') + # Confirm that ipv6 token is not set in the kernel + output = subprocess.check_output(['ip', 'token', 'show', 'dev', 'veth99'], universal_newlines=True).rstrip() + print(output) + self.assertRegex(output, 'token :: dev veth99') + def test_dhcp_client_ipv4_only(self): self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-ipv4-only-ipv6-disabled.network') self.start_networkd() - self.assertTrue(self.link_exits('veth99')) + self.check_link_exists('veth99') self.start_dnsmasq() - output = subprocess.check_output(['networkctl', 'status', 'veth99']).rstrip().decode('utf-8') + output = subprocess.check_output(['networkctl', 'status', 'veth99'], universal_newlines=True).rstrip() print(output) self.assertNotRegex(output, '2600::') self.assertRegex(output, '192.168.5') @@ -1919,11 +1952,11 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities): 'dhcp-client-ipv4-only.network') self.start_networkd() - self.assertTrue(self.link_exits('veth99')) + self.check_link_exists('veth99') self.start_dnsmasq() - output = subprocess.check_output(['networkctl', 'status', 'veth99']).rstrip().decode('utf-8') + output = subprocess.check_output(['networkctl', 'status', 'veth99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '2600::') self.assertRegex(output, '192.168.5') @@ -1932,12 +1965,12 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-ipv4-dhcp-settings.network') self.start_networkd() - self.assertTrue(self.link_exits('veth99')) + self.check_link_exists('veth99') self.start_dnsmasq() print('## ip address show dev veth99') - output = subprocess.check_output(['ip', 'address', 'show', 'dev', 'veth99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'address', 'show', 'dev', 'veth99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '12:34:56:78:9a:bc') self.assertRegex(output, '192.168.5') @@ -1945,12 +1978,12 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities): # issue #8726 print('## ip route show table main dev veth99') - output = subprocess.check_output(['ip', 'route', 'show', 'table', 'main', 'dev', 'veth99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'route', 'show', 'table', 'main', 'dev', 'veth99'], universal_newlines=True).rstrip() print(output) self.assertNotRegex(output, 'proto dhcp') print('## ip route show table 211 dev veth99') - output = subprocess.check_output(['ip', 'route', 'show', 'table', '211', 'dev', 'veth99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'route', 'show', 'table', '211', 'dev', 'veth99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'default via 192.168.5.1 proto dhcp') self.assertRegex(output, '192.168.5.0/24 via 192.168.5.5 proto dhcp') @@ -1966,11 +1999,11 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-ipv6-only.network') self.start_networkd() - self.assertTrue(self.link_exits('veth99')) + self.check_link_exists('veth99') self.start_dnsmasq() - output = subprocess.check_output(['ip', 'address', 'show', 'dev', 'veth99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'address', 'show', 'dev', 'veth99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '12:34:56:78:9a:bc') self.assertTrue(self.search_words_in_dnsmasq_log('14:rapid-commit', True)) @@ -1979,11 +2012,11 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-ipv6-rapid-commit.network') self.start_networkd() - self.assertTrue(self.link_exits('veth99')) + self.check_link_exists('veth99') self.start_dnsmasq() - output = subprocess.check_output(['ip', 'address', 'show', 'dev', 'veth99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'address', 'show', 'dev', 'veth99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '12:34:56:78:9a:bc') self.assertFalse(self.search_words_in_dnsmasq_log('14:rapid-commit', True)) @@ -1992,7 +2025,7 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-anonymize.network') self.start_networkd() - self.assertTrue(self.link_exits('veth99')) + self.check_link_exists('veth99') self.start_dnsmasq() @@ -2004,11 +2037,11 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-listen-port.network') self.start_networkd() - self.assertTrue(self.link_exits('veth99')) + self.check_link_exists('veth99') self.start_dnsmasq('--dhcp-alternate-port=67,5555') - output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'veth99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'veth99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '192.168.5.* dynamic') @@ -2016,11 +2049,11 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-v4-server-veth-peer.network', 'dhcp-client-route-table.network') self.start_networkd() - self.assertTrue(self.link_exits('veth99')) + self.check_link_exists('veth99') self.start_dnsmasq() - output = subprocess.check_output(['ip', 'route', 'show', 'table', '12']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'route', 'show', 'table', '12'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'veth99 proto dhcp') self.assertRegex(output, '192.168.5.1') @@ -2029,11 +2062,11 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-v4-server-veth-peer.network', 'dhcp-client-route-metric.network') self.start_networkd() - self.assertTrue(self.link_exits('veth99')) + self.check_link_exists('veth99') self.start_dnsmasq() - output = subprocess.check_output(['ip', 'route', 'show', 'dev', 'veth99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'route', 'show', 'dev', 'veth99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'metric 24') @@ -2041,21 +2074,21 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-v4-server-veth-peer.network', 'dhcp-client-critical-connection.network') self.start_networkd() - self.assertTrue(self.link_exits('veth99')) + self.check_link_exists('veth99') self.start_dnsmasq() - output = subprocess.check_output(['networkctl', 'status', 'veth99']).rstrip().decode('utf-8') + output = subprocess.check_output(['networkctl', 'status', 'veth99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '192.168.5.*') - # Stoping dnsmasq as networkd won't be allowed to renew the DHCP lease. + # Stopping dnsmasq as networkd won't be allowed to renew the DHCP lease. self.stop_dnsmasq(dnsmasq_pid_file) # Sleep for 120 sec as the dnsmasq minimum lease time can only be set to 120 time.sleep(125) - output = subprocess.check_output(['networkctl', 'status', 'veth99']).rstrip().decode('utf-8') + output = subprocess.check_output(['networkctl', 'status', 'veth99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '192.168.5.*') @@ -2063,11 +2096,11 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client.network') self.start_networkd() - self.assertTrue(self.link_exits('veth99')) + self.check_link_exists('veth99') self.start_dnsmasq() - output = subprocess.check_output(['ip', 'address', 'show', 'dev', 'veth99', 'scope', 'global']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'address', 'show', 'dev', 'veth99', 'scope', 'global'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '192.168.5') self.assertRegex(output, '2600::') @@ -2084,14 +2117,14 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities): self.start_networkd() - self.assertTrue(self.link_exits('veth99')) + self.check_link_exists('veth99') - output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'veth99', 'scope', 'global']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'veth99', 'scope', 'global'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '192.168.5') self.assertRegex(output, 'valid_lft forever preferred_lft forever') - output = subprocess.check_output(['ip', '-6', 'address', 'show', 'dev', 'veth99', 'scope', 'global']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-6', 'address', 'show', 'dev', 'veth99', 'scope', 'global'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '2600::') self.assertRegex(output, 'valid_lft forever preferred_lft forever') @@ -2102,22 +2135,22 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities): '25-vrf.netdev', '25-vrf.network') self.start_networkd() - self.assertTrue(self.link_exits('veth99')) - self.assertTrue(self.link_exits('vrf99')) + self.check_link_exists('veth99') + self.check_link_exists('vrf99') self.start_dnsmasq() print('## ip -d link show dev vrf99') - output = subprocess.check_output(['ip', '-d', 'link', 'show', 'dev', 'vrf99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'dev', 'vrf99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'vrf table 42') print('## ip address show vrf vrf99') - output_ip_vrf = subprocess.check_output(['ip', 'address', 'show', 'vrf', 'vrf99']).rstrip().decode('utf-8') + output_ip_vrf = subprocess.check_output(['ip', 'address', 'show', 'vrf', 'vrf99'], universal_newlines=True).rstrip() print(output_ip_vrf) print('## ip address show dev veth99') - output = subprocess.check_output(['ip', 'address', 'show', 'dev', 'veth99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'address', 'show', 'dev', 'veth99'], universal_newlines=True).rstrip() print(output) self.assertEqual(output, output_ip_vrf) self.assertRegex(output, 'inet 169.254.[0-9]*.[0-9]*/16 brd 169.254.255.255 scope link veth99') @@ -2126,7 +2159,7 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities): self.assertRegex(output, 'inet6 .* scope link') print('## ip route show vrf vrf99') - output = subprocess.check_output(['ip', 'route', 'show', 'vrf', 'vrf99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'route', 'show', 'vrf', 'vrf99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'default via 192.168.5.1 dev veth99 proto dhcp src 192.168.5.') self.assertRegex(output, 'default dev veth99 proto static scope link') @@ -2136,38 +2169,136 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities): self.assertRegex(output, '192.168.5.1 dev veth99 proto dhcp scope link src 192.168.5') print('## ip route show table main dev veth99') - output = subprocess.check_output(['ip', 'route', 'show', 'table', 'main', 'dev', 'veth99']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'route', 'show', 'table', 'main', 'dev', 'veth99'], universal_newlines=True).rstrip() print(output) self.assertEqual(output, '') - output = subprocess.check_output(['networkctl', 'status', 'vrf99']).rstrip().decode('utf-8') - print(output) - self.assertRegex(output, 'State: carrier \(configured\)') - - output = subprocess.check_output(['networkctl', 'status', 'veth99']).rstrip().decode('utf-8') - print(output) - self.assertRegex(output, 'State: routable \(configured\)') + self.check_operstate('vrf99', 'carrier') + self.check_operstate('veth99', 'routable') def test_dhcp_client_gateway_onlink_implicit(self): self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-gateway-onlink-implicit.network') self.start_networkd() - self.assertTrue(self.link_exits('veth99')) + self.check_link_exists('veth99') self.start_dnsmasq() - output = subprocess.check_output(['networkctl', 'status', 'veth99']).rstrip().decode('utf-8') + output = subprocess.check_output(['networkctl', 'status', 'veth99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, '192.168.5') - output = subprocess.check_output(['ip', 'route', 'list', 'dev', 'veth99', '10.0.0.0/8']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'route', 'list', 'dev', 'veth99', '10.0.0.0/8'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'onlink') - output = subprocess.check_output(['ip', 'route', 'list', 'dev', 'veth99', '192.168.100.0/24']).rstrip().decode('utf-8') + output = subprocess.check_output(['ip', 'route', 'list', 'dev', 'veth99', '192.168.100.0/24'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'onlink') + def test_dhcp_client_with_ipv4ll_fallback_with_dhcp_server(self): + self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', + 'dhcp-client-with-ipv4ll-fallback-with-dhcp-server.network') + self.start_networkd(0) + self.wait_online(['veth-peer:carrier']) + self.start_dnsmasq(lease_time='2m') + self.wait_online(['veth99:routable', 'veth-peer:routable']) + + output = subprocess.check_output(['ip', 'address', 'show', 'dev', 'veth99'], universal_newlines=True).rstrip() + print(output) + + output = subprocess.check_output(['ip', '-6', 'address', 'show', 'dev', 'veth99', 'scope', 'global', 'dynamic'], universal_newlines=True).rstrip() + self.assertNotRegex(output, 'inet6 2600::[0-9a-f]*/128 scope global dynamic') + output = subprocess.check_output(['ip', '-6', 'address', 'show', 'dev', 'veth99', 'scope', 'link'], universal_newlines=True).rstrip() + self.assertRegex(output, 'inet6 .* scope link') + output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'veth99', 'scope', 'global', 'dynamic'], universal_newlines=True).rstrip() + self.assertRegex(output, 'inet 192.168.5.[0-9]*/24 brd 192.168.5.255 scope global dynamic veth99') + output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'veth99', 'scope', 'link'], universal_newlines=True).rstrip() + self.assertNotRegex(output, 'inet .* scope link') + + print('Wait for the dynamic address to be expired') + time.sleep(130) + + output = subprocess.check_output(['ip', 'address', 'show', 'dev', 'veth99'], universal_newlines=True).rstrip() + print(output) + + output = subprocess.check_output(['ip', '-6', 'address', 'show', 'dev', 'veth99', 'scope', 'global', 'dynamic'], universal_newlines=True).rstrip() + self.assertNotRegex(output, 'inet6 2600::[0-9a-f]*/128 scope global dynamic') + output = subprocess.check_output(['ip', '-6', 'address', 'show', 'dev', 'veth99', 'scope', 'link'], universal_newlines=True).rstrip() + self.assertRegex(output, 'inet6 .* scope link') + output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'veth99', 'scope', 'global', 'dynamic'], universal_newlines=True).rstrip() + self.assertRegex(output, 'inet 192.168.5.[0-9]*/24 brd 192.168.5.255 scope global dynamic veth99') + output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'veth99', 'scope', 'link'], universal_newlines=True).rstrip() + self.assertNotRegex(output, 'inet .* scope link') + + self.search_words_in_dnsmasq_log('DHCPOFFER', show_all=True) + + def test_dhcp_client_with_ipv4ll_fallback_without_dhcp_server(self): + self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', + 'dhcp-client-with-ipv4ll-fallback-without-dhcp-server.network') + self.start_networkd(0) + self.wait_online(['veth99:degraded', 'veth-peer:routable']) + + output = subprocess.check_output(['ip', 'address', 'show', 'dev', 'veth99'], universal_newlines=True).rstrip() + print(output) + + output = subprocess.check_output(['ip', '-6', 'address', 'show', 'dev', 'veth99', 'scope', 'global', 'dynamic'], universal_newlines=True).rstrip() + self.assertNotRegex(output, 'inet6 2600::[0-9a-f]*/128 scope global dynamic') + output = subprocess.check_output(['ip', '-6', 'address', 'show', 'dev', 'veth99', 'scope', 'link'], universal_newlines=True).rstrip() + self.assertRegex(output, 'inet6 .* scope link') + output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'veth99', 'scope', 'global', 'dynamic'], universal_newlines=True).rstrip() + self.assertNotRegex(output, 'inet 192.168.5.[0-9]*/24 brd 192.168.5.255 scope global dynamic veth99') + output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'veth99', 'scope', 'link'], universal_newlines=True).rstrip() + self.assertRegex(output, 'inet .* scope link') + + def test_dhcp_client_route_remove_on_renew(self): + self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', + 'dhcp-client-ipv4-only-ipv6-disabled.network') + self.start_networkd(0) + self.wait_online(['veth-peer:carrier']) + self.start_dnsmasq(ipv4_range='192.168.5.100,192.168.5.199', lease_time='2m') + self.wait_online(['veth99:routable', 'veth-peer:routable']) + + # test for issue #12490 + + output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'veth99', 'scope', 'global', 'dynamic'], universal_newlines=True).rstrip() + print(output) + self.assertRegex(output, 'inet 192.168.5.1[0-9]*/24 brd 192.168.5.255 scope global dynamic veth99') + address1=None + for line in output.splitlines(): + if 'brd 192.168.5.255 scope global dynamic veth99' in line: + address1 = line.split()[1].split('/')[0] + break + + output = subprocess.check_output(['ip', '-4', 'route', 'show', 'dev', 'veth99'], universal_newlines=True).rstrip() + print(output) + self.assertRegex(output, f'default via 192.168.5.1 proto dhcp src {address1} metric 1024') + self.assertRegex(output, f'192.168.5.1 proto dhcp scope link src {address1} metric 1024') + + self.stop_dnsmasq(dnsmasq_pid_file) + self.start_dnsmasq(ipv4_range='192.168.5.200,192.168.5.250', lease_time='2m') + + print('Wait for the dynamic address to be expired') + time.sleep(130) + + output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'veth99', 'scope', 'global', 'dynamic'], universal_newlines=True).rstrip() + print(output) + self.assertRegex(output, 'inet 192.168.5.2[0-9]*/24 brd 192.168.5.255 scope global dynamic veth99') + address2=None + for line in output.splitlines(): + if 'brd 192.168.5.255 scope global dynamic veth99' in line: + address2 = line.split()[1].split('/')[0] + break + + self.assertNotEqual(address1, address2) + + output = subprocess.check_output(['ip', '-4', 'route', 'show', 'dev', 'veth99'], universal_newlines=True).rstrip() + print(output) + self.assertNotRegex(output, f'default via 192.168.5.1 proto dhcp src {address1} metric 1024') + self.assertNotRegex(output, f'192.168.5.1 proto dhcp scope link src {address1} metric 1024') + self.assertRegex(output, f'default via 192.168.5.1 proto dhcp src {address2} metric 1024') + self.assertRegex(output, f'192.168.5.1 proto dhcp scope link src {address2} metric 1024') + if __name__ == '__main__': unittest.main(testRunner=unittest.TextTestRunner(stream=sys.stdout, verbosity=3))