[swss]: Generate config files for Everflow and IPinIP from minigraph #507

oleksandrivantsiv · 2017-04-14T18:24:51Z

Add Everflow DST IP to minigraph file
Extend minigraph.py to support Everflow
Add templates file for Everflow and IPinIP configuration
Add config.sh for swss docker to generate config files

- Add Everflow DST IP to minigraph file - Extend minigraph.py to support Everflow - Add templates file for Everflow and IPinIP configuration - Add config.sh for swss docker to generate config files

oleksandrivantsiv · 2017-04-14T18:25:58Z

Tests for template files will be added on Monday in separated commit or PR

taoyl-ms · 2017-04-19T00:48:27Z

dockers/docker-orchagent/Dockerfile.j2


 ## Clean up
 RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
 RUN rm -rf /debs

-ENTRYPOINT ["/bin/bash"]
-CMD ["/usr/bin/start.sh"]
+ENTRYPOINT ["/bin/bash", "-c"]


@marian-pritsak has a PR #441 that merges config.sh and start.sh back into a single file. I don't exactly know his reason, but I'll suggest you sync with him to see if he has any concern on using two scripts instead of one.

taoyl-ms · 2017-04-19T01:01:38Z

Will merge this after we verified it on other platforms.

taoyl-ms · 2017-04-19T03:05:46Z

dockers/docker-orchagent/config.sh

+
+mkdir -p /etc/swss/config.d/
+
+sonic-cfggen -m /etc/sonic/minigraph.xml -t /usr/share/sonic/templates/ipinip.json.j2 > /etc/swss/config.d/ipinip.json


I think we need to support the case that ErspanDestinationIpv4 is not defined in minigraph as well. Current implementation will generate an illegal json therefore crashes docker-orchagent.

lguohan · 2017-04-21T00:06:17Z

Hi marian, can you separate this into two PR, one for IP-in-IP and one for everflow. We are validating them separately.

sihuihan88

Could you separate the everflow and ipinip into separate PRs? We could merge the IpInIp part first after the change.

sihuihan88 · 2017-04-20T19:08:30Z

dockers/docker-orchagent/ipinip.json.j2

+            "tunnel_type":"IPINIP",
+            "src_ip":"{{ minigraph_lo_interfaces[0]['addr'] }}",
+            "dst_ip":"{{ minigraph_lo_interfaces[0]['addr'] }}",
+            "dscp_mode":"uniform",


Could you change the dscp_mode to pipe? And validate whether it will work on mlnx platform as well if possible?

pipe currently is not supported on Mellanox platforms. Will left it "uniform" for Mellanox platform and pipe for other

yes, please change broadcom platform to pipe mode. use the asic_type.

oleksandrivantsiv · 2017-04-21T06:16:24Z

I can't simply separate ipinip and everflow. Both depends on the same file (start.sh, config.sh). I can remove everflow from this PR. Do you have any problems with it? I don't understand how it affects ipinip validation.

taoyl-ms · 2017-04-21T06:24:47Z

There is a bug in SWSS now which causes creating mirror session crashes on BRCM platform. Therefore we are blocked from merging this PR. That was the reason why Guohan and Sihui suggested to split ipinip and mirroring as we'll be able to merge ipinip first then.

Anyway, as we already located the bug today, I think I can try to fix the bug in mirroring asap and we can merge this PR after that.

taoyl-ms · 2017-04-21T21:28:06Z

Will merge this PR now. Will submit another PR to use asic_type instead of minigraph_hwsku.

taoyl-ms · 2017-04-21T21:40:55Z

See #527.

Submodule src/sonic-utilities 6aee909..79a0185: > [fast/warm reboot] add some sanity check before warm reboot (sonic-net#510) > In sync with our latest change, where we default failthrough to be False. (sonic-net#507) > [generate_dump] system dump improvements (sonic-net#503) Signed-off-by: Ying Xie <ying.xie@microsoft.com>

Submodule src/sonic-utilities 6aee909..79a0185: > [fast/warm reboot] add some sanity check before warm reboot (#510) > In sync with our latest change, where we default failthrough to be False. (#507) > [generate_dump] system dump improvements (#503) Signed-off-by: Ying Xie <ying.xie@microsoft.com>

Submodule src/sonic-utilities 6ee0aea..b531934: > [db migrator] Introduce the DB migration infrastructure (sonic-net#519) > Skip INTERFACE entries w/o prefix (sonic-net#477) > Bring queue storm status to 'pfcwd show stats' (sonic-net#500) > Align PSU DB count field with the schema Spec. (sonic-net#509) > [scripts] remove duplicate script copying for nbrshow (sonic-net#517) > If fast-reboot-dump gives an error, don't continue with fast-reboot (sonic-net#515) > load_minigraph: restart hostcfgd (sonic-net#511) > [fast/warm reboot] add some sanity check before warm reboot (sonic-net#510) > show BPS, PPS, UTIL rates w/o previous clear (sonic-net#508) > In sync with our latest change, where we default failthrough to be False. (sonic-net#507) > Add warm-boot feature processing for wedge100bf_32x/65x platforms (sonic-net#485) > [generate_dump] system dump improvements (sonic-net#503) > [neighbor advertiser] convert int to string before concatenating (sonic-net#505) Signed-off-by: Ying Xie <ying.xie@microsoft.com>

Submodule src/sonic-utilities 6ee0aea..b531934: > [db migrator] Introduce the DB migration infrastructure (#519) > Skip INTERFACE entries w/o prefix (#477) > Bring queue storm status to 'pfcwd show stats' (#500) > Align PSU DB count field with the schema Spec. (#509) > [scripts] remove duplicate script copying for nbrshow (#517) > If fast-reboot-dump gives an error, don't continue with fast-reboot (#515) > load_minigraph: restart hostcfgd (#511) > [fast/warm reboot] add some sanity check before warm reboot (#510) > show BPS, PPS, UTIL rates w/o previous clear (#508) > In sync with our latest change, where we default failthrough to be False. (#507) > Add warm-boot feature processing for wedge100bf_32x/65x platforms (#485) > [generate_dump] system dump improvements (#503) > [neighbor advertiser] convert int to string before concatenating (#505) Signed-off-by: Ying Xie <ying.xie@microsoft.com>

Submodule src/sonic-utilities 6ee0aea..b531934: > [db migrator] Introduce the DB migration infrastructure (sonic-net#519) > Skip INTERFACE entries w/o prefix (sonic-net#477) > Bring queue storm status to 'pfcwd show stats' (sonic-net#500) > Align PSU DB count field with the schema Spec. (sonic-net#509) > [scripts] remove duplicate script copying for nbrshow (sonic-net#517) > If fast-reboot-dump gives an error, don't continue with fast-reboot (sonic-net#515) > load_minigraph: restart hostcfgd (sonic-net#511) > [fast/warm reboot] add some sanity check before warm reboot (sonic-net#510) > show BPS, PPS, UTIL rates w/o previous clear (sonic-net#508) > In sync with our latest change, where we default failthrough to be False. (sonic-net#507) > Add warm-boot feature processing for wedge100bf_32x/65x platforms (sonic-net#485) > [generate_dump] system dump improvements (sonic-net#503) > [neighbor advertiser] convert int to string before concatenating (sonic-net#505) Signed-off-by: Ying Xie <ying.xie@microsoft.com>

…lse. (sonic-net#507) Reference: Pull request sonic-net#2746

Signed-off-by: Guohan Lu <gulv@microsoft.com>

[swss]: Generate config files for Everflow and IPinIP from minigraph

132759b

- Add Everflow DST IP to minigraph file - Extend minigraph.py to support Everflow - Add templates file for Everflow and IPinIP configuration - Add config.sh for swss docker to generate config files

[sonic-config-engine]: Add tests for IPinIP and Everflow templates.

608094d

taoyl-ms reviewed Apr 19, 2017

View reviewed changes

taoyl-ms approved these changes Apr 19, 2017

View reviewed changes

taoyl-ms suggested changes Apr 19, 2017

View reviewed changes

[swss]: Fix review comments.

385f4dd

marian-pritsak approved these changes Apr 19, 2017

View reviewed changes

taoyl-ms approved these changes Apr 19, 2017

View reviewed changes

taoyl-ms requested a review from sihuihan88 April 19, 2017 22:30

sihuihan88 suggested changes Apr 21, 2017

View reviewed changes

taoyl-ms added 5 commits April 21, 2017 13:01

Use "dscp_mode":"pipe" for non-mlnx platforms

fdab84b

"dscp_mode":"pipe" in test sample

0e733f1

Use "queue": "0" for brcm platform

628bff4

"queue": "0" in test sample output

30346df

Merge branch 'master' into master

8d22a69

sihuihan88 approved these changes Apr 21, 2017

View reviewed changes

taoyl-ms merged commit c7ea347 into sonic-net:master Apr 21, 2017

yxieca mentioned this pull request Apr 16, 2019

[201811][utilities] advance sonic-utilities submodule #2792

Merged

yxieca mentioned this pull request Apr 30, 2019

[sonic-utilities] advance submodule head to latest #2842

Merged

Kalimuthu-Velappan pushed a commit to Kalimuthu-Velappan/sonic-buildimage that referenced this pull request Sep 12, 2019

In sync with our latest change, where we default failthrough to be Fa…

74cca9e

…lse. (sonic-net#507) Reference: Pull request sonic-net#2746

madhanmellanox pushed a commit to madhanmellanox/sonic-buildimage that referenced this pull request Mar 23, 2020

[test]: add portchannel vs test (sonic-net#507)

1ac125e

Signed-off-by: Guohan Lu <gulv@microsoft.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[swss]: Generate config files for Everflow and IPinIP from minigraph #507

[swss]: Generate config files for Everflow and IPinIP from minigraph #507

oleksandrivantsiv commented Apr 14, 2017

oleksandrivantsiv commented Apr 14, 2017

taoyl-ms Apr 19, 2017

taoyl-ms commented Apr 19, 2017

taoyl-ms Apr 19, 2017 •

edited

Loading

oleksandrivantsiv Apr 19, 2017

lguohan commented Apr 21, 2017

sihuihan88 left a comment

sihuihan88 Apr 20, 2017 •

edited

Loading

oleksandrivantsiv Apr 21, 2017

lguohan Apr 21, 2017

oleksandrivantsiv commented Apr 21, 2017

taoyl-ms commented Apr 21, 2017

taoyl-ms commented Apr 21, 2017

taoyl-ms commented Apr 21, 2017


		mkdir -p /etc/swss/config.d/

		sonic-cfggen -m /etc/sonic/minigraph.xml -t /usr/share/sonic/templates/ipinip.json.j2 > /etc/swss/config.d/ipinip.json

[swss]: Generate config files for Everflow and IPinIP from minigraph #507

[swss]: Generate config files for Everflow and IPinIP from minigraph #507

Conversation

oleksandrivantsiv commented Apr 14, 2017

oleksandrivantsiv commented Apr 14, 2017

taoyl-ms Apr 19, 2017

Choose a reason for hiding this comment

taoyl-ms commented Apr 19, 2017

taoyl-ms Apr 19, 2017 • edited Loading

Choose a reason for hiding this comment

oleksandrivantsiv Apr 19, 2017

Choose a reason for hiding this comment

lguohan commented Apr 21, 2017

sihuihan88 left a comment

Choose a reason for hiding this comment

sihuihan88 Apr 20, 2017 • edited Loading

Choose a reason for hiding this comment

oleksandrivantsiv Apr 21, 2017

Choose a reason for hiding this comment

lguohan Apr 21, 2017

Choose a reason for hiding this comment

oleksandrivantsiv commented Apr 21, 2017

taoyl-ms commented Apr 21, 2017

taoyl-ms commented Apr 21, 2017

taoyl-ms commented Apr 21, 2017

taoyl-ms Apr 19, 2017 •

edited

Loading

sihuihan88 Apr 20, 2017 •

edited

Loading