networkd-test: add write_config()
The call was removed in ec89276c2a
, but is
still used. Not sure why noone noticed this.
This commit is contained in:
parent
ff7507295d
commit
fef740aed3
|
@ -111,13 +111,17 @@ class NetworkdTestingUtilities:
|
||||||
list(peer_options))
|
list(peer_options))
|
||||||
self.addCleanup(subprocess.call, ['ip', 'link', 'del', 'dev', peer])
|
self.addCleanup(subprocess.call, ['ip', 'link', 'del', 'dev', peer])
|
||||||
|
|
||||||
|
def write_config(self, path, contents):
|
||||||
|
""""Write a configuration file, and queue it to be removed."""
|
||||||
|
|
||||||
|
with open(path, 'w') as f:
|
||||||
|
f.write(contents)
|
||||||
|
|
||||||
|
self.addCleanup(os.remove, path)
|
||||||
|
|
||||||
def write_network(self, unit_name, contents):
|
def write_network(self, unit_name, contents):
|
||||||
"""Write a network unit file, and queue it to be removed."""
|
"""Write a network unit file, and queue it to be removed."""
|
||||||
unit_path = os.path.join(NETWORK_UNITDIR, unit_name)
|
self.write_config(os.path.join(NETWORK_UNITDIR, unit_name), contents)
|
||||||
|
|
||||||
with open(unit_path, 'w') as unit:
|
|
||||||
unit.write(contents)
|
|
||||||
self.addCleanup(os.remove, unit_path)
|
|
||||||
|
|
||||||
def write_network_dropin(self, unit_name, dropin_name, contents):
|
def write_network_dropin(self, unit_name, dropin_name, contents):
|
||||||
"""Write a network unit drop-in, and queue it to be removed."""
|
"""Write a network unit drop-in, and queue it to be removed."""
|
||||||
|
@ -738,7 +742,7 @@ Domains= ~company ~lab''')
|
||||||
orig_hostname = socket.gethostname()
|
orig_hostname = socket.gethostname()
|
||||||
self.addCleanup(socket.sethostname, orig_hostname)
|
self.addCleanup(socket.sethostname, orig_hostname)
|
||||||
if not os.path.exists('/etc/hostname'):
|
if not os.path.exists('/etc/hostname'):
|
||||||
self.writeConfig('/etc/hostname', orig_hostname)
|
self.write_config('/etc/hostname', orig_hostname)
|
||||||
subprocess.check_call(['systemctl', 'stop', 'systemd-hostnamed.service'])
|
subprocess.check_call(['systemctl', 'stop', 'systemd-hostnamed.service'])
|
||||||
|
|
||||||
self.create_iface(dnsmasq_opts=['--dhcp-host={},192.168.5.210,testgreen'.format(self.iface_mac)])
|
self.create_iface(dnsmasq_opts=['--dhcp-host={},192.168.5.210,testgreen'.format(self.iface_mac)])
|
||||||
|
|
Loading…
Reference in a new issue