From b02b29a984c297052b6a1f60ea09bade7cd062b2 Mon Sep 17 00:00:00 2001
From: kram <kram@barefootnetworks.com>
Date: Mon, 12 Mar 2018 21:06:38 -0700
Subject: [PATCH] updates based on review

---
 dockers/docker-orchagent/swssconfig.sh                      | 6 +++++-
 files/image_config/interfaces/interfaces.j2                 | 5 ++---
 platform/barefoot/one-image.mk                              | 6 +++---
 .../sonic-platform-modules-wnc-osw1800/debian/files         | 1 -
 src/sonic-config-engine/tests/sample_output/interfaces      | 5 ++---
 5 files changed, 12 insertions(+), 11 deletions(-)
 delete mode 100644 platform/barefoot/sonic-platform-modules-wnc-osw1800/debian/files

diff --git a/dockers/docker-orchagent/swssconfig.sh b/dockers/docker-orchagent/swssconfig.sh
index c8ee875933..007f0953ae 100755
--- a/dockers/docker-orchagent/swssconfig.sh
+++ b/dockers/docker-orchagent/swssconfig.sh
@@ -27,7 +27,7 @@ fast_reboot
 
 HWSKU=`sonic-cfggen -d -v "DEVICE_METADATA['localhost']['hwsku']"`
 
-SWSSCONFIG_ARGS="00-copp.config.json ipinip.json ports.json switch.json "
+SWSSCONFIG_ARGS="00-copp.config.json ports.json switch.json "
 
 if [ "$HWSKU" == "Force10-S6000" ]; then
     SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json "
@@ -42,6 +42,10 @@ elif [[ "$HWSKU" == "ACS-MSN27"* ]]; then
     SWSSCONFIG_ARGS+="msn27xx.32ports.buffers.json "
 fi
 
+if [[ "$HWSKU" != "montara" ] && [ "$HWSKU" != "mavericks" ] && [ "$HWSKU" != "OSW1800-48x6q" ] && [ "$HWSKU" != "INGRASYS-S9180-32X"]]; then
+    SWSSCONFIG_ARGS+="ipinip.json "
+fi
+
 for file in $SWSSCONFIG_ARGS; do
     swssconfig /etc/swss/config.d/$file
     sleep 1
diff --git a/files/image_config/interfaces/interfaces.j2 b/files/image_config/interfaces/interfaces.j2
index 2687582af6..4ec20c3b61 100644
--- a/files/image_config/interfaces/interfaces.j2
+++ b/files/image_config/interfaces/interfaces.j2
@@ -20,9 +20,8 @@ iface lo {{ 'inet' if prefix | ipv4 else 'inet6' }} static
 {% block mgmt_interface %}
 # BMC interface
 auto usb0
-iface usb0 inet static
-  address 192.168.0.2
-  netmask 255.255.255.0
+iface usb0 inet6 auto
+
 # The management network interface
 auto eth0
 {% if MGMT_INTERFACE %}
diff --git a/platform/barefoot/one-image.mk b/platform/barefoot/one-image.mk
index 5da028dbe6..a7b5d00951 100644
--- a/platform/barefoot/one-image.mk
+++ b/platform/barefoot/one-image.mk
@@ -4,8 +4,8 @@ SONIC_ONE_IMAGE = sonic-barefoot.bin
 $(SONIC_ONE_IMAGE)_MACHINE = barefoot
 $(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie
 $(SONIC_ONE_IMAGE)_INSTALLS += $(BFN_PLATFORM_MODULE) 
-$(SONIC_ONE_IMAGE)_INSTALLS += $(BFN_MONTARA_PLATFORM_MODULE)
-$(SONIC_ONE_IMAGE)_INSTALLS += $(WNC_OSW1800_PLATFORM_MODULE) 
-$(SONIC_ONE_IMAGE)_INSTALLS += $(INGRASYS_S9180_32X_PLATFORM_MODULE)
+$(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(BFN_MONTARA_PLATFORM_MODULE)
+$(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(WNC_OSW1800_PLATFORM_MODULE) 
+$(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(INGRASYS_S9180_32X_PLATFORM_MODULE)
 $(SONIC_ONE_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES)
 SONIC_INSTALLERS += $(SONIC_ONE_IMAGE)
diff --git a/platform/barefoot/sonic-platform-modules-wnc-osw1800/debian/files b/platform/barefoot/sonic-platform-modules-wnc-osw1800/debian/files
deleted file mode 100644
index 6ec8776133..0000000000
--- a/platform/barefoot/sonic-platform-modules-wnc-osw1800/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-platform-modules-wnc-osw1800_1.0_amd64.deb main extra
diff --git a/src/sonic-config-engine/tests/sample_output/interfaces b/src/sonic-config-engine/tests/sample_output/interfaces
index a9fe483aa5..8a63c6d6e2 100644
--- a/src/sonic-config-engine/tests/sample_output/interfaces
+++ b/src/sonic-config-engine/tests/sample_output/interfaces
@@ -17,9 +17,8 @@ iface lo inet6 static
 #
 # BMC interface
 auto usb0
-iface usb0 inet static
-  address 192.168.0.2
-  netmask 255.255.255.0
+iface usb0 inet6 auto
+
 # The management network interface
 auto eth0
 iface eth0 inet static