[chassis]: support virtual-chassis setup in vs docker by BrynXu · Pull Request #4709 · sonic-net/sonic-buildimage

BrynXu · 2020-06-05T01:12:17Z

virtual-chassis test uses multiple vs instances to simulate a
modular switch and a redis-chassis service is required to run in
the vs instance that represents a supervisor card.
This change allows vs docker start redis-chassis service according
to external config file.

Signed-off-by: Honggang Xu hxu@arista.com

- Why I did it
To support virtual-chassis setup, so that we can test distributed forwarding feature in virtual sonic environment, see Distributed forwarding in a VOQ architecture HLD pull request at sonic-net/SONiC#622

- How I did it
The sonic-vs start.sh is enhanced to start new redis_chassis service if external chassis config file found. The config file doesn't exist in current vs environment, start.sh will behave like before.

- How to verify it
The swss/test still pass. The chassis_db service is verified in virtual-chassis topology and tests which are in following PRs.

- Description for the changelog
[vs] support chassis_db service in vs

- A picture of a cute animal (not mandatory but encouraged)

ghost · 2020-06-05T01:12:29Z

All CLA requirements met.

lgtm-com · 2020-06-10T01:52:38Z

This pull request introduces 3 alerts when merging ca4b79aa358ecdd7e252bb870560413dd130c892 into f31eabb - view on LGTM.com

new alerts:

3 for Unused import

lguohan · 2020-06-10T22:18:08Z

retest baseimage please

BrynXu · 2020-06-10T23:18:34Z

retest vsimage please

BrynXu · 2020-06-11T02:06:28Z

retest vsimage please

daall

See comments/questions.

platform/vs/docker-sonic-vs/Dockerfile.j2

platform/vs/docker-sonic-vs.mk

platform/vs/docker-sonic-vs/chassis_db.py

platform/vs/docker-sonic-vs/default_chassis_cfg.json

platform/vs/docker-sonic-vs/chassis_db.py

platform/vs/docker-sonic-vs/start.sh

platform/vs/docker-sonic-vs/remove_chassisdb_config

lgtm-com · 2020-07-07T00:53:16Z

This pull request introduces 1 alert when merging 10042701d68e35f2cfb76bf208ab88f9908cff02 into 31baf38 - view on LGTM.com

new alerts:

1 for Suspicious unused loop iteration variable

lgtm-com · 2020-07-07T06:19:09Z

This pull request introduces 1 alert when merging 8ed1c4bf2839e71a2b70446d6117cecfc527c07d into fa885c9 - view on LGTM.com

new alerts:

1 for Suspicious unused loop iteration variable

lgtm-com · 2020-07-07T19:44:12Z

This pull request introduces 1 alert when merging aa7d4155aa1e73bfddd8e68eeaa7c5d0d8a3019b into fa885c9 - view on LGTM.com

new alerts:

1 for Suspicious unused loop iteration variable

sonic-net/sonic-buildimage#4709 is a PR for create/delete a virtual chassis. Similar to create_vnet.sh, virtual_chassis.py is used to create the virtual chassis test environment. The changes here are to 1. Add a test_virtual_chassis.py to verify the virtual chassis 2. support virtual chassis topology in conftest.py to run the test_virtual_chassis.py. Notable changes in conftest.py are * Unlike create_vnet, virtual_chassis does not use a sw container. * New DockerVirtualChassisTopology class to setup the connections when the vitual chassis containers restart.

device/virtual/x86_64-kvm_x86_64-r0/virtual_chassis/virtual_chassis.py

daall

See comments.

Also, I think for this PR it is OK but I think we should try to figure out how to use a template or something to generate the config files for the different SONiC instances. There's a lot of overlap and this might become tricky to maintain if we expand to more line cards, multiple supervisors, etc. in the future.

device/virtual/x86_64-kvm_x86_64-r0/virtual_chassis/virtual_chassis.py

device/virtual/x86_64-kvm_x86_64-r0/virtual_chassis/topology_nbr.json

device/virtual/x86_64-kvm_x86_64-r0/virtual_chassis/common/port_config.ini

platform/vs/docker-sonic-vs/start.sh

virtual-chassis test uses multiple vs instances to simulate a modular switch and a redis-chassis service is required to run on the vs instance that represents a supervisor card. This change allows vs docker start redis-chassis service according to external config file. Signed-off-by: Honggang Xu <hxu@arista.com> (cherry picked from commit c1d45cf81ce3238be2dcbccae98c0780944981ce)

daall

@BrynXu @saravanansv @eswaranb LGTM, have you guys already run the pizza-box VS tests with this newly updated VS docker image?

BrynXu · 2020-07-21T20:52:07Z

retest vsimage please

@BrynXu @saravanansv @eswaranb LGTM, have you guys already run the pizza-box VS tests with this newly updated VS docker image?

yes, we run both pizza-box vs swss tests and virtual-chassis tests with docker vs image built with this PR.

BrynXu changed the title ~~[vs]: support virtual-chassis setup in vs docker~~ [chassis]: support virtual-chassis setup in vs docker Jun 6, 2020

BrynXu force-pushed the vschassisdb branch from 1b7ff7e to ca4b79a Compare June 10, 2020 01:38

BrynXu force-pushed the vschassisdb branch 2 times, most recently from 031a2d8 to 86072d9 Compare June 10, 2020 17:11

BrynXu force-pushed the vschassisdb branch from 86072d9 to 3ac2abf Compare June 12, 2020 05:30

lguohan requested a review from daall June 22, 2020 22:36

daall suggested changes Jun 24, 2020

View reviewed changes

BrynXu force-pushed the vschassisdb branch from 3ac2abf to 198eedd Compare June 25, 2020 01:32

daall added the Chassis 🤖 Modular chassis support label Jun 26, 2020

daall reviewed Jun 26, 2020

View reviewed changes

platform/vs/docker-sonic-vs/remove_chassisdb_config Outdated Show resolved Hide resolved

BrynXu force-pushed the vschassisdb branch 5 times, most recently from 459c97c to 1004270 Compare July 7, 2020 00:39

BrynXu force-pushed the vschassisdb branch from 1004270 to 8ed1c4b Compare July 7, 2020 06:04

BrynXu force-pushed the vschassisdb branch from 8ed1c4b to aa7d415 Compare July 7, 2020 19:29

BrynXu force-pushed the vschassisdb branch 2 times, most recently from fc10ce4 to 8264c88 Compare July 8, 2020 01:43

saravanansv mentioned this pull request Jul 8, 2020

[chassis]:sonic-swss test changes for Virtual chassis sonic-net/sonic-swss#1345

Merged

daall reviewed Jul 8, 2020

View reviewed changes

device/virtual/x86_64-kvm_x86_64-r0/virtual_chassis/virtual_chassis.py Outdated Show resolved Hide resolved

daall reviewed Jul 8, 2020

View reviewed changes

daall requested a review from lguohan July 8, 2020 20:19

eswaranb reviewed Jul 8, 2020

View reviewed changes

device/virtual/x86_64-kvm_x86_64-r0/virtual_chassis/topology_nbr.json Outdated Show resolved Hide resolved

eswaranb reviewed Jul 8, 2020

View reviewed changes

device/virtual/x86_64-kvm_x86_64-r0/virtual_chassis/common/port_config.ini Outdated Show resolved Hide resolved

eswaranb reviewed Jul 8, 2020

View reviewed changes

platform/vs/docker-sonic-vs/start.sh Outdated Show resolved Hide resolved

BrynXu force-pushed the vschassisdb branch 5 times, most recently from e8ae74d to c1d45cf Compare July 10, 2020 22:53

qiluo-msft force-pushed the master branch from 13769f9 to 39941f0 Compare July 12, 2020 18:13

BrynXu force-pushed the vschassisdb branch from 27ce5db to dfaf0cd Compare July 14, 2020 21:29

eswaranb reviewed Jul 15, 2020

View reviewed changes

platform/vs/docker-sonic-vs/start.sh Outdated Show resolved Hide resolved

BrynXu force-pushed the vschassisdb branch from dfaf0cd to 207fdca Compare July 16, 2020 00:17

daall self-requested a review July 18, 2020 02:50

BrynXu force-pushed the vschassisdb branch from 207fdca to 6dda957 Compare July 21, 2020 17:16

daall approved these changes Jul 21, 2020

View reviewed changes

lguohan merged commit 311045f into sonic-net:master Jul 29, 2020

BrynXu mentioned this pull request Aug 31, 2020

[ChassisDB]: bring up ChassisDB service #5283

Merged

3 tasks

Conversation

BrynXu commented Jun 5, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ghost commented Jun 5, 2020 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lgtm-com bot commented Jun 10, 2020

Uh oh!

lguohan commented Jun 10, 2020

Uh oh!

BrynXu commented Jun 10, 2020

Uh oh!

BrynXu commented Jun 11, 2020

Uh oh!

daall left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lgtm-com bot commented Jul 7, 2020

Uh oh!

lgtm-com bot commented Jul 7, 2020

Uh oh!

lgtm-com bot commented Jul 7, 2020

Uh oh!

Uh oh!

daall left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

daall left a comment

Choose a reason for hiding this comment

Uh oh!

BrynXu commented Jul 21, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

BrynXu commented Jun 5, 2020 •

edited

Loading

ghost commented Jun 5, 2020 •

edited by ghost

Loading