shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-09-02 17:49:53 +03:00
Code Activity

test-network: add tests for dropin .conf files

Browse Source
This commit is contained in:
Yu Watanabe
2018-11-26 15:01:01 +09:00
parent 6ce611e57c
commit 013c8dc94d
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/test-network/conf/21-vlan.netdev
View File

@ -1,10 +1,3 @@
[NetDev] [NetDev]
Name=vlan99 Name=vlan99
Kind=vlan Kind=vlan
[VLAN]
Id=99
GVRP=true
MVRP=true
LooseBinding=true
ReorderHeader=true

6
test/test-network/conf/21-vlan.netdev.d/override.conf Normal file
View File

@ -0,0 +1,6 @@
[VLAN]
Id=99
GVRP=true
MVRP=true
LooseBinding=true
ReorderHeader=true

3
test/test-network/conf/21-vlan.network
View File

@ -1,5 +1,2 @@
[Match] [Match]
Name=test1 Name=test1
[Network]
VLAN=vlan99

2
test/test-network/conf/21-vlan.network.d/override.conf Normal file
View File

@ -0,0 +1,2 @@
[Network]
VLAN=vlan99

4
test/test-network/systemd-networkd-tests.py
View File

@ -74,11 +74,15 @@ class Utilities():
def copy_unit_to_networkd_unit_path(self, *units): def copy_unit_to_networkd_unit_path(self, *units):
for unit in units: for unit in units:
shutil.copy(os.path.join(networkd_ci_path, unit), network_unit_file_path) shutil.copy(os.path.join(networkd_ci_path, unit), network_unit_file_path)
if (os.path.exists(os.path.join(networkd_ci_path, unit + '.d'))):
copytree(os.path.join(networkd_ci_path, unit + '.d'), os.path.join(network_unit_file_path, unit + '.d'))
def remove_unit_from_networkd_path(self, units): def remove_unit_from_networkd_path(self, units):
for unit in units: for unit in units:
if (os.path.exists(os.path.join(network_unit_file_path, unit))): if (os.path.exists(os.path.join(network_unit_file_path, unit))):
os.remove(os.path.join(network_unit_file_path, unit)) os.remove(os.path.join(network_unit_file_path, unit))
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): def start_dnsmasq(self):
subprocess.check_call('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', shell=True) subprocess.check_call('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', shell=True)