Skip to content

Commit 7066183

Browse files
authoredFeb 12, 2024
Update script test_syslog_source_ip (sonic-net#11253)
Add a vrf create status check function To make the script more stable Change-Id: I4925ad1c136419170751f1ec967c38205aa47142
1 parent 5f86536 commit 7066183

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed
 

‎tests/syslog/syslog_utils.py

+12
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,18 @@ def create_vrf(dut, vrf):
5858
dut.command('sudo config vrf add {} '.format(vrf), module_async=True)
5959

6060

61+
def check_vrf(dut, vrf):
62+
"""
63+
Check if Vrf was created
64+
65+
Args:
66+
dut (SonicHost): The target device
67+
vrf (str): vrf
68+
"""
69+
res = dut.command('sudo show vrf')["stdout"]
70+
return vrf in res
71+
72+
6173
def remove_vrf(dut, vrf):
6274
"""
6375
Remove Vrf

‎tests/syslog/test_syslog_source_ip.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from scapy.all import rdpcap
99
from .syslog_utils import create_vrf, remove_vrf, add_syslog_server, del_syslog_server, capture_syslog_packets,\
10-
replace_ip_neigh, is_mgmt_vrf_enabled, bind_interface_to_vrf, TCPDUMP_CAPTURE_TIME, DUT_PCAP_FILEPATH
10+
replace_ip_neigh, is_mgmt_vrf_enabled, bind_interface_to_vrf, check_vrf, TCPDUMP_CAPTURE_TIME, DUT_PCAP_FILEPATH
1111
from tests.common.utilities import wait_until
1212
from tests.common.helpers.assertions import pytest_assert
1313
from tests.common.reboot import reboot, SONIC_SSH_PORT, SONIC_SSH_REGEX
@@ -220,6 +220,9 @@ def configure_data_vrf_test_data(self, routed_interfaces):
220220
logger.info("Create data vrf {}".format(VRF_LIST[1]))
221221
create_vrf(self.duthost, VRF_LIST[1])
222222

223+
logger.info(f"Validate vrf {VRF_LIST[1]} is created")
224+
wait_until(5, 1, 0, check_vrf, self.duthost, VRF_LIST[1])
225+
223226
logger.info("Bind interface {} to data vrf {}".format(routed_interfaces[1], VRF_LIST[1]))
224227
bind_interface_to_vrf(self.asichost, VRF_LIST[1], routed_interfaces[1])
225228

0 commit comments

Comments
 (0)