-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
[swss]: Generate config files for Everflow and IPinIP from minigraph #507
Conversation
oleksandrivantsiv
commented
Apr 14, 2017
- 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
Tests for template files will be added on Monday in separated commit or PR |
|
||
## 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"] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@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.
Will merge this after we verified it on other platforms. |
|
||
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
Hi marian, can you separate this into two PR, one for IP-in-IP and one for everflow. We are validating them separately. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you separate the everflow and ipinip into separate PRs? We could merge the IpInIp part first after the change.
"tunnel_type":"IPINIP", | ||
"src_ip":"{{ minigraph_lo_interfaces[0]['addr'] }}", | ||
"dst_ip":"{{ minigraph_lo_interfaces[0]['addr'] }}", | ||
"dscp_mode":"uniform", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you change the dscp_mode to pipe? And validate whether it will work on mlnx platform as well if possible?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pipe currently is not supported on Mellanox platforms. Will left it "uniform" for Mellanox platform and pipe for other
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, please change broadcom platform to pipe mode. use the asic_type.
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. |
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. |
Will merge this PR now. Will submit another PR to use asic_type instead of minigraph_hwsku. |
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 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>