Skip to content

[Python3 migration]Fix oid issue in snmp_pdu_controllers.py#7887

Merged
wangxin merged 1 commit intosonic-net:masterfrom
wsycqyz:py2to3-0328
Mar 29, 2023
Merged

[Python3 migration]Fix oid issue in snmp_pdu_controllers.py#7887
wangxin merged 1 commit intosonic-net:masterfrom
wsycqyz:py2to3-0328

Conversation

@wsycqyz
Copy link
Copy Markdown
Contributor

@wsycqyz wsycqyz commented Mar 28, 2023

Description of PR

Summary:
Fixes snmp_pdu_controllers.py issue in Python3

Type of change

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

Back port request

  • 201911
  • 202012
  • 202205

Approach

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.

@mssonicbld
Copy link
Copy Markdown
Collaborator

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.................................................Passed
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/common/plugins/pdu_controller/snmp_pdu_controllers.py:289:121: E501 line too long (123 > 120 characters)

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

  1. 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.
  2. Ensure that the pre-commit package is installed:
sudo pip install pre-commit
  1. Go to repository root folder
  2. Install the pre-commit hooks:
pre-commit install
  1. Use pre-commit to check staged file:
pre-commit
  1. Alternatively, you can check committed files using:
pre-commit run --from-ref <commit_id> --to-ref <commit_id>

@wangxin wangxin merged commit b7f463b into sonic-net:master Mar 29, 2023
wangxin added a commit that referenced this pull request Mar 29, 2023
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 <[email protected]>
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 <[email protected]>

* [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 <[email protected]>

* 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: [email protected]

* 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: [email protected]

* 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 <[email protected]>
Co-authored-by: Xin Wang <[email protected]>
Co-authored-by: ShiyanWangMS <[email protected]>
Co-authored-by: Ye Jianquan <[email protected]>
Co-authored-by: jcaiMR <[email protected]>
Co-authored-by: rraghav-cisco <[email protected]>
@wsycqyz wsycqyz deleted the py2to3-0328 branch March 30, 2023 01:54
wangxin added a commit that referenced this pull request Apr 27, 2023
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 <[email protected]>
wangxin added a commit that referenced this pull request Apr 27, 2023
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 <[email protected]>
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 <[email protected]>

* [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 <[email protected]>

* 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: [email protected]

* 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: [email protected]

* 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 <[email protected]>
Co-authored-by: Xin Wang <[email protected]>
Co-authored-by: ShiyanWangMS <[email protected]>
Co-authored-by: Ye Jianquan <[email protected]>
Co-authored-by: jcaiMR <[email protected]>
Co-authored-by: rraghav-cisco <[email protected]>

* 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 <[email protected]>

* resolving comments

Signed-off-by: selldinesh <[email protected]>

* 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 <[email protected]>
Signed-off-by: selldinesh <[email protected]>
Co-authored-by: vkuma82 <[email protected]>
Co-authored-by: Xin Wang <[email protected]>
Co-authored-by: ShiyanWangMS <[email protected]>
Co-authored-by: Ye Jianquan <[email protected]>
Co-authored-by: jcaiMR <[email protected]>
Co-authored-by: rraghav-cisco <[email protected]>
Co-authored-by: Vinod Kumar <[email protected]>
Co-authored-by: selldinesh <[email protected]>
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 <[email protected]>

* [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 <[email protected]>

* 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: [email protected]

* 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: [email protected]

* 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 <[email protected]>
Co-authored-by: Xin Wang <[email protected]>
Co-authored-by: ShiyanWangMS <[email protected]>
Co-authored-by: Ye Jianquan <[email protected]>
Co-authored-by: jcaiMR <[email protected]>
Co-authored-by: rraghav-cisco <[email protected]>

* 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 <[email protected]>

* resolving comments

Signed-off-by: selldinesh <[email protected]>

* 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 <[email protected]>
Signed-off-by: selldinesh <[email protected]>
Co-authored-by: vkuma82 <[email protected]>
Co-authored-by: Xin Wang <[email protected]>
Co-authored-by: ShiyanWangMS <[email protected]>
Co-authored-by: Ye Jianquan <[email protected]>
Co-authored-by: jcaiMR <[email protected]>
Co-authored-by: rraghav-cisco <[email protected]>
Co-authored-by: Vinod Kumar <[email protected]>
Co-authored-by: selldinesh <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants