From 4612f680e6ab69e9bd3530d65efb8126ec8ed9c0 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Thu, 14 Jan 2021 00:29:21 -0800 Subject: [PATCH 1/2] [swss] Depend on Python 3 version of swsscommon rather than Python 2 (#6432) The only Python code in the SwSS package, restore_neighbors.py, was recently converted to Python 3 and most dependencies were updated as part of #6207. However, the SwSS makefile still listed the Python 2 version of the swsscommon package as a dependency. This caused Python 2-related packages to be installed in containers unnecessarily. --- rules/swss.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/swss.mk b/rules/swss.mk index 21033361455..e4d18cf2eb3 100644 --- a/rules/swss.mk +++ b/rules/swss.mk @@ -8,7 +8,7 @@ $(SWSS)_DEPENDS += $(LIBSAIREDIS_DEV) $(LIBSAIMETADATA_DEV) $(LIBTEAM_DEV) \ $(SWSS)_UNINSTALLS = $(LIBSAIVS_DEV) $(SWSS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBTEAM) \ - $(LIBTEAMDCTL) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) + $(LIBTEAMDCTL) $(LIBSWSSCOMMON) $(PYTHON3_SWSSCOMMON) SONIC_DPKG_DEBS += $(SWSS) SWSS_DBG = swss-dbg_1.0.0_$(CONFIGURED_ARCH).deb From 9a1b42ff6b519c78905ea30eb9b3fb30f437662e Mon Sep 17 00:00:00 2001 From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com> Date: Thu, 14 Jan 2021 10:34:34 +0200 Subject: [PATCH 2/2] [snmpagent] update submodule (#6169) Includes below sonic-snmpagent commits ``` dfde06e 2021-01-13 | Revert "[rfc1213] Interface MIB add l3 vlan interfaces & aggregate rif counters (#169)" (#191) [Stepan Blyshchak] 45edd7e 2021-01-04 | [snmpagent] Fix hardcoded qsfp lane count by reading sensor status from DB (#184) [Junchao-Mellanox] 3b72a6f 2021-01-02 | Fix: handle empty LOC_CHASSIS_TABLE (#190) [Qi Luo] 4aad821 2020-12-29 | [sysName]: Implement sysName OID (#185) [SuvarnaMeenakshi] 8efb4bb 2020-12-29 | [rfc1213] fix counter value type (#189) [Stepan Blyshchak] 025483a 2020-12-23 | [RouteUpdater]: Fix multi_asic mock function implementation and multi_asic variable name (#186) [SuvarnaMeenakshi] 381ae47 2020-12-10 | [mibs] b'VLAN_TABLE:' -> 'VLAN_TABLE' (#181) [Stepan Blyshchak] e54036c 2020-12-09 | [rfc1213] Interface MIB add l3 vlan interfaces & aggregate rif counters (#169) [Stepan Blyshchak] fd1eae7 2020-11-24 | Set swsscommon logging level (#178) [Qi Luo] 706d504 2020-11-23 | Improve MockRedis _encode(): so it will work on all types of value (#179) [Qi Luo] 64c93a1 2020-11-16 | [RFC4292][Namespace]: Fix implementation of RouteUpdater for multi-asic platform (#176) [SuvarnaMeenakshi] b8f19ee 2020-11-12 | [sonic-snmpagent] SONiC physical entity mib extension (#168) [Junchao-Mellanox] 6b94ec3 2020-11-05 | Replace swsssdk.SonicV2Connector with swsscommon.SonicV2Connector (SWIG wrapper of C++ implementation) in production code (#162) [Qi Luo] ``` Signed-off-by: Stepan Blyshchak Co-authored-by: Qi Luo --- src/sonic-snmpagent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent index 57e54d95619..dfde06e2f5d 160000 --- a/src/sonic-snmpagent +++ b/src/sonic-snmpagent @@ -1 +1 @@ -Subproject commit 57e54d9561934b853a44185bbb401207f4503292 +Subproject commit dfde06e2f5d70e23882af6c0f1af4ae43ec2fa43