subprocess.check_call(['systemctl', 'start', 'systemd-networkd'])
def tearDown(self):
- subprocess.check_call(['systemctl', 'stop', 'systemd-networkd'])
+ subprocess.check_call(['systemctl', 'stop', 'systemd-networkd.socket'])
+ subprocess.check_call(['systemctl', 'stop', 'systemd-networkd.service'])
subprocess.check_call(['ip', 'link', 'del', 'mybridge'])
subprocess.check_call(['ip', 'link', 'del', 'port1'])
subprocess.check_call(['ip', 'link', 'del', 'port2'])
def tearDown(self):
self.shutdown_iface()
- subprocess.call(['systemctl', 'stop', 'systemd-networkd'])
+ subprocess.call(['systemctl', 'stop', 'systemd-networkd.socket'])
+ subprocess.call(['systemctl', 'stop', 'systemd-networkd.service'])
subprocess.call(['ip', 'link', 'del', 'dummy0'],
stderr=subprocess.DEVNULL)
def tearDown(self):
"""Stop networkd."""
- subprocess.call(['systemctl', 'stop', 'systemd-networkd'])
+ subprocess.call(['systemctl', 'stop', 'systemd-networkd.socket'])
+ subprocess.call(['systemctl', 'stop', 'systemd-networkd.service'])
def test_basic_matching(self):
"""Verify the Name= line works throughout this class."""
def tearDown(self):
"""Stop networkd."""
- subprocess.call(['systemctl', 'stop', 'systemd-networkd'])
+ subprocess.call(['systemctl', 'stop', 'systemd-networkd.socket'])
+ subprocess.call(['systemctl', 'stop', 'systemd-networkd.service'])
def create_iface(self):
"""Create temporary veth pairs for interface matching."""
shutil.rmtree(networkd_ci_path)
- for u in ['systemd-networkd.service', 'systemd-resolved.service']:
+ for u in ['systemd-networkd.socket', 'systemd-networkd.service', 'systemd-resolved.service']:
check_output(f'systemctl stop {u}')
shutil.rmtree('/run/systemd/system/systemd-networkd.service.d')
def stop_networkd(show_logs=True, remove_state_files=True):
if show_logs:
invocation_id = check_output('systemctl show systemd-networkd -p InvocationID --value')
- check_output('systemctl stop systemd-networkd')
+ check_output('systemctl stop systemd-networkd.socket')
+ check_output('systemctl stop systemd-networkd.service')
if show_logs:
print(check_output('journalctl _SYSTEMD_INVOCATION_ID=' + invocation_id))
if remove_state_files:
self.assertRegex(output, 'Search Domains: one')
def test_keep_configuration_static(self):
- check_output('systemctl stop systemd-networkd')
+ check_output('systemctl stop systemd-networkd.socket')
+ check_output('systemctl stop systemd-networkd.service')
check_output('ip link add name dummy98 type dummy')
check_output('ip address add 10.1.2.3/16 dev dummy98')
print(output)
self.assertRegex(output, r'192.168.5.*')
- check_output('systemctl stop systemd-networkd')
+ check_output('systemctl stop systemd-networkd.socket')
+ check_output('systemctl stop systemd-networkd.service')
print('The lease address should be kept after networkd stopped')
output = check_output('ip address show dev veth99 scope global')
self.assertRegex(output, r'192.168.5.*')
stop_dnsmasq(dnsmasq_pid_file)
- check_output('systemctl stop systemd-networkd')
+ check_output('systemctl stop systemd-networkd.socket')
+ check_output('systemctl stop systemd-networkd.service')
output = check_output('ip address show dev veth99 scope global')
print(output)