Skip to content
New issue

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

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

Already on GitHub? # to your account

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

Merged
merged 3 commits into from
Aug 17, 2022

Conversation

Ndancejic
Copy link
Contributor

PR #2407 added a check which returned true in isNeighborActive if it is
in the skip_neighbors_ list, but only checked for Mux in Subnet. This
extends that check to Mux Ports and Nexthop Muxes.

Signed-off-by: Nikola Dancejic ndancejic@microsoft.com

PR sonic-net#2407 added a check which returned true in isNeighborActive if it is
in the skip_neighbors_ list, but only checked for Mux in Subnet. This
extends that check to Mux Ports and Nexthop Muxes.

Signed-off-by: Nikola Dancejic <ndancejic@microsoft.com>
@Ndancejic Ndancejic requested a review from prsunny as a code owner August 16, 2022 04:04
return true;
}
return ptr->isActive();
return ptr->isActive() | ptr->isSkipNeighbor(nbr);
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can you please make to an || condition?

Signed-off-by: Nikola Dancejic <ndancejic@microsoft.com>
@prsunny prsunny requested a review from yxieca August 16, 2022 17:02
Signed-off-by: Nikola Dancejic <ndancejic@microsoft.com>
@prsunny
Copy link
Collaborator

prsunny commented Aug 16, 2022

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@prsunny prsunny merged commit c0168f3 into sonic-net:master Aug 17, 2022
yxieca pushed a commit that referenced this pull request Aug 17, 2022
…() (#2415)

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

PR #2407 added a check which returned true in isNeighborActive if it is
in the skip_neighbors_ list, but only checked for Mux in Subnet. This
extends that check to Mux Ports and Nexthop Muxes.
yxieca pushed a commit that referenced this pull request Aug 18, 2022
…() (#2415)

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

PR #2407 added a check which returned true in isNeighborActive if it is
in the skip_neighbors_ list, but only checked for Mux in Subnet. This
extends that check to Mux Ports and Nexthop Muxes.
dprital added a commit to dprital/sonic-buildimage that referenced this pull request Aug 29, 2022
Update sonic-swss submodule pointer to include the following:
* Dynamic port configuration - add port buffer cfg to the port ref counter ([sonic-net#2194](sonic-net/sonic-swss#2194))
* tlm_teamd: Filter portchannel subinterface events from STATE_DB LAG_TABLE ([sonic-net#2408](sonic-net/sonic-swss#2408))
* [counters] Improve performance by polling only configured ports buffer queue/pg counters ([sonic-net#2360](sonic-net/sonic-swss#2360))
* added support for Xsight platform ([sonic-net#2426](sonic-net/sonic-swss#2426))
* [ci][asan] add DVS tests run with ASAN ([sonic-net#2363](sonic-net/sonic-swss#2363))
* Handle dual ToR neighbor miss scenario ([sonic-net#2151](sonic-net/sonic-swss#2151))
* Upstream new development on p4orch ([sonic-net#2237](sonic-net/sonic-swss#2237))
* [lgtm] Fix dependency ([sonic-net#2419](sonic-net/sonic-swss#2419))
* [muxorch] Returning true if nbr in skip_neighbor_ in isNeighborActive() ([sonic-net#2415](sonic-net/sonic-swss#2415))
* [macsec]: Set MTU for MACsec ([sonic-net#2398](sonic-net/sonic-swss#2398))
* Delete Invalid if condition in intfsorch.cpp ([sonic-net#2411](sonic-net/sonic-swss#2411))

Signed-off-by: dprital <drorp@nvidia.com>
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants