Refine testbedv2 template output#7895
Merged
yejianquan merged 2 commits intosonic-net:masterfrom Mar 29, 2023
Merged
Conversation
lerry-lee
approved these changes
Mar 29, 2023
selldinesh
added a commit
to selldinesh/sonic-mgmt
that referenced
this pull request
Mar 29, 2023
* 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>
developfast
pushed a commit
that referenced
this pull request
Jul 28, 2023
…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>
7 tasks
AharonMalkin
pushed a commit
to AharonMalkin/sonic-mgmt
that referenced
this pull request
Jan 25, 2024
…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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of PR
Summary:
Fixes # (issue)
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