Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[bgp] Save bgp admin state #690

Merged
merged 6 commits into from
Jun 12, 2017
Merged

[bgp] Save bgp admin state #690

merged 6 commits into from
Jun 12, 2017

Conversation

taoyl-ms
Copy link
Contributor

@taoyl-ms taoyl-ms commented Jun 9, 2017

No description provided.

@taoyl-ms taoyl-ms requested a review from lguohan June 9, 2017 01:32
stcheng
stcheng reviewed Jun 9, 2017
View reviewed changes
dockers/docker-fpm-quagga/start.sh
@@ -1,7 +1,11 @@
#!/usr/bin/env bash

mkdir -p /etc/quagga
sonic-cfggen -m /etc/sonic/minigraph.xml -t /usr/share/sonic/templates/bgpd.conf.j2 > /etc/quagga/bgpd.conf
if [ -f /etc/sonic/bgp_admin.yml ]; then
sonic-cfggen -m /etc/sonic/minigraph.xml -y /etc/sonic/bgp_admin.yml -t /usr/share/sonic/templates/bgpd.conf.j2 > /etc/quagga/bgpd.conf
Copy link
Contributor

Choose a reason for hiding this comment

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

a sample file of bgp_admin.yml file could be provided in sonic-cfggen tests folder.

lguohan
lguohan reviewed Jun 9, 2017
View reviewed changes
dockers/docker-fpm-quagga/base_image_files/bgp_neighbor Outdated

[ -f /etc/sonic/bgp_admin.yml ] || echo "bgp_admin_state:" > /etc/sonic/bgp_admin.yml

if [ "$NEIGHBOR_IP" == "0.0.0.0" ] ; then
Copy link
Collaborator

Choose a reason for hiding this comment

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

add comment: "shutdown down all ipv4 neighbors when "neighbor_ip" = 0.0.0.0

lguohan
lguohan reviewed Jun 9, 2017
View reviewed changes
dockers/docker-fpm-quagga/base_image_files/bgp_neighbor Outdated
usage
fi

ASN=`vtysh -c "show ip bgp su" | sed -n "s/.*AS number \([0-9]\+\).*/\1/p"`
Copy link
Collaborator

Choose a reason for hiding this comment

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

can we use the full names here. su -> summary

@lguohan
Copy link
Collaborator

lguohan commented Jun 9, 2017

why not change this file https://github.com/Azure/sonic-utilities/blob/master/config/main.py to add bgp neighbor shut/unshut functionality? why add another script to do this? I feel this utilities should be part of sonic-utilities.

@taoyl-ms
Copy link
Contributor Author

taoyl-ms commented Jun 9, 2017

I agree. Planned to add into sonic-utilities later.

@taoyl-ms taoyl-ms closed this Jun 9, 2017
@taoyl-ms taoyl-ms reopened this Jun 9, 2017
@taoyl-ms
Copy link
Contributor Author

taoyl-ms commented Jun 9, 2017

Close it by now as we might need more discussion on the default behavior of bgp admin state.

@taoyl-ms taoyl-ms closed this Jun 9, 2017
@taoyl-ms taoyl-ms reopened this Jun 9, 2017
@taoyl-ms
Copy link
Contributor Author

taoyl-ms commented Jun 9, 2017 •
edited
Loading

Set default admin state to ON and add build option to SHUTDOWN_BGP_ON_START to set them as OFF.

@taoyl-ms taoyl-ms changed the title [bgp] Save admin state and set default state to shutdown [bgp] Save bgp admin state Jun 9, 2017
@lguohan lguohan merged commit 5e6620e into sonic-net:master Jun 12, 2017
lguohan added a commit to lguohan/sonic-buildimage that referenced this pull request Nov 22, 2018
@lguohan
update swss and sairedis
82ee6f0 
sairedis:
 * d146572 2018-11-22 | Fix interface name used on link message using lane map (sonic-net#386)

swss:
* c74dc60 2018-11-22 | [vstest]: use eth1~32 as physical interface name in vs docker (sonic-net#700) (HEAD -> master, origin/master, origin/HEAD) [lguohan]
* 6007e7f 2018-11-22 | [portmgrd]: Fix setting default port admin status and MTU (sonic-net#691) [stepanblyschak]
* 6c70f6d 2018-11-22 | [portsorch] Fix port queue index init bug (sonic-net#505) [yangbashuang]
* 70ac79b 2018-11-21 | [gitignore]: Update all binary names in the ignore list (sonic-net#698) [Shuotian Cheng]
* 2a3626c 2018-11-21 | [test]: Remove duplicate legacy ACL tests (sonic-net#699) [Shuotian Cheng]
* 8099811 2018-11-20 | [aclorch]: Remove unnecessary warning message (sonic-net#696) [Shuotian Cheng]
* 63d8ebc 2018-11-18 | [portsorch]: Remove duplicate local variables - port (sonic-net#690) [Shuotian Cheng]
* 28dc042 2018-11-18 | Remove default docker name value of swss. (sonic-net#692) [Jipan Yang]

Signed-off-by: Guohan Lu <gulv@microsoft.com>
lguohan added a commit that referenced this pull request Nov 22, 2018
@lguohan
[vs]: sync changes to disk and add e1000 driver to sonic vm (#2288)
6e71cc7 
* syncd changes to disk and add e1000 driver to sonic vm

* add pg_profile_lookup.ini

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

* update swss and sairedis

sairedis:
 * d146572 2018-11-22 | Fix interface name used on link message using lane map (#386)

swss:
* c74dc60 2018-11-22 | [vstest]: use eth1~32 as physical interface name in vs docker (#700) (HEAD -> master, origin/master, origin/HEAD) [lguohan]
* 6007e7f 2018-11-22 | [portmgrd]: Fix setting default port admin status and MTU (#691) [stepanblyschak]
* 6c70f6d 2018-11-22 | [portsorch] Fix port queue index init bug (#505) [yangbashuang]
* 70ac79b 2018-11-21 | [gitignore]: Update all binary names in the ignore list (#698) [Shuotian Cheng]
* 2a3626c 2018-11-21 | [test]: Remove duplicate legacy ACL tests (#699) [Shuotian Cheng]
* 8099811 2018-11-20 | [aclorch]: Remove unnecessary warning message (#696) [Shuotian Cheng]
* 63d8ebc 2018-11-18 | [portsorch]: Remove duplicate local variables - port (#690) [Shuotian Cheng]
* 28dc042 2018-11-18 | Remove default docker name value of swss. (#692) [Jipan Yang]

Signed-off-by: Guohan Lu <gulv@microsoft.com>
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Oct 3, 2019
@yxieca
[201811][utilities] advance sub module head
0a55df9 
Submodule src/sonic-utilities 2d721de..fb5902f:
  > Revert "[fast reboot] kill teamd docker directly (sonic-net#683)" (sonic-net#690)

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
@yxieca yxieca mentioned this pull request Oct 3, 2019
Merged
yxieca added a commit that referenced this pull request Oct 3, 2019
@yxieca
[201811][utilities] advance sub module head (#3557)
2119205 
Submodule src/sonic-utilities 2d721de..fb5902f:
  > Revert "[fast reboot] kill teamd docker directly (#683)" (#690)

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
madhanmellanox pushed a commit to madhanmellanox/sonic-buildimage that referenced this pull request Mar 23, 2020
@lguohan
[portsorch]: Remove duplicate local variables - port (sonic-net#690)
63d8ebc 
Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
@kcudnik kcudnik mentioned this pull request Dec 5, 2020
Merged
kcudnik added a commit that referenced this pull request Dec 5, 2020
@kcudnik
[sairedis] Advance sairedis pointer to support cmd zmq flag (#6064)
af357f3 
[sairedis] Advance sairedis pointer to support cmd zmq flag

[meta] Use memcpy instead of cast to prevent strict-aliasing error (#723)
[vslib]Add MACsec forward and filters to HostInterfaceInfo (#719)
[vslib] Add StateBase function for MACsec (#717)
Add support for default zmq synchronous mode flag (#711)
[syncd] Code clean (#720)
[sairedis] Remove custom bulk fdb methods (#710)
[vslib]Add MACsec Filters (#713)
[vslib]Add MACsec Forwarder (#714)
[vslib]Add MACsec Manager (#715)
Add helper functions, findObjects and dumpObject (#716)
Code clean refactor (#712)
[vslib] Fix CorePortIndexMap log line (#708)
[meta] Use custom hash in SaiObjectCollection (#709)
Fix LGTM localtime function warnings (#707)
[vs] VoQ Switch objects initialization - Local Port OID mapping to System Ports (#703)
Code style refactor (#705)
[vs] Initialization of VOQ switch objects (#702)
[vs] SAI support for VOQ switches - Switch State Initialization (#701)
Add MACsec meta methods (#704)
[vs] SAI support for VOQ switches (#698)
[vs] SAI support for VOQ switches - Core Port Index Map File parser (#700)
[vs] SAI support for VoQ switch - Core Port Index Map Container (#699)
[syncd][sairedis] Change pub/sub model to push/pull in zmq notification (#695)
[syncd] Use lua script to update db when using bulk api (#690)
[syncd] Fix bulk api object type for next hop group members (#685)
Add FlexCounter for MACsec SA (#684)
santhosh-kt pushed a commit to santhosh-kt/sonic-buildimage that referenced this pull request Feb 25, 2021
@kcudnik @santhosh-kt
[sairedis] Advance sairedis pointer to support cmd zmq flag (sonic-ne…
1183fac 
…t#6064)

[sairedis] Advance sairedis pointer to support cmd zmq flag

[meta] Use memcpy instead of cast to prevent strict-aliasing error (sonic-net#723)
[vslib]Add MACsec forward and filters to HostInterfaceInfo (sonic-net#719)
[vslib] Add StateBase function for MACsec (sonic-net#717)
Add support for default zmq synchronous mode flag (sonic-net#711)
[syncd] Code clean (sonic-net#720)
[sairedis] Remove custom bulk fdb methods (sonic-net#710)
[vslib]Add MACsec Filters (sonic-net#713)
[vslib]Add MACsec Forwarder (sonic-net#714)
[vslib]Add MACsec Manager (sonic-net#715)
Add helper functions, findObjects and dumpObject (sonic-net#716)
Code clean refactor (sonic-net#712)
[vslib] Fix CorePortIndexMap log line (sonic-net#708)
[meta] Use custom hash in SaiObjectCollection (sonic-net#709)
Fix LGTM localtime function warnings (sonic-net#707)
[vs] VoQ Switch objects initialization - Local Port OID mapping to System Ports (sonic-net#703)
Code style refactor (sonic-net#705)
[vs] Initialization of VOQ switch objects (sonic-net#702)
[vs] SAI support for VOQ switches - Switch State Initialization (sonic-net#701)
Add MACsec meta methods (sonic-net#704)
[vs] SAI support for VOQ switches (sonic-net#698)
[vs] SAI support for VOQ switches - Core Port Index Map File parser (sonic-net#700)
[vs] SAI support for VoQ switch - Core Port Index Map Container (sonic-net#699)
[syncd][sairedis] Change pub/sub model to push/pull in zmq notification (sonic-net#695)
[syncd] Use lua script to update db when using bulk api (sonic-net#690)
[syncd] Fix bulk api object type for next hop group members (sonic-net#685)
Add FlexCounter for MACsec SA (sonic-net#684)
stepanblyschak pushed a commit to stepanblyschak/sonic-buildimage that referenced this pull request May 10, 2021
@yxieca
Revert "[fast reboot] kill teamd docker directly (sonic-net#683)" (so…
eb27234 
…nic-net#690)

This reverts commit 592413b.
AidanCopeland pushed a commit to Metaswitch/sonic-buildimage that referenced this pull request Apr 14, 2022
@kcudnik
[syncd] Use lua script to update db when using bulk api (sonic-net#690)
584ce03 
* [syncd] Use lua script to update db when using bulk api

* [syncd] Handle multi keys create with empty attribute list

* [syncd] Fix emplace back on non existing object

* [syncd] Update redis client to use corrected del method name
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stcheng stcheng stcheng left review comments

@lguohan lguohan lguohan approved these changes

Assignees
No one assigned
Labels
Enhancement ➕
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@taoyl-ms @lguohan @stcheng @msftclas