fix test_route_perf packet verify issue by jcaiMR · Pull Request #7877 · sonic-net/sonic-mgmt

jcaiMR · 2023-03-28T07:47:36Z

Description of PR

Summary:
Fixes script failure caused by traffic verification error.

AssertionError: Received expected packet on port 1 for device 0, but it should have arrived on one of these ports: [54, 63, 58, 60, 61, 62, 44, 20, 46, 45, 50, 47, 53, 52, 55, 4, 37, 39, 38, 34, 36, 0, 42, 16].

Type of change

Bug fix
Testbed and Framework(new/improvement)
Test case(new/improvement)

Back port request

201911
202012
202205

Merge sequence relay on: #7686
This PR need merge first.

Approach

What is the motivation for this PR?

Refer to Description

How did you do it?

Missing some port-channel member interfaces, so packet verification failed as destination port not in expect list.
Add all port-channel member interfaces into list.

How did you verify/test it?

Try script multiple times on t1/t0 DUT
route/test_route_perf.py::test_perf_add_remove_routes[4-str-7260cx3-acs-7-None] PASSED [ 50%]
route/test_route_perf.py::test_perf_add_remove_routes[6-str-7260cx3-acs-7-None] PASSED

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

…ute_perf

mssonicbld · 2023-03-28T07:48:41Z

The pre-commit check detected issues in the files touched by this pull request.
The detected issues may be old or new. For new issues, please try to fix them.

For old issues, it is not mandatory to fix them because they were not caused by this change. It is unfair to blame
author of this pull request. But if you can take extra effort to fix the old issues as well, that would be great!

Detailed pre-commit check results:
trim trailing whitespace.................................................Failed - hook id: trailing-whitespace - exit code: 1 - files were modified by this hook Fixing tests/route/test_route_perf.py fix end of files.........................................................Passed check yaml...........................................(no files to check)Skipped check for added large files..............................................Passed check python ast.........................................................Passed flake8...................................................................Failed - hook id: flake8 - exit code: 1 tests/route/test_route_perf.py:7:1: F401 'ipaddress' imported but unused tests/route/test_route_perf.py:11:1: F401 'tests.common.dualtor.dual_tor_utils.get_t1_ptf_ports' imported but unused tests/route/test_route_perf.py:13:1: F401 'tests.common.utilities.wait_until' imported but unused tests/route/test_route_perf.py:52:1: E302 expected 2 blank lines, found 1 tests/route/test_route_perf.py:59:1: E302 expected 2 blank lines, found 1 ... [truncated extra lines, please run pre-commit locally to view full check results]

To run the pre-commit checks locally, you can follow below steps:

Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
docker container.
Ensure that the pre-commit package is installed:

sudo pip install pre-commit

Go to repository root folder
Install the pre-commit hooks:

pre-commit install

Use pre-commit to check staged file:

pre-commit

Alternatively, you can check committed files using:

pre-commit run --from-ref <commit_id> --to-ref <commit_id>

StormLiangMS

LGTM

mssonicbld · 2023-03-28T14:00:44Z

The pre-commit check detected issues in the files touched by this pull request.
The detected issues may be old or new. For new issues, please try to fix them.

For old issues, it is not mandatory to fix them because they were not caused by this change. It is unfair to blame
author of this pull request. But if you can take extra effort to fix the old issues as well, that would be great!

Detailed pre-commit check results:
trim trailing whitespace.................................................Failed - hook id: trailing-whitespace - exit code: 1 - files were modified by this hook Fixing tests/route/test_route_perf.py fix end of files.........................................................Passed check yaml...........................................(no files to check)Skipped check for added large files..............................................Passed check python ast.........................................................Passed flake8...................................................................Failed - hook id: flake8 - exit code: 1 tests/route/test_route_perf.py:7:1: F401 'ipaddress' imported but unused tests/route/test_route_perf.py:11:1: F401 'tests.common.dualtor.dual_tor_utils.get_t1_ptf_ports' imported but unused tests/route/test_route_perf.py:13:1: F401 'tests.common.utilities.wait_until' imported but unused tests/route/test_route_perf.py:52:1: E302 expected 2 blank lines, found 1 tests/route/test_route_perf.py:59:1: E302 expected 2 blank lines, found 1 ... [truncated extra lines, please run pre-commit locally to view full check results]

To run the pre-commit checks locally, you can follow below steps:

Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
docker container.
Ensure that the pre-commit package is installed:

sudo pip install pre-commit

Go to repository root folder
Install the pre-commit hooks:

pre-commit install

Use pre-commit to check staged file:

pre-commit

Alternatively, you can check committed files using:

pre-commit run --from-ref <commit_id> --to-ref <commit_id>

StormLiangMS

LGTM

* Fix "logging not defined" issue of some snappi tests (sonic-net#7855) What is the motivation for this PR? The logging module is used by some files under tests.snappi. However, the module is not imported in the files. This caused error like below while collecting the snappi tests: E NameError: name 'logging' is not defined How did you do it? The fix is to import logging in those files. Signed-off-by: Xin Wang <xiwang5@microsoft.com> * [Python3 migration]Fix oid issue in snmp_pdu_controllers.py sonic-net#7887 What is the motivation for this PR? In Python2, oid.prettyPrint() prints 1.3.6.1.4.1.9.1.283 In Python3, oid.prettyPrint() prints SNMPv2-SMI::enterprises.9.1.283 This difference breaks port_label_dict in _build_outlet_maps() in snmp_pdu_controllers.py How did you do it? Change oid.prettyPrint() to str(oid). This will make code work both in Python2 and Python3. How did you verify/test it? PDU testcase can run manually both in Python2 and Python3. * Fix pdu KeyError for pdu_controller fixture (sonic-net#7876) What is the motivation for this PR? PR sonic-net#7782 updated the pdu_manager_factory interface. Only devutils using this function was updated accordingly. Fixtures like pdu_controller using this function also need to be updated. How did you do it? This PR updated the pdu_controller and get_pdu_controller fixtures accordingly to pass correct PDU variables to the pdu_manager_factory function. This change only can fix the issue under python2. Under python3, the pysnmp package version 4.4.12 is much higher than the 4.2.5 package used in python2. The newer package has compatibility issues. The current snmp_pdu_controllers.py script needs to be updated for python3. That issue is fixed in sonic-net#7887 Signed-off-by: Xin Wang <xiwang5@microsoft.com> * Make test_plan.py compatible between python2 and python3 (sonic-net#7886) * Make test_plan.py compatible between python2 and python3 Approach What is the motivation for this PR? Make test_plan.py compatible between python2 and python3 co-authorized by: jianquanye@microsoft.com * RDMA pfc global pause multi dut test * Refine testbedv2 template output (sonic-net#7895) * Refine testbedv2 template output Approach What is the motivation for this PR? Refine testbedv2 template output Co-authorized by: jianquanye@microsoft.com * fix test_route_perf packet verify issue (sonic-net#7877) * fix route perf failure caused by missing some port-channel members * Skip warm-reboot cases for T2. (sonic-net#7784) --------- Signed-off-by: Xin Wang <xiwang5@microsoft.com> Co-authored-by: Xin Wang <xiwang5@microsoft.com> Co-authored-by: ShiyanWangMS <shiyanwang@microsoft.com> Co-authored-by: Ye Jianquan <jianquanye@microsoft.com> Co-authored-by: jcaiMR <111116206+jcaiMR@users.noreply.github.com> Co-authored-by: rraghav-cisco <58446052+rraghav-cisco@users.noreply.github.com>

wangxin · 2023-03-31T02:24:13Z

@jcaiMR Got many hard to resolve conflicts while merging this PR to 202205 branch. Can you help create a separate PR to the 202205 branch?

jcaiMR · 2023-07-13T06:46:58Z

Double checked the code in 202012 and 202205, the issue test case does not exists in these branches, so removed the request flag.

…frastructure (#7849) * Added Multi Dut Multi asic Support * PreCommit Check * Update common_helpers.py * Rdma multiasic global pause (#9) * Fix "logging not defined" issue of some snappi tests (#7855) What is the motivation for this PR? The logging module is used by some files under tests.snappi. However, the module is not imported in the files. This caused error like below while collecting the snappi tests: E NameError: name 'logging' is not defined How did you do it? The fix is to import logging in those files. Signed-off-by: Xin Wang <xiwang5@microsoft.com> * [Python3 migration]Fix oid issue in snmp_pdu_controllers.py #7887 What is the motivation for this PR? In Python2, oid.prettyPrint() prints 1.3.6.1.4.1.9.1.283 In Python3, oid.prettyPrint() prints SNMPv2-SMI::enterprises.9.1.283 This difference breaks port_label_dict in _build_outlet_maps() in snmp_pdu_controllers.py How did you do it? Change oid.prettyPrint() to str(oid). This will make code work both in Python2 and Python3. How did you verify/test it? PDU testcase can run manually both in Python2 and Python3. * Fix pdu KeyError for pdu_controller fixture (#7876) What is the motivation for this PR? PR #7782 updated the pdu_manager_factory interface. Only devutils using this function was updated accordingly. Fixtures like pdu_controller using this function also need to be updated. How did you do it? This PR updated the pdu_controller and get_pdu_controller fixtures accordingly to pass correct PDU variables to the pdu_manager_factory function. This change only can fix the issue under python2. Under python3, the pysnmp package version 4.4.12 is much higher than the 4.2.5 package used in python2. The newer package has compatibility issues. The current snmp_pdu_controllers.py script needs to be updated for python3. That issue is fixed in #7887 Signed-off-by: Xin Wang <xiwang5@microsoft.com> * Make test_plan.py compatible between python2 and python3 (#7886) * Make test_plan.py compatible between python2 and python3 Approach What is the motivation for this PR? Make test_plan.py compatible between python2 and python3 co-authorized by: jianquanye@microsoft.com * RDMA pfc global pause multi dut test * Refine testbedv2 template output (#7895) * Refine testbedv2 template output Approach What is the motivation for this PR? Refine testbedv2 template output Co-authorized by: jianquanye@microsoft.com * fix test_route_perf packet verify issue (#7877) * fix route perf failure caused by missing some port-channel members * Skip warm-reboot cases for T2. (#7784) --------- Signed-off-by: Xin Wang <xiwang5@microsoft.com> Co-authored-by: Xin Wang <xiwang5@microsoft.com> Co-authored-by: ShiyanWangMS <shiyanwang@microsoft.com> Co-authored-by: Ye Jianquan <jianquanye@microsoft.com> Co-authored-by: jcaiMR <111116206+jcaiMR@users.noreply.github.com> Co-authored-by: rraghav-cisco <58446052+rraghav-cisco@users.noreply.github.com> * removing 2nd asic value * review feedback changes * removing global pause case from infra changes * removing qos fixture from this branch * namespace to asic_value * resolving comments Signed-off-by: selldinesh <s.dineshkumar0692@gmail.com> * resolving comments Signed-off-by: selldinesh <s.dineshkumar0692@gmail.com> * typo fix * removing mlnx only * adding qos fixtures file back * pre commit fix * pre commit fix * changing 'None' to None * resolving precommit errors * resolving comments * adding a short description about this file * review comment fixes * removing quotes * review changes * review changes * review changes * review changes --------- Signed-off-by: Xin Wang <xiwang5@microsoft.com> Signed-off-by: selldinesh <s.dineshkumar0692@gmail.com> Co-authored-by: vkuma82 <kumarvinod82@yahoo.com> Co-authored-by: Xin Wang <xiwang5@microsoft.com> Co-authored-by: ShiyanWangMS <shiyanwang@microsoft.com> Co-authored-by: Ye Jianquan <jianquanye@microsoft.com> Co-authored-by: jcaiMR <111116206+jcaiMR@users.noreply.github.com> Co-authored-by: rraghav-cisco <58446052+rraghav-cisco@users.noreply.github.com> Co-authored-by: Vinod Kumar <vikumar7ks@gmail.com> Co-authored-by: selldinesh <s.dineshkumar0692@gmail.com>

…frastructure (sonic-net#7849) * Added Multi Dut Multi asic Support * PreCommit Check * Update common_helpers.py * Rdma multiasic global pause (sonic-net#9) * Fix "logging not defined" issue of some snappi tests (sonic-net#7855) What is the motivation for this PR? The logging module is used by some files under tests.snappi. However, the module is not imported in the files. This caused error like below while collecting the snappi tests: E NameError: name 'logging' is not defined How did you do it? The fix is to import logging in those files. Signed-off-by: Xin Wang <xiwang5@microsoft.com> * [Python3 migration]Fix oid issue in snmp_pdu_controllers.py sonic-net#7887 What is the motivation for this PR? In Python2, oid.prettyPrint() prints 1.3.6.1.4.1.9.1.283 In Python3, oid.prettyPrint() prints SNMPv2-SMI::enterprises.9.1.283 This difference breaks port_label_dict in _build_outlet_maps() in snmp_pdu_controllers.py How did you do it? Change oid.prettyPrint() to str(oid). This will make code work both in Python2 and Python3. How did you verify/test it? PDU testcase can run manually both in Python2 and Python3. * Fix pdu KeyError for pdu_controller fixture (sonic-net#7876) What is the motivation for this PR? PR sonic-net#7782 updated the pdu_manager_factory interface. Only devutils using this function was updated accordingly. Fixtures like pdu_controller using this function also need to be updated. How did you do it? This PR updated the pdu_controller and get_pdu_controller fixtures accordingly to pass correct PDU variables to the pdu_manager_factory function. This change only can fix the issue under python2. Under python3, the pysnmp package version 4.4.12 is much higher than the 4.2.5 package used in python2. The newer package has compatibility issues. The current snmp_pdu_controllers.py script needs to be updated for python3. That issue is fixed in sonic-net#7887 Signed-off-by: Xin Wang <xiwang5@microsoft.com> * Make test_plan.py compatible between python2 and python3 (sonic-net#7886) * Make test_plan.py compatible between python2 and python3 Approach What is the motivation for this PR? Make test_plan.py compatible between python2 and python3 co-authorized by: jianquanye@microsoft.com * RDMA pfc global pause multi dut test * Refine testbedv2 template output (sonic-net#7895) * Refine testbedv2 template output Approach What is the motivation for this PR? Refine testbedv2 template output Co-authorized by: jianquanye@microsoft.com * fix test_route_perf packet verify issue (sonic-net#7877) * fix route perf failure caused by missing some port-channel members * Skip warm-reboot cases for T2. (sonic-net#7784) --------- Signed-off-by: Xin Wang <xiwang5@microsoft.com> Co-authored-by: Xin Wang <xiwang5@microsoft.com> Co-authored-by: ShiyanWangMS <shiyanwang@microsoft.com> Co-authored-by: Ye Jianquan <jianquanye@microsoft.com> Co-authored-by: jcaiMR <111116206+jcaiMR@users.noreply.github.com> Co-authored-by: rraghav-cisco <58446052+rraghav-cisco@users.noreply.github.com> * removing 2nd asic value * review feedback changes * removing global pause case from infra changes * removing qos fixture from this branch * namespace to asic_value * resolving comments Signed-off-by: selldinesh <s.dineshkumar0692@gmail.com> * resolving comments Signed-off-by: selldinesh <s.dineshkumar0692@gmail.com> * typo fix * removing mlnx only * adding qos fixtures file back * pre commit fix * pre commit fix * changing 'None' to None * resolving precommit errors * resolving comments * adding a short description about this file * review comment fixes * removing quotes * review changes * review changes * review changes * review changes --------- Signed-off-by: Xin Wang <xiwang5@microsoft.com> Signed-off-by: selldinesh <s.dineshkumar0692@gmail.com> Co-authored-by: vkuma82 <kumarvinod82@yahoo.com> Co-authored-by: Xin Wang <xiwang5@microsoft.com> Co-authored-by: ShiyanWangMS <shiyanwang@microsoft.com> Co-authored-by: Ye Jianquan <jianquanye@microsoft.com> Co-authored-by: jcaiMR <111116206+jcaiMR@users.noreply.github.com> Co-authored-by: rraghav-cisco <58446052+rraghav-cisco@users.noreply.github.com> Co-authored-by: Vinod Kumar <vikumar7ks@gmail.com> Co-authored-by: selldinesh <s.dineshkumar0692@gmail.com>

jcaiMR added 7 commits March 24, 2023 08:55

improve bgp update timer, add session down case

ca11176

fix format issue, adjust wait timeout to 120

1b28066

fix comments, use black format

363b026

import six to support both python2 and python3 str

949e000

fix comments

5be27ba

fix route perf failure caused by missing some portchannel members

49c664c

Merge branch 'master' of github.com:jcaiMR/sonic-mgmt into dev/fix_ro…

6d72ad9

…ute_perf

jcaiMR assigned StormLiangMS Mar 28, 2023

StormLiangMS previously approved these changes Mar 28, 2023

View reviewed changes

use black for format, fix pre-check errors

1634988

jcaiMR dismissed StormLiangMS’s stale review via 1634988 March 29, 2023 05:31

StormLiangMS added Request for 202205 branch Request for 202012 branch labels Mar 29, 2023

StormLiangMS approved these changes Mar 29, 2023

View reviewed changes

jcaiMR merged commit a1ae1e0 into sonic-net:master Mar 29, 2023

wangxin added the Cherry Pick Conflict_202205 label Mar 31, 2023

wangxin added the Cherry Pick Conflict_202012 label Mar 31, 2023

jcaiMR removed Request for 202205 branch Cherry Pick Conflict_202205 Request for 202012 branch Cherry Pick Conflict_202012 labels Jul 13, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix test_route_perf packet verify issue#7877

fix test_route_perf packet verify issue#7877
jcaiMR merged 8 commits intosonic-net:masterfrom
jcaiMR:dev/fix_route_perf

jcaiMR commented Mar 28, 2023 •

edited

Loading

Uh oh!

mssonicbld commented Mar 28, 2023

Uh oh!

StormLiangMS left a comment

Uh oh!

mssonicbld commented Mar 28, 2023

Uh oh!

StormLiangMS left a comment

Uh oh!

wangxin commented Mar 31, 2023

Uh oh!

jcaiMR commented Jul 13, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

jcaiMR commented Mar 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of PR

Type of change

Back port request

Approach

What is the motivation for this PR?

How did you do it?

How did you verify/test it?

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

Uh oh!

mssonicbld commented Mar 28, 2023

Uh oh!

StormLiangMS left a comment

Choose a reason for hiding this comment

Uh oh!

mssonicbld commented Mar 28, 2023

Uh oh!

StormLiangMS left a comment

Choose a reason for hiding this comment

Uh oh!

wangxin commented Mar 31, 2023

Uh oh!

jcaiMR commented Jul 13, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jcaiMR commented Mar 28, 2023 •

edited

Loading