Skip to content

Added Change to Skip Route Programming if NH is link/oper down #3520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prsunny merged 6 commits into from
Feb 24, 2025
Merged

Added Change to Skip Route Programming if NH is link/oper down #3520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
36439cf
Added Change to Skip Route Programming if NH is link/oper down
abdosi Feb 18, 2025
ac88093
To debug failure
abdosi Feb 21, 2025
478662a
Merge remote-tracking branch 'upstream/master' into nhop_link
abdosi Feb 21, 2025
e0162e5
Fix UT
abdosi Feb 22, 2025
bee09ea
Revert "To debug failure"
abdosi Feb 22, 2025
d9015a5
Add mirror session verification and route checks
abdosi Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions orchagent/routeorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1870,6 +1870,11 @@ bool RouteOrch::addRoute(RouteBulkContext& ctx, const NextHopGroupKey &nextHops)
return false;
}
}
else if (m_neighOrch->isNextHopFlagSet(nexthop, NHFLAGS_IFDOWN))
Copy link
Collaborator

@prsunny prsunny Feb 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just thinking if it impact tunnel route in dualtor case if NHFLAG is down? @Ndancejic , can you check this change?

Copy link
Contributor

@Ndancejic Ndancejic Feb 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think tunnel routes should be safe, I believe line 1839 would catch interface nexthops. also I think routes to tunnel nh get skipped in doTask:

/* skip direct routes to tun0 */
else if (alsv[0] == "tun0")
{
    it = consumer.m_toSync.erase(it);
}

{
SWSS_LOG_INFO("Interface down for NH %s, skip this Route for programming", nexthop.to_string().c_str());
return false;
}
}
/* For non-existent MPLS NH, check if IP neighbor NH exists */
else if (nexthop.isMplsNextHop() &&
Expand Down
3 changes: 2 additions & 1 deletion tests/mock_tests/flowcounterrouteorch_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ namespace flowcounterrouteorch_test
for (const auto &it : ports)
{
portTable.set(it.first, it.second);
portTable.set(it.first, {{ "oper_status", "up" }});
}

// Set PortConfigDone
Expand Down Expand Up @@ -412,4 +413,4 @@ namespace flowcounterrouteorch_test
vrf_consumer->addToSync(entries);
static_cast<Orch *>(gVrfOrch)->doTask();
}
}
}
7 changes: 7 additions & 0 deletions tests/test_mirror_port_erspan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,13 @@ def test_PortMirrorDestMoveLag(self, dvs, testlog):
# add route
dvs.add_route("13.13.13.0/24", "200.0.0.1")
self.dvs_mirror.verify_session_status(session)

# As the Route pointing to Down NH Interface it will not get installed and Mirror State should not be changed.
self.dvs_mirror.verify_session(dvs, session, asic_db=expected_asic_db, src_ports=src_asic_ports, direction="RX")

# Now Make Port Channel oper up so route pointing to this gets installed
(exitcode, _) = dvs.runcmd("ip link set dev PortChannel080 carrier on")
assert exitcode == 0, "ip link set failed"

expected_asic_db = {"SAI_MIRROR_SESSION_ATTR_MONITOR_PORT": pmap.get("Ethernet32"),
"SAI_MIRROR_SESSION_ATTR_DST_MAC_ADDRESS": "12:10:08:06:04:02"}
Expand Down
Loading