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.

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

dhcpv6 per-interface counter automation script coverage #9876

Merged
merged 1 commit into from
Sep 11, 2023

Conversation

jcaiMR
Copy link
Contributor

@jcaiMR jcaiMR commented Sep 7, 2023

Description of PR

DHCPv6 per interface counter automation script coverage

Summary:
Fixes # (issue)

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?

  1. Cover basic function of DHCPv6 per interface counter.
  2. Script support both old counter STATE_DB format and new format.
Old STATE_DB format
sonic-db-cli STATE_DB hgetall 'DHCPv6_COUNTER_TABLE|Vlan1000'
{'Unknown':'0','Solicit':'0','Advertise':'0','Request':'0','Confirm':'0','Renew':'0','Rebind':'0','Reply':'0','Release':'0','Decline':'0','Reconfigure':'0','Information-Request':'0','Relay-Forward':'0','Relay-Reply':'0','Malformed':'0'}
New STATE_DB format
sonic-db-cli STATE_DB hgetall 'DHCPv6_COUNTER_TABLE|Vlan1000'
{'TX': "{'Unknown':'0','Solicit':'0','Advertise':'0','Request':'0','Confirm':'0','Renew':'0','Rebind':'0','Reply':'0','Release':'0','Decline':'0','Reconfigure':'0','Information-Request':'0','Relay-Forward':'0','Relay-Reply':'0','Malformed':'0'}",
'RX': "{'Unknown':'0','Solicit':'0','Advertise':'0','Request':'0','Confirm':'0','Renew':'0','Rebind':'0','Reply':'0','Release':'0','Decline':'0','Reconfigure':'0','Information-Request':'0','Relay-Forward':'0','Relay-Reply':'0','Malformed':'0'}"}

How did you do it?

How did you verify/test it?

dhcp_relay/test_dhcpv6_relay.py::test_dhcpv6_relay_counter

Run script with both old image and new image, on dual tor and single tor

Any platform specific information?

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

Documentation

@jcaiMR jcaiMR changed the title dhcpv6 per-interface counter function automation script coverage dhcpv6 per-interface counter automation script coverage Sep 7, 2023
@mssonicbld
Copy link
Collaborator

The pre-commit check detected issues in the files touched by this pull request.
The pre-commit check is a mandatory check, please fix detected issues.

Detailed pre-commit check results:
trim trailing whitespace.................................................Failed
- hook id: trailing-whitespace
- exit code: 1
- files were modified by this hook

Fixing tests/dhcp_relay/test_dhcpv6_relay.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/dhcp_relay/test_dhcpv6_relay.py:27:121: E501 line too long (132 > 120 characters)
tests/dhcp_relay/test_dhcpv6_relay.py:39:1: E302 expected 2 blank lines, found 1
tests/dhcp_relay/test_dhcpv6_relay.py:42:121: E501 line too long (124 > 120 characters)
tests/dhcp_relay/test_dhcpv6_relay.py:44:121: E501 line too long (124 > 120 characters)
tests/dhcp_relay/test_dhcpv6_relay.py:65: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:

  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>

@jcaiMR jcaiMR force-pushed the dev/jcai_per_if_counter branch from 4401aa9 to 2e29b01 Compare September 7, 2023 08:59
@mssonicbld
Copy link
Collaborator

The pre-commit check detected issues in the files touched by this pull request.
The pre-commit check is a mandatory check, please fix detected issues.

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/dhcp_relay/test_dhcpv6_relay.py:278:121: E501 line too long (121 > 120 characters)

flake8...............................................(no files to check)Skipped
check conditional mark sort..........................(no files to check)Skipped

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>

@jcaiMR jcaiMR force-pushed the dev/jcai_per_if_counter branch from 2e29b01 to 5b2aa47 Compare September 7, 2023 09:33
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202305: #10412

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants