519a1e4a91
* Update sairedis submodule This submodule update needs to be manually done due to build changes done in the sairedis submodule. Specifically, Debian build profiles are now being used instead of dpkg build targets, and dbgsym packages are being used instead of dbg packages. Because of this, there needs to be changes on the sonic-buildimage side for this. This is a reland of #15720, which was reverted in #15995 due to the RPC package build failing. That failure has since been fixed, and the PR pipeline has been updated to build the RPC package so that this is checked at the PR stage. This submodule update brings in the following changes: ``` 4dbdb21 Fix RPC package build failure due to shell syntax issue (#1268) 588d596 Make sure new binaries replace existing binaries in docker-sonic-vs (#1269) ce8f642 [vs] Use boost join to concatenate switch types in config (#1266) d6055a2 [vslib]: Temporaily map DPU switch type to NVDA_MBF2H536C (#1259) e1cdb4d [CodeQL]: Use dependencies with relevant versions in azp template. (#1262) c08f9a2 [CI]: Fix collect log error in azp template. (#1260) eed856c [CodeQL]: Fix syncd compilation in azp template. (#1261) a3f1f1a Reland 'Make changes to building and packaging sairedis (#1116)' (#1194) ``` Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> * Update sairedis submodule with the fix for the RPC package build Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> --------- Signed-off-by: Saikrishna Arcot <sarcot@microsoft.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-sai.dep | ||
docker-ptf-sai.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 7000
OR
-
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
-