Fix ssip issue (sonic-net#15639)

when removing mgmt vrf, dut connection will be lost for a while. So, before config reload we need remove mgmt vrf, otherwise it will cause host unreachable.
selldinesh · Dec 9, 2024 · a275a29 · a275a29
1 parent 195af4c
commit a275a29
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/tests/syslog/test_syslog_source_ip.py b/tests/syslog/test_syslog_source_ip.py
@@ -85,9 +85,19 @@ def is_support_ssip(duthosts, enum_rand_one_per_hwsku_frontend_hostname):
 
 
 @pytest.fixture(scope="module", autouse=True)
-def restore_config_by_config_reload(duthosts, enum_rand_one_per_hwsku_frontend_hostname):
+def restore_config_by_config_reload(duthosts, enum_rand_one_per_hwsku_frontend_hostname, localhost):
     yield
-    config_reload(duthosts[enum_rand_one_per_hwsku_frontend_hostname])
+    duthost = duthosts[enum_rand_one_per_hwsku_frontend_hostname]
+
+    if is_mgmt_vrf_enabled(duthost):
+        # when removing mgmt vrf, dut connection will be lost for a while. So, before config reload,
+        # we need remove mgmt vrf, otherwise it will cause host unreachable
+        remove_vrf(duthost, VRF_LIST[2])
+        localhost.wait_for(host=duthost.mgmt_ip, port=SONIC_SSH_PORT, search_regex=SONIC_SSH_REGEX,
+                           state='absent', delay=1, timeout=30)
+        localhost.wait_for(host=duthost.mgmt_ip, port=SONIC_SSH_PORT, search_regex=SONIC_SSH_REGEX,
+                           state='started', delay=2, timeout=180)
+    config_reload(duthost)
 
 
 @pytest.fixture(autouse=True)