summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-02-20 20:07:34 +0100
committerChristian Poessinger <christian@poessinger.com>2022-02-20 20:18:22 +0100
commit835fdc5fa56c32b529c4f9102ead002b4dd42eae (patch)
treeb6578bd8d17b467617203d2b9ac1d9d1550c5f57
parente86eb6f311270b4f0ed539b25c7627258b2bb0ed (diff)
downloadvyos-1x-835fdc5fa56c32b529c4f9102ead002b4dd42eae.tar.gz
vyos-1x-835fdc5fa56c32b529c4f9102ead002b4dd42eae.zip
smoketest: dhcp: T4203: set missing interface options if present
Commit 5d14a04b ("smoketest: dhcp: T4203: move testcase to base class") added global support in the test case framework for DHCP tests. Some interfaces (e.g. MACsec) require additional options to be passed before the test can be launched. In the MACsec case this includes a source interface, or encryption ciphers. (cherry picked from commit 5ae566086c5c190d52b15f64454abcae9c8a1d46)
-rw-r--r--smoketest/scripts/cli/base_interfaces_test.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/smoketest/scripts/cli/base_interfaces_test.py b/smoketest/scripts/cli/base_interfaces_test.py
index 266169986..b3492b074 100644
--- a/smoketest/scripts/cli/base_interfaces_test.py
+++ b/smoketest/scripts/cli/base_interfaces_test.py
@@ -109,6 +109,10 @@ class BasicInterfaceTest:
# even when dhcpc starts on the given interface
for interface in self._interfaces:
self.cli_set(self._base_path + [interface, 'disable'])
+ for option in self._options.get(interface, []):
+ self.cli_set(self._base_path + [interface] + option.split())
+
+ self.cli_set(self._base_path + [interface, 'disable'])
# Also enable DHCP (ISC DHCP always places interface in admin up
# state so we check that we do not start DHCP client.