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

[minigraph]: Add portchannels/vlans dictionary and update teamd templates #408

Merged
merged 1 commit into from
Mar 17, 2017
Merged

[minigraph]: Add portchannels/vlans dictionary and update teamd templates #408

merged 1 commit into from
Mar 17, 2017

Conversation

stcheng
Copy link
Contributor

@stcheng stcheng commented Mar 17, 2017

  • minigraph_portchannel_interfaces and minigraph_vlan_interfaces are lists
    of interfaces and the name could duplicate due to multiple IPs
  • Add minigraph_portchannels and minigraph_vlans dictionaries to support
    querying port channels and vlans via the name
  • Update teamd.j2 template and config.sh file in docker-teamd

Signed-off-by: Shuotian Cheng shuche@microsoft.com

@stcheng stcheng self-assigned this Mar 17, 2017
@stcheng stcheng requested a review from taoyl-ms March 17, 2017 10:11
@stcheng stcheng mentioned this pull request Mar 17, 2017
Closed
@lguohan
Copy link
Collaborator

lguohan commented Mar 17, 2017

@taoyl-ms, can you check-in the minigraph test first, so that we can ensure this pass the test.

@taoyl-ms
Copy link
Contributor

taoyl-ms commented Mar 17, 2017 •
edited
Loading

I've merged the cfggen functional test PR (#375). You can run the test by python setup.py test in sonic-cfggen folder. make all with also trigger it automatically.

In reply to: 287328096 [](ancestors = 287328096)

@stcheng
Copy link
Contributor Author

stcheng commented Mar 17, 2017

@taoyl-ms thanks

8 passed in 0.70 seconds please review.

taoyl-ms
taoyl-ms suggested changes Mar 17, 2017
View reviewed changes
src/sonic-config-engine/minigraph.py
@@ -180,6 +180,7 @@ def parse_dpg(dpg, hname):

pcintfs = child.find(str(QName(ns, "PortChannelInterfaces")))
pc_intfs = []
Copy link
Contributor

@taoyl-ms taoyl-ms Mar 17, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

As PC interfaces are no longer in minigraph_interfaces (actually not in this PR but in #381), I think we need to update zebra.conf.j2 as well to configure bgp on pc interfaces correctly.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated. please check.

src/sonic-config-engine/minigraph.py
@@ -191,6 +192,7 @@ def parse_dpg(dpg, hname):
for addrtuple in pc_map.get(pcintfname, []):
pc_attributes.update(addrtuple)
pc_intfs.append(copy.deepcopy(pc_attributes))
pcs[pcintfname] = pc_attributes
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we want to keep 'members' (and 'vlanid') information duplicated in both minigraph_xxx_interfaces and minigraph_xxx? Or shall we let minigraph_xxx_interfaces to have only the same information with minigraph_interfaces?

Copy link
Contributor

Choose a reason for hiding this comment

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

which means, name, alias, addr, mask, subnet, and peer_addr

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i would vote for removing the duplicated information but not here in this commit. i'll submit a separate pull request to address this as well as adding some unit tests to make sure that the generated configuration files are not changed before/after new code changes.

Copy link
Contributor

Choose a reason for hiding this comment

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

Sure.

[minigraph]: Add portchannels/vlans dictionary and update teamd templ…
b86dece 
…ates

- minigraph_portchannel_interfaces and minigraph_vlan_interfaces are lists
  of interfaces and the name could duplicate due to multiple IPs
- Add minigraph_portchannels and minigraph_vlans dictionaries to support
  querying port channels and vlans via the name
- Update teamd.j2 template and config.sh file in docker-teamd
- Update zebra.conf.j2 template to add port channel interfaces

Signed-off-by: Shuotian Cheng <shuche@microsoft.com>
@stcheng stcheng merged commit 783be14 into sonic-net:master Mar 17, 2017
@stcheng stcheng deleted the minigraph branch March 17, 2017 23:48
@stcheng
Copy link
Contributor Author

stcheng commented Mar 17, 2017

build is already passed in previous iterations

yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Jan 25, 2019
@yxieca
[sub module] advance sairedis sub-module
8734a04 
Including following changes:

- install SAI extension header files into /usr/include/sai (sonic-net#412)
- Initialize notification queue pointer before switch create (sonic-net#411)
- Add log info for not matching SG/IPG/QUEUES (sonic-net#409)
- Update SAI pointer to latest master (sonic-net#408)
- Add support for any number of ports in virtual switch using lane map (sonic-net#407)

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
lguohan added a commit to yxieca/sonic-buildimage that referenced this pull request Feb 16, 2019
@lguohan
[submodule]: update swss, sairedis, swss-common, sonic-utilities
5a9be97 
swss

* a6d60f2 2019-02-15 | Create egress ACL table group during the PFCWD stats list installment (sonic-net#787) (HEAD, origin/master, origin/HEAD) [Wenda Ni]
* 52de963 2019-02-15 | [fpmsyncd] Add VNET routes support (sonic-net#772) [Wei Bai]
* d27f49e 2019-02-13 | Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (sonic-net#786) [Jipan Yang]
* 6363985 2019-02-08 | [vstest]: Potential fix for timing issue in warm_reboot's routing UT (sonic-net#788) [Rodny Molina]
* 6d5424d 2019-02-07 | VNet/Vxlan delete handling (sonic-net#766) [Prince Sunny]
* d680ce2 2019-02-07 | [neighsyncd] increase neighbor syncd restore timeout to 110 seconds (sonic-net#745) [Ying Xie]
* b78cc8d 2019-02-01 | support 8 lanes for a physical port (sonic-net#778) [lguohan]
* 73b620c 2019-02-01 | Increase the watermark polling interval to 10s (sonic-net#777) [Wenda Ni]
* a2b987b 2019-02-01 | [vstest]: fix test_speed.py (sonic-net#780) [lguohan]
* cef4bd0 2019-02-01 | [vstest]: fix test_port_an_warm.py test (sonic-net#779) [lguohan]
* 9f20eda 2019-02-01 | fix a unstable swss egress acl test (sonic-net#776) [Kebo Liu]
* 316ae6c 2019-01-30 | portsorch ports init done flag should means buffer, autoneg, speed, m… (sonic-net#747) [Jipan Yang]
* 4280036 2019-01-30 | [teammgrd] Fix inconsistent port admin status (sonic-net#755) [Jipan Yang]
* cf12bdf 2019-01-30 | Remove AclTableGroup upon removal of port/lag/vlan (sonic-net#751) [Jipan Yang]
* 5779c1a 2019-01-29 | [aclorch] Remove  L4 port range support limitation on egress ACL table and add new SWSS virtual test. (sonic-net#741) [Kebo Liu]
* 36e85eb 2019-01-29 | On a routing vlan, the neighbor entry in the /31 subnet is not added to hardware (sonic-net#771) [Kiran Kumar Kella]
* 882ccc6 2019-01-24 | [vnetorch] Change logic for adding VNet interface (sonic-net#761) [Marian Pritsak]
* f637557 2019-01-25 | [vrfmgrd] Fix VRF is not set to VRF_TABLE in APP_DB correctly (sonic-net#768) [yorke]
* e84a6ab 2019-01-24 | use sai_stat_id_t for new SAI header file (sonic-net#769) [lguohan]

sairedis

* d685e35 2019-02-15 | Add support for fdb_event MOVE and check fdb event oids (sonic-net#420) (HEAD, origin/master, origin/HEAD) [Kamil Cudnik]
* 2b91013 2019-02-15 | [vslib] add missing port attributes for virtual switch (sonic-net#419) [Stepan Blyshchak]
* dcc8688 2019-02-14 | Add more specific logic for ingress ACL and buffer profile (sonic-net#421) [Kamil Cudnik]
* c0b39ea 2019-02-12 | Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (sonic-net#418) [Jipan Yang]
* ab35dfa 2019-02-11 | Add support for vlan tagged frames in virtual switch (sonic-net#417) [Kamil Cudnik]
* 145ea44 2019-02-02 | [flex counter] handle router interface stats (sonic-net#410) [Mykola F]
* c03d639 2019-02-02 | Add more information on failed map sizes (sonic-net#416) [Kamil Cudnik]
* 29f1e3c 2019-01-31 | Update SAI pointer (sonic-net#414) [Marian Pritsak]
* c0a948d 2019-01-30 | Add WRED specific comparison logic (sonic-net#413) [Kamil Cudnik]
* 1b6a661 2019-01-24 | install SAI extension header files into /usr/include/sai (sonic-net#412) [lguohan]
* 849525a 2019-01-24 | Initialize notification queue pointer before switch create (sonic-net#411) [Kamil Cudnik]
* 02d92f1 2019-01-23 | Add log info for not matching SG/IPG/QUEUES (sonic-net#409) [Kamil Cudnik]
* 8793562 2019-01-18 | Update SAI pointer to latest master (sonic-net#408) [Marian Pritsak]

swss-common

* ec04a5a 2019-02-14 | Add support for WarmStart::setDataCheckState() (sonic-net#242) [Jipan Yang]
* 56bd73f 2019-02-13 | Force only supported commands on consumer table (sonic-net#261) [Kamil Cudnik]
* 414de0f 2019-02-12 | Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (sonic-net#260) [Jipan Yang]
* 88de725 2019-02-05 | [pyext] enable types in stdint.h (sonic-net#259) [Ying Xie]
* f457ae8 2019-02-05 | Optimized ProducerStateTable set/del notification processing to avoid… (sonic-net#257) [Jipan Yang]
* e5286fd 2019-01-30 | [rif counters] Rif counter schema update (sonic-net#256) [Mykola F]

sonic-utilities

* b44b462 2019-02-14 | Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABL… (sonic-net#458) (HEAD, origin/master, origin/HEAD) [Jipan Yang]
* e856b8b 2019-02-11 | [aclshow] output only counters per table/rule (sonic-net#442) [Roman Kachur]

Signed-off-by: Guohan Lu <gulv@microsoft.com>
lguohan pushed a commit that referenced this pull request Feb 16, 2019
@yxieca @lguohan
[sai and sairedis] advance sairedis sub-module and upgrade to matchin…
0846654 
…g Broadcom SAI build (#2488)

* [Broadcom SAI] upgrade Broadcom SAI to 3.3.4.3m-3

This is SAI 3.3.4.3m-3 compiled with SAI header file at commit ID
6ad3382217ec22f64cd268faefcbc2ff7caba4fd of SAI repo.

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

* change libsaithrift version to 0.9.4

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

* [submodule]: update swss, sairedis, swss-common, sonic-utilities

swss

* a6d60f2 2019-02-15 | Create egress ACL table group during the PFCWD stats list installment (#787) (HEAD, origin/master, origin/HEAD) [Wenda Ni]
* 52de963 2019-02-15 | [fpmsyncd] Add VNET routes support (#772) [Wei Bai]
* d27f49e 2019-02-13 | Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (#786) [Jipan Yang]
* 6363985 2019-02-08 | [vstest]: Potential fix for timing issue in warm_reboot's routing UT (#788) [Rodny Molina]
* 6d5424d 2019-02-07 | VNet/Vxlan delete handling (#766) [Prince Sunny]
* d680ce2 2019-02-07 | [neighsyncd] increase neighbor syncd restore timeout to 110 seconds (#745) [Ying Xie]
* b78cc8d 2019-02-01 | support 8 lanes for a physical port (#778) [lguohan]
* 73b620c 2019-02-01 | Increase the watermark polling interval to 10s (#777) [Wenda Ni]
* a2b987b 2019-02-01 | [vstest]: fix test_speed.py (#780) [lguohan]
* cef4bd0 2019-02-01 | [vstest]: fix test_port_an_warm.py test (#779) [lguohan]
* 9f20eda 2019-02-01 | fix a unstable swss egress acl test (#776) [Kebo Liu]
* 316ae6c 2019-01-30 | portsorch ports init done flag should means buffer, autoneg, speed, m… (#747) [Jipan Yang]
* 4280036 2019-01-30 | [teammgrd] Fix inconsistent port admin status (#755) [Jipan Yang]
* cf12bdf 2019-01-30 | Remove AclTableGroup upon removal of port/lag/vlan (#751) [Jipan Yang]
* 5779c1a 2019-01-29 | [aclorch] Remove  L4 port range support limitation on egress ACL table and add new SWSS virtual test. (#741) [Kebo Liu]
* 36e85eb 2019-01-29 | On a routing vlan, the neighbor entry in the /31 subnet is not added to hardware (#771) [Kiran Kumar Kella]
* 882ccc6 2019-01-24 | [vnetorch] Change logic for adding VNet interface (#761) [Marian Pritsak]
* f637557 2019-01-25 | [vrfmgrd] Fix VRF is not set to VRF_TABLE in APP_DB correctly (#768) [yorke]
* e84a6ab 2019-01-24 | use sai_stat_id_t for new SAI header file (#769) [lguohan]

sairedis

* d685e35 2019-02-15 | Add support for fdb_event MOVE and check fdb event oids (#420) (HEAD, origin/master, origin/HEAD) [Kamil Cudnik]
* 2b91013 2019-02-15 | [vslib] add missing port attributes for virtual switch (#419) [Stepan Blyshchak]
* dcc8688 2019-02-14 | Add more specific logic for ingress ACL and buffer profile (#421) [Kamil Cudnik]
* c0b39ea 2019-02-12 | Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (#418) [Jipan Yang]
* ab35dfa 2019-02-11 | Add support for vlan tagged frames in virtual switch (#417) [Kamil Cudnik]
* 145ea44 2019-02-02 | [flex counter] handle router interface stats (#410) [Mykola F]
* c03d639 2019-02-02 | Add more information on failed map sizes (#416) [Kamil Cudnik]
* 29f1e3c 2019-01-31 | Update SAI pointer (#414) [Marian Pritsak]
* c0a948d 2019-01-30 | Add WRED specific comparison logic (#413) [Kamil Cudnik]
* 1b6a661 2019-01-24 | install SAI extension header files into /usr/include/sai (#412) [lguohan]
* 849525a 2019-01-24 | Initialize notification queue pointer before switch create (#411) [Kamil Cudnik]
* 02d92f1 2019-01-23 | Add log info for not matching SG/IPG/QUEUES (#409) [Kamil Cudnik]
* 8793562 2019-01-18 | Update SAI pointer to latest master (#408) [Marian Pritsak]

swss-common

* ec04a5a 2019-02-14 | Add support for WarmStart::setDataCheckState() (#242) [Jipan Yang]
* 56bd73f 2019-02-13 | Force only supported commands on consumer table (#261) [Kamil Cudnik]
* 414de0f 2019-02-12 | Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (#260) [Jipan Yang]
* 88de725 2019-02-05 | [pyext] enable types in stdint.h (#259) [Ying Xie]
* f457ae8 2019-02-05 | Optimized ProducerStateTable set/del notification processing to avoid… (#257) [Jipan Yang]
* e5286fd 2019-01-30 | [rif counters] Rif counter schema update (#256) [Mykola F]

sonic-utilities

* b44b462 2019-02-14 | Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABL… (#458) (HEAD, origin/master, origin/HEAD) [Jipan Yang]
* e856b8b 2019-02-11 | [aclshow] output only counters per table/rule (#442) [Roman Kachur]

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

* [mlnx] update mellanox sai

Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
lguohan added a commit to lguohan/sonic-buildimage that referenced this pull request Jun 27, 2019
@lguohan
[submodule]: update sonic-swss and sonic-sairedis submodule
fb505f6 
sonic-swss

* 32d3297 2019-01-24 | use sai_stat_id_t for new SAI header file (sonic-net#769)

sonic-sairedis

* 889e409 2019-04-24 | [SAI] Advance submodule to v1.4.1 (sonic-net#450) (HEAD -> 201811, origin/201811) [Marian Pritsak]
* b614468 2019-02-27 | [vslib]: Add support of bitmap VNET (bmtor) SAI API (sonic-net#424) [Volodymyr Samotiy]
* 1c3ff5c 2019-04-23 | [SAI]: Move SAI pointer to v1.4 (sonic-net#447) [Shuotian Cheng]
* 21e737c 2019-03-04 | [SAI] Update SAI pointer (sonic-net#431) [Stepan Blyshchak]
* dbf86a7 2019-02-22 | Fix compilation issues in stretch docker with gcc-6.3 (sonic-net#426) [Stepan Blyshchak]
* aecfeac 2019-01-31 | Update SAI pointer (sonic-net#414) [Marian Pritsak]
* 4910be8 2019-01-18 | Update SAI pointer to latest master (sonic-net#408) [Marian Pritsak]
* 1f5de84 2019-06-24 | Revert "[SAI header] upgrade SAI header to version v1.3.7 (sonic-net#445)" [Guohan Lu]

Signed-off-by: Guohan Lu <gulv@microsoft.com>
lguohan added a commit to lguohan/sonic-buildimage that referenced this pull request Jul 2, 2019
@lguohan
[submodule]: update sonic-swss and sonic-sairedis submodule
8f077b8 
sonic-swss

* 32d3297 2019-01-24 | use sai_stat_id_t for new SAI header file (sonic-net#769)

sonic-sairedis

* fdfcefd 2019-04-24 | [SAI] Advance submodule to v1.4.1 (sonic-net#450) (HEAD -> 201811, origin/201811) [Marian Pritsak]
* 006df41 2019-02-27 | [vslib]: Add support of bitmap VNET (bmtor) SAI API (sonic-net#424) [Volodymyr Samotiy]
* ec5e187 2019-04-23 | [SAI]: Move SAI pointer to v1.4 (sonic-net#447) [Shuotian Cheng]
* 6b9c32e 2019-03-04 | [SAI] Update SAI pointer (sonic-net#431) [Stepan Blyshchak]
* f078998 2019-02-22 | Fix compilation issues in stretch docker with gcc-6.3 (sonic-net#426) [Stepan Blyshchak]
* 0540e59 2019-01-31 | Update SAI pointer (sonic-net#414) [Marian Pritsak]
* 9084920 2019-01-18 | Update SAI pointer to latest master (sonic-net#408) [Marian Pritsak]
* fbfe48b 2019-06-24 | Revert "[SAI header] upgrade SAI header to version v1.3.7 (sonic-net#445)" [Guohan Lu]

Signed-off-by: Guohan Lu <gulv@microsoft.com>
dmytroxshevchuk pushed a commit to dmytroxshevchuk/sonic-buildimage that referenced this pull request Aug 31, 2020
@marian-pritsak @lguohan
Update SAI pointer to latest master (sonic-net#408)
8793562 
* Update SAI pointer to latest master

Signed-off-by: Marian Pritsak <marianp@mellanox.com>

* Use SAI_EXTENSIONS_TYPE_MAX

Signed-off-by: Marian Pritsak <marianp@mellanox.com>
lguohan pushed a commit that referenced this pull request Nov 4, 2020
@qiluo-msft
[swss-common]: Advance submodule (#5799)
4ed2ff8 
ec96868 2020-11-03 | Fix: treat DBConnector timeout=0 as infinite timeout (#408) [Qi Luo]
b4b8334 2020-11-03 | Add lua script for redis multi keys api hmset and del (#406) [Kamil Cudnik]
sudhanshukumar22 added a commit to sudhanshukumar22/sonic-buildimage that referenced this pull request Jan 4, 2021
@sudhanshukumar22
lldp patches
3e8030f 
    The details are as follows:
    1. 0010-Ported-fix-for-length-exceeded-from-lldp-community.patch
    Ported fix lldpd/lldpd#408 from LLDP community.
    lib: remove limit on system description length

    The limit was introduced in 9c49ced while fixing a memory leak.
    The state data is used to ensure we don't interleave operations. We
    need to handle the case where the value is truncated because it is
    larger than the allocated size.

    Fix sonic-net#408.
    2. 0011-fix-med-location-len.patch
    Ported fix lldpd/lldpd#422 from community.
    lib: fix LLDP-MED location parsing in liblldpctl

    Some bounds were not checked correctly when parsing LLDP-MED civic
    location fields. This triggers out-of-bound reads (no write) in
    lldpcli, ultimately leading to a crash.

    Fix sonic-net#420
Signed-off-by: sudhanshukumar22 <sudhanshu.kumar@broadcom.com>
santhosh-kt pushed a commit to santhosh-kt/sonic-buildimage that referenced this pull request Feb 25, 2021
@qiluo-msft @santhosh-kt
[swss-common]: Advance submodule (sonic-net#5799)
0167472 
ec96868 2020-11-03 | Fix: treat DBConnector timeout=0 as infinite timeout (sonic-net#408) [Qi Luo]
b4b8334 2020-11-03 | Add lua script for redis multi keys api hmset and del (sonic-net#406) [Kamil Cudnik]
mssonicbld added a commit that referenced this pull request Nov 3, 2023
@mssonicbld
[submodule] Update submodule sonic-platform-common to the latest HEAD…
9ab6026 
… automatically (#17084)

#### Why I did it
src/sonic-platform-common
```
* e7325db - (HEAD -> 202305, origin/202305) Fix SSD health percentage issue for vendor Virtium (#407) (#408) (11 hours ago) [Stephen Sun]
* 87e33ab - [Credo][Ycable] Remove the thread locker protection from the thread-safe APIs (#388) (11 hours ago) [Xinyu Lin]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

Assignees

@stcheng stcheng

Labels
Bug 🐛
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@stcheng @lguohan @taoyl-ms