diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-10-21 19:38:38 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-10-21 19:46:05 +0200 |
| commit | 103fca9f77c28e392146f791e0241e119feeadc9 (patch) | |
| tree | 959fb82e019a72a35bf93a90d93a9e2e1c80adf9 /smoketest | |
| parent | 7bf418f5979b85d55d5634184b40b5d3a82966f9 (diff) | |
| download | vyos-1x-103fca9f77c28e392146f791e0241e119feeadc9.tar.gz vyos-1x-103fca9f77c28e392146f791e0241e119feeadc9.zip | |
tunnel: T3925: dhcp-interface was of no use - use source-interface instead
(cherry picked from commit c1015d8ce0013719eb898b60b14ffec192b8141c)
Diffstat (limited to 'smoketest')
| -rw-r--r-- | smoketest/configs/tunnel-broker | 2 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_interfaces_tunnel.py | 20 |
2 files changed, 1 insertions, 21 deletions
diff --git a/smoketest/configs/tunnel-broker b/smoketest/configs/tunnel-broker index d4a5c2dfc..03ac0db41 100644 --- a/smoketest/configs/tunnel-broker +++ b/smoketest/configs/tunnel-broker @@ -56,7 +56,7 @@ interfaces { tunnel tun100 { address 172.16.0.1/30 encapsulation gre-bridge - local-ip 192.0.2.0 + dhcp-interface eth0 remote-ip 192.0.2.100 } tunnel tun200 { diff --git a/smoketest/scripts/cli/test_interfaces_tunnel.py b/smoketest/scripts/cli/test_interfaces_tunnel.py index 841527d21..fc2e254d6 100755 --- a/smoketest/scripts/cli/test_interfaces_tunnel.py +++ b/smoketest/scripts/cli/test_interfaces_tunnel.py @@ -156,26 +156,6 @@ class TunnelInterfaceTest(BasicInterfaceTest.TestCase): self.cli_delete(self._base_path + [interface]) self.cli_commit() - def test_tunnel_verify_local_dhcp(self): - # We can not use source-address and dhcp-interface at the same time - - interface = f'tun1020' - local_if_addr = f'10.0.0.1/24' - - self.cli_set(self._base_path + [interface, 'address', local_if_addr]) - self.cli_set(self._base_path + [interface, 'encapsulation', 'gre']) - self.cli_set(self._base_path + [interface, 'source-address', self.local_v4]) - self.cli_set(self._base_path + [interface, 'remote', remote_ip4]) - self.cli_set(self._base_path + [interface, 'dhcp-interface', 'eth0']) - - # source-address and dhcp-interface can not be used at the same time - with self.assertRaises(ConfigSessionError): - self.cli_commit() - self.cli_delete(self._base_path + [interface, 'dhcp-interface']) - - # Check if commit is ok - self.cli_commit() - def test_tunnel_parameters_gre(self): interface = f'tun1030' gre_key = '10' |