[mellanox|ffb] remove unused scripts

Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
sonic-net · Jan 10, 2019 · b1fb0a5 · b1fb0a5
1 parent 2601785
commit b1fb0a5
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 222 deletions.
diff --git a/platform/mellanox/docker-syncd-mlnx-rpc.mk b/platform/mellanox/docker-syncd-mlnx-rpc.mk
@@ -2,7 +2,7 @@
 
 DOCKER_SYNCD_MLNX_RPC = docker-syncd-mlnx-rpc.gz
 $(DOCKER_SYNCD_MLNX_RPC)_PATH = $(PLATFORM_PATH)/docker-syncd-mlnx-rpc
-$(DOCKER_SYNCD_MLNX_RPC)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT) $(MLNX_SFPD) $(MLNX_ISSU)
+$(DOCKER_SYNCD_MLNX_RPC)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT) $(MLNX_SFPD)
 $(DOCKER_SYNCD_MLNX_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_MLNX)
 SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX_RPC)
 ifeq ($(ENABLE_SYNCD_RPC),y)

diff --git a/platform/mellanox/docker-syncd-mlnx.mk b/platform/mellanox/docker-syncd-mlnx.mk
@@ -2,7 +2,7 @@
 
 DOCKER_SYNCD_MLNX = docker-syncd-mlnx.gz
 $(DOCKER_SYNCD_MLNX)_PATH = $(PLATFORM_PATH)/docker-syncd-mlnx
-$(DOCKER_SYNCD_MLNX)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API) $(MLNX_SFPD) $(MLNX_ISSU)
+$(DOCKER_SYNCD_MLNX)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API) $(MLNX_SFPD)
 $(DOCKER_SYNCD_MLNX)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
 SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX)
 ifneq ($(ENABLE_SYNCD_RPC),y)

diff --git a/platform/mellanox/mlnx-ffb.sh b/platform/mellanox/mlnx-ffb.sh
@@ -49,9 +49,9 @@ check_sdk_upgrade()
             break;
         }
 
-        ISSU_CHECK_CMD="docker exec -t syncd issu --check ${NEXT_SDK_VERSION}"
-
-        ${ISS_CHECK_CMD} > /dev/null && CHECK_RESULT="${FFB_SUCCESS}"
+        # TODO: Place a call to SDK check script
+        # for now assume check succeeded
+        CHECK_RESULT="${FFB_SUCCESS}"
 
         break
     done
@@ -68,31 +68,11 @@ check_ffb()
         echo "ISSU is not enabled on this HWSKU"
         return "${FFB_FAILURE}"
     }
+
     check_sdk_upgrade || {
         echo "SDK upgrade check failued"
         return "${FFB_FAILURE}"
     }
     return "${FFB_SUCCESS}";
 }
 
-# Perform ISSU start
-issu_start()
-{
-    ISSU_START_CMD="docker exec -t syncd issu --start"
-    ${ISSU_START_CMD} > /dev/null
-
-    EXIT_CODE=$?
-
-    return $EXIT_CODE
-}
-
-# Perform ISSU end
-issu_end()
-{
-    ISSU_END_CMD="docker exec -t syncd issu --end"
-    ${ISSU_END_CMD} > /dev/null
-
-    EXIT_CODE=$?
-
-    return $EXIT_CODE
-}
diff --git a/platform/mellanox/mlnx-issu.mk b/platform/mellanox/mlnx-issu.mk
diff --git a/platform/mellanox/mlnx-issu/scripts/issu b/platform/mellanox/mlnx-issu/scripts/issu
diff --git a/platform/mellanox/mlnx-issu/setup.py b/platform/mellanox/mlnx-issu/setup.py
diff --git a/platform/mellanox/rules.mk b/platform/mellanox/rules.mk
@@ -12,7 +12,6 @@ include $(PLATFORM_PATH)/libsaithrift-dev.mk
 include $(PLATFORM_PATH)/docker-ptf-mlnx.mk
 include $(PLATFORM_PATH)/mlnx-sfpd.mk
 include $(PLATFORM_PATH)/mlnx-ffb.mk
-include $(PLATFORM_PATH)/mlnx-issu.mk
 
 SONIC_ALL += $(SONIC_ONE_IMAGE) \
              $(DOCKER_FPM)