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

[topo_mx] Add new topo for BMC Mgmt ToR Router #6636

Merged
merged 2 commits into from
Oct 28, 2022

Conversation

yaqiangz
Copy link
Contributor

@yaqiangz yaqiangz commented Oct 27, 2022

Description of PR

Summary:
Fixes # (issue)

Type of change

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

Back port request

  • 201911
  • 202012
  • 202205

Approach

What is the motivation for this PR?

For BMC Mgmt ToR Router, both testing methodology and physical wiring pattern are quite different with existing topos. Adding this topo can let us filter unrelated test cases from mgmt network.

How did you do it?

  • Add a new topo (inherit from t0-52)
  • Enhance topo config and topo_facts for including interfaces
  • Enhance minigraph templates to support generate minigraph for this new topo

How did you verify/test it?

Generate minigraph and deploy to DUT.
Use ./testbed-cli.sh deploy-mg to gen&deploy minigraph with new topo mx successfully,
All the related configuration are correct pushed to DUT after deploy.

Any platform specific information?

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

Documentation

@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/common/testbed.py

fix end of files.........................................................Failed
- hook id: end-of-file-fixer
- exit code: 1
- files were modified by this hook

Fixing ansible/templates/minigraph_png.j2

check yaml...............................................................Passed
check for added large files..............................................Passed
check python ast.........................................................Passed
flake8...................................................................Failed
- hook id: flake8
- exit code: 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>

ansible/vars/topo_mx.yml Outdated Show resolved Hide resolved
tests/common/testbed.py Outdated Show resolved Hide resolved
@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/common/testbed.py

fix end of files.........................................................Failed
- hook id: end-of-file-fixer
- exit code: 1
- files were modified by this hook

Fixing ansible/templates/minigraph_png.j2

check yaml...............................................................Passed
check for added large files..............................................Passed
check python ast.........................................................Passed
flake8...................................................................Failed
- hook id: flake8
- exit code: 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>

@yaqiangz yaqiangz merged commit c77974f into sonic-net:master Oct 28, 2022
yaqiangz added a commit to yaqiangz/sonic-mgmt that referenced this pull request Oct 28, 2022
yaqiangz added a commit that referenced this pull request Oct 28, 2022
…nounce routes for mx #6635 #6636 (#6650)

What is the motivation for this PR?
Manually cherry-pick and resolve conflicts of these PR: #6635 #6636
yaqiangz added a commit to yaqiangz/sonic-mgmt that referenced this pull request Nov 2, 2022
What is the motivation for this PR?
For BMC Mgmt ToR Router, both testing methodology and physical wiring pattern are quite different with existing topos. Adding this topo can let us filter unrelated test cases from mgmt network.

How did you do it?
Add a new topo (inherit from t0-52)
Enhance topo config and topo_facts for including interfaces
Enhance minigraph templates to support generate minigraph for this new topo
How did you verify/test it?
Generate minigraph and deploy to DUT.
Use ./testbed-cli.sh deploy-mg to gen&deploy minigraph with new topo mx successfully,
All the related configuration are correct pushed to DUT after deploy.
lolyu pushed a commit to lolyu/sonic-mgmt that referenced this pull request Dec 19, 2022
…Azure/sonic-mgmt into internal

Fix merge conflicts.
Commit history:

- Modified args for some of the calls (sonic-net#6605)
- Run telemetry tests on all DUT types in a multi-dut setup (sonic-net#6098)
- [dualtor]: Fix loopback route removal (sonic-net#6555)
- Added support for one portChannel and one routed interface if two por… (sonic-net#5331)
- Use config_reload when recovering from internal interfaces that are in down state (sonic-net#6076)
- Added python fixture for resetting config changes to fix nightly backend snmp test failures (sonic-net#6607)
- Fix Python3 RuntimeError - dictionary changed size during iteration (sonic-net#6646)
- [mx] Add docs for mx topo (sonic-net#6634)
- [topo_mx] Add new topo for BMC Mgmt ToR Router (sonic-net#6636)
- [mx] Enhance announce routes to support MX topo (sonic-net#6635)
- Merge branch 'azure-master' into dev/yaqiangzhu/internal_merge
bingwang-ms pushed a commit to bingwang-ms/sonic-mgmt that referenced this pull request Jul 27, 2023
…thub.com/Azure/sonic-mgmt into internal-202205

Fix merge conflicts.
Commit history:
- [202205][topo_mx] Add new topo for BMC Mgmt ToR Router and enhance announce routes for mx sonic-net#6635 sonic-net#6636 (sonic-net#6650)
- Merge commit 'cb91a01b1d44404578d677d501d0e4d011940244' into internal-202205
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.

None yet

2 participants