Skip to content

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

Merged
taoyl-ms merged 8 commits intosonic-net:masterfrom
oleksandrivantsiv:master
Apr 21, 2017
Merged

[swss]: Generate config files for Everflow and IPinIP from minigraph#507
taoyl-ms merged 8 commits intosonic-net:masterfrom
oleksandrivantsiv:master

Conversation

@oleksandrivantsiv
Copy link
Copy Markdown
Collaborator

@oleksandrivantsiv 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

@oleksandrivantsiv
[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
@oleksandrivantsiv
Copy link
Copy Markdown
Collaborator Author

oleksandrivantsiv commented Apr 14, 2017

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

taoyl-ms
taoyl-ms reviewed Apr 19, 2017
View reviewed changes
dockers/docker-orchagent/Dockerfile.j2 Outdated

ENTRYPOINT ["/bin/bash"]
CMD ["/usr/bin/start.sh"]
ENTRYPOINT ["/bin/bash", "-c"]
Copy link
Copy Markdown
Contributor

@taoyl-ms taoyl-ms Apr 19, 2017

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.

@taoyl-ms
Copy link
Copy Markdown
Contributor

taoyl-ms commented Apr 19, 2017

Will merge this after we verified it on other platforms.

taoyl-ms
taoyl-ms suggested changes Apr 19, 2017
View reviewed changes
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
Copy link
Copy Markdown
Contributor

@taoyl-ms taoyl-ms Apr 19, 2017 •
edited
Loading

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.

Copy link
Copy Markdown
Collaborator Author

@oleksandrivantsiv oleksandrivantsiv Apr 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@taoyl-ms taoyl-ms requested a review from sihuihan88 April 19, 2017 22:30
@lguohan
Copy link
Copy Markdown
Collaborator

lguohan commented Apr 21, 2017

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

sihuihan88
sihuihan88 suggested changes Apr 21, 2017
View reviewed changes
Copy link
Copy Markdown
Contributor

@sihuihan88 sihuihan88 left a 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.

dockers/docker-orchagent/ipinip.json.j2 Outdated
"tunnel_type":"IPINIP",
"src_ip":"{{ minigraph_lo_interfaces[0]['addr'] }}",
"dst_ip":"{{ minigraph_lo_interfaces[0]['addr'] }}",
"dscp_mode":"uniform",
Copy link
Copy Markdown
Contributor

@sihuihan88 sihuihan88 Apr 20, 2017 •
edited
Loading

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?

Copy link
Copy Markdown
Collaborator Author

@oleksandrivantsiv oleksandrivantsiv Apr 21, 2017

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

Copy link
Copy Markdown
Collaborator

@lguohan lguohan Apr 21, 2017

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.

@oleksandrivantsiv
Copy link
Copy Markdown
Collaborator Author

oleksandrivantsiv commented Apr 21, 2017

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
Copy link
Copy Markdown
Contributor

taoyl-ms commented Apr 21, 2017

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
Copy link
Copy Markdown
Contributor

taoyl-ms commented Apr 21, 2017

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

@taoyl-ms taoyl-ms merged commit c7ea347 into sonic-net:master Apr 21, 2017
@taoyl-ms
Copy link
Copy Markdown
Contributor

taoyl-ms commented Apr 21, 2017

See #527.

yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Apr 16, 2019
@yxieca
[201811][utilities] advance sonic-utilities submodule
af89110 
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>
@yxieca yxieca mentioned this pull request Apr 16, 2019
Merged
yxieca added a commit that referenced this pull request Apr 16, 2019
@yxieca
[201811][utilities] advance sonic-utilities submodule (#2792)
543aec6 
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>
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Apr 30, 2019
@yxieca
[sonic-utilities] advance submodule head to latest
a4e7a83 
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>
@yxieca yxieca mentioned this pull request Apr 30, 2019
Merged
yxieca added a commit that referenced this pull request Apr 30, 2019
@yxieca
[sonic-utilities] advance submodule head to latest (#2842)
df45a77 
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>
MichelMoriniaux pushed a commit to criteo-forks/sonic-buildimage that referenced this pull request May 28, 2019
@yxieca @MichelMoriniaux
[sonic-utilities] advance submodule head to latest (sonic-net#2842)
d8bcec3 
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>
Kalimuthu-Velappan pushed a commit to Kalimuthu-Velappan/sonic-buildimage that referenced this pull request Sep 12, 2019
@renukamanavalan
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
@lguohan
[test]: add portchannel vs test (sonic-net#507)
1ac125e 
Signed-off-by: Guohan Lu <gulv@microsoft.com>
jon-nokia pushed a commit to jon-nokia/sonic-buildimage that referenced this pull request Jan 10, 2025
@abdosi
Merge pull request sonic-net#507 from abdosi/counter
c5fba9c 
What I did:

Changes to increase poll interval 10sec for port counter on supervisor.
Reducing poll interval decreases cpu load as on packet chassis we can
have 600+ ethernet backplane ports.

For voq chaassis it is no-op as their is no ethernet port

How I verify:
Manual Verification of syncd cpu usage goes down.
Counter working fine.
mssonicbld added a commit that referenced this pull request Nov 28, 2025
@mssonicbld
[submodule] Update submodule sonic-gnmi to the latest HEAD automatica…
1c0c84b 
…lly (#24623)

#### Why I did it
src/sonic-gnmi
```
* 5a62935 - (HEAD -> master, origin/master, origin/HEAD) gNOI: Add gNMI Server changes for Healthz Acknowledge RPC (#509) (25 hours ago) [jayaragini-hcl]
* ca045ea - Add support for ACL counter (#540) (2 days ago) [Feng-msft]
* 4a5afd4 - gNOI: Add support for Healthz List and Check RPC (#487) (2 days ago) [jayaragini-hcl]
* 08f7266 - gNOI: Add gNMI Server changes for Healthz Get RPC (#507) (2 days ago) [jayaragini-hcl]
```
#### How I did it
#### How to verify it
#### Description for the changelog
hdwhdw pushed a commit to hdwhdw/sonic-buildimage that referenced this pull request Dec 2, 2025
@mssonicbld @hdwhdw
[submodule] Update submodule sonic-gnmi to the latest HEAD automatica…
ee2d8dd 
…lly (sonic-net#24623)

#### Why I did it
src/sonic-gnmi
```
* 5a62935 - (HEAD -> master, origin/master, origin/HEAD) gNOI: Add gNMI Server changes for Healthz Acknowledge RPC (sonic-net#509) (25 hours ago) [jayaragini-hcl]
* ca045ea - Add support for ACL counter (sonic-net#540) (2 days ago) [Feng-msft]
* 4a5afd4 - gNOI: Add support for Healthz List and Check RPC (sonic-net#487) (2 days ago) [jayaragini-hcl]
* 08f7266 - gNOI: Add gNMI Server changes for Healthz Get RPC (sonic-net#507) (2 days ago) [jayaragini-hcl]
```
#### How I did it
#### How to verify it
#### Description for the changelog
NavdhaJindal pushed a commit to NavdhaJindal/sonic-buildimage that referenced this pull request Dec 2, 2025
@mssonicbld @NavdhaJindal
[submodule] Update submodule sonic-gnmi to the latest HEAD automatica…
3b0fa93 
…lly (sonic-net#24623)

#### Why I did it
src/sonic-gnmi
```
* 5a62935 - (HEAD -> master, origin/master, origin/HEAD) gNOI: Add gNMI Server changes for Healthz Acknowledge RPC (sonic-net#509) (25 hours ago) [jayaragini-hcl]
* ca045ea - Add support for ACL counter (sonic-net#540) (2 days ago) [Feng-msft]
* 4a5afd4 - gNOI: Add support for Healthz List and Check RPC (sonic-net#487) (2 days ago) [jayaragini-hcl]
* 08f7266 - gNOI: Add gNMI Server changes for Healthz Get RPC (sonic-net#507) (2 days ago) [jayaragini-hcl]
```
#### How I did it
#### How to verify it
#### Description for the changelog

Signed-off-by: Navdha Jindal <navdhajindal@microsoft.com>
FengPan-Frank pushed a commit to FengPan-Frank/sonic-buildimage that referenced this pull request Dec 4, 2025
@mssonicbld @FengPan-Frank
[submodule] Update submodule sonic-gnmi to the latest HEAD automatica…
9a886e4 
…lly (sonic-net#24623)

#### Why I did it
src/sonic-gnmi
```
* 5a62935 - (HEAD -> master, origin/master, origin/HEAD) gNOI: Add gNMI Server changes for Healthz Acknowledge RPC (sonic-net#509) (25 hours ago) [jayaragini-hcl]
* ca045ea - Add support for ACL counter (sonic-net#540) (2 days ago) [Feng-msft]
* 4a5afd4 - gNOI: Add support for Healthz List and Check RPC (sonic-net#487) (2 days ago) [jayaragini-hcl]
* 08f7266 - gNOI: Add gNMI Server changes for Healthz Get RPC (sonic-net#507) (2 days ago) [jayaragini-hcl]
```
#### How I did it
#### How to verify it
#### Description for the changelog

Signed-off-by: Feng Pan <fenpan@microsoft.com>
xwjiang-ms pushed a commit to xwjiang-ms/sonic-buildimage that referenced this pull request Dec 22, 2025
@mssonicbld @xwjiang-ms
[submodule] Update submodule sonic-gnmi to the latest HEAD automatica…
553a6a6 
…lly (sonic-net#24623)

#### Why I did it
src/sonic-gnmi
```
* 5a62935 - (HEAD -> master, origin/master, origin/HEAD) gNOI: Add gNMI Server changes for Healthz Acknowledge RPC (sonic-net#509) (25 hours ago) [jayaragini-hcl]
* ca045ea - Add support for ACL counter (sonic-net#540) (2 days ago) [Feng-msft]
* 4a5afd4 - gNOI: Add support for Healthz List and Check RPC (sonic-net#487) (2 days ago) [jayaragini-hcl]
* 08f7266 - gNOI: Add gNMI Server changes for Healthz Get RPC (sonic-net#507) (2 days ago) [jayaragini-hcl]
```
#### How I did it
#### How to verify it
#### Description for the changelog

Signed-off-by: xiaweijiang <xiaweijiang@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lguohan lguohan lguohan left review comments

@marian-pritsak marian-pritsak marian-pritsak approved these changes

+2 more reviewers

@taoyl-ms taoyl-ms taoyl-ms approved these changes

@sihuihan88 sihuihan88 sihuihan88 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@oleksandrivantsiv @taoyl-ms @lguohan @marian-pritsak @sihuihan88