Skip to content
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

Jump to bottom

[route_check]: Ignore standalone tunnel routes #2325

Merged
merged 7 commits into from
Aug 30, 2022
Merged

[route_check]: Ignore standalone tunnel routes #2325

merged 7 commits into from
Aug 30, 2022

Conversation

theasianpianist
Copy link
Contributor

@theasianpianist theasianpianist commented Aug 22, 2022 •
edited
Loading

Signed-off-by: Lawrence Lee lawlee@microsoft.com

What I did

When checking for route entry mismatches, ignore mismatched routes where an APPL_DB neighbor entry with a zero MAC is present.

These routes are introduced by this change in SWSS and are expected: sonic-net/sonic-swss#2137

How I did it

How to verify it

Run the updated route_check_test.sh script

Previous command output (if the output of a command-line utility has changed)

New command output (if the output of a command-line utility has changed)

@theasianpianist
[route_check]: Ignore standalone tunnel routes
564ab28 
Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
@theasianpianist
[route_check]: Only run special logic on dualtor
190f44b 
Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
@theasianpianist
[route_check]: Return early
15d1904 
Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
prsunny
prsunny previously approved these changes Aug 23, 2022
View reviewed changes
@prsunny
Copy link
Contributor

prsunny commented Aug 23, 2022

You may want to add few more test cases and also please raise a separate PR to 202012

@theasianpianist
[test]: Add dualtor route check test
108df23 
Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
@theasianpianist
Copy link
Contributor Author

/Azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@theasianpianist theasianpianist mentioned this pull request Aug 24, 2022
Merged
@theasianpianist
[test]: Fix route check tests
a8e606e 
- Add mocked hget method
- Add route subnet

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
@theasianpianist
[test]: Change route check test order
148fd97 
Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
prsunny
prsunny previously approved these changes Aug 30, 2022
View reviewed changes
@theasianpianist
[test]: Don't cache ARP during tests
627f52b 
Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
@theasianpianist theasianpianist merged commit f0ce586 into sonic-net:master Aug 30, 2022
@yxieca
Copy link
Contributor

yxieca commented Sep 1, 2022

@theasianpianist is there another PR needs to be cherry-picked before this one? There is a conflict. Can you raise separate PR?

theasianpianist added a commit to theasianpianist/sonic-utilities that referenced this pull request Sep 1, 2022
@theasianpianist
[route_check]: Ignore standalone tunnel routes (sonic-net#2325)
a3533a9 
When checking for route entry mismatches, ignore mismatched routes where an APPL_DB neighbor entry with a zero MAC is present.

These routes are introduced by this change in SWSS and are expected: sonic-net/sonic-swss#2137

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
@theasianpianist
Copy link
Contributor Author

@theasianpianist is there another PR needs to be cherry-picked before this one? There is a conflict. Can you raise separate PR?

PR here #2346

yxieca pushed a commit that referenced this pull request Sep 2, 2022
@theasianpianist
[route_check]: Ignore standalone tunnel routes (#2325) (#2346)
5bf684c 
When checking for route entry mismatches, ignore mismatched routes where an APPL_DB neighbor entry with a zero MAC is present.

These routes are introduced by this change in SWSS and are expected: sonic-net/sonic-swss#2137

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
dgsudharsan added a commit to dgsudharsan/sonic-buildimage that referenced this pull request Sep 14, 2022
@dgsudharsan
[submodule] Update sonic-utilities submodule
489aee6 
Update sonic-utilities submodule pointer to include the following:
* 4d377a6 [subinterface]Added additional checks in portchannel and subinterface commands ([sonic-net#2345](sonic-net/sonic-utilities#2345))
* bbcdf2e disk_check: Publish event  for RO state ([sonic-net#2320](sonic-net/sonic-utilities#2320))
* 3fd537b Support the bandit check by GitHub Action ([sonic-net#2358](sonic-net/sonic-utilities#2358))
* 491d3d3 [generate dump]Added error message when saisdkdump fails ([sonic-net#2356](sonic-net/sonic-utilities#2356))
* 6830e01 [counterpoll]Fixing counterpoll show for tunnel and acl stats ([sonic-net#2355](sonic-net/sonic-utilities#2355))
* 3be2ad7 [fast-reboot]Avoid stopping masked services during fast-reboot ([sonic-net#2335](sonic-net/sonic-utilities#2335))
* 0e1b0cf [GCU] Fix missing backend in dry run ([sonic-net#2347](sonic-net/sonic-utilities#2347))
* 676c31b Add verification for override ([sonic-net#2305](sonic-net/sonic-utilities#2305))
* 48997c2 Add Password Hardening CLI support ([sonic-net#2338](sonic-net/sonic-utilities#2338))
* 414e239 update unit tests for swap ([#locato](https://github.com/Azure/sonic-utilities/pull/locato))
* a91a492 consider swap checking memory in ([#stalle](https://github.com/Azure/sonic-utilities/pull/stalle))
* f0ce586 [route_check]: Ignore standalone tunnel routes ([sonic-net#2325](sonic-net/sonic-utilities#2325))

Signed-off-by: dgsudharsan <sudharsand@nvidia.com>
@dgsudharsan dgsudharsan mentioned this pull request Sep 14, 2022
Closed
7 tasks
@Xichen96 Xichen96 mentioned this pull request Sep 21, 2022
Closed
7 tasks
dprital added a commit to dprital/sonic-buildimage that referenced this pull request Sep 21, 2022
@dprital
[submodule] Advance sonic-utilities pointer
e838a23 
Update sonic-utilities submodule pointer to include the following:
* 0a7557b [minigraph] add option to specify golden path in load_minigraph ([sonic-net#2350](sonic-net/sonic-utilities#2350))
* 322aefc [GCU]Remove GCU unique lane check for duplicate lanes platforms ([sonic-net#2343](sonic-net/sonic-utilities#2343))
* 7099fff [fastboot] fastboot enhancement: Use warm-boot infrastructure for fast-boot ([sonic-net#2286](sonic-net/sonic-utilities#2286))
* 09026ed [warm-reboot] fix warm-reboot when /tmp/cache is missing ([sonic-net#2367](sonic-net/sonic-utilities#2367))
* a3c404c Fix typo in platform_sfputil_helper.is_rj45_port ([sonic-net#2374](sonic-net/sonic-utilities#2374))
* 637d834 Vnet_route_check Vxlan tunnel route update. ([sonic-net#2281](sonic-net/sonic-utilities#2281))
* 29a3e51 Added support for tunnel route status in show vnet routes all. ([sonic-net#2341](sonic-net/sonic-utilities#2341))
* 1ac584b Use 'default' VRF when VRF name is not provided ([sonic-net#2368](sonic-net/sonic-utilities#2368))
* 4d377a6 [subinterface]Added additional checks in portchannel and subinterface commands ([sonic-net#2345](sonic-net/sonic-utilities#2345))
* bbcdf2e disk_check: Publish event  for RO state ([sonic-net#2320](sonic-net/sonic-utilities#2320))
* 3fd537b Support the bandit check by GitHub Action ([sonic-net#2358](sonic-net/sonic-utilities#2358))
* 491d3d3 [generate dump]Added error message when saisdkdump fails ([sonic-net#2356](sonic-net/sonic-utilities#2356))
* 6830e01 [counterpoll]Fixing counterpoll show for tunnel and acl stats ([sonic-net#2355](sonic-net/sonic-utilities#2355))
* 3be2ad7 [fast-reboot]Avoid stopping masked services during fast-reboot ([sonic-net#2335](sonic-net/sonic-utilities#2335))
* 0e1b0cf [GCU] Fix missing backend in dry run ([sonic-net#2347](sonic-net/sonic-utilities#2347))
* 676c31b Add verification for override ([sonic-net#2305](sonic-net/sonic-utilities#2305))
* 48997c2 Add Password Hardening CLI support ([sonic-net#2338](sonic-net/sonic-utilities#2338))
* 414e239 update unit tests for swap ([#locato](https://github.com/sonic-net/sonic-utilities/pull/locato))
* a91a492 consider swap checking memory in ([#stalle](https://github.com/sonic-net/sonic-utilities/pull/stalle))
* f0ce586 [route_check]: Ignore standalone tunnel routes ([sonic-net#2325](sonic-net/sonic-utilities#2325))

Signed-off-by: dprital <drorp@nvidia.com>
@dprital dprital mentioned this pull request Sep 21, 2022
Closed
7 tasks
EdenGri pushed a commit to EdenGri/sonic-utilities that referenced this pull request Oct 12, 2022
@theasianpianist @EdenGri
[route_check]: Ignore standalone tunnel routes (sonic-net#2325)
d9d3ee4 
When checking for route entry mismatches, ignore mismatched routes where an APPL_DB neighbor entry with a zero MAC is present.

These routes are introduced by this change in SWSS and are expected: sonic-net/sonic-swss#2137

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
theasianpianist added a commit that referenced this pull request Oct 27, 2022
@theasianpianist
Revert "[config reload]: On dual ToR systems, cache ARP and FDB table… (
936f1b1 
#2461)

…s (#1465)"

- This reverts commit 10de91d.
- Also removes '--disable-arp-cache' option from config reload tests that was added in #2325 

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
theasianpianist added a commit that referenced this pull request Oct 28, 2022
@theasianpianist
Revert "[config reload]: On dual ToR systems, cache ARP and FDB table… (
8473517 
#2460)

…s (#1465)"

- This reverts commit 10de91d.
- Also removes '--disable-arp-cache' option from config reload tests that was added in #2325 

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
theasianpianist added a commit to theasianpianist/sonic-utilities that referenced this pull request Nov 10, 2022
@theasianpianist
Revert "[config reload]: On dual ToR systems, cache ARP and FDB table… (
44f1796 
sonic-net#2460)

…s (sonic-net#1465)"

- This reverts commit 10de91d.
- Also removes '--disable-arp-cache' option from config reload tests that was added in sonic-net#2325

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
preetham-singh pushed a commit to preetham-singh/sonic-utilities that referenced this pull request Nov 21, 2022
@theasianpianist @preetham-singh
[route_check]: Ignore standalone tunnel routes (sonic-net#2325)
5e77c3c 
When checking for route entry mismatches, ignore mismatched routes where an APPL_DB neighbor entry with a zero MAC is present.

These routes are introduced by this change in SWSS and are expected: sonic-net/sonic-swss#2137

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
preetham-singh pushed a commit to preetham-singh/sonic-utilities that referenced this pull request Nov 21, 2022
@theasianpianist @preetham-singh
Revert "[config reload]: On dual ToR systems, cache ARP and FDB table… (
2b71438 
sonic-net#2460)

…s (sonic-net#1465)"

- This reverts commit 10de91d.
- Also removes '--disable-arp-cache' option from config reload tests that was added in sonic-net#2325 

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
theasianpianist added a commit that referenced this pull request Dec 21, 2022
@theasianpianist
[202012]Revert "[config reload]: On dual ToR systems, cache ARP and F…
b44e153 
…DB tables (#1465)" (#2490)

- This reverts commit 10de91d.
- Also removes '--disable-arp-cache' option from config reload tests that was added in #2325

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@prsunny prsunny prsunny approved these changes

Assignees
No one assigned
Labels
Cherry Pick Conflict_202205 Included in 202205 Branch Request for 202205 Branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@theasianpianist @prsunny @yxieca