Skip to content

[muxorch] Returning true if nbr in skip_neighbor_ in isNeighborActive() #2415

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 3 commits into from
Aug 17, 2022
Merged

[muxorch] Returning true if nbr in skip_neighbor_ in isNeighborActive() #2415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db25beb
[muxorch] Returning true if nbr in skip_neighbor_ in isNeighborActive()
Ndancejic Aug 16, 2022
c53f702
[mux] Changing "|" comparison to "||"
Ndancejic Aug 16, 2022
4446734
[mux] adding parenthesis around return statements
Ndancejic Aug 16, 2022
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
10 changes: 3 additions & 7 deletions orchagent/muxorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,11 +963,7 @@ bool MuxOrch::isNeighborActive(const IpAddress& nbr, const MacAddress& mac, stri

if (ptr)
{
if (ptr->getSkipNeighborsSet().find(nbr) != ptr->getSkipNeighborsSet().end())
{
return true;
}
return ptr->isActive();
return (ptr->isActive() || ptr->isSkipNeighbor(nbr));
}

string port;
Expand All @@ -981,15 +977,15 @@ bool MuxOrch::isNeighborActive(const IpAddress& nbr, const MacAddress& mac, stri
if (!port.empty() && isMuxExists(port))
{
MuxCable* ptr = getMuxCable(port);
return ptr->isActive();
return (ptr->isActive() || ptr->isSkipNeighbor(nbr));
}

NextHopKey nh_key = NextHopKey(nbr, alias);
string curr_port = getNexthopMuxName(nh_key);
if (port.empty() && !curr_port.empty() && isMuxExists(curr_port))
{
MuxCable* ptr = getMuxCable(curr_port);
return ptr->isActive();
return (ptr->isActive() || ptr->isSkipNeighbor(nbr));
}

return true;
Expand Down
4 changes: 2 additions & 2 deletions orchagent/muxorch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ class MuxCable
{
return nbr_handler_->getNextHopId(nh);
}
std::set<IpAddress> getSkipNeighborsSet()
bool isSkipNeighbor(const IpAddress& nbr)
{
return skip_neighbors_;
return (skip_neighbors_.find(nbr) != skip_neighbors_.end());
}

private:
Expand Down