From 0cb53c684dd6ca0732fb89cc55daab6ef6ce5221 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jolevequ@microsoft.com>
Date: Fri, 12 Jan 2018 00:04:47 +0000
Subject: [PATCH 1/4] Add sonic-platform-common submodule

---
 .gitmodules               | 3 +++
 src/sonic-platform-common | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 src/sonic-platform-common

diff --git a/.gitmodules b/.gitmodules
index 1c7a6da0281d..bcc9a8f3038a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -50,6 +50,9 @@
 [submodule "platform/broadcom/sonic-platform-modules-ingrasys"]
 	path = platform/broadcom/sonic-platform-modules-ingrasys
 	url = https://github.com/Ingrasys-sonic/sonic-platform-modules-ingrasys
+[submodule "src/sonic-platform-common"]
+	path = src/sonic-platform-common
+	url = https://github.com/Azure/sonic-platform-common
 [submodule "src/sonic-platform-daemons"]
 	path = src/sonic-platform-daemons
 	url = https://github.com/Azure/sonic-platform-daemons
diff --git a/src/sonic-platform-common b/src/sonic-platform-common
new file mode 160000
index 000000000000..e6727bcddd21
--- /dev/null
+++ b/src/sonic-platform-common
@@ -0,0 +1 @@
+Subproject commit e6727bcddd21edd9f22729c8e733e4f3dc1b1432

From b262eede99a53f22257b8df4b180dac61c1f0c93 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jolevequ@microsoft.com>
Date: Fri, 12 Jan 2018 22:48:49 +0000
Subject: [PATCH 2/4] Move platform-specific hardware plugin packages to
 sonic-platform-common submodule

---
 dockers/docker-snmp-sv2/Dockerfile.j2           |  2 +-
 files/build_templates/sonic_debian_extension.j2 |  6 ++++++
 platform/p4/docker-sonic-p4.mk                  | 10 +++++-----
 rules/asyncsnmp-py3.mk                          |  4 ++--
 rules/sonic-ledd.mk                             |  2 +-
 rules/sonic-platform-common.mk                  | 13 +++++++++++++
 rules/sonic-utilities.mk                        | 10 +---------
 slave.mk                                        |  4 +++-
 8 files changed, 32 insertions(+), 19 deletions(-)
 create mode 100644 rules/sonic-platform-common.mk

diff --git a/dockers/docker-snmp-sv2/Dockerfile.j2 b/dockers/docker-snmp-sv2/Dockerfile.j2
index 3c5473951116..0e83b230746a 100644
--- a/dockers/docker-snmp-sv2/Dockerfile.j2
+++ b/dockers/docker-snmp-sv2/Dockerfile.j2
@@ -7,7 +7,7 @@ COPY [ \
     "/debs/"]
 
 # Install Python SwSSSDK (SNMP subagent dependency)
-COPY python-wheels/sonic_utilities-*-py3-*.whl /python-wheels/
+COPY python-wheels/sonic_platform_common-*-py3-*.whl /python-wheels/
 COPY python-wheels/swsssdk-*-py3-*.whl /python-wheels/
 COPY python-wheels/asyncsnmp-*-py3-*.whl /python-wheels/
 
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index f861543e98c8..a2bea7a6baa6 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -77,6 +77,12 @@ sudo cp {{swsssdk_py2_wheel_path}} $FILESYSTEM_ROOT/$SWSSSDK_PY2_WHEEL_NAME
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install $SWSSSDK_PY2_WHEEL_NAME
 sudo rm -rf $FILESYSTEM_ROOT/$SWSSSDK_PY2_WHEEL_NAME
 
+# Install sonic-platform-common Python 2 package
+PLATFORM_COMMON_PY2_WHEEL_NAME=$(basename {{platform_common_py2_wheel_path}})
+sudo cp {{platform_common_py2_wheel_path}} $FILESYSTEM_ROOT/$PLATFORM_COMMON_PY2_WHEEL_NAME
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install $PLATFORM_COMMON_PY2_WHEEL_NAME
+sudo rm -rf $FILESYSTEM_ROOT/$PLATFORM_COMMON_PY2_WHEEL_NAME
+
 # Install SONiC Utilities (and its dependencies via 'apt-get -y install -f')
 sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/python-sonic-utilities_*.deb || \
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
diff --git a/platform/p4/docker-sonic-p4.mk b/platform/p4/docker-sonic-p4.mk
index ebe7ceb080a2..1cd15439fb77 100644
--- a/platform/p4/docker-sonic-p4.mk
+++ b/platform/p4/docker-sonic-p4.mk
@@ -3,11 +3,11 @@
 DOCKER_SONIC_P4 = docker-sonic-p4.gz
 $(DOCKER_SONIC_P4)_PATH = $(PLATFORM_PATH)/docker-sonic-p4
 $(DOCKER_SONIC_P4)_DEPENDS += $(SWSS) \
-							  $(SYNCD) \
-							  $(P4_SWITCH) \
-							  $(REDIS_SERVER) \
-							  $(REDIS_TOOLS) \
-							  $(PYTHON_SWSSCOMMON) \
+                              $(SYNCD) \
+                              $(P4_SWITCH) \
+                              $(REDIS_SERVER) \
+                              $(REDIS_TOOLS) \
+                              $(PYTHON_SWSSCOMMON) \
                               $(LIBTEAMDCT) \
                               $(LIBTEAM_UTILS) \
                               $(SONIC_DEVICE_DATA) \
diff --git a/rules/asyncsnmp-py3.mk b/rules/asyncsnmp-py3.mk
index f44d7f336534..cc0af244d856 100644
--- a/rules/asyncsnmp-py3.mk
+++ b/rules/asyncsnmp-py3.mk
@@ -3,6 +3,6 @@
 ASYNCSNMP_PY3 = asyncsnmp-2.1.0-py3-none-any.whl
 $(ASYNCSNMP_PY3)_SRC_PATH = $(SRC_PATH)/sonic-snmpagent
 $(ASYNCSNMP_PY3)_PYTHON_VERSION = 3
-# Depends on sonic-utilities so it is possible to import sonic_psu
-$(ASYNCSNMP_PY3)_DEPENDS += $(SWSSSDK_PY3) $(SONIC_UTILS_PY3)
+# Depends on sonic-platform-common so it is possible to import sonic_psu
+$(ASYNCSNMP_PY3)_DEPENDS += $(SWSSSDK_PY3) $(SONIC_PLATFORM_COMMON_PY3)
 SONIC_PYTHON_WHEELS += $(ASYNCSNMP_PY3)
diff --git a/rules/sonic-ledd.mk b/rules/sonic-ledd.mk
index aa95b46cf478..056f0f6c9bd8 100644
--- a/rules/sonic-ledd.mk
+++ b/rules/sonic-ledd.mk
@@ -1,5 +1,5 @@
 # sonic-ledd (SONiC Front-panel LED control daemon) Debian package
 
-SONIC_LEDD = python-sonic-ledd_1.0-1_all.deb
+SONIC_LEDD = python-sonic-ledd_1.1-1_all.deb
 $(SONIC_LEDD)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-ledd
 SONIC_PYTHON_STDEB_DEBS += $(SONIC_LEDD)
diff --git a/rules/sonic-platform-common.mk b/rules/sonic-platform-common.mk
new file mode 100644
index 000000000000..95789354a4da
--- /dev/null
+++ b/rules/sonic-platform-common.mk
@@ -0,0 +1,13 @@
+# sonic-platform-common package
+
+SONIC_PLATFORM_COMMON_PY2 = sonic_platform_common-1.0-py2-none-any.whl
+$(SONIC_PLATFORM_COMMON_PY2)_SRC_PATH = $(SRC_PATH)/sonic-platform-common
+$(SONIC_PLATFORM_COMMON_PY2)_PYTHON_VERSION = 2
+SONIC_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2)
+
+# Als build sonic-platform-common into python3 wheel, so we can use PSU code in SNMP docker
+# Note: _DEPENDS macro is not defined
+SONIC_PLATFORM_COMMON_PY3 = sonic_platform_common-1.0-py3-none-any.whl
+$(SONIC_PLATFORM_COMMON_PY3)_SRC_PATH = $(SRC_PATH)/sonic-platform-common
+$(SONIC_PLATFORM_COMMON_PY3)_PYTHON_VERSION = 3
+SONIC_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY3)
diff --git a/rules/sonic-utilities.mk b/rules/sonic-utilities.mk
index 0dae94d8aa70..4f05e781f900 100644
--- a/rules/sonic-utilities.mk
+++ b/rules/sonic-utilities.mk
@@ -1,14 +1,6 @@
 # sonic utilities package
 
-SONIC_UTILS = python-sonic-utilities_1.1-1_all.deb
+SONIC_UTILS = python-sonic-utilities_1.2-1_all.deb
 $(SONIC_UTILS)_SRC_PATH = $(SRC_PATH)/sonic-utilities
 $(SONIC_UTILS)_WHEEL_DEPENDS = $(SONIC_CONFIG_ENGINE)
 SONIC_PYTHON_STDEB_DEBS += $(SONIC_UTILS)
-
-# Build sonic-utilities into python3 wheel, so we can use PSU code
-# Note: _DEPENDS macro is not defined
-SONIC_UTILS_PY3 = sonic_utilities-1.1-py3-none-any.whl
-$(SONIC_UTILS_PY3)_SRC_PATH = $(SRC_PATH)/sonic-utilities
-$(SONIC_UTILS_PY3)_PYTHON_VERSION = 3
-$(SONIC_UTILS_PY3)_TEST = n
-SONIC_PYTHON_WHEELS += $(SONIC_UTILS_PY3)
diff --git a/slave.mk b/slave.mk
index 425ba4c41d82..34a892b73281 100644
--- a/slave.mk
+++ b/slave.mk
@@ -416,7 +416,8 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
                 $(LIBPAM_TACPLUS) \
                 $(LIBNSS_TACPLUS)) \
         $$(addprefix $(TARGET_PATH)/,$$($$*_DOCKERS)) \
-        $$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CONFIG_ENGINE))
+        $$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CONFIG_ENGINE)) \
+        $$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_COMMON_PY2))
 	$(HEADER)
 	# Pass initramfs and linux kernel explicitly. They are used for all platforms
 	export initramfs_tools="$(DEBS_PATH)/$(INITRAMFS_TOOLS)"
@@ -433,6 +434,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
 	export installer_images="$(addprefix $(TARGET_PATH)/,$($*_DOCKERS))"
 	export config_engine_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CONFIG_ENGINE))"
 	export swsssdk_py2_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SWSSSDK_PY2))"
+	export platform_common_py2_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_COMMON_PY2))"
 	
 	$(foreach docker, $($*_DOCKERS),\
 		export docker_image="$(docker)"

From a85cd49bfeb180bf5d97eaf6ae520dc2183152e5 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jolevequ@microsoft.com>
Date: Sat, 13 Jan 2018 01:09:41 +0000
Subject: [PATCH 3/4] Update sonic-platform-common, sonic-platform-daemons and
 sonic-utilities submodules

---
 src/sonic-platform-common  | 2 +-
 src/sonic-platform-daemons | 2 +-
 src/sonic-utilities        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index e6727bcddd21..0581611b7be5 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit e6727bcddd21edd9f22729c8e733e4f3dc1b1432
+Subproject commit 0581611b7be5cc52aea2877199785fe72f759a58
diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index d1df4717627a..920f29b39186 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit d1df4717627acf9421861545b71e411acf3c5f32
+Subproject commit 920f29b3918635cce14a1e03749ffb1e76bf9abd
diff --git a/src/sonic-utilities b/src/sonic-utilities
index 6823ce2f3e46..495584bd2f22 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 6823ce2f3e46d9bbf5fcfa6b371705a7368929cb
+Subproject commit 495584bd2f228af81934b23e4cf19648ab387fab

From 96d7b69b370fe2e98887909ab7726f76bf58c8ee Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jolevequ@microsoft.com>
Date: Sat, 13 Jan 2018 01:56:40 +0000
Subject: [PATCH 4/4] Add comment to rules/sonic-utilities.mk re: runtime
 dependencies

---
 rules/sonic-utilities.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/rules/sonic-utilities.mk b/rules/sonic-utilities.mk
index 4f05e781f900..eba618d051dc 100644
--- a/rules/sonic-utilities.mk
+++ b/rules/sonic-utilities.mk
@@ -1,4 +1,14 @@
 # sonic utilities package
+#
+# NOTE: sonic-config-engine is a build-time dependency of sonic-utilities
+# due to unit tests which are run during the build. However,
+# sonic-platform-common and swsssdk are runtime dependencies, and should be
+# added here also. However, the current build system assumes all runtime
+# dependencies are .deb packages.
+#
+# TODO: Create a way to specify both .deb and .whl runtime dependencies
+#       then add the aforementioned runtime dependencies here.
+#
 
 SONIC_UTILS = python-sonic-utilities_1.2-1_all.deb
 $(SONIC_UTILS)_SRC_PATH = $(SRC_PATH)/sonic-utilities