dd9ff10fee
Added support for Mellanox-SN2700 based SKU for docker-sonic-vs and to differentiate platform based on hw-sku rather than on fake_platform in VS. Currently SAI VS library uses hwsku based SAI profile to differentiate and mock different platform implementations. The same functionality in swss is achieved using a fake_platform env variable. Using a fake_platform has some drawbacks that the vs container appears to still use a different vendor hw-sku env PLATFORM=x86_64-kvm_x86_64-r0 HOSTNAME=dd21a1637723 PWD=/ HOME=/root TERM=xterm HWSKU=Force10-S6000 SHLVL=1 fake_platform=mellanox PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin DEBIAN_FRONTEND=noninteractive _=/usr/bin/env In order to unify the approach at both swss and vs SAI and to be uniform throughout this PR introduces the approach of using hw-sku to differentiate different platforms. This requires support for Mellanox-SN2700 HWSKU for Mellanox platform which is also addressed by this PR. root@23c9ba83b0aa:/# show platform summary /bin/sh: 1: sudo: not found Platform: x86_64-kvm_x86_64-r0 HwSKU: Mellanox-SN2700 ASIC: vs ASIC Count: 1 Serial Number: N/A Model Number: N/A Hardware Revision: N/A root@23c9ba83b0aa:/# env PLATFORM=x86_64-kvm_x86_64-r0 HOSTNAME=23c9ba83b0aa PWD=/ HOME=/root TERM=xterm HWSKU=Mellanox-SN2700 SHLVL=1 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin DEBIAN_FRONTEND=noninteractive _=/usr/bin/env root@23c9ba83b0aa:/# Signed-off-by: Sudharsan Dhamal Gopalarathnam <sudharsand@nvidia.com> |
||
|---|---|---|
| .. | ||
| docker-gbsyncd-vs | ||
| docker-sonic-vs | ||
| docker-syncd-vs | ||
| sonic-version | ||
| tests | ||
| create_vnet.sh | ||
| docker-gbsyncd-vs.dep | ||
| docker-gbsyncd-vs.mk | ||
| docker-ptf.dep | ||
| docker-ptf.mk | ||
| docker-sonic-vs.dep | ||
| docker-sonic-vs.mk | ||
| docker-syncd-vs.dep | ||
| docker-syncd-vs.mk | ||
| gbsyncd-vs.mk | ||
| kvm-image.dep | ||
| kvm-image.mk | ||
| libsaithrift-dev.dep | ||
| libsaithrift-dev.mk | ||
| one-image.dep | ||
| one-image.mk | ||
| onie.dep | ||
| onie.mk | ||
| platform.conf | ||
| raw-image.dep | ||
| raw-image.mk | ||
| README.gns3.md | ||
| README.vsdocker.md | ||
| README.vsvm.md | ||
| rules.dep | ||
| rules.mk | ||
| sonic_multiasic.xml | ||
| sonic-gns3a.sh | ||
| sonic-version.dep | ||
| sonic-version.mk | ||
| sonic.xml | ||
| syncd-vs.dep | ||
| syncd-vs.mk | ||
HOWTO Use Virtual Switch (VM)
- Install libvirt, kvm, qemu
sudo apt-get install libvirt-clients qemu-kvm libvirt-bin
- Create SONiC VM for single ASIC HWSKU
$ sudo virsh
Welcome to virsh, the virtualization interactive terminal.
Type: 'help' for help with commands
'quit' to quit
virsh #
virsh # create sonic.xml
Domain sonic created from sonic.xml
virsh #
- Create SONiC VM for multi-ASIC HWSKU
- Based on the number of asics of hwsku, update device/x86_64-kvm_x86_64-r0/asic.conf
NUM_ASIC=<n>
DEV_ID_ASIC_0=0
DEV_ID_ASIC_1=1
DEV_ID_ASIC_2=2
DEV_ID_ASIC_3=3
..
DEV_ID_ASIC_<n-1>=<n-1>
For example, a four asic VS asic.conf will be:
NUM_ASIC=4
DEV_ID_ASIC_0=0
DEV_ID_ASIC_1=1
DEV_ID_ASIC_2=2
DEV_ID_ASIC_3=3
-
Create a topology.sh script which will create the internal asic topology for the specific hwsku. For example, for msft_multi_asic_vs: https://github.com/Azure/sonic-buildimage/blob/master/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/topology.sh
-
With the updated asic.conf and topology.sh, build sonic-vs.img which can be used to bring up multi-asic virtual switch.
-
Update platform/vs/sonic_multiasic.xml with higher memory and vcpu as required.
- For 4-asic vs platform msft_four_asic_vs hwsku, 8GB memory and 10vCPUs.
- For 7-ASIC vs platform msft_multi_asic_vs hwsku, 8GB and 16vCPUs.
-
Update the number of front-panel interfaces in sonic_multliasic.xml
- For 4-ASIC vs platform, 8 front panel interfaces.
- For 6-ASIC vs platform, 64 front panel interfaces.
-
With multi-asic sonic_vs.img and sonic_multiasic.xml file, bring up multi-asic vs as:
$ sudo virsh
Welcome to virsh, the virtualization interactive terminal.
Type: 'help' for help with commands
'quit' to quit
virsh #
virsh # create sonic_multiasic.xml
Domain sonic created from sonic.xml
virsh #
-
Steps to convert a prebuilt single asic sonic-vs.img:
- Use the updated sonic_multiasic.xml file and bring up virtual switch.
- Update /usr/share/sonic/device/x86_64-kvm_x86_64-r0/asic.conf as above.
- Add topology.sh in /usr/share/sonic/device/x86_64-kvm_x86_64-r0/
- stop database service and remove database docker, so that when vs is
rebooted, database_global.json is created with the right namespaces.
- systemctl stop database
- docker rm database
- sudo reboot
- Once rebooted, VS should be multi-asic VS.
-
Start topology service.
sudo systemctl start topology.
- Load configuration using minigraph or config_dbs.
-
Access virtual switch:
- Connect SONiC VM via console
$ telnet 127.0.0.1 7000OR
-
Connect SONiC VM via SSH
-
Connect via console (see 3.1 above)
-
Request a new DHCP address
sudo dhclient -v- Connect via SSH
$ ssh -p 3040 admin@127.0.0.1 -