Skip to content

[multi-asic][minigraph]: Modify minigraph templates for multi-asic platform#3025

Merged
SuvarnaMeenakshi merged 6 commits intosonic-net:masterfrom
SuvarnaMeenakshi:multi_asic_mg_templates
Mar 10, 2021
Merged

[multi-asic][minigraph]: Modify minigraph templates for multi-asic platform#3025
SuvarnaMeenakshi merged 6 commits intosonic-net:masterfrom
SuvarnaMeenakshi:multi_asic_mg_templates

Conversation

@SuvarnaMeenakshi
Copy link
Contributor

Signed-off-by: SuvarnaMeenakshi sumeenak@microsoft.com

Description of PR

Summary:
Fixes # (issue)

Type of change

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

Approach

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.

admin@vlab-08:~$ show ip bgp summary -d all

IPv4 Unicast Summary:
asic0: BGP router identifier 8.0.0.0, local AS number 65100 vrf-id 0
BGP table version 12784
asic1: BGP router identifier 8.0.0.1, local AS number 65100 vrf-id 0
BGP table version 12779
asic2: BGP router identifier 8.0.0.2, local AS number 65100 vrf-id 0
BGP table version 6398
asic3: BGP router identifier 8.0.0.3, local AS number 65100 vrf-id 0
BGP table version 6398
RIB entries 51176, using 9416384 bytes of memory
Peers 14, using 292880 KiB of memory
Peer groups 12, using 768 bytes of memory


Neighbhor      V     AS    MsgRcvd    MsgSent    TblVer    InQ    OutQ  Up/Down      State/PfxRcd  NeighborName
-----------  ---  -----  ---------  ---------  --------  -----  ------  ---------  --------------  --------------
10.0.0.1       4  65200       3945       7122         0      0       0  00:38:31             6370  ARISTA01T2
10.0.0.5       4  65200       3946       6988         0      0       0  00:38:29             6370  ARISTA03T2
10.0.0.33      4  64001        775       6788         0      0       0  00:38:28                3  ARISTA01T0
10.0.0.35      4  64002        773       6788         0      0       0  00:38:27                3  ARISTA02T0
10.0.0.37      4  64003        782       6784         0      0       0  00:38:22                4  ARISTA03T0
10.0.0.39      4  64004        773       6781         0      0       0  00:38:24                3  ARISTA04T0
10.1.0.0       4  65100       3949       3945         0      0       0  00:37:14             6398  ASIC2
10.1.0.1       4  65100       3945       3950         0      0       0  00:37:18             6377  ASIC0
10.1.0.2       4  65100       3944       3940         0      0       0  00:37:18             6398  ASIC3
10.1.0.3       4  65100       3942       3947         0      0       0  00:37:25             6377  ASIC0
10.1.0.4       4  65100       3946        763         0      0       0  00:37:24             6398  ASIC2
10.1.0.5       4  65100        763       3947         0      0       0  00:37:26               21  ASIC1
10.1.0.6       4  65100       3946        763         0      0       0  00:37:25             6398  ASIC3
10.1.0.7       4  65100        765       3948         0      0       0  00:37:30               21  ASIC1

Total number of neighbors 14
admin@vlab-08:~$ show interfaces status -d all
      Interface        Lanes    Speed    MTU    FEC        Alias             Vlan    Oper    Admin    Type    Asym PFC
---------------  -----------  -------  -----  -----  -----------  ---------------  ------  -------  ------  ----------
      Ethernet0      1,2,3,4      40G   9100    N/A  Ethernet1/1  PortChannel0002      up       up     N/A         off
      Ethernet4      5,6,7,8      40G   9100    N/A  Ethernet1/2  PortChannel0002      up       up     N/A         off
      Ethernet8   9,10,11,12      40G   9100    N/A  Ethernet1/3  PortChannel0005      up       up     N/A         off
     Ethernet12  13,14,15,16      40G   9100    N/A  Ethernet1/4  PortChannel0005      up       up     N/A         off
     Ethernet16      1,2,3,4      40G   9100    N/A  Ethernet1/5  PortChannel0001      up       up     N/A         off
     Ethernet20      5,6,7,8      40G   9100    N/A  Ethernet1/6  PortChannel0003      up       up     N/A         off
     Ethernet24   9,10,11,12      40G   9100    N/A  Ethernet1/7  PortChannel0004      up       up     N/A         off
     Ethernet28  13,14,15,16      40G   9100    N/A  Ethernet1/8  PortChannel0006      up       up     N/A         off
   Ethernet-BP0  17,18,19,20      40G   9100    N/A   Eth4-ASIC0  PortChannel4020      up       up     N/A         off
   Ethernet-BP4  21,22,23,24      40G   9100    N/A   Eth5-ASIC0  PortChannel4020      up       up     N/A         off
   Ethernet-BP8  25,26,27,28      40G   9100    N/A   Eth6-ASIC0  PortChannel4030      up       up     N/A         off
  Ethernet-BP12  29,30,31,32      40G   9100    N/A   Eth7-ASIC0  PortChannel4030      up       up     N/A         off
  Ethernet-BP16  17,18,19,20      40G   9100    N/A   Eth4-ASIC1  PortChannel4021      up       up     N/A         off
  Ethernet-BP20  21,22,23,24      40G   9100    N/A   Eth5-ASIC1  PortChannel4021      up       up     N/A         off
  Ethernet-BP24  25,26,27,28      40G   9100    N/A   Eth6-ASIC1  PortChannel4031      up       up     N/A         off
  Ethernet-BP28  29,30,31,32      40G   9100    N/A   Eth7-ASIC1  PortChannel4031      up       up     N/A         off
  Ethernet-BP32      1,2,3,4      40G   9100    N/A   Eth0-ASIC2  PortChannel4002      up       up     N/A         off
  Ethernet-BP36      5,6,7,8      40G   9100    N/A   Eth1-ASIC2  PortChannel4002      up       up     N/A         off
  Ethernet-BP40   9,10,11,12      40G   9100    N/A   Eth2-ASIC2  PortChannel4012      up       up     N/A         off
  Ethernet-BP44  13,14,15,16      40G   9100    N/A   Eth3-ASIC2  PortChannel4012      up       up     N/A         off
  Ethernet-BP48  17,18,19,20      N/A   9100    N/A   Eth4-ASIC2           routed    down     down     N/A         off
  Ethernet-BP52  21,22,23,24      N/A   9100    N/A   Eth5-ASIC2           routed    down     down     N/A         off
  Ethernet-BP56  25,26,27,28      N/A   9100    N/A   Eth6-ASIC2           routed    down     down     N/A         off
  Ethernet-BP60  29,30,31,32      N/A   9100    N/A   Eth7-ASIC2           routed    down     down     N/A         off
  Ethernet-BP64      1,2,3,4      40G   9100    N/A   Eth0-ASIC3  PortChannel4003      up       up     N/A         off
  Ethernet-BP68      5,6,7,8      40G   9100    N/A   Eth1-ASIC3  PortChannel4003      up       up     N/A         off
  Ethernet-BP72   9,10,11,12      40G   9100    N/A   Eth2-ASIC3  PortChannel4013      up       up     N/A         off
  Ethernet-BP76  13,14,15,16      40G   9100    N/A   Eth3-ASIC3  PortChannel4013      up       up     N/A         off
  Ethernet-BP80  17,18,19,20      N/A   9100    N/A   Eth4-ASIC3           routed    down     down     N/A         off
  Ethernet-BP84  21,22,23,24      N/A   9100    N/A   Eth5-ASIC3           routed    down     down     N/A         off
  Ethernet-BP92  25,26,27,28      N/A   9100    N/A   Eth6-ASIC3           routed    down     down     N/A         off
  Ethernet-BP96  29,30,31,32      N/A   9100    N/A   Eth7-ASIC3           routed    down     down     N/A         off
PortChannel0001          N/A      40G   9100    N/A          N/A           routed      up       up     N/A         N/A
PortChannel0002          N/A      80G   9100    N/A          N/A           routed      up       up     N/A         N/A
PortChannel0003          N/A      40G   9100    N/A          N/A           routed      up       up     N/A         N/A
PortChannel0004          N/A      40G   9100    N/A          N/A           routed      up       up     N/A         N/A
PortChannel0005          N/A      80G   9100    N/A          N/A           routed      up       up     N/A         N/A
PortChannel0006          N/A      40G   9100    N/A          N/A           routed      up       up     N/A         N/A
PortChannel4002          N/A      80G   9100    N/A          N/A           routed      up       up     N/A         N/A
PortChannel4003          N/A      80G   9100    N/A          N/A           routed      up       up     N/A         N/A
PortChannel4012          N/A      80G   9100    N/A          N/A           routed      up       up     N/A         N/A
PortChannel4013          N/A      80G   9100    N/A          N/A           routed      up       up     N/A         N/A
PortChannel4020          N/A      80G   9100    N/A          N/A           routed      up       up     N/A         N/A
PortChannel4021          N/A      80G   9100    N/A          N/A           routed      up       up     N/A         N/A
PortChannel4030          N/A      80G   9100    N/A          N/A           routed      up       up     N/A         N/A
PortChannel4031          N/A      80G   9100    N/A          N/A           routed      up       up     N/A         N/A

Any platform specific information?

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

Documentation

to generate miningraph for multi-asic platform which
will include ASIC information.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
@yxieca
Copy link
Collaborator

yxieca commented Feb 26, 2021

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

and topo_facts.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
@SuvarnaMeenakshi SuvarnaMeenakshi requested a review from wangxin March 3, 2021 19:25
Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
SuvarnaMeenakshi added a commit that referenced this pull request Mar 9, 2021
…for multi-asic (#3024)

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.
To provide the internal asic information, a new topo file is added. The new topo file will hwsku specific, and will contain asic topology similar to the other topo files. A single topo file will be used to provide topology of all asics for that hwsku.
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.
Made changes to topo_facts.py to parse the newly added topo files similar to the parsing logic of existing topo files.
Made changes to port_alias.py to generate a list of front-end ASIC interface names and list of interfaces of each ASIC which will be used in minigraph templates.
Made changes to config config_sonic_basedon_testbed to pass hwsku to topo_facts.py. Based on the hwsku, topo_facts will look for hwsku specific topo file.
How did you verify/test it?
No change in single-asic minigraph generation.
For multi-asic platform, minigraph can be generated along with minigraph template changes added in PR #3025
@SuvarnaMeenakshi
Copy link
Contributor Author

/Azurepipelines run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@SuvarnaMeenakshi SuvarnaMeenakshi merged commit 986592b into sonic-net:master Mar 10, 2021
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
…lly (sonic-net#18838)

#### Why I did it
src/sonic-swss
```
* e1005dd6 - (HEAD -> 202305, origin/202305) [portsorch] process only updated APP_DB fields when port is already created (sonic-net#3025) (19 hours ago) [Stepan Blyshchak]
```
#### How I did it
#### How to verify it
#### Description for the changelog
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.

4 participants