[cfggen] Conform With Python 3 Syntax #5154

tahmed-dev · 2020-08-11T23:59:46Z

Preparing sonic-cfggen for migration to Python 3.

signed-off-by: Tamer Ahmed tamer.ahmed@microsoft.com

- Why I did it
Updated package syntax to Python3

- How I did it
Used 2to3 tool to update the syntax. Also, added print function import from future when required

- How to verify it
Unit test cases pass.

- Which release branch to backport (provide reason below if selected)
N/A

lguohan · 2020-08-12T00:04:42Z

src/sonic-config-engine/config_samples.py

@@ -35,22 +35,22 @@ def generate_t1_sample_config(data):

 def generate_empty_config(data):
    new_data = {'DEVICE_METADATA': data['DEVICE_METADATA']}
-    if not new_data['DEVICE_METADATA']['localhost'].has_key('hostname'):


is this necessary? https://www.tutorialspoint.com/python3/dictionary_has_key.htm

I can see python3 still have this support.

indeed. Not sure why 2to3 converted. I used 2to3 -f all switch. Are there recommended switches to use?

removed in 3.1:

https://docs.python.org/3.1/whatsnew/3.0.html

Can confirm, has_key() has been removed in Python 3. in is the new proper way to check for a key.

jleveque · 2020-08-12T00:25:28Z

src/sonic-config-engine/minigraph.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from __future__ import print_function


This line should not be necessary for backward-compatibility with Python 2.7, but it won't hurt anything.

I was getting error related to the print function syntax:

Running sonic-cfggen -y /sonic/src/sonic-config-engine/tests/test.yml -t /sonic/src/sonic-config-engine/tests/test.j2 -------------------------------------------------------------------------------------------------------------------------------------------------- Captured stderr call -------------------------------------------------------------------------------------------------------------------------------------------------- Traceback (most recent call last): File "/sonic/src/sonic-config-engine/tests/../sonic-cfggen", line 39, in <module> from minigraph import minigraph_encoder File "/sonic/src/sonic-config-engine/minigraph.py", line 291 print("VNI must be an integer (use default VNI %d instead)" % vni_default, file=sys.stderr) ^ SyntaxError: invalid syntax

Oh, maybe the file= argument was added in Python 3.0.

Edit: I figured out why from __future__ import print_function is not always needed in Python 2. In Python 2, adding parentheses around the arguments to print does not change it into a function call; it simply translates to "pass this tuple of args to the print statement". This works fine in Python 2, and in Python 3, it works because it is interpreted as a function call. However, adding the file= parameter won't work in Python 2 because print is not technically a function. This is the case when from __future__ import print_function is needed.

src/sonic-config-engine/openconfig_acl.py

qiluo-msft

I commented on some patterns, but not covered all the occurrence. Please check thoroughly if you agree.

src/sonic-config-engine/config_samples.py

src/sonic-config-engine/minigraph.py

src/sonic-config-engine/tests/test_multinpu_cfggen.py

qiluo-msft · 2020-08-12T01:14:55Z

src/sonic-config-engine/openconfig_acl.py

@@ -18,7 +18,9 @@
 from pyangbind.lib.base import PybindBase
 from decimal import Decimal
 from bitarray import bitarray
-import __builtin__


As the first line commented, wondering you manually modified it or auto generated it? #Closed

The whole PR is auto generated except for setup.py file.

This is auto generated using 2to3 tool

jleveque

Build failure:

18:04:24  ==================================== ERRORS ====================================
18:04:24  ____ ERROR collecting deb_dist/sonic-utilities-1.2/tests/acl_loader_test.py ____
18:04:24  ImportError while importing test module '/sonic/src/sonic-utilities/deb_dist/sonic-utilities-1.2/tests/acl_loader_test.py'.
18:04:24  Hint: make sure your test modules/packages have valid Python names.
18:04:24  Traceback:
18:04:24  /usr/lib/python2.7/dist-packages/six.py:709: in exec_
18:04:24      exec("""exec _code_ in _globs_, _locs_""")
18:04:24  tests/acl_loader_test.py:10: in <module>
18:04:24      from acl_loader.main import *
18:04:24  acl_loader/main.py:8: in <module>
18:04:24      import openconfig_acl
18:04:24  /usr/local/lib/python2.7/dist-packages/openconfig_acl.py:22: in <module>
18:04:24      import builtins
18:04:24  E   ImportError: No module named builtins

tahmed-dev · 2020-08-12T02:38:49Z

Build failure:

18:04:24  ==================================== ERRORS ====================================
18:04:24  ____ ERROR collecting deb_dist/sonic-utilities-1.2/tests/acl_loader_test.py ____
18:04:24  ImportError while importing test module '/sonic/src/sonic-utilities/deb_dist/sonic-utilities-1.2/tests/acl_loader_test.py'.
18:04:24  Hint: make sure your test modules/packages have valid Python names.
18:04:24  Traceback:
18:04:24  /usr/lib/python2.7/dist-packages/six.py:709: in exec_
18:04:24      exec("""exec _code_ in _globs_, _locs_""")
18:04:24  tests/acl_loader_test.py:10: in <module>
18:04:24      from acl_loader.main import *
18:04:24  acl_loader/main.py:8: in <module>
18:04:24      import openconfig_acl
18:04:24  /usr/local/lib/python2.7/dist-packages/openconfig_acl.py:22: in <module>
18:04:24      import builtins
18:04:24  E   ImportError: No module named builtins

I did not see this failure when I build it locall. Will look into it

src/sonic-config-engine/setup.py

src/sonic-config-engine/openconfig_acl.py

src/sonic-config-engine/portconfig.py

src/sonic-config-engine/sonic-cfggen

Preparing sonic-cfggen for migration to Python 3. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>

lguohan · 2020-08-18T21:04:26Z

my suggestion is to enable py3 package build as soon as possible so that we have build check even though we may not using them in our image, otherwise it can be degraded.

lguohan · 2020-08-19T13:02:11Z

anything pending here?

tahmed-dev · 2020-08-19T16:29:16Z

anything pending here?

Nope, merging PR now.

* [BFN] Add support pcied daemon for Montara and Newport (sonic-net#5199) Signed-off-by: Petro Bratash <petrox.bratash@intel.com> * [cfggen] Allow Write To Redis DB With Template/Batch Mode (sonic-net#5203) Argument to write to config-db is not allowed when using template. This PR allows cfggen to write to redis db when using template mode. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com> * [submodule]: Advance sonic-snmpagent. (sonic-net#5213) Update sonic-snmpagent submodule to include below commits: 1a2b62a [Namespace]: Fix SAI_ID key used in cpfcIfTable and csqIfQosGroupStatsTable implementation (sonic-net#138) d06f00c [pytest/coverage]: add coverage support (sonic-net#156) 90e9f2e [Namespace]: Simplify sync_d functions to use higher order (sonic-net#154) b5815d9 [LLDP]: Modify OID index of LLDPRemTableUpdater MIB (sonic-net#155) d5f2b92 [Multiasic]: Provide namespace support for ipNetToMediaPhysAddress (sonic-net#129) 166c221 [Namespace]: Fix interface counters in RFC 1213 (sonic-net#145) Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com> * [cfggen] Conform With Python 3 Syntax (sonic-net#5154) Preparing sonic-cfggen for migration to Python 3. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com> * [redis-dump-load] Update submodule (sonic-net#5215) * src/redis-dump-load 832a645...7585497 (2): > Merge pull request sonic-net#63 from jleveque/update_gitignore > Merge pull request sonic-net#59 from breser/redis-load-empty * [services] Fix Delay Start of SNMP And Telemetry (sonic-net#5211) SNMP and Telemetry services are not critical to switch startup. They also cause fast-reboot not to meet timing requirements. In order to delay start those service are associated with systemd timer units, however when hostcfgd initiate service start, it start the service and not the timer. This PR fixes this issue by starting the timer associated with systemd unit. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com> * [sonic-py-common][multi ASIC] API to get a list of frontend ports (sonic-net#5221) * [sonic-py-common][multi ASIC] utility to get a list of frontend ports from a given list of ports * [sonic-config-engine] Update .gitignore (sonic-net#5223) - Ignore directories generated by building Python wheel package - Move all sonic-config-engine ignores from the root .gitignore to src/sonic-config-engine/.gitignore * Advance swss-common submodule. (sonic-net#5222) 9a7c9d Dbconnector namespace support (sonic-net#376) c32f0b5 add state db entry for fgnhg route entry (sonic-net#374) * [caclmgrd] Add support for multi-ASIC platforms (sonic-net#5022) * Support for Control Plane ACL's for Multi-asic Platforms. Following changes were done: 1) Moved from using blocking listen() on Config DB to the select() model via python-swsscommon since we have to wait on event from multiple config db's 2) Since python-swsscommon is not available on host added libswsscommon and python-swsscommon and dependent packages in the base image (host enviroment) 3) Made iptables programmed in all namespace using ip netns exec Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Address Review Comments Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Fix Review Comments * Fix Comments * Added Change for Multi-asic to have iptables rules to accept internal docker tcp/udp traffic needed for syslog and redis-tcp connection. Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Fix Review Comments * Added more comments on logic. * Fixed all warning/errors reported by http://pep8online.com/ other than line > 80 characters. * Fix Comment Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Verified with swsscommon package. Fix issue for single asic platforms. * Moved to new python package * Address Review Comments. Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Address Review Comments. * Add support to VS platform for platform.json and DPB CLI Tests (sonic-net#5192) - Reverts commit 457674c - Creates "platform.json" for vs docker - Adds test case for port breakout CLI - Explicitly sets admin status of all the VS interfaces to down to be compatible with SWSS test cases, specifically vnet tests and sflow tests Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com> * [iccpd] Fix uninitialized variable. (sonic-net#5112) To declare *tb[] but do not initialize it, it might be very risky. We get iccpd exception during processing arp/nd event. Initialize it to {0}; * Fix unwanted python exception in syslog during database container (sonic-net#5227) startup when doing redis PING since database_config.json getting generated from jinja2 template is still not ready. Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * [hostcfgd] Handle Both Service And Timer Units (sonic-net#5228) Commit e484ae9 introduced systemd .timer unit to hostcfgd. However, when stopping service that has timer, there is possibility that timer is not running and the service would not be stopped. This PR address this situation by handling both .timer and .service units. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com> * [arista] Update driver submodules (sonic-net#5147) - fix watchdog timeout units - fix import path for thermal_manager - remove arista bind mounts for docker-snmp - improve arista bind mounts for pmon * [docker-radv] Fix startup issues (sonic-net#5230) **- Why I did it** PR sonic-net#4599 introduced two bugs in the startup of the router advertiser container: 1. References to the `wait_for_intf.sh` script were changed to `wait_for_link.sh`, but the actual script was not renamed 2. The `ipv6_found` Jinja2 variable added to the supervisor config file goes out of scope before it is read. **- How I did it** 1. Rename the `wait_for_intf.sh` script to `wait_for_link.sh` 2. Use the Jinja2 "namespace" construct to fix the scope issue **- How to verify it** Ensure all processes in the radv container start properly under the correct conditions (i.e., whether or not there is at least one VLAN with an IPv6 address assigned). * [sonic-utilities] Update submodule (sonic-net#5233) * src/sonic-utilities d5fdd74...17fb378 (7): > [sonic-installer] Import re module (sonic-net#1061) > [fast-reboot]: Fix fail to execute fast-reboot problem (sonic-net#1047) > [config] Reduce Calls to SONiC Cfggen (sonic-net#1052) > [filter-fdb] Call Filter FDB Main From Within Test Code (sonic-net#1051) > [sflow_test.py]: Fix show sflow display. (sonic-net#1054) > Change fast-reboot script to use swss and radv service script (sonic-net#1036) > Common functions for show CLI support on multi ASIC (sonic-net#999) * [sonic-host-service]: Add SONiC Host Services infrastructure (sonic-net#4840) - Why I did it When SONiC is configured with the management framework and/or telemetry services, the applications running inside those containers need to access some functionality on the host system. The following is a non-exhaustive list of such functionality: Image management Configuration save and load ZTP enable/disable and status Show tech support - How I did it The host service is a Python process that listens for requests via D-Bus. It will then service those requests and send a response back to the requestor. This PR only introduces the host service infrastructure. Applications that need access to the host services must add applets that will register on D-Bus endpoints to service the appropriate functionality. - How to verify it - Description for the changelog Add SONiC Host Service for container to execute select commands in host Signed-off-by: Nirenjan Krishnan <Nirenjan.Krishnan@dell.com> * Add common functions applicable to single/multi asic platforms (sonic-net#5224) * Add common functions applicable to single/multi asic platforms * Raise exception if invalid namespace is given as input. * [sonic-swss] Update submodule (sonic-net#5231) * src/sonic-swss d2bab10...c4949a2 (34): > [dvs] Add new common issues and TOC to DVS README (sonic-net#1405) > Avoid adding loopback interface (ip link add) when setting nat zone on loopback interface (sonic-net#1411) > [portsorch] add buffer drop FC group (sonic-net#1368) > [dvs/chassis] Bring up SONiC interfaces in virtual chassis (sonic-net#1410) > [chassis/dvs] Add support for virtual chassis to DVS testbed (sonic-net#1345) > [sonic-swsss] Fix the issue of field "next_hop_ip" not getting updated in state DB in ERSPAN Mirror (sonic-net#1375) > [intfmgr] Fix OA crash issue due to link local configurations (sonic-net#1195) > Fix the issue when persistent DVS is used to run pytest which has number of front-panel ports < 32 (sonic-net#1373) > [dvs] Refactor AsicDbValidator (sonic-net#1402) > [fec] Get FEC mode when port is already admin down (sonic-net#1403) > [fec] added logic that put port down before applying fec onfiguration (sonic-net#1399) > [dvs] Add performance test for adding and deleting routes (sonic-net#1392) > Ignore IPv6 link-local and multicast entries as Vnet routes (sonic-net#1401) > [vlanmgr] Support Jumbo Frame By Default (sonic-net#1393) > Fix log/syslog not being correct when last test fails for given module (sonic-net#1395) > Get initial speed from ASIC DB (sonic-net#1390) > [dvs] Add options to limit CPU usage (sonic-net#1394) > [intfsorch] Retrieve Port object before setting NAT zone on router interfaces. (sonic-net#1372) > [.gitignore] Ignore gearsyncd binary (sonic-net#1381) > Added Max Nexthopgroup/ECMP Count supported by device into State DB. (sonic-net#1383) > [dvs] Upload logs even if failure occurs during startup (sonic-net#1389) > [rates] fix issue with rates init (sonic-net#1387) > [dvs] Validate that SWSS is ready to receive input before starting tests (sonic-net#1385) > [dvs] Convert sflow and speed tests to use dvslib (sonic-net#1382) > [dvs_acl] Refactor and document dvs_acl library (sonic-net#1378) > [dvs] Fix install instructions in README (sonic-net#1379) > [dvs] Update README with new flags, options, and known issues (sonic-net#1380) > swss: gearsyncd should return 0 on exit (sonic-net#1376) > Remove 00-copp.config.json from swss debian package. (sonic-net#1366) > fix undefined var in rates lua scripts (sonic-net#1365) > [fdborch] Fixed Orchagent crash in FDB flush on port disable. (sonic-net#1369) > [tlm_teamd]: Try to add LAG again, when teamd is not ready first time (sonic-net#1347) > [vs] Incorporate python3 best practices into DVSLib (sonic-net#1357) > [dvs] Mark unstable tests as xfail (sonic-net#1356) * [arista/aboot]: Zero out 1st MB before repartitioning (sonic-net#5220) The first partition starting point was changed to be 1M as part of this commit: 6ba2f97. On systems that are misaligned before conversion (partition start is the first sector), the relica partition that is left in the first MB can cause problems in Aboot and result in corruption of the filesystem on the new aligned partition. Zeroing this old relica makes sure that there is nothing left of the old partition lying around. There won't be any risk of having Aboot corrupt the new filesystem because of the old relica. Signed-off-by: Baptiste Covolato <baptiste@arista.com> * [sonic-py-common] Add unit test framework (sonic-net#5238) **- Why I did it** To install the framework for adding unit tests to the sonic-py-common package and report coverage. ** How I did it ** - Incorporate pytest and pytest-cov into sonic-py-common package build - Updgrade version of 'mock' installed to version 3.0.5, the last version which supports Python 2. This fixes a bug where the file object returned from `mock_open()` was not iterable (see https://bugs.python.org/issue32933) - Add support for Python 3 setuptools and pytest in sonic-slave-buster environment - Add tests for `device_info.get_machine_info()` and `device_info.get_platform()` functions - Also add a .gitignore in the root of the sonic-py-common directory, move all related ignores from main .gitignore file, and add ignores for files and dirs generated by pytest-cov * Add switch for synchronous mode (sonic-net#5237) Add a master switch so that the sync/async mode can be configured. Example usage of the switch: 1. Configure mode while building an image `make ENABLE_SYNCHRONOUS_MODE=y <target>` 2. Configure when the device is running Change CONFIG_DB with `sonic-cfggen -a '{"DEVICE_METADATA":{"localhost": {"synchronous_mode": "enable"}}}' --write-to-db` Restart swss with `systemctl restart swss` * [enable counters] Enable port buffer drops by default and update MLNX SAI submodule (sonic-net#5059) * Enable port buffer drops by default * [Mellanox] Update SAI_Implementation Signed-off-by: Mykola Faryma <mykolaf@mellanox.com> * Platform monitor changes in daemon_base for multi_asic (sonic-net#4932) Adding namespace support for db connect API. Co-authored-by: Petro Bratash <68950226+bratashX@users.noreply.github.com> Co-authored-by: Tamer Ahmed <tamer.ahmed@microsoft.com> Co-authored-by: SuvarnaMeenakshi <50386592+SuvarnaMeenakshi@users.noreply.github.com> Co-authored-by: Joe LeVeque <jleveque@users.noreply.github.com> Co-authored-by: Mahesh Maddikayala <10645050+smaheshm@users.noreply.github.com> Co-authored-by: judyjoseph <53951155+judyjoseph@users.noreply.github.com> Co-authored-by: abdosi <58047199+abdosi@users.noreply.github.com> Co-authored-by: Sangita Maity <sangitamaity0211@gmail.com> Co-authored-by: Kelly Chen <kelly_chen@edge-core.com> Co-authored-by: Samuel Angebault <staphylo@arista.com> Co-authored-by: nirenjan <nirenjan@users.noreply.github.com> Co-authored-by: Baptiste Covolato <b.covolato@gmail.com> Co-authored-by: shi-su <67605788+shi-su@users.noreply.github.com> Co-authored-by: Mykola F <37578614+mykolaf@users.noreply.github.com>

* [BFN] Add support pcied daemon for Montara and Newport (sonic-net#5199) Signed-off-by: Petro Bratash <petrox.bratash@intel.com> * [cfggen] Allow Write To Redis DB With Template/Batch Mode (sonic-net#5203) Argument to write to config-db is not allowed when using template. This PR allows cfggen to write to redis db when using template mode. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com> * [submodule]: Advance sonic-snmpagent. (sonic-net#5213) Update sonic-snmpagent submodule to include below commits: 1a2b62a [Namespace]: Fix SAI_ID key used in cpfcIfTable and csqIfQosGroupStatsTable implementation (sonic-net#138) d06f00c [pytest/coverage]: add coverage support (sonic-net#156) 90e9f2e [Namespace]: Simplify sync_d functions to use higher order (sonic-net#154) b5815d9 [LLDP]: Modify OID index of LLDPRemTableUpdater MIB (sonic-net#155) d5f2b92 [Multiasic]: Provide namespace support for ipNetToMediaPhysAddress (sonic-net#129) 166c221 [Namespace]: Fix interface counters in RFC 1213 (sonic-net#145) Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com> * [cfggen] Conform With Python 3 Syntax (sonic-net#5154) Preparing sonic-cfggen for migration to Python 3. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com> * [redis-dump-load] Update submodule (sonic-net#5215) * src/redis-dump-load 832a645...7585497 (2): > Merge pull request sonic-net#63 from jleveque/update_gitignore > Merge pull request sonic-net#59 from breser/redis-load-empty * [services] Fix Delay Start of SNMP And Telemetry (sonic-net#5211) SNMP and Telemetry services are not critical to switch startup. They also cause fast-reboot not to meet timing requirements. In order to delay start those service are associated with systemd timer units, however when hostcfgd initiate service start, it start the service and not the timer. This PR fixes this issue by starting the timer associated with systemd unit. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com> * [sonic-py-common][multi ASIC] API to get a list of frontend ports (sonic-net#5221) * [sonic-py-common][multi ASIC] utility to get a list of frontend ports from a given list of ports * [sonic-config-engine] Update .gitignore (sonic-net#5223) - Ignore directories generated by building Python wheel package - Move all sonic-config-engine ignores from the root .gitignore to src/sonic-config-engine/.gitignore * Advance swss-common submodule. (sonic-net#5222) 9a7c9d Dbconnector namespace support (sonic-net#376) c32f0b5 add state db entry for fgnhg route entry (sonic-net#374) * [caclmgrd] Add support for multi-ASIC platforms (sonic-net#5022) * Support for Control Plane ACL's for Multi-asic Platforms. Following changes were done: 1) Moved from using blocking listen() on Config DB to the select() model via python-swsscommon since we have to wait on event from multiple config db's 2) Since python-swsscommon is not available on host added libswsscommon and python-swsscommon and dependent packages in the base image (host enviroment) 3) Made iptables programmed in all namespace using ip netns exec Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Address Review Comments Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Fix Review Comments * Fix Comments * Added Change for Multi-asic to have iptables rules to accept internal docker tcp/udp traffic needed for syslog and redis-tcp connection. Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Fix Review Comments * Added more comments on logic. * Fixed all warning/errors reported by http://pep8online.com/ other than line > 80 characters. * Fix Comment Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Verified with swsscommon package. Fix issue for single asic platforms. * Moved to new python package * Address Review Comments. Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Address Review Comments. * Add support to VS platform for platform.json and DPB CLI Tests (sonic-net#5192) - Reverts commit 457674c - Creates "platform.json" for vs docker - Adds test case for port breakout CLI - Explicitly sets admin status of all the VS interfaces to down to be compatible with SWSS test cases, specifically vnet tests and sflow tests Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com> * [iccpd] Fix uninitialized variable. (sonic-net#5112) To declare *tb[] but do not initialize it, it might be very risky. We get iccpd exception during processing arp/nd event. Initialize it to {0}; * Fix unwanted python exception in syslog during database container (sonic-net#5227) startup when doing redis PING since database_config.json getting generated from jinja2 template is still not ready. Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * [hostcfgd] Handle Both Service And Timer Units (sonic-net#5228) Commit e484ae9 introduced systemd .timer unit to hostcfgd. However, when stopping service that has timer, there is possibility that timer is not running and the service would not be stopped. This PR address this situation by handling both .timer and .service units. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com> * [arista] Update driver submodules (sonic-net#5147) - fix watchdog timeout units - fix import path for thermal_manager - remove arista bind mounts for docker-snmp - improve arista bind mounts for pmon * [docker-radv] Fix startup issues (sonic-net#5230) **- Why I did it** PR sonic-net#4599 introduced two bugs in the startup of the router advertiser container: 1. References to the `wait_for_intf.sh` script were changed to `wait_for_link.sh`, but the actual script was not renamed 2. The `ipv6_found` Jinja2 variable added to the supervisor config file goes out of scope before it is read. **- How I did it** 1. Rename the `wait_for_intf.sh` script to `wait_for_link.sh` 2. Use the Jinja2 "namespace" construct to fix the scope issue **- How to verify it** Ensure all processes in the radv container start properly under the correct conditions (i.e., whether or not there is at least one VLAN with an IPv6 address assigned). * [sonic-utilities] Update submodule (sonic-net#5233) * src/sonic-utilities d5fdd74...17fb378 (7): > [sonic-installer] Import re module (sonic-net#1061) > [fast-reboot]: Fix fail to execute fast-reboot problem (sonic-net#1047) > [config] Reduce Calls to SONiC Cfggen (sonic-net#1052) > [filter-fdb] Call Filter FDB Main From Within Test Code (sonic-net#1051) > [sflow_test.py]: Fix show sflow display. (sonic-net#1054) > Change fast-reboot script to use swss and radv service script (sonic-net#1036) > Common functions for show CLI support on multi ASIC (sonic-net#999) * [sonic-host-service]: Add SONiC Host Services infrastructure (sonic-net#4840) - Why I did it When SONiC is configured with the management framework and/or telemetry services, the applications running inside those containers need to access some functionality on the host system. The following is a non-exhaustive list of such functionality: Image management Configuration save and load ZTP enable/disable and status Show tech support - How I did it The host service is a Python process that listens for requests via D-Bus. It will then service those requests and send a response back to the requestor. This PR only introduces the host service infrastructure. Applications that need access to the host services must add applets that will register on D-Bus endpoints to service the appropriate functionality. - How to verify it - Description for the changelog Add SONiC Host Service for container to execute select commands in host Signed-off-by: Nirenjan Krishnan <Nirenjan.Krishnan@dell.com> * Add common functions applicable to single/multi asic platforms (sonic-net#5224) * Add common functions applicable to single/multi asic platforms * Raise exception if invalid namespace is given as input. * [sonic-swss] Update submodule (sonic-net#5231) * src/sonic-swss d2bab10...c4949a2 (34): > [dvs] Add new common issues and TOC to DVS README (sonic-net#1405) > Avoid adding loopback interface (ip link add) when setting nat zone on loopback interface (sonic-net#1411) > [portsorch] add buffer drop FC group (sonic-net#1368) > [dvs/chassis] Bring up SONiC interfaces in virtual chassis (sonic-net#1410) > [chassis/dvs] Add support for virtual chassis to DVS testbed (sonic-net#1345) > [sonic-swsss] Fix the issue of field "next_hop_ip" not getting updated in state DB in ERSPAN Mirror (sonic-net#1375) > [intfmgr] Fix OA crash issue due to link local configurations (sonic-net#1195) > Fix the issue when persistent DVS is used to run pytest which has number of front-panel ports < 32 (sonic-net#1373) > [dvs] Refactor AsicDbValidator (sonic-net#1402) > [fec] Get FEC mode when port is already admin down (sonic-net#1403) > [fec] added logic that put port down before applying fec onfiguration (sonic-net#1399) > [dvs] Add performance test for adding and deleting routes (sonic-net#1392) > Ignore IPv6 link-local and multicast entries as Vnet routes (sonic-net#1401) > [vlanmgr] Support Jumbo Frame By Default (sonic-net#1393) > Fix log/syslog not being correct when last test fails for given module (sonic-net#1395) > Get initial speed from ASIC DB (sonic-net#1390) > [dvs] Add options to limit CPU usage (sonic-net#1394) > [intfsorch] Retrieve Port object before setting NAT zone on router interfaces. (sonic-net#1372) > [.gitignore] Ignore gearsyncd binary (sonic-net#1381) > Added Max Nexthopgroup/ECMP Count supported by device into State DB. (sonic-net#1383) > [dvs] Upload logs even if failure occurs during startup (sonic-net#1389) > [rates] fix issue with rates init (sonic-net#1387) > [dvs] Validate that SWSS is ready to receive input before starting tests (sonic-net#1385) > [dvs] Convert sflow and speed tests to use dvslib (sonic-net#1382) > [dvs_acl] Refactor and document dvs_acl library (sonic-net#1378) > [dvs] Fix install instructions in README (sonic-net#1379) > [dvs] Update README with new flags, options, and known issues (sonic-net#1380) > swss: gearsyncd should return 0 on exit (sonic-net#1376) > Remove 00-copp.config.json from swss debian package. (sonic-net#1366) > fix undefined var in rates lua scripts (sonic-net#1365) > [fdborch] Fixed Orchagent crash in FDB flush on port disable. (sonic-net#1369) > [tlm_teamd]: Try to add LAG again, when teamd is not ready first time (sonic-net#1347) > [vs] Incorporate python3 best practices into DVSLib (sonic-net#1357) > [dvs] Mark unstable tests as xfail (sonic-net#1356) * [arista/aboot]: Zero out 1st MB before repartitioning (sonic-net#5220) The first partition starting point was changed to be 1M as part of this commit: 6ba2f97. On systems that are misaligned before conversion (partition start is the first sector), the relica partition that is left in the first MB can cause problems in Aboot and result in corruption of the filesystem on the new aligned partition. Zeroing this old relica makes sure that there is nothing left of the old partition lying around. There won't be any risk of having Aboot corrupt the new filesystem because of the old relica. Signed-off-by: Baptiste Covolato <baptiste@arista.com> * [sonic-py-common] Add unit test framework (sonic-net#5238) **- Why I did it** To install the framework for adding unit tests to the sonic-py-common package and report coverage. ** How I did it ** - Incorporate pytest and pytest-cov into sonic-py-common package build - Updgrade version of 'mock' installed to version 3.0.5, the last version which supports Python 2. This fixes a bug where the file object returned from `mock_open()` was not iterable (see https://bugs.python.org/issue32933) - Add support for Python 3 setuptools and pytest in sonic-slave-buster environment - Add tests for `device_info.get_machine_info()` and `device_info.get_platform()` functions - Also add a .gitignore in the root of the sonic-py-common directory, move all related ignores from main .gitignore file, and add ignores for files and dirs generated by pytest-cov * Add switch for synchronous mode (sonic-net#5237) Add a master switch so that the sync/async mode can be configured. Example usage of the switch: 1. Configure mode while building an image `make ENABLE_SYNCHRONOUS_MODE=y <target>` 2. Configure when the device is running Change CONFIG_DB with `sonic-cfggen -a '{"DEVICE_METADATA":{"localhost": {"synchronous_mode": "enable"}}}' --write-to-db` Restart swss with `systemctl restart swss` * [enable counters] Enable port buffer drops by default and update MLNX SAI submodule (sonic-net#5059) * Enable port buffer drops by default * [Mellanox] Update SAI_Implementation Signed-off-by: Mykola Faryma <mykolaf@mellanox.com> * Platform monitor changes in daemon_base for multi_asic (sonic-net#4932) Adding namespace support for db connect API. * [py-swsssdk] Submodule Update (sonic-net#5249) Change: c25d492 Merge pull request sonic-net#83 from tahmed-dev/taahme/add-redis-pipeline-operation 198d143 review comments - part of [configdb] Add Ability to Query/Update Redis Using Pipelines 994851c review comments - part of [configdb] Add Ability to Query/Update Redis Using Pipelines 2d2b7e1 making lgtm happy - part of [configdb] Add Ability to Query/Update Redis Using Pipelines fa9093c [configdb] Add Ability to Query/Update Redis Using Pipelines signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com> * [cfggen] Use Redis Pipeline (sonic-net#5250) This PR enables cfggen to readr/write from Redis DB using pipelines. Pipelines enables batch read/write from/to Redis DB. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com> Co-authored-by: Petro Bratash <68950226+bratashX@users.noreply.github.com> Co-authored-by: Tamer Ahmed <tamer.ahmed@microsoft.com> Co-authored-by: SuvarnaMeenakshi <50386592+SuvarnaMeenakshi@users.noreply.github.com> Co-authored-by: Joe LeVeque <jleveque@users.noreply.github.com> Co-authored-by: Mahesh Maddikayala <10645050+smaheshm@users.noreply.github.com> Co-authored-by: judyjoseph <53951155+judyjoseph@users.noreply.github.com> Co-authored-by: abdosi <58047199+abdosi@users.noreply.github.com> Co-authored-by: Sangita Maity <sangitamaity0211@gmail.com> Co-authored-by: Kelly Chen <kelly_chen@edge-core.com> Co-authored-by: Samuel Angebault <staphylo@arista.com> Co-authored-by: nirenjan <nirenjan@users.noreply.github.com> Co-authored-by: Baptiste Covolato <b.covolato@gmail.com> Co-authored-by: shi-su <67605788+shi-su@users.noreply.github.com> Co-authored-by: Mykola F <37578614+mykolaf@users.noreply.github.com>

jleveque · 2020-09-22T00:09:01Z

@tahmed-dev: You modified the sonic-config-engine syntax to support Python 3. However you did not modify the build process to build and install a Python 3 version of the sonic-config-engine package. Is there a reason why not?

tahmed-dev · 2020-09-22T00:12:52Z

@jleveque no particular reason. let me take note of that.

jleveque · 2020-09-22T00:15:55Z

Thanks. I ask because I am working on creating a Python 3 sonic-utilities package, and the unit tests require sonic-config-engine, so we need a Python 3 sonic-config-engine package first.

tahmed-dev · 2020-09-22T01:56:14Z

Thanks. I ask because I am working on creating a Python 3 sonic-utilities package, and the unit tests require sonic-config-engine, so we need a Python 3 sonic-config-engine package first.

I'll dedicate some time on Wed to address this.

Preparing sonic-cfggen for migration to Python 3. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>

tahmed-dev requested review from lguohan and jleveque August 11, 2020 23:59

lguohan reviewed Aug 12, 2020

View reviewed changes

tahmed-dev requested a review from lguohan August 12, 2020 00:15

jleveque reviewed Aug 12, 2020

View reviewed changes

jleveque suggested changes Aug 12, 2020

View reviewed changes

src/sonic-config-engine/openconfig_acl.py Show resolved Hide resolved

tahmed-dev requested a review from jleveque August 12, 2020 00:36

jleveque suggested changes Aug 12, 2020

View reviewed changes

src/sonic-config-engine/openconfig_acl.py Show resolved Hide resolved

qiluo-msft reviewed Aug 12, 2020

View reviewed changes

jleveque suggested changes Aug 12, 2020

View reviewed changes

tahmed-dev requested review from jleveque and qiluo-msft August 12, 2020 03:12

jleveque suggested changes Aug 12, 2020

View reviewed changes

src/sonic-config-engine/setup.py Outdated Show resolved Hide resolved

tahmed-dev force-pushed the taahme/update-sonic-cfggen-to-py3 branch from eb08d61 to 9b96f13 Compare August 12, 2020 03:14

tahmed-dev requested a review from jleveque August 12, 2020 03:17

jleveque suggested changes Aug 13, 2020

View reviewed changes

src/sonic-config-engine/portconfig.py Outdated Show resolved Hide resolved

src/sonic-config-engine/sonic-cfggen Show resolved Hide resolved

tahmed-dev added 6 commits August 17, 2020 15:33

[cfggen] Conform With Python 3 Syntax

fd26311

Preparing sonic-cfggen for migration to Python 3. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>

review comment

21783ab

review comments

4a723d9

fix build error

76ba1bf

2to3 missed sonic-cfggen script. Adding it.

2a255ec

review comment and rebasing to lastest.

d14d923

tahmed-dev force-pushed the taahme/update-sonic-cfggen-to-py3 branch from cc4dc72 to d14d923 Compare August 17, 2020 22:42

tahmed-dev requested a review from jleveque August 17, 2020 23:17

jleveque approved these changes Aug 18, 2020

View reviewed changes

lguohan approved these changes Aug 18, 2020

View reviewed changes

tahmed-dev merged commit ec11308 into sonic-net:master Aug 19, 2020

jleveque mentioned this pull request Nov 7, 2020

[sonic-bgpcfgd] Call Python 3 version of sonic-cfggen for testing #5847

Merged

3 tasks

jleveque added Python 3 sonic-cfggen SONiC Configuration Generator Tool labels Nov 19, 2020

santhosh-kt pushed a commit to santhosh-kt/sonic-buildimage that referenced this pull request Feb 25, 2021

[cfggen] Conform With Python 3 Syntax (sonic-net#5154)

416eaeb

Preparing sonic-cfggen for migration to Python 3. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[cfggen] Conform With Python 3 Syntax #5154

[cfggen] Conform With Python 3 Syntax #5154

tahmed-dev commented Aug 11, 2020

lguohan Aug 12, 2020

tahmed-dev Aug 12, 2020

tahmed-dev Aug 12, 2020

jleveque Aug 12, 2020 •

edited

jleveque Aug 12, 2020

tahmed-dev Aug 12, 2020

jleveque Aug 12, 2020 •

edited

qiluo-msft left a comment

qiluo-msft Aug 12, 2020 •

edited

tahmed-dev Aug 12, 2020

tahmed-dev Aug 12, 2020

jleveque left a comment

tahmed-dev commented Aug 12, 2020

lguohan commented Aug 18, 2020

lguohan commented Aug 19, 2020

tahmed-dev commented Aug 19, 2020

jleveque commented Sep 22, 2020

tahmed-dev commented Sep 22, 2020

jleveque commented Sep 22, 2020

tahmed-dev commented Sep 22, 2020

		@@ -1,4 +1,5 @@
		#!/usr/bin/env python
		from __future__ import print_function

[cfggen] Conform With Python 3 Syntax #5154

[cfggen] Conform With Python 3 Syntax #5154

Conversation

tahmed-dev commented Aug 11, 2020

lguohan Aug 12, 2020

Choose a reason for hiding this comment

tahmed-dev Aug 12, 2020

Choose a reason for hiding this comment

tahmed-dev Aug 12, 2020

Choose a reason for hiding this comment

jleveque Aug 12, 2020 • edited

Choose a reason for hiding this comment

jleveque Aug 12, 2020

Choose a reason for hiding this comment

tahmed-dev Aug 12, 2020

Choose a reason for hiding this comment

jleveque Aug 12, 2020 • edited

Choose a reason for hiding this comment

qiluo-msft left a comment

Choose a reason for hiding this comment

qiluo-msft Aug 12, 2020 • edited

Choose a reason for hiding this comment

tahmed-dev Aug 12, 2020

Choose a reason for hiding this comment

tahmed-dev Aug 12, 2020

Choose a reason for hiding this comment

jleveque left a comment

Choose a reason for hiding this comment

tahmed-dev commented Aug 12, 2020

lguohan commented Aug 18, 2020

lguohan commented Aug 19, 2020

tahmed-dev commented Aug 19, 2020

jleveque commented Sep 22, 2020

tahmed-dev commented Sep 22, 2020

jleveque commented Sep 22, 2020

tahmed-dev commented Sep 22, 2020

jleveque Aug 12, 2020 •

edited

jleveque Aug 12, 2020 •

edited

qiluo-msft Aug 12, 2020 •

edited