[multi-asic][minigraph]: Add changes to support minigraph generation for multi-asic #3024
Conversation
This file contains 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
generation for multi-asic VS. - Add new topo files to define internal asic topology for Virtual Switch hwsku msft_multi_asic_vs and msft_four_asic_vs. - Add changes in topo_facts to parse the new ASIC topo files. - Add changes in port_alias to generate list of asic names for front-end interfaces. - Add additional dictionary in port_alias to generate interfaces list for all ASICs. Signed-off-by: SuvarnaMeenakshi <[email protected]>
3 tasks
|
This pull request introduces 2 alerts when merging b0c202b into b0890db - view on LGTM.com new alerts:
|
|
@SuvarnaMeenakshi please address LGTM issues. |
Signed-off-by: SuvarnaMeenakshi <[email protected]>
Fixed LGTM errors. |
arlakshm
reviewed
Feb 27, 2021
ansible/library/port_alias.py
Outdated
| @@ -94,6 +94,11 @@ def get_portmap(self, asic_id=None): | |||
| portmap = {} | |||
| aliasmap = {} | |||
| portspeed = {} | |||
| # Front end interface asic names | |||
| asicifnames = [] | |||
There was a problem hiding this comment.
Renamed to front_panel_asic_ifnames. This will be the list of asic names of front panel interfaces.
arlakshm
reviewed
Feb 27, 2021
ansible/library/port_alias.py
Outdated
| # Front end interface asic names | ||
| asicifnames = [] | ||
| # All asic names | ||
| asicnames = [] |
There was a problem hiding this comment.
Renamed to asic_if_names. This will be a map of ASIC: [ list of all interface of that asic ]
arlakshm
reviewed
Feb 27, 2021
| asicifnames.append(asicifname) | ||
| if (asic_name_index != -1) and (len(mapping) > asic_name_index): | ||
| asicname = mapping[asic_name_index] | ||
| asicnames.append(asicname) | ||
|
|
There was a problem hiding this comment.
the asicnames list will have both internal and external interfaces ?
Can you elaborate what is the difference between asicnames and asicifnames ?
There was a problem hiding this comment.
Changed to front_panel_asic_ifnames and asic_if_names to make it clear, updated comment in port_alias.py
arlakshm
reviewed
Feb 27, 2021
| ASIC0: | ||
| topology: | ||
| ASICs: | ||
| ASIC2: |
There was a problem hiding this comment.
rename this to NEIGH_ASIC or PEER_ASIC? it is clearer
There was a problem hiding this comment.
Modified to NEIGH_ASIC
- Change variable name of list of front-panel asic interface names. - Change variable name of dict of asic to list of all asic ifnames. - Change ASICs key word to NEIGH_ASIC in topo file for multi-asic hwsku. Signed-off-by: SuvarnaMeenakshi <[email protected]>
of current asic instead of interface index. Signed-off-by: SuvarnaMeenakshi <[email protected]>
SuvarnaMeenakshi
added a commit
that referenced
this pull request
Mar 10, 2021
…atform (#3025) What is the motivation for this PR? Minigraph template changes to support minigraph generation for multi-asic platform. How did you do it? Pre-requisite: #3024 Add changes to minigraph templates to use the new data structure asic_topo_config and include asic topology. How did you verify/test it? With the changes in PR#3024: Bring up four-asic VS testbed using the changes in: #2858 testbed-cli.sh -t vtestbed.csv -m veos_vtb -k ceos add-topo vms-kvm-four-asic-t1-lag password.txt Deploy minigraph using: ./testbed-cli.sh -t vtestbed.csv -m veos_vtb deploy-mg vms-kvm-four-asic-t1-lag lab password.txt With this, minigraph should be generated and deployed on the multi-asic VS DUT. Check all interfaces status and BGP status.
3 tasks
wangxin
pushed a commit
that referenced
this pull request
Mar 11, 2021
What is the motivation for this PR? #3024 introduced a new function with an argument called 'type'. This will override existing python 'type' function. To avoid this, modify the argument name to 'neigh_type' which can be 'VMs' or 'NEIGH_ASIC' based on the topo file being parsed. How did you do it? Modify the argument name to 'neigh_type'. How did you verify/test it? Bring up single-asic and multi-asic VS testbed with this change. Signed-off-by: Suvarna Meenakshi <[email protected]>
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
for Virtual Switch hwsku msft_multi_asic_vs and
msft_four_asic_vs.
front-end interfaces.
interfaces list for all ASICs.
Signed-off-by: SuvarnaMeenakshi [email protected]
Description of PR
Summary:
Fixes # (issue)
Type of change
Approach
What is the motivation for this PR?
To support minigraph generation for multi-asic platforms.
How did you do it?
Multi-asic minigraph will include internal asic topology and asic metadata.
In the pull request, topo files for 2 Virtual switch hwsku's is added: - topo_msft_multi_asic_vs.yml and topo_msft_four_asic_vs.yml.
How did you verify/test it?
Any platform specific information?
Supported testbed topology if it's a new test case?
Documentation