diff options
author | Christian Poessinger <christian@poessinger.com> | 2020-11-20 12:55:59 +0100 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2020-11-20 12:55:59 +0100 |
commit | 7ad026794beee0bc4310a96bac286823283b7fd8 (patch) | |
tree | d08306b99dd4c361099938ef225fe366116d5113 /smoketest/scripts | |
parent | 1b3cde673ad0e00198565711ae5d6969ebd1cd82 (diff) | |
parent | 672eaeb2be1ce3176083017283389d0c0bd5d052 (diff) | |
download | vyos-1x-7ad026794beee0bc4310a96bac286823283b7fd8.tar.gz vyos-1x-7ad026794beee0bc4310a96bac286823283b7fd8.zip |
Merge branch 'tunnel-rewrite' into current
* tunnel-rewrite:
tunnel: T3068: automatic generate link-local adresses
tunnel: T3072: interfaces used for NHRP can not be deleted
tunnel: T3072: xml: harden regex validators
tunnel: T3072: migrate to get_config_dict()
Diffstat (limited to 'smoketest/scripts')
-rwxr-xr-x | smoketest/scripts/cli/test_interfaces_tunnel.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/smoketest/scripts/cli/test_interfaces_tunnel.py b/smoketest/scripts/cli/test_interfaces_tunnel.py index 4817321cf..aaff92dea 100755 --- a/smoketest/scripts/cli/test_interfaces_tunnel.py +++ b/smoketest/scripts/cli/test_interfaces_tunnel.py @@ -168,12 +168,12 @@ class TunnelInterfaceTest(BasicInterfaceTest.BaseTest): self.session.set(self._base_path + [interface, 'local-ip', self.local_v6]) self.session.set(self._base_path + [interface, 'remote-ip', remote_ip6]) - # Encapsulation mode requires IPv6 local-ip + # Encapsulation mode requires IPv4 local-ip with self.assertRaises(ConfigSessionError): self.session.commit() self.session.set(self._base_path + [interface, 'local-ip', self.local_v4]) - # Encapsulation mode requires IPv6 local-ip + # Encapsulation mode requires IPv4 local-ip with self.assertRaises(ConfigSessionError): self.session.commit() self.session.set(self._base_path + [interface, 'remote-ip', remote_ip4]) @@ -360,7 +360,7 @@ class TunnelInterfaceTest(BasicInterfaceTest.BaseTest): # No assertion is raised for GRE remote-ip when missing self.session.set(self._base_path + [interface, 'remote-ip', remote_ip4]) - # Source interface can not be used with si + # Source interface can not be used with sit self.session.set(self._base_path + [interface, 'source-interface', source_if]) with self.assertRaises(ConfigSessionError): self.session.commit() |