Skip to content

[sonic-cfggen] Add check to generate valid bgpconfig#440

Merged
pavel-shirshov merged 2 commits intosonic-net:masterfrom
NStetskovych-zz:bgp_templ
Mar 27, 2017
Merged

[sonic-cfggen] Add check to generate valid bgpconfig#440
pavel-shirshov merged 2 commits intosonic-net:masterfrom
NStetskovych-zz:bgp_templ

Conversation

@NStetskovych-zz
Copy link
Copy Markdown
Contributor

@NStetskovych-zz NStetskovych-zz commented Mar 26, 2017

Trying to apply manual bgp config and
loading minigraph with no bgp configuration leads to bgp daemon failed to start.
Log attached
bgp_status_log.txt
.

Signed-off-by: Nadiya.Stetskovych [email protected]

pavel-shirshov
pavel-shirshov suggested changes Mar 27, 2017
View reviewed changes
dockers/docker-fpm/bgpd.conf.j2 Outdated
! enable password {# {{ en_passwd }} TODO: param needed #}
{% endblock system_init %}
!
{% if minigraph_bgp_asn != None %}
Copy link
Copy Markdown
Contributor

@pavel-shirshov pavel-shirshov Mar 27, 2017

Choose a reason for hiding this comment

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

Will the following work better for Jinja2?
{% if minigraph_bgp_asn is defined %}

Copy link
Copy Markdown
Contributor Author

@NStetskovych-zz NStetskovych-zz Mar 27, 2017

Choose a reason for hiding this comment

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

hmm It`s defined to None :). Have no effect.

Copy link
Copy Markdown
Contributor

@pavel-shirshov pavel-shirshov Mar 27, 2017

Choose a reason for hiding this comment

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

Yes. You're right. But it's unusual to see something != None in python. Usually we write something is not None.
I don't know the right patter for Jinja2.
I found there're 'none' constant is Jinja2 templates http://jinja.pocoo.org/docs/2.9/templates/#expressions

Also I found a special function none() (see the same document).

So my concert here: I don't want to have an expression in our code which might be deprecated.

dockers/docker-fpm/bgpd.conf.j2 Outdated
{% endfor %}
{% endblock bgp_sessions %}
!
{% if minigraph_bgp_asn != None %}
Copy link
Copy Markdown
Contributor

@pavel-shirshov pavel-shirshov Mar 27, 2017

Choose a reason for hiding this comment

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

The same as above

@pavel-shirshov pavel-shirshov changed the title [sonic-cfggen]Add check to generate valid bgpconfig [sonic-cfggen] Add check to generate valid bgpconfig Mar 27, 2017
Use builtin none instead of None
9470481 
Signed-off-by: Nadiya.Stetskovych <[email protected]>
@pavel-shirshov pavel-shirshov merged commit 713f6fc into sonic-net:master Mar 27, 2017
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Mar 19, 2019
@yxieca
[201811 sub-module] advance sub-modules: utilities, swss, swss-common
e44a22b 
Submodule src/sonic-utilities f95da07..2fe01fe:
  > neighbor advertiser script (sonic-net#469)
  > [aclshow] restore PRIO column and sort entries by priority (sonic-net#476)
  > Update watermark default polling interval to 10s (sonic-net#470)
  > show interface status <interface-name> throws error (fixes sonic-net#427) (sonic-net#440)

Submodule src/sonic-swss 90eb25d..91171b6:
  > fix a unstable swss egress acl test (sonic-net#776)
  > [aclorch] Remove  L4 port range support limitation on egress ACL table and add new SWSS virtual test. (sonic-net#741)
  > Fix orchagent SEGV when PortConfigDone not set (sonic-net#803)

Submodule src/sonic-swss-common 2592b0c..5f4abd9:
  > Force only supported commands on consumer table (sonic-net#261)
  > Add multiple fields hdel support (sonic-net#267)


Signed-off-by: Ying Xie <[email protected]>
@yxieca yxieca mentioned this pull request Mar 19, 2019
Merged
yxieca added a commit that referenced this pull request Mar 19, 2019
@yxieca
[201811 sub-module] advance sub-modules: utilities, swss, swss-common (…
4c61c0e 
…#2679)

Submodule src/sonic-utilities f95da07..2fe01fe:
  > neighbor advertiser script (#469)
  > [aclshow] restore PRIO column and sort entries by priority (#476)
  > Update watermark default polling interval to 10s (#470)
  > show interface status <interface-name> throws error (fixes #427) (#440)

Submodule src/sonic-swss 90eb25d..91171b6:
  > fix a unstable swss egress acl test (#776)
  > [aclorch] Remove  L4 port range support limitation on egress ACL table and add new SWSS virtual test. (#741)
  > Fix orchagent SEGV when PortConfigDone not set (#803)

Submodule src/sonic-swss-common 2592b0c..5f4abd9:
  > Force only supported commands on consumer table (#261)
  > Add multiple fields hdel support (#267)


Signed-off-by: Ying Xie <[email protected]>
tiantianlv pushed a commit to SONIC-DEV/sonic-buildimage that referenced this pull request Apr 10, 2019
@yxieca @tiantianlv
[201811 sub-module] advance sub-modules: utilities, swss, swss-common (…
5b0f2c0 
…sonic-net#2679)

Submodule src/sonic-utilities f95da07..2fe01fe:
  > neighbor advertiser script (sonic-net#469)
  > [aclshow] restore PRIO column and sort entries by priority (sonic-net#476)
  > Update watermark default polling interval to 10s (sonic-net#470)
  > show interface status <interface-name> throws error (fixes sonic-net#427) (sonic-net#440)

Submodule src/sonic-swss 90eb25d..91171b6:
  > fix a unstable swss egress acl test (sonic-net#776)
  > [aclorch] Remove  L4 port range support limitation on egress ACL table and add new SWSS virtual test. (sonic-net#741)
  > Fix orchagent SEGV when PortConfigDone not set (sonic-net#803)

Submodule src/sonic-swss-common 2592b0c..5f4abd9:
  > Force only supported commands on consumer table (#261)
  > Add multiple fields hdel support (#267)


Signed-off-by: Ying Xie <[email protected]>
tiantianlv pushed a commit to SONIC-DEV/sonic-buildimage that referenced this pull request Apr 10, 2019
@yxieca @tiantianlv
[201811 sub-module] advance sub-modules: utilities, swss, swss-common (…
4b81fbf 
…sonic-net#2679)

Submodule src/sonic-utilities f95da07..2fe01fe:
  > neighbor advertiser script (sonic-net#469)
  > [aclshow] restore PRIO column and sort entries by priority (sonic-net#476)
  > Update watermark default polling interval to 10s (sonic-net#470)
  > show interface status <interface-name> throws error (fixes sonic-net#427) (sonic-net#440)

Submodule src/sonic-swss 90eb25d..91171b6:
  > fix a unstable swss egress acl test (sonic-net#776)
  > [aclorch] Remove  L4 port range support limitation on egress ACL table and add new SWSS virtual test. (sonic-net#741)
  > Fix orchagent SEGV when PortConfigDone not set (sonic-net#803)

Submodule src/sonic-swss-common 2592b0c..5f4abd9:
  > Force only supported commands on consumer table (#261)
  > Add multiple fields hdel support (#267)


Signed-off-by: Ying Xie <[email protected]>
tiantianlv pushed a commit to SONIC-DEV/sonic-buildimage that referenced this pull request Apr 10, 2019
@yxieca @tiantianlv
[201811 sub-module] advance sub-modules: utilities, swss, swss-common (…
2c96055 
…sonic-net#2679)

Submodule src/sonic-utilities f95da07..2fe01fe:
  > neighbor advertiser script (sonic-net#469)
  > [aclshow] restore PRIO column and sort entries by priority (sonic-net#476)
  > Update watermark default polling interval to 10s (sonic-net#470)
  > show interface status <interface-name> throws error (fixes sonic-net#427) (sonic-net#440)

Submodule src/sonic-swss 90eb25d..91171b6:
  > fix a unstable swss egress acl test (sonic-net#776)
  > [aclorch] Remove  L4 port range support limitation on egress ACL table and add new SWSS virtual test. (sonic-net#741)
  > Fix orchagent SEGV when PortConfigDone not set (sonic-net#803)

Submodule src/sonic-swss-common 2592b0c..5f4abd9:
  > Force only supported commands on consumer table (#261)
  > Add multiple fields hdel support (#267)


Signed-off-by: Ying Xie <[email protected]>
Kalimuthu-Velappan pushed a commit to Kalimuthu-Velappan/sonic-buildimage that referenced this pull request Sep 12, 2019
@kirankella @lguohan
show interface status <interface-name> throws error (fixes sonic-net#427
72b7069 
) (sonic-net#440)

* sonic-utilities: Bug fix while showing interface status for a specific interface.

* While getting the keys from port table for a specific interface, wrong db is passed, fixed the bug

Signed-off-by: [email protected]
qiluo-msft added a commit to qiluo-msft/sonic-buildimage that referenced this pull request Jan 7, 2021
@qiluo-msft
[sonic-swss-common] Update submodule
2ad522c 
Includes sonic-swss-common commits:
```
71dc350 2021-01-07 | Lower the log level for outdated key for SubscriberStateTable notification (sonic-net#441) [Qi Luo]
7e40582 2021-01-08 | Add boost dependencies (sonic-net#442) [Ze Gan]
30a8ddf 2021-01-05 | Change DBConnector::hgetall return type from map to unordered_map (sonic-net#440) [Qi Luo]
021108d 2021-01-02 | MCLAG Enhancements per HLD sonic-net/SONiC#596 (sonic-net#405) [Praveen-Brcm]
54996fc 2021-01-02 | Implement ConfigDBConnector and ConfigDBPipeConnector in C++ (sonic-net#437) [Qi Luo]
8286525 2020-12-27 | Simply refactor DBConnector hgetall() [Qi Luo]
6d1d33b 2020-12-27 | Fix RedisTransactioner: handle empty deque [Qi Luo]
624e0b8 2020-12-26 | Move complex class constructor as explicit, and fix several mistaken copy constructor usage [Qi Luo]
3b983f9 2020-12-30 | [ci]: add timeout to 180 minutes for arm build (sonic-net#439) [lguohan]
f2e4210 2020-12-29 | Add utility for string and redis (sonic-net#434) [Ze Gan]
7a885fd 2020-12-29 | [build]: add build check for arm64 and armhf (sonic-net#436) [lguohan]
47bccc4 2020-12-24 | Add missed vector header to rediscommand.h (sonic-net#435) [Ze Gan]
```
qiluo-msft added a commit that referenced this pull request Jan 8, 2021
@qiluo-msft
[sonic-swss-common] Update submodule (#6382)
5b7f88a 
Includes sonic-swss-common commits:
```
71dc350 2021-01-07 | Lower the log level for outdated key for SubscriberStateTable notification (#441) [Qi Luo]
7e40582 2021-01-08 | Add boost dependencies (#442) [Ze Gan]
30a8ddf 2021-01-05 | Change DBConnector::hgetall return type from map to unordered_map (#440) [Qi Luo]
021108d 2021-01-02 | MCLAG Enhancements per HLD sonic-net/SONiC#596 (#405) [Praveen-Brcm]
54996fc 2021-01-02 | Implement ConfigDBConnector and ConfigDBPipeConnector in C++ (#437) [Qi Luo]
8286525 2020-12-27 | Simply refactor DBConnector hgetall() [Qi Luo]
6d1d33b 2020-12-27 | Fix RedisTransactioner: handle empty deque [Qi Luo]
624e0b8 2020-12-26 | Move complex class constructor as explicit, and fix several mistaken copy constructor usage [Qi Luo]
3b983f9 2020-12-30 | [ci]: add timeout to 180 minutes for arm build (#439) [lguohan]
f2e4210 2020-12-29 | Add utility for string and redis (#434) [Ze Gan]
7a885fd 2020-12-29 | [build]: add build check for arm64 and armhf (#436) [lguohan]
47bccc4 2020-12-24 | Add missed vector header to rediscommand.h (#435) [Ze Gan]
```
lguohan pushed a commit that referenced this pull request Jan 9, 2021
@qiluo-msft @lguohan
[sonic-swss-common] Update submodule (#6382)
88ace50 
Includes sonic-swss-common commits:
```
71dc350 2021-01-07 | Lower the log level for outdated key for SubscriberStateTable notification (#441) [Qi Luo]
7e40582 2021-01-08 | Add boost dependencies (#442) [Ze Gan]
30a8ddf 2021-01-05 | Change DBConnector::hgetall return type from map to unordered_map (#440) [Qi Luo]
021108d 2021-01-02 | MCLAG Enhancements per HLD sonic-net/SONiC#596 (#405) [Praveen-Brcm]
54996fc 2021-01-02 | Implement ConfigDBConnector and ConfigDBPipeConnector in C++ (#437) [Qi Luo]
8286525 2020-12-27 | Simply refactor DBConnector hgetall() [Qi Luo]
6d1d33b 2020-12-27 | Fix RedisTransactioner: handle empty deque [Qi Luo]
624e0b8 2020-12-26 | Move complex class constructor as explicit, and fix several mistaken copy constructor usage [Qi Luo]
3b983f9 2020-12-30 | [ci]: add timeout to 180 minutes for arm build (#439) [lguohan]
f2e4210 2020-12-29 | Add utility for string and redis (#434) [Ze Gan]
7a885fd 2020-12-29 | [build]: add build check for arm64 and armhf (#436) [lguohan]
47bccc4 2020-12-24 | Add missed vector header to rediscommand.h (#435) [Ze Gan]
```
mssonicbld added a commit that referenced this pull request Feb 19, 2024
@mssonicbld
[submodule] Update submodule sonic-platform-common to the latest HEAD…
4383c7f 
… automatically (#18126)

#### Why I did it
src/sonic-platform-common
```
* 5430f6f - (HEAD -> 202311, origin/202311) Change get_transceiver_info_firmware_versions return type to dict (#440) (2 days ago) [mihirpat1]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Feb 19, 2024
@mssonicbld
[submodule] Update submodule sonic-platform-common to the latest HEAD…
97b3964 
… automatically (#18124)

#### Why I did it
src/sonic-platform-common
```
* 796e89a - (HEAD -> master, origin/master, origin/HEAD) Change get_transceiver_info_firmware_versions return type to dict (#440) (2 days ago) [mihirpat1]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Mar 1, 2024
@mssonicbld
[submodule] Update submodule sonic-platform-daemons to the latest HEA…
0c4db5e 
…D automatically (#18218)

#### Why I did it
src/sonic-platform-daemons
```
* b9e6ba5 - (HEAD -> master, origin/master, origin/HEAD) Updated supported CMIS module types in xcvrd to include new module for SPC4 (#440) (25 hours ago) [Tomer Shalvi]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Mar 5, 2024
@mssonicbld
[submodule] Update submodule sonic-platform-daemons to the latest HEA…
e13e38b 
…D automatically (#18261)

#### Why I did it
src/sonic-platform-daemons
```
* 83e5106 - (HEAD -> 202311, origin/202311) Updated supported CMIS module types in xcvrd to include new module for SPC4 (#440) (4 hours ago) [Tomer Shalvi]
* f390d8d - Mark sub-port interfaces as invalid ports in xcvrd (#412) (21 hours ago) [mihirpat1]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Oct 22, 2024
@mssonicbld
[submodule] Update submodule sonic-linux-kernel to the latest HEAD au…
45f949a 
…tomatically (#20568)

#### Why I did it
src/sonic-linux-kernel
```
* 6411b03 - (HEAD -> 202405, origin/202405) Fix RCU stall detected in kernel 6.1 when unregistering devlink (#437) (63 minutes ago) [Vivek]
* bd40662 - Fix for Winbond flash devices that could not parse SFDP (#440) (3 hours ago) [Vivek]
```
#### How I did it
#### How to verify it
#### Description for the changelog
DavidZagury pushed a commit to DavidZagury/sonic-buildimage that referenced this pull request Dec 7, 2024
@vivekrnv
Fix for Winbond flash devices that could not parse SFDP (sonic-net#440)
bd40662 
Signed-off-by: Vivek Reddy <[email protected]>
jianyuewu pushed a commit to jianyuewu/sonic-buildimage that referenced this pull request May 7, 2025
@mihirpat1
Change get_transceiver_info_firmware_versions return type to dict (so…
796e89a 
…nic-net#440)

Signed-off-by: Mihir Patel <[email protected]>
mssonicbld added a commit that referenced this pull request Jul 25, 2025
@mssonicbld
[submodule] Update submodule sonic-gnmi to the latest HEAD automatica…
f8d5cd0 
…lly (#23471)

#### Why I did it
src/sonic-gnmi
```
* 12f436b - (HEAD -> 202311, origin/202311) Merge pull request #440 from liuh-80/dev/liuh/multirole_202311_cp (22 hours ago) [Ying Xie]
* 94bbdd1 - Update server_test.go (2 weeks ago) [Hua Liu]
* 4fbb981 - Update server_test.go (2 weeks ago) [Hua Liu]
* 342d6c0 - Update clientCertAuth.go (2 weeks ago) [Hua Liu]
* b7f999c - Update azure-pipelines.yml (2 weeks ago) [Hua Liu]
* a2bb467 - Update azure-pipelines.yml (2 weeks ago) [Hua Liu]
* 08f78b7 - Update azure-pipelines.yml (2 weeks ago) [Hua Liu]
* def33cc - Add cert multiple roles support (#366) (2 weeks ago) [Hua Liu]
```
#### How I did it
#### How to verify it
#### Description for the changelog
bobby-nexthop pushed a commit to bobby-nexthop/sonic-buildimage that referenced this pull request Aug 1, 2025
@tshalvi
Updated supported CMIS module types in xcvrd to include new module fo…
b9e6ba5 
…r SPC4 (sonic-net#440)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@pavel-shirshov pavel-shirshov pavel-shirshov approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Enhancement ➕

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@NStetskovych-zz @pavel-shirshov @stcheng