[sonic-cfggen]: Add -p option and add teamd.j2 test #414
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
taoyl-ms
reviewed
Mar 18, 2017
src/sonic-config-engine/minigraph.py
Outdated
| port_config_candidates = [] | ||
| port_config_candidates.append('/usr/share/sonic/hwsku/port_config.ini') | ||
| if platform != None: | ||
| port_config_candidates.append(os.path.join('/usr/share/sonic/device', platform, hwsku, 'port_config.ini')) | ||
| port_config_candidates.append(os.path.join('/usr/share/sonic/platform', hwsku, 'port_config.ini')) | ||
| port_config_candidates.append(os.path.join('/usr/share/sonic', hwsku, 'port_config.ini')) | ||
| if port_config_file != None: |
There was a problem hiding this comment.
Shouldn't we put this explicitly-specified filename at the first of the candidates?
- Add -p --port-config option to feed sonic-cfggen with port_config.ini
file when necessary.
- Update minigraph.py file to accept the -p option
- Add test_j2files.py test to test config.sh and all .j2 templates
* Currently test_teamd is added to test both the config.sh and teamd.j2
file works well with the t0 sample minigraph and sample port config
file
* The sample output is added to the folder sample_output for comparison
Signed-off-by: Shuotian Cheng <shuche@microsoft.com>
taoyl-ms
approved these changes
Mar 18, 2017
stcheng
pushed a commit
to stcheng/sonic-buildimage
that referenced
this pull request
Dec 13, 2018
Merge pull request sonic-net#409 from pavel-shirshov/pavelsh/teamsyncd [acl-loader]: Read state from state db instead of appl db (sonic-net#415) [show]: Change show mirror session to show mirror_session (sonic-net#414) [sonic_installer] preserve the backup file/directories structure, attributes etc (sonic-net#410) Removed 'show interfaces alias and show interfaces summary'. (sonic-net#412) don't exit when bgpd process doesn't exist(EXIT_CODE 1) (sonic-net#417) Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
lguohan
pushed a commit
that referenced
this pull request
Dec 14, 2018
Merge pull request #409 from pavel-shirshov/pavelsh/teamsyncd [acl-loader]: Read state from state db instead of appl db (#415) [show]: Change show mirror session to show mirror_session (#414) [sonic_installer] preserve the backup file/directories structure, attributes etc (#410) Removed 'show interfaces alias and show interfaces summary'. (#412) don't exit when bgpd process doesn't exist(EXIT_CODE 1) (#417) Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
lguohan
added a commit
to yxieca/sonic-buildimage
that referenced
this pull request
Feb 16, 2019
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
…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
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
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>
Kalimuthu-Velappan
pushed a commit
to Kalimuthu-Velappan/sonic-buildimage
that referenced
this pull request
Sep 12, 2019
madhanmellanox
pushed a commit
to madhanmellanox/sonic-buildimage
that referenced
this pull request
Mar 23, 2020
* Support IPv6 ACL * Add vs test cases for ipv6 ACL
dmytroxshevchuk
pushed a commit
to dmytroxshevchuk/sonic-buildimage
that referenced
this pull request
Aug 31, 2020
* Update SAI pointer Signed-off-by: Marian Pritsak <marianp@mellanox.com> * Add support for BMToR API Signed-off-by: Marian Pritsak <marianp@mellanox.com>
stephenxs
added a commit
to stephenxs/sonic-buildimage
that referenced
this pull request
Dec 3, 2020
swss: - [port_rates][rif_rates] Fix port_rates.lua (sonic-net#1520) - Improve the way of handling BUFFER_PG during PFC storm (sonic-net#1480) - [Orchagent] Vxlanorch and Portsorch changes for EVPN VXLAN (sonic-net#1264) - [sub intf] ecmp hardware convergence acceleration at parent port oper status changes (sonic-net#1492) - [dvs/copp] Adjust policer checks in VS tests for default COPP policers (sonic-net#1519) - Flush ARP/neighbor entry on FDB flush when port L2-L3 (sonic-net#1506) - [intfmgr]: Add GARP support (sonic-net#1503) swss-common: - [Dynamic buffer calc] Support dynamic buffer calculation (sonic-net#361) - README.md: Update build requirements (sonic-net#414) Signed-off-by: Stephen Sun <stephens@nvidia.com>
3 tasks
daall
pushed a commit
that referenced
this pull request
Dec 4, 2020
swss: - [port_rates][rif_rates] Fix port_rates.lua (#1520) - Improve the way of handling BUFFER_PG during PFC storm (#1480) - [Orchagent] Vxlanorch and Portsorch changes for EVPN VXLAN (#1264) - [sub intf] ecmp hardware convergence acceleration at parent port oper status changes (#1492) - [dvs/copp] Adjust policer checks in VS tests for default COPP policers (#1519) - Flush ARP/neighbor entry on FDB flush when port L2-L3 (#1506) - [intfmgr]: Add GARP support (#1503) swss-common: - [Dynamic buffer calc] Support dynamic buffer calculation (#361) - README.md: Update build requirements (#414) Signed-off-by: Stephen Sun <stephens@nvidia.com>
santhosh-kt
pushed a commit
to santhosh-kt/sonic-buildimage
that referenced
this pull request
Feb 25, 2021
…t#6111) swss: - [port_rates][rif_rates] Fix port_rates.lua (sonic-net#1520) - Improve the way of handling BUFFER_PG during PFC storm (sonic-net#1480) - [Orchagent] Vxlanorch and Portsorch changes for EVPN VXLAN (sonic-net#1264) - [sub intf] ecmp hardware convergence acceleration at parent port oper status changes (sonic-net#1492) - [dvs/copp] Adjust policer checks in VS tests for default COPP policers (sonic-net#1519) - Flush ARP/neighbor entry on FDB flush when port L2-L3 (sonic-net#1506) - [intfmgr]: Add GARP support (sonic-net#1503) swss-common: - [Dynamic buffer calc] Support dynamic buffer calculation (sonic-net#361) - README.md: Update build requirements (sonic-net#414) Signed-off-by: Stephen Sun <stephens@nvidia.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
file when necessary.
file works well with the t0 sample minigraph and sample port config
file
Signed-off-by: Shuotian Cheng shuche@microsoft.com