From 0ae17393875014e8fd30027da18d97f86b08ecd6 Mon Sep 17 00:00:00 2001 From: Abhishek Dosi Date: Fri, 16 Oct 2020 13:59:40 -0700 Subject: [PATCH 1/2] Fix the everflow test case where non reachable nexthop might be ger resolved because of new change in sonic of enabling nexthop recursive resoultion over default route Signed-off-by: Abhishek Dosi --- tests/everflow/everflow_test_utilities.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/everflow/everflow_test_utilities.py b/tests/everflow/everflow_test_utilities.py index f582d16e93d..e510d60ff42 100644 --- a/tests/everflow/everflow_test_utilities.py +++ b/tests/everflow/everflow_test_utilities.py @@ -165,6 +165,11 @@ def get_port_info(in_port_list, out_port_list, out_port_ptf_id_list, out_port_la peer_ip, _ = get_neighbor_info(duthost, spine_dest_ports[3]) + # Disable recursive route resolution as we have test case where we check + # if better unresolved route is there then it should be picked by Mirror state DB + # This change is triggeed by Sonic PR#https://github.com/Azure/sonic-buildimage/pull/5600 + duthost.shell("vtysh -c \"configure terminal\" -c \"no ip nht resolve-via-default\"") + add_route(duthost, "30.0.0.1/24", peer_ip) duthost.command("mkdir -p {}".format(DUT_RUN_DIR)) @@ -175,6 +180,8 @@ def get_port_info(in_port_list, out_port_list, out_port_ptf_id_list, out_port_la remove_route(duthost, "30.0.0.1/24", peer_ip) + duthost.shell("vtysh -c \"configure terminal\" -c \"ip nht resolve-via-default\"") + # TODO: This should be refactored to some common area of sonic-mgmt. def add_route(duthost, prefix, nexthop): From a122f9585671876ce3981d20be52b65fd1e8f276 Mon Sep 17 00:00:00 2001 From: Abhishek Dosi Date: Fri, 16 Oct 2020 14:04:36 -0700 Subject: [PATCH 2/2] Fix the comment Signed-off-by: Abhishek Dosi --- tests/everflow/everflow_test_utilities.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/everflow/everflow_test_utilities.py b/tests/everflow/everflow_test_utilities.py index e510d60ff42..7b461813d7c 100644 --- a/tests/everflow/everflow_test_utilities.py +++ b/tests/everflow/everflow_test_utilities.py @@ -166,7 +166,7 @@ def get_port_info(in_port_list, out_port_list, out_port_ptf_id_list, out_port_la peer_ip, _ = get_neighbor_info(duthost, spine_dest_ports[3]) # Disable recursive route resolution as we have test case where we check - # if better unresolved route is there then it should be picked by Mirror state DB + # if better unresolved route is there then it should not be picked by Mirror state DB # This change is triggeed by Sonic PR#https://github.com/Azure/sonic-buildimage/pull/5600 duthost.shell("vtysh -c \"configure terminal\" -c \"no ip nht resolve-via-default\"")