[advanced-reboot] IO path verification fixes for dualtor#6968
[advanced-reboot] IO path verification fixes for dualtor#6968vaibhavhd merged 5 commits intosonic-net:masterfrom
Conversation
|
The pre-commit check detected issues in the files touched by this pull request. For old issues, it is not mandatory to fix them because they were not caused by this change. It is unfair to blame Detailed pre-commit check results: To run the pre-commit checks locally, you can follow below steps:
|
|
/Azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@vaibhavhd can you update the PR comments, it should be dst mac instead of src mac in your 'fixes' section. |
|
/Azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@vaibhavhd Cherry-picking this PR to 202205 branch hit similar issue. |
Three improvements: Present test_advanced_reboot crashes in examine_flow. This is due to packets are incorrectly matched in the code. Additionally, added icmp_responder in the test, so that mux state is healthy during the duration of test. Change mux config on both TORs to manual during the duration of test. Fixes: Identifying received packet in dualtor case -- t1->server rcvd pkt will have src MAC as vlan_mac, and server->t1 rcvd pkt will have src MAC as dut_mac Identifying sent packet -- t1->server sent pkt will have dst MAC as dut_mac, and server->t1 sent pkt will have dst MAC as vlan_mac How did you do it? Added checks for vlan_mac execute config mux mode manuall all during test, and revert to auto after the test. How did you verify/test it? Tested on physical testbed. The test does not crash anymore. However, there are still some packet drops which points towards an image issue.
…-responder on single TOR (#7188) This PR fixes two recently introduced issues: Fix advanced reboot tests fail on non-dualtor testbeds #7146 caused by [advanced-reboot] IO path verification fixes for dualtor #6968 After merge of PR Fix pre-commit check errors in platform_tests/conftest.py #7049 , all testcases using get_advanced_reboot fixture are failing due to fixture 'get_advanced_reboot' not found How did you do it? To fix 7146, do not run GARP service and ICMP responder for non-dualtor advanced-reboot cases. I have not added a more simple skip for non-dualtor as these services are still needed for MOCK dualtor cases which run on single TOR testbeds. To fix 2, added a new import in the test scripts directly.
Signed-off-by: Neetha John <nejo@microsoft.com> What is the motivation for this PR? The following commit done as part of cherry-picking to 202012 appears bad (ab3d07d) This was trying to bring in changes from #6968 and #6994 How did you do it? Cleaned up the inadvertent changes How did you verify/test it? Ran the crm testcase "test_crm_nexthop" with the changes and it passes
Fixed "TypeError: __init__() takes exactly 8 arguments (7 given)" in test platform_tests/test_cont_warm_reboot.py which happen after merge community code. Issue introduced in PR: sonic-net#6968 - [advanced-reboot] IO path verification fixes for dualtor Signed-off-by: Petro Pikh <petrop@nvidia.com>
) Fixed "TypeError: __init__() takes exactly 8 arguments (7 given)" in test platform_tests/test_cont_warm_reboot.py which happen after merge community code. Issue introduced in PR: #6968 - [advanced-reboot] IO path verification fixes for dualtor - What is the motivation for this PR? Fix issue "TypeError: init() takes exactly 8 arguments (7 given)" - How did you do it? Added argument in method call - How did you verify/test it? Executed test which has been modified Signed-off-by: Petro Pikh <petrop@nvidia.com>
) Fixed "TypeError: __init__() takes exactly 8 arguments (7 given)" in test platform_tests/test_cont_warm_reboot.py which happen after merge community code. Issue introduced in PR: #6968 - [advanced-reboot] IO path verification fixes for dualtor - What is the motivation for this PR? Fix issue "TypeError: init() takes exactly 8 arguments (7 given)" - How did you do it? Added argument in method call - How did you verify/test it? Executed test which has been modified Signed-off-by: Petro Pikh <petrop@nvidia.com>
) Fixed "TypeError: __init__() takes exactly 8 arguments (7 given)" in test platform_tests/test_cont_warm_reboot.py which happen after merge community code. Issue introduced in PR: #6968 - [advanced-reboot] IO path verification fixes for dualtor - What is the motivation for this PR? Fix issue "TypeError: init() takes exactly 8 arguments (7 given)" - How did you do it? Added argument in method call - How did you verify/test it? Executed test which has been modified Signed-off-by: Petro Pikh <petrop@nvidia.com>
…nic-net#7322) Fixed "TypeError: __init__() takes exactly 8 arguments (7 given)" in test platform_tests/test_cont_warm_reboot.py which happen after merge community code. Issue introduced in PR: sonic-net#6968 - [advanced-reboot] IO path verification fixes for dualtor - What is the motivation for this PR? Fix issue "TypeError: init() takes exactly 8 arguments (7 given)" - How did you do it? Added argument in method call - How did you verify/test it? Executed test which has been modified Signed-off-by: Petro Pikh <petrop@nvidia.com>
…-responder on single TOR (#7188) This PR fixes two recently introduced issues: Fix advanced reboot tests fail on non-dualtor testbeds #7146 caused by [advanced-reboot] IO path verification fixes for dualtor #6968 After merge of PR Fix pre-commit check errors in platform_tests/conftest.py #7049 , all testcases using get_advanced_reboot fixture are failing due to fixture 'get_advanced_reboot' not found How did you do it? To fix 7146, do not run GARP service and ICMP responder for non-dualtor advanced-reboot cases. I have not added a more simple skip for non-dualtor as these services are still needed for MOCK dualtor cases which run on single TOR testbeds. To fix 2, added a new import in the test scripts directly.
…unt for sent and rcvd packets (#9599) Summary: Currently dual tor warmboot fails w/ control plane not ready for warmboot. This is because the test expects 2 responses for every ping packet sent to Loopback. This expectation is not correct after PR #9089 is merged. Update the testcase to now only expect 1 icmp response for every icmp packet sent to Loopback0. Updated the test to remove the earlier expectation of removing the packets that were sent by icmp_responder. This essentially reverts part of older PR: #6968 How did you verify/test it? Tested on a physical testbed and this test issue is not seen. The test is now able to see the responses of ping packets
…unt for sent and rcvd packets (sonic-net#9599) Summary: Currently dual tor warmboot fails w/ control plane not ready for warmboot. This is because the test expects 2 responses for every ping packet sent to Loopback. This expectation is not correct after PR sonic-net#9089 is merged. Update the testcase to now only expect 1 icmp response for every icmp packet sent to Loopback0. Updated the test to remove the earlier expectation of removing the packets that were sent by icmp_responder. This essentially reverts part of older PR: sonic-net#6968 How did you verify/test it? Tested on a physical testbed and this test issue is not seen. The test is now able to see the responses of ping packets
…unt for sent and rcvd packets (#9599) Summary: Currently dual tor warmboot fails w/ control plane not ready for warmboot. This is because the test expects 2 responses for every ping packet sent to Loopback. This expectation is not correct after PR #9089 is merged. Update the testcase to now only expect 1 icmp response for every icmp packet sent to Loopback0. Updated the test to remove the earlier expectation of removing the packets that were sent by icmp_responder. This essentially reverts part of older PR: #6968 How did you verify/test it? Tested on a physical testbed and this test issue is not seen. The test is now able to see the responses of ping packets
…unt for sent and rcvd packets (sonic-net#9599) Summary: Currently dual tor warmboot fails w/ control plane not ready for warmboot. This is because the test expects 2 responses for every ping packet sent to Loopback. This expectation is not correct after PR sonic-net#9089 is merged. Update the testcase to now only expect 1 icmp response for every icmp packet sent to Loopback0. Updated the test to remove the earlier expectation of removing the packets that were sent by icmp_responder. This essentially reverts part of older PR: sonic-net#6968 How did you verify/test it? Tested on a physical testbed and this test issue is not seen. The test is now able to see the responses of ping packets
…unt for sent and rcvd packets (#9599) (#10068) Raising PR for cherry-pick conflict: 225e257 [advanced-reboot][dualtor] Update Loopback0 ping test: expect same count for sent and rcvd packets (#9599) Summary: Currently dual tor warmboot fails w/ control plane not ready for warmboot. This is because the test expects 2 responses for every ping packet sent to Loopback. This expectation is not correct after PR #9089 is merged. Update the testcase to now only expect 1 icmp response for every icmp packet sent to Loopback0. Updated the test to remove the earlier expectation of removing the packets that were sent by icmp_responder. This essentially reverts part of older PR: #6968 How did you verify/test it? Tested on a physical testbed and this test issue is not seen. The test is now able to see the responses of ping packets Co-authored-by: Vaibhav Hemant Dixit <vaibhav.dixit@microsoft.com>
…unt for sent and rcvd packets (sonic-net#9599) Summary: Currently dual tor warmboot fails w/ control plane not ready for warmboot. This is because the test expects 2 responses for every ping packet sent to Loopback. This expectation is not correct after PR sonic-net#9089 is merged. Update the testcase to now only expect 1 icmp response for every icmp packet sent to Loopback0. Updated the test to remove the earlier expectation of removing the packets that were sent by icmp_responder. This essentially reverts part of older PR: sonic-net#6968 How did you verify/test it? Tested on a physical testbed and this test issue is not seen. The test is now able to see the responses of ping packets
Description of PR
Summary: Update checks for vlan and dut MAC in the bidirectional IO.
Fixes # (issue)
Type of change
Back port request
Approach
What is the motivation for this PR?
Three improvements:
examine_flow. This is due to packets are incorrectly matched in the code.Fixes:
t1->serverrcvd pkt will have src MAC as vlan_mac, andserver->t1rcvd pkt will have src MAC as dut_mact1->serversent pkt will have dst MAC as dut_mac, andserver->t1sent pkt will have dst MAC as vlan_macHow did you do it?
Added checks for vlan_mac
execute
config mux mode manuall allduring test, and revert toautoafter the test.How did you verify/test it?
Tested on physical testbed. The test does not crash anymore.
However, there are still some packet drops which points towards an image issue.
Any platform specific information?
Supported testbed topology if it's a new test case?
Documentation