Skip to content

Fix KeyError: u'MUX_LINKMGR' when comparing pre config and current config#6918

Merged
ZhaohuiS merged 1 commit intosonic-net:masterfrom
ZhaohuiS:fix/dut_config_check
Dec 1, 2022
Merged

Fix KeyError: u'MUX_LINKMGR' when comparing pre config and current config#6918
ZhaohuiS merged 1 commit intosonic-net:masterfrom
ZhaohuiS:fix/dut_config_check

Conversation

@ZhaohuiS
Copy link
Contributor

@ZhaohuiS ZhaohuiS commented Nov 29, 2022

Signed-off-by: Zhaohui Sun zhaohuisun@microsoft.com

Description of PR

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?

Some test cases failed at teardown when comparing pre config and current config:

                    for key in cur_config_extra_keys:
>                       cur_only_config[duthost.hostname].update({key: cur_running_config[key]})
E                       KeyError: u'MUX_LINKMGR'

The issue is introduced by #6527.

How did you do it?

Get previous and current config keys after removing exclusive keys.
Also add [cfg_context] for cur_only_config and pre_only_config

How did you verify/test it?

Run dualtor case,such as dualtor/test_tor_ecn.py::test_dscp_to_queue_during_encap_on_standby

Any platform specific information?

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

Documentation

…nfig

Signed-off-by: Zhaohui Sun <zhaohuisun@microsoft.com>
@azure-pipelines
Copy link

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/conftest.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/conftest.py:1854:121: E501 line too long (155 > 120 characters)
tests/conftest.py:1855:121: E501 line too long (155 > 120 characters)
tests/conftest.py:1856:121: E501 line too long (128 > 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>

@ZhaohuiS ZhaohuiS merged commit e4ba888 into sonic-net:master Dec 1, 2022
yxieca pushed a commit that referenced this pull request Dec 1, 2022
…nfig (#6918)

What is the motivation for this PR?
Some test cases failed at teardown when comparing pre config and current config:

                    for key in cur_config_extra_keys:
>                       cur_only_config[duthost.hostname].update({key: cur_running_config[key]})
E                       KeyError: u'MUX_LINKMGR'
The issue is introduced by #6527.

How did you do it?
Get previous and current config keys after removing exclusive keys.
Also add [cfg_context] for cur_only_config and pre_only_config

How did you verify/test it?
Run dualtor case,such as dualtor/test_tor_ecn.py::test_dscp_to_queue_during_encap_on_standby

Signed-off-by: Zhaohui Sun <zhaohuisun@microsoft.com>
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