[sonic-cfggen] Support multiple input yaml files in -y option #729

taoyl-ms · 2017-06-20T22:02:44Z

No description provided.

lguohan · 2017-06-21T03:50:12Z

src/sonic-config-engine/sonic-cfggen

@@ -49,7 +49,8 @@ def main():
    parser=argparse.ArgumentParser(description="Render configuration file from minigraph data and jinja2 template.")
    parser.add_argument("-m", "--minigraph", help="minigraph xml file")
    parser.add_argument("-p", "--port-config", help="port config file, used with -m")
-    parser.add_argument("-y", "--yaml", help="yaml file that contains addtional variables")
+    parser.add_argument("-y", "--yaml", help="yaml file that contains addtional variables", action='append', default=[])
+    parser.add_argument("-Y", "--optional-yaml", help="optional yaml file that contains addtional variables", action='append', default=[])


i feel this is error prone. can we do this check this outside sonic-cfggen?

like [ -f $file ] && sonic-cfggen -y $file.

This is what we are doing now.

lguohan

optional-yaml option does not seem to be a good idea.

taoyl-ms · 2017-06-21T18:30:28Z

OK, I can remove it.

* [build_debian]: Add dbus package to update timezone (#702) Signed-off-by: Hiayang Zheng haiyang.z@alibaba.inc * [Accton]: Add a new supported device and platform, AS7712-32X (#662) * platform/broadcom: Add a new supported device and platform, AS7712-32X * Switch Vendor: Edge-core * Switch SKU: AS7712-32X * ASIC Vendor: Broadcom * Swich ASIC: Tomahawk * Port Configuration: 32x100G * SONiC Image: SONiC-ONIE-Broadcom Signed-off-by: polly_hsu@accton.com * [image]: load platform specific settings in sonic-to-sonic upgrade (#710) * [submodule]: Update sairedis submodule (#712) Include fix for saithrift port split parsing * [docker-ptf]: Install exabgp in docker ptf (#709) * [platform]: fix file mode for acction platform to create clean build (#714) * [image]: expand dockerfs.tar.gz directly on to disk without intermediate file (#715) * [submodule]: update swss/sairedis/swss-common submodule (#716) fix bug for logrotate sairedis log * [submodule]: update sonic-swss (#719) * [image]: add debian security update in the apt source list (#724) * [submodule]: update sonic-platform-daemons (#722) * [platform]: turn on/off four leds for breakout-able front panel ports (#723) turn on/off four leds for breakout-able front panel ports on arista 7050 qx32 platform * [sonic-quagga]:update submodule (#718) Signed-off-by: Sihui Han <sihan@microsoft.com> * Add Broadcom LED microprocessor initialization for Dell S6000 (#726) * Add Broadcom LED microprocessor initialization for Dell S6000 * Increase bcmcmd timeout to 60 seconds * [platform]: Update sonic-platform-modules-arista (#727) * [Broadcom]: Update SAI package to support Accton-AS7712-C32 (#720) * Remove exsiting sonic-platform-modules-accton and apply submodule add… (#717) * Remove exsiting sonic-platform-modules-accton and apply submodule adding on this folder. * Remove redundant commnet * Remove folder platform/broadcom/sonic-platform-modules-accton. * Add this dir for submodule. * [submodule]: update sonic-platform-daemons submodule (#731) * [installer] Copy old config files rather than only minigraph (#730) * [BGPD]: add bgp dynamic neighbor configuration (#708) * add bgp dynamic neighbor configuration * [bgpd]: update as comments * update as comment * update to deployment_id_asn_map * minor change * [docker-syncd-brcm]: Sleep to allow syncd to create socket before calling bcmcmd (#733) * [docker-syncd-brcm]: Sleep to allow syncd to create socket before calling bcmcmd * Instead of fixed sleep interval, continually check for presence of socket * [sonic-cfggen]: Support multiple input yaml files with -y option (#729) * [sonic-cfggen]: Fix minigraph.py when port_alias_map absent (#738) * [bgp]: move allowas-in into ipv6 section to enable allowas-in for ipv6 (#741) * [swss]: Sleep 5 min regardless of arp_update return code (#743) - arp_update return code is not guaranteed to be true/false. When there is no VLAN, arp_update will return true. When there are VLANs, arp_update will return false because the command arping returns 1 due to the option '-w 0'. - This script should be run every 5 minutes regardless of the return code. * [Mellanox]: Update SAI version (#740) - Initialize ECMP default hashing with IPv6 packets * [sonic-cfggen]: Add default IP deny rule in translate_acl (#734) - Add IPv4 implicit rule: deny ip any any This implicit rule has lowest priority and ensures that the device denies all unmatched IP traffic. * [docker-platform-monitor]: Add fancontrol (#735) * Fix typo in README (#750) * Fix typo in README * Fix comment * Fix README * [DHCP Relay]: Add support for custom Option 82 circuit_id of the form '<hostname>:<portname>' (#747) * Add docker-dhcp-relay/Dockerfile to .gitignore * Add isc-dhcp-relay .deb package to image build process, along with my Option 82 patch * Install custom isc-dhcp-relay in dhcp_relay docker * Install isc-dhcp-relay build dependencies in sonic-slave Docker container * Copy the built .deb package to the destination directory * Add dependencies for isc-dhcp-relay * Change Option 82 string to '<hostname>:<portname>' * Install dependencies of .deb files implicitly in Dockerfile * Remove unused line * Remove unnecessary space * [Accton]: Add a new supported device and platform AS7716-32X (#732) Switch Vendor: Edge-core Switch SKU: AS7716-32X ASIC Vendor: Broadcom Swich ASIC: Tomahawk Port Configuration: 32x100G SONiC Image: SONiC-ONIE-Broadcom Signed-off-by: polly_hsu@accton.com * [.gitignore]: Update src, config engine (#754) Signed-off-by: marian-pritsak <marianp@mellanox.com> * [submodule]: update sonic-swss (#755) * [sonic-swss-common]: Submodule update (#759) * [mgmt slave] Install correct version of python-cffi (#760) * [DHCP Relay]: Fix Option 82 string - Remove quotes; add MAC address of receiving port as remote_id (#763) * [platform]: add front panel index in port_config.ini for s6100 (#752) * add front panel index in port_config.ini * [igb]: change download url to azure storage url (#770) * [baseimage]: Increase net.core.rmem_max to 2097152 (#767) * Increase net.core.rmem_max to 2097152 * Update Ingrasys platform submodule (#764) * Remove specific fancontrol service. Signed-off-by: Wade He <chihen.he@gmail.com> * [Broadcom]: Update SAI package to support Celestica Seastone DX010 and Accton AS7716 (#768) * [LLDP]: Port description (TLV 4) now contains '<neighbor_host_name>:<port_name>' (#772) * [sonic-slave]: install docker-ce 17.03.02 stable version (#774) * [device]: add minigraph and LED support for Arista 7050 QX32S (#773) * Update submodules: sairedis, swss

* 0c07a80 2018-12-27 | [intfmgrd]: Merge intfsyncd into intfmgrd (sonic-net#635) (HEAD, origin/master, origin/HEAD) [Marian Pritsak] * a45c7b5 2018-12-23 | [watermark] fix watermark clear not working for PG (sonic-net#729) [Mykola F] * 25d16b3 2018-12-23 | [neighorch] return back original condition for port oper status (sonic-net#727) [Qi Luo] |\ | * 05a3558 2018-12-12 | [neighorch] return back original condition for port oper status [Stepan Blyschak] * | 514cfef 2018-12-23 | [swssconfig]: Remove deprecated qos buffer configurations (sonic-net#726) [Shuotian Cheng] * | 025268a 2018-12-22 | [WR]: Add reconciliation logic for teamsyncd (sonic-net#725) [pavel-shirshov] * | 5803a8c 2018-12-21 | Fix: crash while destructing crmorch (sonic-net#731) [Qi Luo] * | 998b4ab 2018-12-21 | Temporarily skip the testcase test_routing_WarmRestart to unblock other pull requests (sonic-net#733) [Qi Luo] * | a7a68c1 2018-12-19 | Optimize neigh restore process during warm-reboot (sonic-net#722) [zhenggen-xu] |/ * 3d60b3e 2018-12-03 | [portsorch] Portsorch simple improvements (sonic-net#718) [stepanblyschak] Signed-off-by: Guohan Lu <gulv@microsoft.com>

* 0c07a80 2018-12-27 | [intfmgrd]: Merge intfsyncd into intfmgrd (#635) (HEAD, origin/master, origin/HEAD) [Marian Pritsak] * a45c7b5 2018-12-23 | [watermark] fix watermark clear not working for PG (#729) [Mykola F] * 25d16b3 2018-12-23 | [neighorch] return back original condition for port oper status (#727) [Qi Luo] |\ | * 05a3558 2018-12-12 | [neighorch] return back original condition for port oper status [Stepan Blyschak] * | 514cfef 2018-12-23 | [swssconfig]: Remove deprecated qos buffer configurations (#726) [Shuotian Cheng] * | 025268a 2018-12-22 | [WR]: Add reconciliation logic for teamsyncd (#725) [pavel-shirshov] * | 5803a8c 2018-12-21 | Fix: crash while destructing crmorch (#731) [Qi Luo] * | 998b4ab 2018-12-21 | Temporarily skip the testcase test_routing_WarmRestart to unblock other pull requests (#733) [Qi Luo] * | a7a68c1 2018-12-19 | Optimize neigh restore process during warm-reboot (#722) [zhenggen-xu] |/ * 3d60b3e 2018-12-03 | [portsorch] Portsorch simple improvements (#718) [stepanblyschak] Signed-off-by: Guohan Lu <gulv@microsoft.com>

- [neighbor advertiser] remove http endpoint access (sonic-net#792) - [dropconfig] Move prefix-handling from CLI to orchagent (sonic-net#785) - [acl-loader] Use V6 ethertype for IPv6 ACL rule (sonic-net#788) - kdump support (sonic-net#729) - Add command line support for thermal control (sonic-net#777) - [fdbshow][nbrshow] Print interface OID in lieu of name if there is no OID->interface name mapping (sonic-net#789) - ipaddr module to ipaddress for show command (sonic-net#786) - [sonic_installer] Adding support for ARM Uboot firmware (sonic-net#769) - [config] Merge duplicate vrf configuration (sonic-net#759) - [dropconfig] Clean-up error output for devices that do not support drop counters (sonic-net#784) - [show] enhance 'show ip[v6] bgp summary' command (sonic-net#754) - On sflow enable, start the docker since it is disabled by default (sonic-net#773) - [portstat] fix header used (sonic-net#743) - Add VRF-related commands to Command Reference Document (sonic-net#778) - [intfstat] fix --delete fail when counters dump does not exist (sonic-net#752) - [scripts] Adds support for management (1.0) commands (sonic-net#745) - A generic JSON file updater, which can add/update-existing attributes. (sonic-net#770) - [command reference] Update show int counters info with l3 RIF (sonic-net#725) - [fast/warm reboot] ignore errors after shutting down critical service(s) (sonic-net#761) - Platform Driver Development Framework (PDDF): Adding PDDF CLI utils (sonic-net#624) - Platform plugin for Fast-reboot/warm-reboot (sonic-net#740) Signed-off-by: Danny Allen <daall@microsoft.com>

- [neighbor advertiser] remove http endpoint access (#792) - [dropconfig] Move prefix-handling from CLI to orchagent (#785) - [acl-loader] Use V6 ethertype for IPv6 ACL rule (#788) - kdump support (#729) - Add command line support for thermal control (#777) - [fdbshow][nbrshow] Print interface OID in lieu of name if there is no OID->interface name mapping (#789) - ipaddr module to ipaddress for show command (#786) - [sonic_installer] Adding support for ARM Uboot firmware (#769) - [config] Merge duplicate vrf configuration (#759) - [dropconfig] Clean-up error output for devices that do not support drop counters (#784) - [show] enhance 'show ip[v6] bgp summary' command (#754) - On sflow enable, start the docker since it is disabled by default (#773) - [portstat] fix header used (#743) - Add VRF-related commands to Command Reference Document (#778) - [intfstat] fix --delete fail when counters dump does not exist (#752) - [scripts] Adds support for management (1.0) commands (#745) - A generic JSON file updater, which can add/update-existing attributes. (#770) - [command reference] Update show int counters info with l3 RIF (#725) - [fast/warm reboot] ignore errors after shutting down critical service(s) (#761) - Platform Driver Development Framework (PDDF): Adding PDDF CLI utils (#624) - Platform plugin for Fast-reboot/warm-reboot (#740) Signed-off-by: Danny Allen <daall@microsoft.com>

e98a7af95a9767093904d9e8fd320067163d5f87 (HEAD -> 201911, origin/201911) [syncd] Translate removed RIDs in fdb notification (#729) 3ceeae5371eee5b69064fa1af88f51e27caa2d36 [syncd] Process all cases fdb flush notification (#726) 115ba0783edf85658fd0329eb23796d758c309f5 fix compile error when compiling with g++-4.8.4 (#718) a67f94d3d91325516069ef8c0d99bdec30bafbce Fix typo at SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT32 (#662) Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

In the event of a kernel crash, we need to gather as much information as possible to understand and identify the root cause of the crash. Currently, the kernel does not provide much information, which make kernel crash investigation difficult and time consuming. Fortunately, there is a way in the kernel to provide more information in the case of a kernel crash. kdump is a feature of the Linux kernel that creates crash dumps in the event of a kernel crash. This PR will add kernel kdump support. Please note that there is another PR in sonic-utilities which is also needed: sonic-net#3722 An extension to the CLI utilities config and show is provided to configure and manage kdump: view kdump status (enabled/disabled, active, configuration, stored crash files) enable / disable kdump functionality configure kdump (how many kernel crash logs can be saved, memory allocated for capture kernel) view kernel crash logs There is a design document which describes this kdump implementation: sonic-net/SONiC#510

[sonic-cfggen] Support multiple -y option and an optional -Y option

98a0a5a

taoyl-ms requested review from lguohan and sihuihan88 June 20, 2017 22:02

msftclas added the cla-not-required label Jun 20, 2017

sihuihan88 approved these changes Jun 21, 2017

View reviewed changes

stcheng added the Enhancement ➕ label Jun 21, 2017

lguohan reviewed Jun 21, 2017

View reviewed changes

lguohan requested changes Jun 21, 2017

View reviewed changes

Remove optional-yml

dbfa6e3

taoyl-ms changed the title ~~[sonic-cfggen] Support multiple -y option and an optional -Y option~~ [sonic-cfggen] Support multiple -y option Jun 21, 2017

taoyl-ms changed the title ~~[sonic-cfggen] Support multiple -y option~~ [sonic-cfggen] Support multiple input yaml files in -y option Jun 21, 2017

lguohan approved these changes Jun 22, 2017

View reviewed changes

stcheng merged commit a8e3d97 into sonic-net:master Jun 22, 2017

lguohan mentioned this pull request Dec 28, 2018

[submodule]: update sonic-swss #2403

Merged

daall mentioned this pull request Jan 28, 2020

[utilities] Update utilities submodule #4080

Merged

madhanmellanox pushed a commit to madhanmellanox/sonic-buildimage that referenced this pull request Mar 23, 2020

[watermark] fix watermark clear not working for PG (sonic-net#729)

a45c7b5

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[sonic-cfggen] Support multiple input yaml files in -y option #729

[sonic-cfggen] Support multiple input yaml files in -y option #729

taoyl-ms commented Jun 20, 2017

lguohan Jun 21, 2017

taoyl-ms Jun 21, 2017

lguohan left a comment

taoyl-ms commented Jun 21, 2017

[sonic-cfggen] Support multiple input yaml files in -y option #729

[sonic-cfggen] Support multiple input yaml files in -y option #729

Conversation

taoyl-ms commented Jun 20, 2017

lguohan Jun 21, 2017

Choose a reason for hiding this comment

taoyl-ms Jun 21, 2017

Choose a reason for hiding this comment

lguohan left a comment

Choose a reason for hiding this comment

taoyl-ms commented Jun 21, 2017