diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-03-31 22:12:34 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-31 22:12:34 +0900 |
| commit | b07b19dff8d4e11de66354334a0a574af7d08f49 (patch) | |
| tree | 0146a4c7b19fd576ee3e0b6eed750084768720f8 /test | |
| parent | d923021aebc6aa0d5f550f69a27f431d128180ba (diff) | |
| parent | 6730a1f343ef0cbba766037490731e573f09ccc3 (diff) | |
| download | systemd-b07b19dff8d4e11de66354334a0a574af7d08f49.tar.gz | |
Merge pull request #12147 from yuwata/network-gre-key-12144
network: make GRE and GRETAP support Key= or friends
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 9ff7e37a3e..4e4858507f 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -296,6 +296,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): '25-wireguard-private-key.txt', '25-wireguard.netdev', '6rd.network', + 'erspan.network', 'gre.network', 'gretap.network', 'gretun.network', @@ -735,9 +736,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')) |