VS cleanup

sonic-net · Dec 4, 2024 · f39f6aa · f39f6aa
1 parent 0317c00
commit f39f6aa
Show file tree

Hide file tree

Showing 14 changed files with 4 additions and 272 deletions.
diff --git a/tests/MRVLTL7.pl b/tests/MRVLTL7.pl
diff --git a/tests/MRVLTL7/lanemap.ini b/tests/MRVLTL7/lanemap.ini
diff --git a/tests/MRVLTL7/query_stats_capability.rec b/tests/MRVLTL7/query_stats_capability.rec
diff --git a/tests/MRVLTL7/vsprofile.ini b/tests/MRVLTL7/vsprofile.ini
diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -33,4 +33,4 @@ testdash_gtest_LDADD = -lgtest -lhiredis -lswsscommon -lpthread \
 				   $(top_srcdir)/lib/libsairedis.la $(top_srcdir)/syncd/libSyncd.a \
 				   -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
 
-TESTS = checksaiapi.sh aspellcheck.pl conflictnames.pl swsslogentercheck.sh checkwhitespace.sh tests BCM56850.pl MLNX2700.pl BCM56971B0.pl NVDAMBF2H536C.pl MRVLTL7.pl testdash_gtest
+TESTS = checksaiapi.sh aspellcheck.pl conflictnames.pl swsslogentercheck.sh checkwhitespace.sh tests BCM56850.pl MLNX2700.pl BCM56971B0.pl NVDAMBF2H536C.pl testdash_gtest
diff --git a/unittest/vslib/Makefile.am b/unittest/vslib/Makefile.am
@@ -46,8 +46,7 @@ tests_SOURCES = main.cpp \
 				TestMACsecManager.cpp \
 				TestSwitchStateBase.cpp \
 				TestSai.cpp \
-				TestVirtualSwitchSaiInterface.cpp \
-				TestSwitchMrvlTL7.cpp
+				TestVirtualSwitchSaiInterface.cpp
 
 tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) -fno-access-control
 tests_LDADD = $(LDADD_GTEST) $(top_srcdir)/vslib/libSaiVS.a -lhiredis -lswsscommon -lnl-genl-3 -lnl-nf-3 -lnl-route-3 -lnl-3 \

diff --git a/unittest/vslib/TestSwitchMrvlTL7.cpp b/unittest/vslib/TestSwitchMrvlTL7.cpp
diff --git a/vslib/Makefile.am b/vslib/Makefile.am
@@ -50,7 +50,6 @@ libSaiVS_a_SOURCES = \
 					  Switch.cpp \
 					  SwitchMLNX2700.cpp \
 					  SwitchNvdaMBF2H536C.cpp \
-					  SwitchMrvlTL7.cpp \
 					  SwitchStateBase.cpp \
 					  SwitchStateBaseFdb.cpp \
 					  SwitchStateBaseHostif.cpp \

diff --git a/vslib/SwitchConfig.cpp b/vslib/SwitchConfig.cpp
@@ -90,10 +90,6 @@ bool SwitchConfig::parseSwitchType(
          */
         switchType = SAI_VS_SWITCH_TYPE_NVDA_MBF2H536C;
     }
-    else if (st == SAI_VALUE_VS_SWITCH_TYPE_MRVLTL7)
-    {
-        switchType = SAI_VS_SWITCH_TYPE_MRVLTL7;
-    }
     else
     {
         std::vector<std::string> vals {
@@ -102,8 +98,7 @@ bool SwitchConfig::parseSwitchType(
                 SAI_VALUE_VS_SWITCH_TYPE_BCM56971B0,
                 SAI_VALUE_VS_SWITCH_TYPE_MLNX2700,
                 SAI_VALUE_VS_SWITCH_TYPE_NVDA_MBF2H536C,
-                SAI_VALUE_VS_SWITCH_TYPE_DPU_SIMU_2P,
-                SAI_VALUE_VS_SWITCH_TYPE_MRVLTL7
+                SAI_VALUE_VS_SWITCH_TYPE_DPU_SIMU_2P
         };
 
         SWSS_LOG_ERROR("unknown switch type: '%s', expected (%s)",

diff --git a/vslib/SwitchConfig.h b/vslib/SwitchConfig.h
@@ -26,9 +26,7 @@ namespace saivs
 
         SAI_VS_SWITCH_TYPE_MLNX2700,
 
-        SAI_VS_SWITCH_TYPE_NVDA_MBF2H536C,
-
-        SAI_VS_SWITCH_TYPE_MRVLTL7,
+        SAI_VS_SWITCH_TYPE_NVDA_MBF2H536C
 
     } sai_vs_switch_type_t;
 

diff --git a/vslib/SwitchMrvlTL7.cpp b/vslib/SwitchMrvlTL7.cpp
diff --git a/vslib/SwitchMrvlTL7.h b/vslib/SwitchMrvlTL7.h
diff --git a/vslib/VirtualSwitchSaiInterface.cpp b/vslib/VirtualSwitchSaiInterface.cpp
@@ -15,7 +15,6 @@
 #include "SwitchBCM56971B0.h"
 #include "SwitchMLNX2700.h"
 #include "SwitchNvdaMBF2H536C.h"
-#include "SwitchMrvlTL7.h"
 
 #include <inttypes.h>
 
@@ -602,11 +601,6 @@ std::shared_ptr<SwitchStateBase> VirtualSwitchSaiInterface::init_switch(
             m_switchStateMap[switch_id] = std::make_shared<SwitchNvdaMBF2H536C>(switch_id, m_realObjectIdManager, config, warmBootState);
             break;
 
-        case SAI_VS_SWITCH_TYPE_MRVLTL7:
-
-            m_switchStateMap[switch_id] = std::make_shared<SwitchMrvlTL7>(switch_id, m_realObjectIdManager, config, warmBootState);
-            break;
-
         default:
 
             SWSS_LOG_WARN("unknown switch type: %d", config->m_switchType);

diff --git a/vslib/saivs.h b/vslib/saivs.h
@@ -92,7 +92,6 @@ extern "C" {
 #define SAI_VALUE_VS_SWITCH_TYPE_MLNX2700          "SAI_VS_SWITCH_TYPE_MLNX2700"
 #define SAI_VALUE_VS_SWITCH_TYPE_NVDA_MBF2H536C    "SAI_VS_SWITCH_TYPE_NVDA_MBF2H536C"
 #define SAI_VALUE_VS_SWITCH_TYPE_DPU_SIMU_2P       "SAI_VS_SWITCH_TYPE_DPU_SIMU_2P"
-#define SAI_VALUE_VS_SWITCH_TYPE_MRVLTL7           "SAI_VS_SWITCH_TYPE_MRVLTL7"
 
 /*
  * Values for SAI_KEY_BOOT_TYPE (defined in saiswitch.h)