diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-03-23 15:19:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-23 15:19:35 +0100 |
| commit | 8da2b48ab6ff913cfa86730d86870cc7e2effeec (patch) | |
| tree | aca5880a376ce88746583b95c4bee7168d5bd1d5 | |
| parent | 7380bf1216399f905fe85ff26eaa0272b9f6dfe0 (diff) | |
| parent | 62875954a6679e1124cd727187f64bd37ec4678f (diff) | |
| download | vyos-1x-8da2b48ab6ff913cfa86730d86870cc7e2effeec.tar.gz vyos-1x-8da2b48ab6ff913cfa86730d86870cc7e2effeec.zip | |
Merge pull request #1910 from sarthurdev/ipsec_test
ipsec: T5003: Resolve issue with IPsec DHCP test
| -rwxr-xr-x | smoketest/scripts/cli/test_vpn_ipsec.py | 10 | ||||
| -rwxr-xr-x | src/conf_mode/vpn_ipsec.py | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/smoketest/scripts/cli/test_vpn_ipsec.py b/smoketest/scripts/cli/test_vpn_ipsec.py index 61363b853..b677f0e45 100755 --- a/smoketest/scripts/cli/test_vpn_ipsec.py +++ b/smoketest/scripts/cli/test_vpn_ipsec.py @@ -117,6 +117,8 @@ rgiyCHemtMepq57Pl1Nmj49eEA== """ class TestVPNIPsec(VyOSUnitTestSHIM.TestCase): + skip_process_check = False + @classmethod def setUpClass(cls): super(TestVPNIPsec, cls).setUpClass() @@ -141,7 +143,10 @@ class TestVPNIPsec(VyOSUnitTestSHIM.TestCase): def tearDown(self): # Check for running process - self.assertTrue(process_named_running(PROCESS_NAME)) + if not self.skip_process_check: + self.assertTrue(process_named_running(PROCESS_NAME)) + else: + self.skip_process_check = False # Reset self.cli_delete(base_path) self.cli_delete(tunnel_path) @@ -151,6 +156,9 @@ class TestVPNIPsec(VyOSUnitTestSHIM.TestCase): self.assertFalse(process_named_running(PROCESS_NAME)) def test_01_dhcp_fail_handling(self): + # Skip process check - connection is not created for this test + self.skip_process_check = True + # Interface for dhcp-interface self.cli_set(ethernet_path + [interface, 'vif', vif, 'address', 'dhcp']) # Use VLAN to avoid getting IP from qemu dhcp server diff --git a/src/conf_mode/vpn_ipsec.py b/src/conf_mode/vpn_ipsec.py index d207c63df..63887b278 100755 --- a/src/conf_mode/vpn_ipsec.py +++ b/src/conf_mode/vpn_ipsec.py @@ -549,6 +549,8 @@ def generate(ipsec): if ipsec['dhcp_no_address']: with open(DHCP_HOOK_IFLIST, 'w') as f: f.write(" ".join(ipsec['dhcp_no_address'].values())) + elif os.path.exists(DHCP_HOOK_IFLIST): + os.unlink(DHCP_HOOK_IFLIST) for path in [swanctl_dir, CERT_PATH, CA_PATH, CRL_PATH, PUBKEY_PATH]: if not os.path.exists(path): |