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

[mutli-asic][vs]: Add support to test multi-asic vs with four asic and 8 interfaces #2858

Merged
merged 14 commits into from
Feb 25, 2021

Conversation

SuvarnaMeenakshi
Copy link
Contributor

@SuvarnaMeenakshi SuvarnaMeenakshi commented Jan 25, 2021

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?

How did you do it?

  • Add new t1-lag topo file to support 8 front panel interfaces.
  • Modify sonic.xml.j2 file to use higher number of vcpus based on the multi-asic hwsku, 6 asic hwsku will require more vcpus.
  • Add new testbed for msft_four_asic_vs and new DUT vlab-08.
  • Add a new minigraph for mutli-asic vlab-08 DUT to come up with t1-lag topology.
  • Start topology service before load_minigraph for multi-asic vs platform.

How did you verify/test it?

  • Bring up multi-asic vs image with 4-asics testbed using add-topo:
    ./testbed-cli.sh -t vtestbed.csv -m veos_vtb -k ceos add-topo vms-kvm-four-asic-t1-lag password.txt
  • Copy the minigraph to virtual switch.
  • Start topology service (systemctl start topology.service)
  • load minigraph.
  • Ensure that all internal and external interfaces are up and all BGP sessions are up.
 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 12754
asic1: BGP router identifier 8.0.0.1, local AS number 65100 vrf-id 0
BGP table version 12775
asic2: BGP router identifier 8.0.0.4, local AS number 65100 vrf-id 0
BGP table version 6398
asic3: BGP router identifier 8.0.0.5, 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       3774       6963         0      0       0  00:29:50             6370  ARISTA01T2
10.0.0.5       4  65200       3775       6914         0      0       0  00:29:46             6370  ARISTA03T2
10.0.0.33      4  64001        603       6980         0      0       0  00:29:54                3  ARISTA01T0
10.0.0.35      4  64002        603       6978         0      0       0  00:29:52                3  ARISTA02T0
10.0.0.37      4  64003        604       6976         0      0       0  00:29:51                4  ARISTA03T0
10.0.0.39      4  64004        602       6978         0      0       0  00:29:48                3  ARISTA04T0
10.1.0.0       4  65100       3769       3765         0      0       0  00:28:32             6398  ASIC2
10.1.0.1       4  65100       3766       3770         0      0       0  00:28:36             6377  ASIC0
10.1.0.2       4  65100       3768       3763         0      0       0  00:28:27             6398  ASIC3
10.1.0.3       4  65100       3765       3770         0      0       0  00:28:34             6377  ASIC0
10.1.0.4       4  65100       3770        586         0      0       0  00:28:34             6398  ASIC2
10.1.0.5       4  65100        587       3770         0      0       0  00:28:36               21  ASIC1
10.1.0.6       4  65100       3770        586         0      0       0  00:28:35             6398  ASIC3
10.1.0.7       4  65100        588       3772         0      0       0  00:28:40               21  ASIC1
admin@vlab-08:~$ show platform summary
Platform: x86_64-kvm_x86_64-r0
HwSKU: msft_four_asic_vs
ASIC: vs
ASIC Count: 4

Any platform specific information?

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

Documentation

with 8 front panel interfaces.
Add 8 interfaces topo files.
Modify number of asics for msft_multi_asic_vs hwsku to 4.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
t1-8-lag topology.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
@@ -4,4 +4,4 @@ vms-kvm-t0-64,vms6-1,t0-64,docker-ptf,ptf-01,10.250.0.102/24,fec0::ffff:afa:2/64
vms-kvm-t1-lag,vms6-2,t1-lag,docker-ptf,ptf-02,10.250.0.106/24,fec0::ffff:afa:6/64,server_1,VM0104,[vlab-03],Tests virtual switch vm
vms-kvm-t0-2,vms6-3,t0,docker-ptf,ptf-03,10.250.0.108/24,fec0::ffff:afa:8/64,server_1,VM0104,[vlab-04],Tests virtual switch vm
vms-kvm-dual-t0,vms6-4,dualtor,docker-ptf,ptf-04,10.250.0.109/24,fec0::ffff:afa:9/64,server_1,VM0108,[vlab-05;vlab-06],Dual-TOR testbed
vms-kvm-multi-asic-t1-lag,vms6-4,t1-64-lag,docker-ptf,ptf-05,10.250.0.110/24,fec0::ffff:afa:a/64,server_1,VM0104,[vlab-07],Tests multi-asic virtual switch vm
vms-kvm-multi-asic-t1-lag,vms6-4,t1-8-lag,docker-ptf,ptf-05,10.250.0.110/24,fec0::ffff:afa:a/64,server_1,VM0104,[vlab-07],Tests multi-asic virtual switch vm
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i do not think we should remove t1-64-lag

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Modified to add a new DUT/testbed with a new hwsku msft_four_asic_vs added using: sonic-net/sonic-buildimage#6558

@@ -113,7 +114,7 @@ all:
type: kvm
hwsku: msft_multi_asic_vs
serial_port: 9005
num_asics: 6
num_asics: 4
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be kept.

I am ok to introduce a new one since in the long term we need to run vs test with 6 asics.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a new hwsku for 4-asics and kept the 6-asic sku as is.

with hwsku msft_four_asic_vs.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
@SuvarnaMeenakshi SuvarnaMeenakshi requested a review from a team as a code owner February 17, 2021 20:43
Minor fixes.
Change the number of vcpus based on the multi-asic hwsku.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
Add flag to specify if topology service has to be started
before loading minigraph.
start topology service before loading minigraph
for multi-asic vs platform.

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

@arlakshm arlakshm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as comments

vars:
hwsku: msft_four_asic_vs
iface_speed: 40000
num_asics: 4
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add the frontend asic attribute as well
frontend_asics: [2,3]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated to [0,1].

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
@SuvarnaMeenakshi SuvarnaMeenakshi merged commit 2e6847c into sonic-net:master Feb 25, 2021
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.
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.

5 participants