diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-03-30 03:50:11 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-03-30 21:17:53 +0900 |
| commit | 6730a1f343ef0cbba766037490731e573f09ccc3 (patch) | |
| tree | ad904b81510a31dd0c1d28f40b6ace4713bc5e08 /test | |
| parent | c65c01c41ac1263dbee2acd40e671536d0900a54 (diff) | |
| download | systemd-6730a1f343ef0cbba766037490731e573f09ccc3.tar.gz | |
test-network: test stacked erspan tunnels
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-network/conf/25-erspan-tunnel-local-any.netdev | 1 | ||||
| -rw-r--r-- | test/test-network/conf/25-erspan-tunnel.netdev | 1 | ||||
| -rw-r--r-- | test/test-network/conf/erspan.network | 6 | ||||
| -rwxr-xr-x | test/test-network/systemd-networkd-tests.py | 5 |
4 files changed, 10 insertions, 3 deletions
diff --git a/test/test-network/conf/25-erspan-tunnel-local-any.netdev b/test/test-network/conf/25-erspan-tunnel-local-any.netdev index cd7df3ada1..e9eb1c1cfc 100644 --- a/test/test-network/conf/25-erspan-tunnel-local-any.netdev +++ b/test/test-network/conf/25-erspan-tunnel-local-any.netdev @@ -3,7 +3,6 @@ Name=erspan98 Kind=erspan [Tunnel] -Independent=true ERSPANIndex=124 Local = any Remote = 172.16.1.100 diff --git a/test/test-network/conf/25-erspan-tunnel.netdev b/test/test-network/conf/25-erspan-tunnel.netdev index 60da0e9dad..86935e998c 100644 --- a/test/test-network/conf/25-erspan-tunnel.netdev +++ b/test/test-network/conf/25-erspan-tunnel.netdev @@ -3,7 +3,6 @@ Name=erspan99 Kind=erspan [Tunnel] -Independent=true ERSPANIndex=123 Local = 172.16.1.200 Remote = 172.16.1.100 diff --git a/test/test-network/conf/erspan.network b/test/test-network/conf/erspan.network new file mode 100644 index 0000000000..49364c506c --- /dev/null +++ b/test/test-network/conf/erspan.network @@ -0,0 +1,6 @@ +[Match] +Name=dummy98 + +[Network] +Tunnel=erspan99 +Tunnel=erspan98 diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 1621d400b1..f0851efb15 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -289,6 +289,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): '25-wireguard-private-key.txt', '25-wireguard.netdev', '6rd.network', + 'erspan.network', 'gre.network', 'gretap.network', 'gretun.network', @@ -728,9 +729,11 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): @expectedFailureIfERSPANModuleIsNotAvailable() def test_erspan_tunnel(self): - self.copy_unit_to_networkd_unit_path('25-erspan-tunnel.netdev', '25-erspan-tunnel-local-any.netdev') + 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')) |