From 609691d86607d524b964543d9c47c4bebfe5f7ad Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jolevequ@microsoft.com>
Date: Mon, 27 Mar 2017 22:58:55 +0000
Subject: [PATCH 1/4] [swsssdk]: Update nomenclature: sswsdk -> swsssdk

---
 dockers/docker-lldp-sv2/Dockerfile.j2 | 4 ++--
 dockers/docker-lldp/Dockerfile        | 6 +++---
 dockers/docker-snmp-sv2/Dockerfile.j2 | 3 ++-
 dockers/docker-snmp/Dockerfile        | 1 -
 rules/asyncsnmp-py3.mk                | 2 +-
 rules/dbsyncd-py2.mk                  | 2 +-
 rules/sswsdk-py2.mk                   | 6 ------
 rules/sswsdk-py3.mk                   | 8 --------
 rules/swsssdk-py2.mk                  | 6 ++++++
 rules/swsssdk-py3.mk                  | 8 ++++++++
 10 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 rules/sswsdk-py2.mk
 delete mode 100644 rules/sswsdk-py3.mk
 create mode 100644 rules/swsssdk-py2.mk
 create mode 100644 rules/swsssdk-py3.mk

diff --git a/dockers/docker-lldp-sv2/Dockerfile.j2 b/dockers/docker-lldp-sv2/Dockerfile.j2
index 4ff66944fe0..3b0e8d4a22e 100644
--- a/dockers/docker-lldp-sv2/Dockerfile.j2
+++ b/dockers/docker-lldp-sv2/Dockerfile.j2
@@ -14,7 +14,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y python-pip supervisor libbsd0 libevent-2.0-5 libjansson4 libwrap0 libxml2 libpci3 libperl5.20 
 
 ## Pre-install the fundamental packages
-## Install Python SSWSDK
+## Install Python SwSSSDK
 ## Install LLDP Sync Daemon
 
 RUN dpkg -i \
@@ -22,7 +22,7 @@ RUN dpkg -i \
 debs/{{ deb }}{{' '}}
 {%- endfor %}
 
-RUN pip install /python-wheels/sswsdk-2.0.1-py2-none-any.whl && \
+RUN pip install /python-wheels/swsssdk-2.0.1-py2-none-any.whl && \
     pip install /python-wheels/sonic_d-2.0.0-py2-none-any.whl && \
     apt-get remove -y python-pip && \
     apt-get purge -y && apt-get autoclean -y && apt-get autoremove -y && \
diff --git a/dockers/docker-lldp/Dockerfile b/dockers/docker-lldp/Dockerfile
index 044e16953e8..2005c63a32e 100644
--- a/dockers/docker-lldp/Dockerfile
+++ b/dockers/docker-lldp/Dockerfile
@@ -1,12 +1,12 @@
 FROM docker-base
 
-COPY deps/sswsdk*.whl deps/lldpsyncd_*.deb deps/lldpd_*.deb /deps/
+COPY deps/swsssdk*.whl deps/lldpsyncd_*.deb deps/lldpd_*.deb /deps/
 
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
 
 ## Pre-install the fundamental packages
-## Install Python SSWSDK (lldpsyncd dependency)
+## Install Python SWSSSDK (lldpsyncd dependency)
 ## Install LLDP Sync Daemon
 ## Note: dpkg_apt function has the benefit to detect missing .deb file
 ## Clean up
@@ -15,7 +15,7 @@ RUN apt-get update && \
     dpkg_apt /deps/lldpd_*.deb && \
     dpkg_apt /deps/lldpsyncd_*.deb && \
     apt-get install -y python-pip supervisor && \
-    pip install /deps/sswsdk*.whl && \
+    pip install /deps/swsssdk*.whl && \
     apt-get remove -y python-pip && \
     apt-get purge -y && apt-get autoclean -y && apt-get autoremove -y && \
     rm -rf /deps ~/.cache
diff --git a/dockers/docker-snmp-sv2/Dockerfile.j2 b/dockers/docker-snmp-sv2/Dockerfile.j2
index db5a6a574f4..fed2d1b85d5 100644
--- a/dockers/docker-snmp-sv2/Dockerfile.j2
+++ b/dockers/docker-snmp-sv2/Dockerfile.j2
@@ -6,7 +6,8 @@ COPY [ \
 {%- endfor %} \
     "/debs/"]
 
-COPY python-wheels/sswsdk-*-py3-*.whl /python-wheels/
+# Install Python SwSSSDK (SNMP subagent dependency)
+COPY python-wheels/swsssdk-*-py3-*.whl /python-wheels/
 COPY python-wheels/asyncsnmp-*-py3-*.whl /python-wheels/
 
 # enable -O for all Python calls
diff --git a/dockers/docker-snmp/Dockerfile b/dockers/docker-snmp/Dockerfile
index c13428563e3..6a79db976ad 100644
--- a/dockers/docker-snmp/Dockerfile
+++ b/dockers/docker-snmp/Dockerfile
@@ -10,7 +10,6 @@ ENV PYTHONOPTIMIZE 1
 ENV DEBIAN_FRONTEND=noninteractive
 
 ## Pre-install the fundamental packages
-## Install Python SSWSDK (SNMP subagent dependency)
 ## Install SNMP subagent
 ## Note: dpkg_apt function has the benefit to detect missing .deb file
 ## Clean up
diff --git a/rules/asyncsnmp-py3.mk b/rules/asyncsnmp-py3.mk
index 68566b1fa49..a5a078e15bc 100644
--- a/rules/asyncsnmp-py3.mk
+++ b/rules/asyncsnmp-py3.mk
@@ -3,5 +3,5 @@
 ASYNCSNMP_PY3 = asyncsnmp-2.1.0-py3-none-any.whl
 $(ASYNCSNMP_PY3)_SRC_PATH = $(SRC_PATH)/sonic-snmpagent
 $(ASYNCSNMP_PY3)_PYTHON_VERSION = 3
-$(ASYNCSNMP_PY3)_DEPENDS += $(SSWSDK_PY3)
+$(ASYNCSNMP_PY3)_DEPENDS += $(SWSSSDK_PY3)
 SONIC_PYTHON_WHEELS += $(ASYNCSNMP_PY3)
diff --git a/rules/dbsyncd-py2.mk b/rules/dbsyncd-py2.mk
index cd85b9ed7f6..220dc5fe7a1 100644
--- a/rules/dbsyncd-py2.mk
+++ b/rules/dbsyncd-py2.mk
@@ -3,5 +3,5 @@
 DBSYNCD_PY2 = sonic_d-2.0.0-py2-none-any.whl
 $(DBSYNCD_PY2)_SRC_PATH = $(SRC_PATH)/sonic-dbsyncd
 $(DBSYNCD_PY2)_PYTHON_VERSION = 2
-$(DBSYNCD_PY2)_DEPENDS += $(SSWSDK_PY2)
+$(DBSYNCD_PY2)_DEPENDS += $(SWSSSDK_PY2)
 SONIC_PYTHON_WHEELS += $(DBSYNCD_PY2)
diff --git a/rules/sswsdk-py2.mk b/rules/sswsdk-py2.mk
deleted file mode 100644
index b50ea229ab7..00000000000
--- a/rules/sswsdk-py2.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# sswsdk python2 wheel
-
-SSWSDK_PY2 = sswsdk-2.0.1-py2-none-any.whl
-$(SSWSDK_PY2)_SRC_PATH = $(SRC_PATH)/sonic-py-swsssdk
-$(SSWSDK_PY2)_PYTHON_VERSION = 2
-SONIC_PYTHON_WHEELS += $(SSWSDK_PY2)
diff --git a/rules/sswsdk-py3.mk b/rules/sswsdk-py3.mk
deleted file mode 100644
index 4dd0e7805bb..00000000000
--- a/rules/sswsdk-py3.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# sswsdk python3 wheel
-
-SSWSDK_PY3 = sswsdk-2.0.1-py3-none-any.whl
-$(SSWSDK_PY3)_SRC_PATH = $(SRC_PATH)/sonic-py-swsssdk
-$(SSWSDK_PY3)_PYTHON_VERSION = 3
-# Synthetic dependency just to avoid race condition
-$(SSWSDK_PY3)_DEPENDS += $(SSWSDK_PY2)
-SONIC_PYTHON_WHEELS += $(SSWSDK_PY3)
diff --git a/rules/swsssdk-py2.mk b/rules/swsssdk-py2.mk
new file mode 100644
index 00000000000..a45677ae588
--- /dev/null
+++ b/rules/swsssdk-py2.mk
@@ -0,0 +1,6 @@
+# swsssdk python2 wheel
+
+SWSSSDK_PY2 = swsssdk-2.0.1-py2-none-any.whl
+$(SWSSSDK_PY2)_SRC_PATH = $(SRC_PATH)/sonic-py-swsssdk
+$(SWSSSDK_PY2)_PYTHON_VERSION = 2
+SONIC_PYTHON_WHEELS += $(SWSSSDK_PY2)
diff --git a/rules/swsssdk-py3.mk b/rules/swsssdk-py3.mk
new file mode 100644
index 00000000000..e2f3519e00c
--- /dev/null
+++ b/rules/swsssdk-py3.mk
@@ -0,0 +1,8 @@
+# swsssdk python3 wheel
+
+SWSSSDK_PY3 = swsssdk-2.0.1-py3-none-any.whl
+$(SWSSSDK_PY3)_SRC_PATH = $(SRC_PATH)/sonic-py-swsssdk
+$(SWSSSDK_PY3)_PYTHON_VERSION = 3
+# Synthetic dependency just to avoid race condition
+$(SWSSSDK_PY3)_DEPENDS += $(SWSSSDK_PY2)
+SONIC_PYTHON_WHEELS += $(SWSSSDK_PY3)

From 140c8302566da36c3831f93bb4ed963c79419b6f Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jolevequ@microsoft.com>
Date: Wed, 29 Mar 2017 21:13:39 +0000
Subject: [PATCH 2/4] Update sonic-py-swsssdk submodule pointer

---
 src/sonic-py-swsssdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sonic-py-swsssdk b/src/sonic-py-swsssdk
index 497bdfe64c3..ebb5ec6870a 160000
--- a/src/sonic-py-swsssdk
+++ b/src/sonic-py-swsssdk
@@ -1 +1 @@
-Subproject commit 497bdfe64c3ddc2ce711ec8a2b0839d9d26f5666
+Subproject commit ebb5ec6870acccfde267e513d68d107873b0960e

From dd6bc9b4c34b3357a889e784afc3e6fea294e27e Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jolevequ@microsoft.com>
Date: Thu, 30 Mar 2017 00:14:52 +0000
Subject: [PATCH 3/4] Update sonic-dbsyncd, sonic-snmpagent and sonic-utilities
 submodule pointers

---
 src/sonic-dbsyncd   | 2 +-
 src/sonic-snmpagent | 2 +-
 src/sonic-utilities | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sonic-dbsyncd b/src/sonic-dbsyncd
index 3d30cfc9318..812f2cd50f8 160000
--- a/src/sonic-dbsyncd
+++ b/src/sonic-dbsyncd
@@ -1 +1 @@
-Subproject commit 3d30cfc9318d03652df01c0871090f5ef6c8ccb2
+Subproject commit 812f2cd50f83c1b83fbfc2688752e969cd5cd6f9
diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent
index c0e022addaa..d39b66b354a 160000
--- a/src/sonic-snmpagent
+++ b/src/sonic-snmpagent
@@ -1 +1 @@
-Subproject commit c0e022addaaa0af857331d36e3766a88a2095941
+Subproject commit d39b66b354af4db07313af82341fdc20762e89fc
diff --git a/src/sonic-utilities b/src/sonic-utilities
index edbda467002..5c59ec6b8e0 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit edbda467002700230f89a7362a21b3d3909b1079
+Subproject commit 5c59ec6b8e067dab8c3d786432d6d2c9b961ec78

From bfdea7f4625e552363d65ae74b1d4570635f2bea Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jolevequ@microsoft.com>
Date: Thu, 30 Mar 2017 00:22:30 +0000
Subject: [PATCH 4/4] Unify comments

---
 dockers/docker-lldp-sv2/Dockerfile.j2 |  6 +++---
 dockers/docker-lldp/Dockerfile        | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dockers/docker-lldp-sv2/Dockerfile.j2 b/dockers/docker-lldp-sv2/Dockerfile.j2
index 3b0e8d4a22e..1910e0d79fe 100644
--- a/dockers/docker-lldp-sv2/Dockerfile.j2
+++ b/dockers/docker-lldp-sv2/Dockerfile.j2
@@ -13,9 +13,9 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y python-pip supervisor libbsd0 libevent-2.0-5 libjansson4 libwrap0 libxml2 libpci3 libperl5.20 
 
-## Pre-install the fundamental packages
-## Install Python SwSSSDK
-## Install LLDP Sync Daemon
+# Pre-install the fundamental packages
+# Install Python SwSS SDK
+# Install LLDP Sync Daemon
 
 RUN dpkg -i \
 {% for deb in docker_lldp_sv2_debs.split(' ') -%}
diff --git a/dockers/docker-lldp/Dockerfile b/dockers/docker-lldp/Dockerfile
index 2005c63a32e..595c41bcd85 100644
--- a/dockers/docker-lldp/Dockerfile
+++ b/dockers/docker-lldp/Dockerfile
@@ -2,14 +2,14 @@ FROM docker-base
 
 COPY deps/swsssdk*.whl deps/lldpsyncd_*.deb deps/lldpd_*.deb /deps/
 
-## Make apt-get non-interactive
+# Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
 
-## Pre-install the fundamental packages
-## Install Python SWSSSDK (lldpsyncd dependency)
-## Install LLDP Sync Daemon
-## Note: dpkg_apt function has the benefit to detect missing .deb file
-## Clean up
+# Pre-install the fundamental packages
+# Install Python SwSS SDK (lldpsyncd dependency)
+# Install LLDP Sync Daemon
+# Note: dpkg_apt function has the benefit to detect missing .deb file
+# Clean up
 RUN apt-get update && \
     dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } && \
     dpkg_apt /deps/lldpd_*.deb && \