diff --git a/.buckconfig.d/external_cells/facebook/buck2-shims-meta/external_cell.buckconfig b/.buckconfig.d/external_cells/facebook/buck2-shims-meta/external_cell.buckconfig
index 51665d718950a..c231baf41a8f2 100644
--- a/.buckconfig.d/external_cells/facebook/buck2-shims-meta/external_cell.buckconfig
+++ b/.buckconfig.d/external_cells/facebook/buck2-shims-meta/external_cell.buckconfig
@@ -6,4 +6,4 @@ gh_facebook_buck2_shims_meta = git
 
 [external_cell_gh_facebook_buck2_shims_meta]
 git_origin = https://github.com/facebook/buck2-shims-meta.git
-commit_hash = 461a1b10af7eb8af2f6d0eb0129009d60048e6de
+commit_hash = b79235f6447a07f78644ab08261e3acfe4e12604
diff --git a/build/deps/github_hashes/facebook/fb303-rev.txt b/build/deps/github_hashes/facebook/fb303-rev.txt
index d57cd36a4163c..e3ab9e52b2b77 100644
--- a/build/deps/github_hashes/facebook/fb303-rev.txt
+++ b/build/deps/github_hashes/facebook/fb303-rev.txt
@@ -1 +1 @@
-Subproject commit 43a8ca1e89fc3ab45abf9eff78b6c0ec4510ebdb
+Subproject commit d15028627fdd473945f04124f118e17142471f81
diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt
index 2e120f76285e3..334bb35fc08bd 100644
--- a/build/deps/github_hashes/facebook/fbthrift-rev.txt
+++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt
@@ -1 +1 @@
-Subproject commit 6c55aa9762cffed619c25abf07d273b39985e979
+Subproject commit 300f4d5e79e763ef74243da9a1f3b9f649d5addd
diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt
index 0c225b340a4c2..d94e75e4f27b3 100644
--- a/build/deps/github_hashes/facebook/wangle-rev.txt
+++ b/build/deps/github_hashes/facebook/wangle-rev.txt
@@ -1 +1 @@
-Subproject commit 46688946ef13435ad9e873a5ba5684677783945b
+Subproject commit d54405ad3588791be7146a19fe4e914af0807c28
diff --git a/cmake/Agent.cmake b/cmake/Agent.cmake
index 597d810c8b502..2c843db1acdac 100644
--- a/cmake/Agent.cmake
+++ b/cmake/Agent.cmake
@@ -457,6 +457,7 @@ target_link_libraries(switchid_scope_resolver
   fboss_error
   hwswitch_matcher
   state
+  switchinfo_utils
 )
 
 add_library(hwagent
diff --git a/fboss/agent/ApplyThriftConfig.cpp b/fboss/agent/ApplyThriftConfig.cpp
index 0ecfa93b6c34b..9f4c387eae0ac 100644
--- a/fboss/agent/ApplyThriftConfig.cpp
+++ b/fboss/agent/ApplyThriftConfig.cpp
@@ -101,6 +101,7 @@ using folly::StringPiece;
 using std::make_shared;
 using std::shared_ptr;
 
+using namespace facebook::fboss;
 namespace {
 
 const uint8_t kV6LinkLocalAddrMask{64};
@@ -148,6 +149,55 @@ std::shared_ptr<MultiMap> toMultiSwitchMap(
   return multiMap;
 }
 
+bool haveParallelLinksToInterfaceNodes(
+    const cfg::SwitchConfig* cfg,
+    const std::vector<SwitchID>& localFabricSwitchIds,
+    const std::unordered_map<std::string, std::vector<uint32_t>>&
+        switchNameToSwitchIds,
+    SwitchIdScopeResolver& scopeResolver,
+    const PlatformMapping* platformMapping) {
+  for (const auto& fabricSwitchId : localFabricSwitchIds) {
+    // Determine parallel links on VD level - there are two VDs per R3 ASIC
+    std::unordered_map<int, std::unordered_set<std::string>> vd2VoqNeighbors;
+    for (const auto& port : *cfg->ports()) {
+      // Only process ports belonging to one switchId
+      if (scopeResolver.scope(port).has(SwitchID(fabricSwitchId)) &&
+          port.expectedNeighborReachability()->size() > 0) {
+        auto neighborRemoteSwitchId =
+            getRemoteSwitchID(cfg, port, switchNameToSwitchIds);
+        const auto& neighborDsfNodeIter =
+            cfg->dsfNodes()->find(neighborRemoteSwitchId);
+        CHECK(neighborDsfNodeIter != cfg->dsfNodes()->end());
+        if (*neighborDsfNodeIter->second.type() ==
+            cfg::DsfNodeType::INTERFACE_NODE) {
+          CHECK(port.name().has_value());
+          auto localVirtualDeviceId =
+              platformMapping->getVirtualDeviceID(*port.name());
+          if (!localVirtualDeviceId.has_value()) {
+            throw FbossError(
+                "Unable to find virtual device id for port: ",
+                *port.logicalID(),
+                " virtual device");
+          }
+
+          if (vd2VoqNeighbors.find(localVirtualDeviceId.value()) ==
+              vd2VoqNeighbors.end()) {
+            vd2VoqNeighbors.insert(
+                {localVirtualDeviceId.value(),
+                 std::unordered_set<std::string>()});
+          }
+          auto& voqNeighbors = vd2VoqNeighbors[localVirtualDeviceId.value()];
+          const auto& [neighborName, _] = getExpectedNeighborAndPortName(port);
+          if (voqNeighbors.find(neighborName) != voqNeighbors.end()) {
+            return true;
+          }
+          voqNeighbors.insert(neighborName);
+        }
+      }
+    }
+  }
+  return false;
+};
 } // anonymous namespace
 
 namespace facebook::fboss {
@@ -4532,6 +4582,28 @@ shared_ptr<SwitchSettings> ThriftConfigApplier::updateSwitchSettings(
     switchSettingsChange = true;
   }
 
+  std::optional<uint16_t> newLinkFlowControlCreditThreshold;
+  if (cfg_->switchSettings()->linkFlowControlCreditThreshold()) {
+    newLinkFlowControlCreditThreshold =
+        *cfg_->switchSettings()->linkFlowControlCreditThreshold();
+  }
+  if (newLinkFlowControlCreditThreshold !=
+      origSwitchSettings->getLinkFlowControlCreditThreshold()) {
+    newSwitchSettings->setLinkFlowControlCreditThreshold(
+        newLinkFlowControlCreditThreshold);
+    switchSettingsChange = true;
+  }
+
+  std::optional<uint32_t> newVoqDramBoundThreshold;
+  if (cfg_->switchSettings()->voqDramBoundThreshold()) {
+    newVoqDramBoundThreshold = *cfg_->switchSettings()->voqDramBoundThreshold();
+  }
+  if (newVoqDramBoundThreshold !=
+      origSwitchSettings->getVoqDramBoundThreshold()) {
+    newSwitchSettings->setVoqDramBoundThreshold(newVoqDramBoundThreshold);
+    switchSettingsChange = true;
+  }
+
   if (origSwitchSettings->getSwitchDrainState() !=
       *cfg_->switchSettings()->switchDrainState()) {
     auto numVoqSwtitches =
diff --git a/fboss/agent/BUCK b/fboss/agent/BUCK
index 6914bf80711cb..a1e6c3fd84cb8 100644
--- a/fboss/agent/BUCK
+++ b/fboss/agent/BUCK
@@ -616,6 +616,22 @@ cpp_library(
     ],
 )
 
+cpp_library(
+    name = "fsdb_adapted_sub_manager",
+    srcs = [
+        "FsdbAdaptedSubManager.cpp",
+    ],
+    headers = [
+        "FsdbAdaptedSubManager.h",
+    ],
+    exported_deps = [
+        "//fboss/agent/state:state",
+        "//fboss/fsdb/client:fsdb_sub_manager",
+        "//fboss/fsdb/if:fsdb_model",
+        "//fboss/thrift_cow/storage:cow_storage",
+    ],
+)
+
 cpp_library(
     name = "core",
     srcs = [
@@ -633,7 +649,6 @@ cpp_library(
         "EncapIndexAllocator.cpp",
         "FabricConnectivityManager.cpp",
         "FibHelpers.cpp",
-        "FsdbAdaptedSubManager.cpp",
         "FsdbSyncer.cpp",
         "HwAsicTable.cpp",
         "HwSwitchConnectionStatusTable.cpp",
@@ -721,6 +736,7 @@ cpp_library(
         ":fboss-error",
         ":fboss-event-base",
         ":fboss-types",
+        ":fsdb_adapted_sub_manager",
         ":hw_switch_handler",
         ":hwswitchcallback",
         ":l2learn_event_observer",
@@ -1181,6 +1197,7 @@ cpp_library(
         ":fboss-error",
         ":fboss-types",
         ":hwswitch_matcher",
+        ":switchinfo_utils",
         "//fboss/agent/state:state",
     ],
     exported_external_deps = [
diff --git a/fboss/agent/DsfUpdateValidator.cpp b/fboss/agent/DsfUpdateValidator.cpp
index e5f4a2ed5f5a4..c494deaf6065a 100644
--- a/fboss/agent/DsfUpdateValidator.cpp
+++ b/fboss/agent/DsfUpdateValidator.cpp
@@ -2,7 +2,7 @@
 
 #include "fboss/agent/DsfUpdateValidator.h"
 #include "fboss/agent/DsfStateUpdaterUtil.h"
-#include "fboss/agent/Utils.h"
+#include "fboss/agent/SwitchInfoUtils.h"
 #include "fboss/agent/state/DeltaFunctions.h"
 #include "fboss/agent/state/InterfaceMap.h"
 #include "fboss/agent/state/StateDelta.h"
diff --git a/fboss/agent/SwitchIdScopeResolver.cpp b/fboss/agent/SwitchIdScopeResolver.cpp
index d122e99c127da..f90515682fb24 100644
--- a/fboss/agent/SwitchIdScopeResolver.cpp
+++ b/fboss/agent/SwitchIdScopeResolver.cpp
@@ -2,6 +2,7 @@
 
 #include "fboss/agent/SwitchIdScopeResolver.h"
 #include "fboss/agent/FbossError.h"
+#include "fboss/agent/SwitchInfoUtils.h"
 #include "fboss/agent/state/AclTableGroup.h"
 #include "fboss/agent/state/AggregatePort.h"
 #include "fboss/agent/state/ForwardingInformationBaseMap.h"
@@ -137,17 +138,11 @@ HwSwitchMatcher SwitchIdScopeResolver::scope(
 }
 
 HwSwitchMatcher SwitchIdScopeResolver::scope(SystemPortID sysPortId) const {
-  auto sysPortInt = static_cast<int64_t>(sysPortId);
   for (const auto& [id, info] : switchIdToSwitchInfo_) {
-    if (!info.systemPortRange().has_value()) {
-      continue;
-    }
-    if (sysPortInt >= *info.systemPortRange()->minimum() &&
-        sysPortInt <= *info.systemPortRange()->maximum()) {
+    if (withinRange(*info.systemPortRanges(), sysPortId)) {
       return HwSwitchMatcher(std::unordered_set<SwitchID>({SwitchID(id)}));
     }
   }
-
   // This is a non local sys port. So it maps to all local voq switchIds
   return voqSwitchMatcher();
 }
diff --git a/fboss/agent/SwitchInfoUtils.cpp b/fboss/agent/SwitchInfoUtils.cpp
index 356d454a93b19..6bb3fc60bcd70 100644
--- a/fboss/agent/SwitchInfoUtils.cpp
+++ b/fboss/agent/SwitchInfoUtils.cpp
@@ -17,6 +17,20 @@
 #include "fboss/agent/hw/switch_asics/HwAsic.h"
 
 namespace facebook::fboss {
+namespace {
+
+bool withinRange(const cfg::SystemPortRanges& ranges, int64_t id) {
+  bool inRange{false};
+  for (const auto& sysPortRange : *ranges.systemPortRanges()) {
+    if (id >= *sysPortRange.minimum() && id <= *sysPortRange.maximum()) {
+      inRange = true;
+      break;
+    }
+  }
+  return inRange;
+}
+} // namespace
+
 const std::map<int64_t, cfg::SwitchInfo> getSwitchInfoFromConfigImpl(
     const cfg::SwitchConfig* config) {
   std::map<int64_t, cfg::SwitchInfo> switchInfoMap;
@@ -32,16 +46,6 @@ const std::map<int64_t, cfg::SwitchInfo> getSwitchInfoFromConfigImpl(
         switchInfo.portIdRange()->maximum() =
             cfg::switch_config_constants::DEFAULT_PORT_ID_RANGE_MAX();
       }
-      if (switchInfo.switchType() == cfg::SwitchType::VOQ &&
-          !switchInfo.systemPortRange()) {
-        auto dsfItr =
-            config->dsfNodes()->find(static_cast<int64_t>(entry.first));
-        if (dsfItr != config->dsfNodes()->end()) {
-          auto localNode = dsfItr->second;
-          CHECK(localNode.systemPortRange().has_value());
-          switchInfo.systemPortRange() = *localNode.systemPortRange();
-        }
-      }
       switchInfoMap.emplace(entry.first, switchInfo);
     }
   }
@@ -106,4 +110,13 @@ const std::optional<cfg::SdkVersion> getSdkVersionFromConfig(
   auto& swConfig = config->thrift.sw().value();
   return getSdkVersionFromConfigImpl(&swConfig);
 }
+
+bool withinRange(const cfg::SystemPortRanges& ranges, InterfaceID intfId) {
+  return withinRange(ranges, static_cast<int64_t>(intfId));
+}
+
+bool withinRange(const cfg::SystemPortRanges& ranges, SystemPortID sysPortId) {
+  return withinRange(ranges, static_cast<int64_t>(sysPortId));
+}
+
 } // namespace facebook::fboss
diff --git a/fboss/agent/SwitchInfoUtils.h b/fboss/agent/SwitchInfoUtils.h
index 3c82e75004d68..f62b30f464331 100644
--- a/fboss/agent/SwitchInfoUtils.h
+++ b/fboss/agent/SwitchInfoUtils.h
@@ -40,4 +40,7 @@ const std::optional<cfg::SdkVersion> getSdkVersionFromConfig();
 const std::optional<cfg::SdkVersion> getSdkVersionFromConfig(
     const AgentConfig* config);
 
+bool withinRange(const cfg::SystemPortRanges& ranges, InterfaceID intfId);
+
+bool withinRange(const cfg::SystemPortRanges& ranges, SystemPortID sysPortId);
 } // namespace facebook::fboss
diff --git a/fboss/agent/Utils.cpp b/fboss/agent/Utils.cpp
index 789647e3fa1ab..ff58d442029ce 100644
--- a/fboss/agent/Utils.cpp
+++ b/fboss/agent/Utils.cpp
@@ -14,7 +14,6 @@
 #include "fboss/agent/AsicUtils.h"
 #include "fboss/agent/FbossError.h"
 #include "fboss/agent/FsdbHelper.h"
-#include "fboss/agent/SwitchIdScopeResolver.h"
 #include "fboss/agent/SysError.h"
 #include "fboss/agent/hw/HwSwitchFb303Stats.h"
 #include "fboss/agent/state/ArpEntry.h"
@@ -139,16 +138,6 @@ getPlatformMappingForDsfNode(const facebook::fboss::PlatformType platformType) {
   return nullptr;
 }
 
-bool withinRange(const cfg::SystemPortRanges& ranges, int64_t id) {
-  bool inRange{false};
-  for (const auto& sysPortRange : *ranges.systemPortRanges()) {
-    if (id >= *sysPortRange.minimum() && id <= *sysPortRange.maximum()) {
-      inRange = true;
-      break;
-    }
-  }
-  return inRange;
-}
 } // namespace
   //
 
@@ -501,14 +490,6 @@ SystemPortID getInbandSystemPortID(
       *switchInfoItr->second.inbandPortId());
 }
 
-bool withinRange(const cfg::SystemPortRanges& ranges, InterfaceID intfId) {
-  return withinRange(ranges, static_cast<int64_t>(intfId));
-}
-
-bool withinRange(const cfg::SystemPortRanges& ranges, SystemPortID sysPortId) {
-  return withinRange(ranges, static_cast<int64_t>(sysPortId));
-}
-
 cfg::Range64 getFirstSwitchSystemPortIdRange(
     const std::map<int64_t, cfg::SwitchInfo>& switchToSwitchInfo) {
   for (const auto& [switchId, switchInfo] : switchToSwitchInfo) {
@@ -1062,56 +1043,6 @@ int getRemoteSwitchID(
   return remoteSwitchId;
 };
 
-bool haveParallelLinksToInterfaceNodes(
-    const cfg::SwitchConfig* cfg,
-    const std::vector<SwitchID>& localFabricSwitchIds,
-    const std::unordered_map<std::string, std::vector<uint32_t>>&
-        switchNameToSwitchIds,
-    SwitchIdScopeResolver& scopeResolver,
-    const PlatformMapping* platformMapping) {
-  for (const auto& fabricSwitchId : localFabricSwitchIds) {
-    // Determine parallel links on VD level - there are two VDs per R3 ASIC
-    std::unordered_map<int, std::unordered_set<std::string>> vd2VoqNeighbors;
-    for (const auto& port : *cfg->ports()) {
-      // Only process ports belonging to one switchId
-      if (scopeResolver.scope(port).has(SwitchID(fabricSwitchId)) &&
-          port.expectedNeighborReachability()->size() > 0) {
-        auto neighborRemoteSwitchId =
-            getRemoteSwitchID(cfg, port, switchNameToSwitchIds);
-        const auto& neighborDsfNodeIter =
-            cfg->dsfNodes()->find(neighborRemoteSwitchId);
-        CHECK(neighborDsfNodeIter != cfg->dsfNodes()->end());
-        if (*neighborDsfNodeIter->second.type() ==
-            cfg::DsfNodeType::INTERFACE_NODE) {
-          CHECK(port.name().has_value());
-          auto localVirtualDeviceId =
-              platformMapping->getVirtualDeviceID(*port.name());
-          if (!localVirtualDeviceId.has_value()) {
-            throw FbossError(
-                "Unable to find virtual device id for port: ",
-                *port.logicalID(),
-                " virtual device");
-          }
-
-          if (vd2VoqNeighbors.find(localVirtualDeviceId.value()) ==
-              vd2VoqNeighbors.end()) {
-            vd2VoqNeighbors.insert(
-                {localVirtualDeviceId.value(),
-                 std::unordered_set<std::string>()});
-          }
-          auto& voqNeighbors = vd2VoqNeighbors[localVirtualDeviceId.value()];
-          const auto& [neighborName, _] = getExpectedNeighborAndPortName(port);
-          if (voqNeighbors.find(neighborName) != voqNeighbors.end()) {
-            return true;
-          }
-          voqNeighbors.insert(neighborName);
-        }
-      }
-    }
-  }
-  return false;
-};
-
 CpuCosQueueId hwQueueIdToCpuCosQueueId(
     uint8_t hwQueueId,
     const HwAsic* asic,
diff --git a/fboss/agent/Utils.h b/fboss/agent/Utils.h
index 6e6e6571d3a6b..614ac4c36ef91 100644
--- a/fboss/agent/Utils.h
+++ b/fboss/agent/Utils.h
@@ -85,7 +85,6 @@ inline const int kUdfAclRethDmaLenFieldSizeInBytes(2);
 class SwitchState;
 class Interface;
 class SwitchSettings;
-class SwitchIdScopeResolver;
 class PlatformMapping;
 struct AgentConfig;
 class HwAsic;
@@ -276,9 +275,6 @@ std::vector<PortID> getPortsForInterface(
     InterfaceID intf,
     const std::shared_ptr<SwitchState>& state);
 
-bool withinRange(const cfg::SystemPortRanges& ranges, InterfaceID intfId);
-
-bool withinRange(const cfg::SystemPortRanges& ranges, SystemPortID sysPortId);
 /*
  * An NPU switch injects a broadcast message such as neighbor solicitation or
  * advertisement via pipeline lookup. ASIC forwards these messages to all the
@@ -443,14 +439,6 @@ int getRemoteSwitchID(
     const std::unordered_map<std::string, std::vector<uint32_t>>&
         switchNameToSwitchIds);
 
-bool haveParallelLinksToInterfaceNodes(
-    const cfg::SwitchConfig* cfg,
-    const std::vector<SwitchID>& localFabricSwitchIds,
-    const std::unordered_map<std::string, std::vector<uint32_t>>&
-        switchNameToSwitchIds,
-    SwitchIdScopeResolver& scopeResolver,
-    const PlatformMapping* platformMapping);
-
 CpuCosQueueId hwQueueIdToCpuCosQueueId(
     uint8_t hwQueueId,
     const HwAsic* asic,
diff --git a/fboss/agent/hw/sai/store/SaiObject.cpp b/fboss/agent/hw/sai/store/SaiObject.cpp
index 6abb8fab5b170..2b85f55935f6c 100644
--- a/fboss/agent/hw/sai/store/SaiObject.cpp
+++ b/fboss/agent/hw/sai/store/SaiObject.cpp
@@ -61,7 +61,7 @@ SaiObject<SaiNextHopGroupTraits>::adapterHostKeyToFollyDynamic() {
 template <>
 typename SaiNextHopGroupTraits::AdapterHostKey
 SaiObject<SaiNextHopGroupTraits>::follyDynamicToAdapterHostKey(
-    folly::dynamic json) {
+    const folly::dynamic& json) {
   SaiNextHopGroupTraits::AdapterHostKey key;
   for (auto object : json) {
     auto type =
@@ -138,7 +138,8 @@ folly::dynamic SaiObject<SaiLagTraits>::adapterHostKeyToFollyDynamic() {
 
 template <>
 typename SaiLagTraits::AdapterHostKey
-SaiObject<SaiLagTraits>::follyDynamicToAdapterHostKey(folly::dynamic json) {
+SaiObject<SaiLagTraits>::follyDynamicToAdapterHostKey(
+    const folly::dynamic& json) {
   std::string label = json.asString();
   SaiLagTraits::AdapterHostKey::ValueType key{};
   std::copy(std::begin(label), std::end(label), std::begin(key));
@@ -182,7 +183,7 @@ folly::dynamic SaiObject<SaiWredTraits>::adapterHostKeyToFollyDynamic() {
 
 template <typename attrT>
 void pupulateOptionalAttrtToKey(
-    folly::dynamic& array,
+    const folly::dynamic& array,
     SaiWredTraits::AdapterHostKey& adapterHostKey,
     int index) {
   if (!array[index].isString()) {
@@ -192,7 +193,8 @@ void pupulateOptionalAttrtToKey(
 
 template <>
 typename SaiWredTraits::AdapterHostKey
-SaiObject<SaiWredTraits>::follyDynamicToAdapterHostKey(folly::dynamic json) {
+SaiObject<SaiWredTraits>::follyDynamicToAdapterHostKey(
+    const folly::dynamic& json) {
   SaiWredTraits::AdapterHostKey key;
   std::get<SaiWredTraits::Attributes::GreenEnable>(key) = json[0].asBool();
   pupulateOptionalAttrtToKey<SaiWredTraits::Attributes::GreenMinThreshold>(
@@ -219,7 +221,7 @@ folly::dynamic SaiObject<SaiAclTableTraits>::adapterHostKeyToFollyDynamic() {
 template <>
 typename SaiAclTableTraits::AdapterHostKey
 SaiObject<SaiAclTableTraits>::follyDynamicToAdapterHostKey(
-    folly::dynamic json) {
+    const folly::dynamic& json) {
   return json.asString();
 }
 
@@ -231,7 +233,7 @@ folly::dynamic SaiObject<SaiUdfGroupTraits>::adapterHostKeyToFollyDynamic() {
 template <>
 typename SaiUdfGroupTraits::AdapterHostKey
 SaiObject<SaiUdfGroupTraits>::follyDynamicToAdapterHostKey(
-    folly::dynamic json) {
+    const folly::dynamic& json) {
   return json.asString();
 }
 } // namespace fboss
diff --git a/fboss/agent/hw/sai/store/SaiObject.h b/fboss/agent/hw/sai/store/SaiObject.h
index 5e524db492d7d..330c8758f8cc1 100644
--- a/fboss/agent/hw/sai/store/SaiObject.h
+++ b/fboss/agent/hw/sai/store/SaiObject.h
@@ -372,7 +372,7 @@ class SaiObject {
   folly::dynamic adapterHostKeyToFollyDynamic();
 
   static typename SaiObjectTraits::AdapterHostKey follyDynamicToAdapterHostKey(
-      folly::dynamic);
+      const folly::dynamic&);
 
   void setIgnoreMissingInHwOnDelete(bool ignore) {
     ignoreMissingInHwOnDelete_ = ignore;
diff --git a/fboss/agent/hw/sai/switch/SaiAclTableGroupManager.cpp b/fboss/agent/hw/sai/switch/SaiAclTableGroupManager.cpp
index 3682193292fba..5ad1582702ad4 100644
--- a/fboss/agent/hw/sai/switch/SaiAclTableGroupManager.cpp
+++ b/fboss/agent/hw/sai/switch/SaiAclTableGroupManager.cpp
@@ -33,6 +33,8 @@ sai_acl_stage_t SaiAclTableGroupManager::cfgAclStageToSaiAclStage(
       return SAI_ACL_STAGE_INGRESS_MACSEC;
     case cfg::AclStage::EGRESS_MACSEC:
       return SAI_ACL_STAGE_EGRESS_MACSEC;
+    case cfg::AclStage::EGRESS:
+      return SAI_ACL_STAGE_EGRESS;
   }
 
   // should return in one of the cases
diff --git a/fboss/agent/hw/sai/switch/SaiAclTableManager.cpp b/fboss/agent/hw/sai/switch/SaiAclTableManager.cpp
index 419f1ba9feae3..2659f5a85374a 100644
--- a/fboss/agent/hw/sai/switch/SaiAclTableManager.cpp
+++ b/fboss/agent/hw/sai/switch/SaiAclTableManager.cpp
@@ -1409,7 +1409,11 @@ std::set<cfg::AclTableQualifier> SaiAclTableManager::getSupportedQualifierSet(
 }
 
 std::set<cfg::AclTableQualifier> SaiAclTableManager::getSupportedQualifierSet(
-    sai_acl_stage_t /* aclStage */) const {
+    sai_acl_stage_t aclStage) const {
+  if (aclStage == SAI_ACL_STAGE_EGRESS &&
+      platform_->getAsic()->isSupported(HwAsic::Feature::EGRESS_ACL_TABLE)) {
+    throw FbossError("egress acl table is not supported on switch asic");
+  }
   /*
    * Not all the qualifiers are supported by every ASIC.
    * Moreover, different ASICs have different max key widths.
@@ -1567,20 +1571,24 @@ std::set<cfg::AclTableQualifier> SaiAclTableManager::getSupportedQualifierSet(
   }
 }
 
-void SaiAclTableManager::addDefaultAclTable(cfg::AclStage stage) {
-  if (handles_.find(kAclTable1) != handles_.end()) {
-    throw FbossError("default acl table already exists.");
+void SaiAclTableManager::addDefaultAclTable(
+    cfg::AclStage stage,
+    const std::string& name) {
+  if (handles_.find(name) != handles_.end()) {
+    throw FbossError("default acl table ", name, " already exists.");
   }
   // TODO(saranicholas): set appropriate table priority
   state::AclTableFields aclTableFields{};
   aclTableFields.priority() = 0;
-  aclTableFields.id() = kAclTable1;
+  aclTableFields.id() = name;
   auto table1 = std::make_shared<AclTable>(std::move(aclTableFields));
   addAclTable(table1, stage);
 }
 
-void SaiAclTableManager::removeDefaultAclTable(cfg::AclStage stage) {
-  if (handles_.find(kAclTable1) == handles_.end()) {
+void SaiAclTableManager::removeDefaultAclTable(
+    cfg::AclStage stage,
+    const std::string& name) {
+  if (handles_.find(name) == handles_.end()) {
     return;
   }
   // remove from acl table group
@@ -1588,7 +1596,7 @@ void SaiAclTableManager::removeDefaultAclTable(cfg::AclStage stage) {
       SaiAclTableGroupManager::cfgAclStageToSaiAclStage(stage);
   if (platform_->getAsic()->isSupported(HwAsic::Feature::ACL_TABLE_GROUP)) {
     managerTable_->aclTableGroupManager().removeAclTableGroupMember(
-        saiAclStage, kAclTable1);
+        saiAclStage, name);
   }
   handles_.erase(kAclTable1);
 }
@@ -1878,4 +1886,11 @@ std::shared_ptr<AclEntry> SaiAclTableManager::reconstructAclEntry(
     int /*priority*/) const {
   throw FbossError("reconstructAclEntry not implemented in SaiAclTableManager");
 }
+
+void SaiAclTableManager::addDefaultIngressAclTable() {
+  addDefaultAclTable(cfg::AclStage::INGRESS, kAclTable1);
+}
+void SaiAclTableManager::removeDefaultIngressAclTable() {
+  removeDefaultAclTable(cfg::AclStage::INGRESS, kAclTable1);
+}
 } // namespace facebook::fboss
diff --git a/fboss/agent/hw/sai/switch/SaiAclTableManager.h b/fboss/agent/hw/sai/switch/SaiAclTableManager.h
index f12d60aceece1..3e31f63e42ca2 100644
--- a/fboss/agent/hw/sai/switch/SaiAclTableManager.h
+++ b/fboss/agent/hw/sai/switch/SaiAclTableManager.h
@@ -191,8 +191,8 @@ class SaiAclTableManager {
   std::set<cfg::AclTableQualifier> getSupportedQualifierSet(
       cfg::AclStage stage) const;
 
-  void addDefaultAclTable(cfg::AclStage stage);
-  void removeDefaultAclTable(cfg::AclStage stage);
+  void addDefaultIngressAclTable();
+  void removeDefaultIngressAclTable();
 
   bool isQualifierSupported(
       const std::string& aclTableName,
@@ -277,6 +277,9 @@ class SaiAclTableManager {
   std::set<cfg::AclTableQualifier> getSupportedQualifierSet(
       sai_acl_stage_t aclStage) const;
 
+  void addDefaultAclTable(cfg::AclStage stage, const std::string& name);
+  void removeDefaultAclTable(cfg::AclStage stage, const std::string& name);
+
   SaiStore* saiStore_;
   SaiManagerTable* managerTable_;
   const SaiPlatform* platform_;
diff --git a/fboss/agent/hw/sai/switch/SaiSwitch.cpp b/fboss/agent/hw/sai/switch/SaiSwitch.cpp
index 312dfa7853b74..4bf7bbf158559 100644
--- a/fboss/agent/hw/sai/switch/SaiSwitch.cpp
+++ b/fboss/agent/hw/sai/switch/SaiSwitch.cpp
@@ -1107,10 +1107,8 @@ std::shared_ptr<SwitchState> SaiSwitch::stateChangedImplLocked(
       // remove default acl table and add a new one. table removal should
       // clear acl entries too
       managerTable_->switchManager().resetIngressAcl();
-      managerTable_->aclTableManager().removeDefaultAclTable(
-          cfg::AclStage::INGRESS);
-      managerTable_->aclTableManager().addDefaultAclTable(
-          cfg::AclStage::INGRESS);
+      managerTable_->aclTableManager().removeDefaultIngressAclTable();
+      managerTable_->aclTableManager().addDefaultIngressAclTable();
       managerTable_->switchManager().setIngressAcl();
     }
 
@@ -1359,6 +1357,26 @@ void SaiSwitch::processSwitchSettingsChangeSansDrainedEntryLocked(
           newSramGlobalXonTh.value_or(0));
     }
   }
+  {
+    const auto oldLinkFlowControlCreditTh =
+        oldSwitchSettings->getLinkFlowControlCreditThreshold();
+    const auto newLinkFlowControlCreditTh =
+        newSwitchSettings->getLinkFlowControlCreditThreshold();
+    if (oldLinkFlowControlCreditTh != newLinkFlowControlCreditTh) {
+      managerTable_->switchManager().setLinkFlowControlCreditTh(
+          newLinkFlowControlCreditTh.value_or(0));
+    }
+  }
+  {
+    const auto oldVoqDramBoundTh =
+        oldSwitchSettings->getVoqDramBoundThreshold();
+    const auto newVoqDramBoundTh =
+        newSwitchSettings->getVoqDramBoundThreshold();
+    if (oldVoqDramBoundTh != newVoqDramBoundTh) {
+      managerTable_->switchManager().setVoqDramBoundTh(
+          newVoqDramBoundTh.value_or(0));
+    }
+  }
 }
 
 template <typename LockPolicyT>
@@ -2564,8 +2582,7 @@ void SaiSwitch::initStoreAndManagersLocked(
             std::make_shared<AclTableGroup>(cfg::AclStage::INGRESS);
         managerTable_->aclTableGroupManager().addAclTableGroup(aclTableGroup);
 
-        managerTable_->aclTableManager().addDefaultAclTable(
-            cfg::AclStage::INGRESS);
+        managerTable_->aclTableManager().addDefaultIngressAclTable();
       }
     }
 
diff --git a/fboss/agent/hw/sai/switch/SaiSwitchManager.cpp b/fboss/agent/hw/sai/switch/SaiSwitchManager.cpp
index 13639e35617ce..bb19587f1c8af 100644
--- a/fboss/agent/hw/sai/switch/SaiSwitchManager.cpp
+++ b/fboss/agent/hw/sai/switch/SaiSwitchManager.cpp
@@ -1026,4 +1026,26 @@ void SaiSwitchManager::setSramGlobalFreePercentXonTh(
           sramFreePercentXonThreshold});
 #endif
 }
+
+void SaiSwitchManager::setLinkFlowControlCreditTh(
+    uint16_t linkFlowControlThreshold) {
+#if defined(BRCM_SAI_SDK_DNX_GTE_11_0) && !defined(BRCM_SAI_SDK_DNX_GTE_12_0)
+  switch_->setOptionalAttribute(
+      SaiSwitchTraits::Attributes::FabricCllfcTxCreditTh{
+          linkFlowControlThreshold});
+#endif
+}
+
+void SaiSwitchManager::setVoqDramBoundTh(uint32_t dramBoundThreshold) {
+#if defined(BRCM_SAI_SDK_DNX_GTE_11_0) && !defined(BRCM_SAI_SDK_DNX_GTE_12_0)
+  // There are 3 different types of rate classes available and
+  // dramBound, upper and lower limits are applied to each of
+  // those. However, in our case, we just need to set the same
+  // DRAM bounds value for all the rate classes.
+  std::vector<uint32_t> dramBounds(6, dramBoundThreshold);
+  switch_->setOptionalAttribute(
+      SaiSwitchTraits::Attributes::VoqDramBoundTh{dramBounds});
+#endif
+}
+
 } // namespace facebook::fboss
diff --git a/fboss/agent/hw/sai/switch/SaiSwitchManager.h b/fboss/agent/hw/sai/switch/SaiSwitchManager.h
index 5981a8c9fd1d5..3c428fe48cdc4 100644
--- a/fboss/agent/hw/sai/switch/SaiSwitchManager.h
+++ b/fboss/agent/hw/sai/switch/SaiSwitchManager.h
@@ -105,6 +105,8 @@ class SaiSwitchManager {
   void setReachabilityGroupList(int reachabilityGroupListSize);
   void setSramGlobalFreePercentXoffTh(uint8_t sramFreePercentXoffThreshold);
   void setSramGlobalFreePercentXonTh(uint8_t sramFreePercentXonThreshold);
+  void setLinkFlowControlCreditTh(uint16_t linkFlowControlThreshold);
+  void setVoqDramBoundTh(uint32_t dramBoundThreshold);
 
  private:
   void programEcmpLoadBalancerParams(
diff --git a/fboss/agent/hw/switch_asics/ChenabAsic.cpp b/fboss/agent/hw/switch_asics/ChenabAsic.cpp
index 787458ffcd1d8..28a61777b86dd 100644
--- a/fboss/agent/hw/switch_asics/ChenabAsic.cpp
+++ b/fboss/agent/hw/switch_asics/ChenabAsic.cpp
@@ -76,6 +76,7 @@ bool ChenabAsic::isSupportedNonFabric(Feature feature) const {
     case HwAsic::Feature::SAI_TTL0_PACKET_FORWARD_ENABLE:
     case HwAsic::Feature::L3_INTF_MTU:
     case HwAsic::Feature::PORT_MTU_ERROR_TRAP:
+    case HwAsic::Feature::EGRESS_ACL_TABLE:
       return true;
     case HwAsic::Feature::EVENTOR_PORT_FOR_SFLOW:
     case HwAsic::Feature::CPU_VOQ_BUFFER_PROFILE:
diff --git a/fboss/agent/hw/switch_asics/EbroAsic.cpp b/fboss/agent/hw/switch_asics/EbroAsic.cpp
index 03e2d71bd6f1e..22d4df180c75a 100644
--- a/fboss/agent/hw/switch_asics/EbroAsic.cpp
+++ b/fboss/agent/hw/switch_asics/EbroAsic.cpp
@@ -190,6 +190,7 @@ bool EbroAsic::isSupportedNonFabric(Feature feature) const {
     case HwAsic::Feature::MULTIPLE_EGRESS_BUFFER_POOL:
     case HwAsic::Feature::PORT_MTU_ERROR_TRAP:
     case HwAsic::Feature::DEDICATED_CPU_BUFFER_POOL:
+    case HwAsic::Feature::EGRESS_ACL_TABLE:
       return false;
     case HwAsic::Feature::SAI_ACL_ENTRY_SRC_PORT_QUALIFIER:
       /*
diff --git a/fboss/agent/hw/switch_asics/HwAsic.h b/fboss/agent/hw/switch_asics/HwAsic.h
index 08b75f8b4e31e..bc26fdb565b7c 100644
--- a/fboss/agent/hw/switch_asics/HwAsic.h
+++ b/fboss/agent/hw/switch_asics/HwAsic.h
@@ -199,6 +199,7 @@ class HwAsic {
     PORT_MTU_ERROR_TRAP,
     L3_INTF_MTU,
     DEDICATED_CPU_BUFFER_POOL,
+    EGRESS_ACL_TABLE,
   };
 
   enum class AsicMode {
diff --git a/fboss/agent/hw/switch_asics/Jericho2Asic.cpp b/fboss/agent/hw/switch_asics/Jericho2Asic.cpp
index 4ce365512a903..b0a6b828a5d44 100644
--- a/fboss/agent/hw/switch_asics/Jericho2Asic.cpp
+++ b/fboss/agent/hw/switch_asics/Jericho2Asic.cpp
@@ -194,6 +194,7 @@ bool Jericho2Asic::isSupported(Feature feature) const {
     case HwAsic::Feature::ENABLE_DELAY_DROP_CONGESTION_THRESHOLD:
     case HwAsic::Feature::PORT_MTU_ERROR_TRAP:
     case HwAsic::Feature::DEDICATED_CPU_BUFFER_POOL:
+    case HwAsic::Feature::EGRESS_ACL_TABLE:
       return false;
   }
   return false;
diff --git a/fboss/agent/hw/switch_asics/Jericho3Asic.cpp b/fboss/agent/hw/switch_asics/Jericho3Asic.cpp
index 4867aa294b5db..24c9328247534 100644
--- a/fboss/agent/hw/switch_asics/Jericho3Asic.cpp
+++ b/fboss/agent/hw/switch_asics/Jericho3Asic.cpp
@@ -198,6 +198,7 @@ bool Jericho3Asic::isSupported(Feature feature) const {
     case HwAsic::Feature::L3_MTU_ERROR_TRAP:
     case HwAsic::Feature::L3_INTF_MTU:
     case HwAsic::Feature::DEDICATED_CPU_BUFFER_POOL:
+    case HwAsic::Feature::EGRESS_ACL_TABLE:
       return false;
   }
   return false;
diff --git a/fboss/agent/hw/switch_asics/Tomahawk3Asic.cpp b/fboss/agent/hw/switch_asics/Tomahawk3Asic.cpp
index 334a6914be684..da695d4d2e55b 100644
--- a/fboss/agent/hw/switch_asics/Tomahawk3Asic.cpp
+++ b/fboss/agent/hw/switch_asics/Tomahawk3Asic.cpp
@@ -183,6 +183,7 @@ bool Tomahawk3Asic::isSupported(Feature feature) const {
     case HwAsic::Feature::ENABLE_DELAY_DROP_CONGESTION_THRESHOLD:
     case HwAsic::Feature::PORT_MTU_ERROR_TRAP:
     case HwAsic::Feature::DEDICATED_CPU_BUFFER_POOL:
+    case HwAsic::Feature::EGRESS_ACL_TABLE:
       return false;
   }
   return false;
diff --git a/fboss/agent/hw/switch_asics/Tomahawk4Asic.cpp b/fboss/agent/hw/switch_asics/Tomahawk4Asic.cpp
index 43411ed5651b4..f56c555de5efc 100644
--- a/fboss/agent/hw/switch_asics/Tomahawk4Asic.cpp
+++ b/fboss/agent/hw/switch_asics/Tomahawk4Asic.cpp
@@ -202,6 +202,7 @@ bool Tomahawk4Asic::isSupported(Feature feature) const {
     case HwAsic::Feature::ENABLE_DELAY_DROP_CONGESTION_THRESHOLD:
     case HwAsic::Feature::PORT_MTU_ERROR_TRAP:
     case HwAsic::Feature::DEDICATED_CPU_BUFFER_POOL:
+    case HwAsic::Feature::EGRESS_ACL_TABLE:
       return false;
   }
   return false;
diff --git a/fboss/agent/hw/switch_asics/Tomahawk5Asic.cpp b/fboss/agent/hw/switch_asics/Tomahawk5Asic.cpp
index 49325c85dad57..608bbe3e03e2c 100644
--- a/fboss/agent/hw/switch_asics/Tomahawk5Asic.cpp
+++ b/fboss/agent/hw/switch_asics/Tomahawk5Asic.cpp
@@ -185,6 +185,7 @@ bool Tomahawk5Asic::isSupported(Feature feature) const {
     case HwAsic::Feature::ENABLE_DELAY_DROP_CONGESTION_THRESHOLD:
     case HwAsic::Feature::PORT_MTU_ERROR_TRAP:
     case HwAsic::Feature::DEDICATED_CPU_BUFFER_POOL:
+    case HwAsic::Feature::EGRESS_ACL_TABLE:
       return false;
   }
   return false;
diff --git a/fboss/agent/hw/switch_asics/TomahawkAsic.cpp b/fboss/agent/hw/switch_asics/TomahawkAsic.cpp
index ac461313d44f2..affb7d52db83d 100644
--- a/fboss/agent/hw/switch_asics/TomahawkAsic.cpp
+++ b/fboss/agent/hw/switch_asics/TomahawkAsic.cpp
@@ -183,6 +183,7 @@ bool TomahawkAsic::isSupported(Feature feature) const {
     case HwAsic::Feature::ENABLE_DELAY_DROP_CONGESTION_THRESHOLD:
     case HwAsic::Feature::PORT_MTU_ERROR_TRAP:
     case HwAsic::Feature::DEDICATED_CPU_BUFFER_POOL:
+    case HwAsic::Feature::EGRESS_ACL_TABLE:
       return false;
   }
   return false;
diff --git a/fboss/agent/hw/switch_asics/Trident2Asic.cpp b/fboss/agent/hw/switch_asics/Trident2Asic.cpp
index a805d3a7ae540..2d743b39334f7 100644
--- a/fboss/agent/hw/switch_asics/Trident2Asic.cpp
+++ b/fboss/agent/hw/switch_asics/Trident2Asic.cpp
@@ -183,6 +183,7 @@ bool Trident2Asic::isSupported(Feature feature) const {
     case HwAsic::Feature::ENABLE_DELAY_DROP_CONGESTION_THRESHOLD:
     case HwAsic::Feature::PORT_MTU_ERROR_TRAP:
     case HwAsic::Feature::DEDICATED_CPU_BUFFER_POOL:
+    case HwAsic::Feature::EGRESS_ACL_TABLE:
       return false;
   }
   return false;
diff --git a/fboss/agent/hw/switch_asics/YubaAsic.cpp b/fboss/agent/hw/switch_asics/YubaAsic.cpp
index 1ab7b5e514189..471fbfab15d00 100644
--- a/fboss/agent/hw/switch_asics/YubaAsic.cpp
+++ b/fboss/agent/hw/switch_asics/YubaAsic.cpp
@@ -189,6 +189,7 @@ bool YubaAsic::isSupportedNonFabric(Feature feature) const {
     case HwAsic::Feature::EGRESS_GVOQ_WATERMARK_BYTES:
     case HwAsic::Feature::ENABLE_DELAY_DROP_CONGESTION_THRESHOLD:
     case HwAsic::Feature::PORT_MTU_ERROR_TRAP:
+    case HwAsic::Feature::EGRESS_ACL_TABLE:
       return false;
   }
   return false;
diff --git a/fboss/agent/platforms/sai/SaiPlatform.cpp b/fboss/agent/platforms/sai/SaiPlatform.cpp
index 8b90b960f752e..4127a96e71c5b 100644
--- a/fboss/agent/platforms/sai/SaiPlatform.cpp
+++ b/fboss/agent/platforms/sai/SaiPlatform.cpp
@@ -261,11 +261,11 @@ std::string SaiPlatform::getHwAsicConfig(
   }
 
 #if defined(BRCM_SAI_SDK_DNX_GTE_11_0) && !defined(BRCM_SAI_SDK_DNX_GTE_12_0)
-  if (getAsic()->isSupported(HwAsic::Feature::EVENTOR_PORT_FOR_SFLOW)) {
-    // Interim workaround for 11.7 GA as this SoC property is needed for
-    // J3AI 11.x but not for 12.x until 12.0.0.4.
-    // TODO: While integrating 12.0.0.4, these workarounds need to be removed
-    // and instead this SoC property would be added in config directly.
+  // Interim workaround for 11.7 GA as this SoC property is needed for
+  // J3AI 11.x but not for 12.x until 12.0.0.4.
+  // TODO: While integrating 12.0.0.4, these workarounds need to be removed
+  // and instead this SoC property would be added in config directly.
+  if (getAsic()->getAsicType() == cfg::AsicType::ASIC_TYPE_JERICHO3) {
     nameValStrs.push_back("custom_feature_shel_arm_enable=1");
   }
 #endif
diff --git a/fboss/agent/state/SwitchSettings.h b/fboss/agent/state/SwitchSettings.h
index 0fe60d19eb6d6..46bd0ffa9aef8 100644
--- a/fboss/agent/state/SwitchSettings.h
+++ b/fboss/agent/state/SwitchSettings.h
@@ -611,6 +611,40 @@ class SwitchSettings
     }
   }
 
+  std::optional<uint16_t> getLinkFlowControlCreditThreshold() const {
+    if (auto linkFlowControlCreditTh =
+            cref<switch_state_tags::linkFlowControlCreditThreshold>()) {
+      return linkFlowControlCreditTh->toThrift();
+    }
+    return std::nullopt;
+  }
+
+  void setLinkFlowControlCreditThreshold(
+      std::optional<uint16_t> linkFlowControlCreditTh) {
+    if (!linkFlowControlCreditTh) {
+      ref<switch_state_tags::linkFlowControlCreditThreshold>().reset();
+    } else {
+      set<switch_state_tags::linkFlowControlCreditThreshold>(
+          *linkFlowControlCreditTh);
+    }
+  }
+
+  std::optional<uint32_t> getVoqDramBoundThreshold() const {
+    if (auto voqDramBoundTh =
+            cref<switch_state_tags::voqDramBoundThreshold>()) {
+      return voqDramBoundTh->toThrift();
+    }
+    return std::nullopt;
+  }
+
+  void setVoqDramBoundThreshold(std::optional<uint32_t> voqDramBoundTh) {
+    if (!voqDramBoundTh) {
+      ref<switch_state_tags::voqDramBoundThreshold>().reset();
+    } else {
+      set<switch_state_tags::voqDramBoundThreshold>(*voqDramBoundTh);
+    }
+  }
+
   SwitchSettings* modify(std::shared_ptr<SwitchState>* state);
 
  private:
diff --git a/fboss/agent/switch_config.thrift b/fboss/agent/switch_config.thrift
index fb59f71a58b37..1179cb14427ba 100644
--- a/fboss/agent/switch_config.thrift
+++ b/fboss/agent/switch_config.thrift
@@ -605,6 +605,7 @@ enum AclStage {
   INGRESS = 0,
   INGRESS_MACSEC = 1,
   EGRESS_MACSEC = 2,
+  EGRESS = 3,
 }
 
 // startdocs_AclTableGroup_struct
@@ -1712,7 +1713,7 @@ struct SwitchSettings {
   20: optional byte sramGlobalFreePercentXonThreshold;
   // Fabric side threshold tracking the minimum needed
   // fifo free space on the peer device fifo.
-  21: optional i16 fabricCllfcTxCreditThreshold;
+  21: optional i16 linkFlowControlCreditThreshold;
   // SRAM2DRAM threshold on VOQ. Single parameter as of now
   // controlling both bounds and recovery thresholds.
   22: optional i32 voqDramBoundThreshold;
diff --git a/fboss/agent/switch_state.thrift b/fboss/agent/switch_state.thrift
index da9adb7c8631d..032c7c472c492 100644
--- a/fboss/agent/switch_state.thrift
+++ b/fboss/agent/switch_state.thrift
@@ -393,7 +393,7 @@ struct SwitchSettingsFields {
   // SRAM global thresholds to send PFC XOFF/XON
   44: optional byte sramGlobalFreePercentXoffThreshold;
   45: optional byte sramGlobalFreePercentXonThreshold;
-  46: optional i16 fabricCllfcTxCreditThreshold;
+  46: optional i16 linkFlowControlCreditThreshold;
   47: optional i32 voqDramBoundThreshold;
 }
 
diff --git a/fboss/agent/test/TestUtils.cpp b/fboss/agent/test/TestUtils.cpp
index c65d6a1e6516f..cc65fce9e7a78 100644
--- a/fboss/agent/test/TestUtils.cpp
+++ b/fboss/agent/test/TestUtils.cpp
@@ -271,7 +271,10 @@ cfg::SwitchConfig testConfigAImpl(bool isMhnic, cfg::SwitchType switchType) {
       cfg::DsfNode myNode = makeDsfNodeCfg(kVoqSwitchIdBegin);
       cfg.dsfNodes()->insert({*myNode.switchId(), myNode});
       cfg.interfaces()->resize(kPortCount);
-      CHECK(myNode.systemPortRange().has_value());
+      CHECK(!myNode.systemPortRanges()->systemPortRanges()->empty());
+      CHECK_EQ(myNode.systemPortRanges()->systemPortRanges()->size(), 1);
+      auto sysPortRange =
+          *myNode.systemPortRanges()->systemPortRanges()->begin();
       cfg.switchSettings()->switchIdToSwitchInfo() = {std::make_pair(
           kVoqSwitchIdBegin,
           createSwitchInfo(
@@ -282,13 +285,12 @@ cfg::SwitchConfig testConfigAImpl(bool isMhnic, cfg::SwitchType switchType) {
               cfg::switch_config_constants::
                   DEFAULT_PORT_ID_RANGE_MAX(), /* port id range max */
               0, /* switchIndex */
-              *myNode.systemPortRange()->minimum(),
-              *myNode.systemPortRange()->maximum(),
+              *sysPortRange.minimum(),
+              *sysPortRange.maximum(),
               "02:00:00:00:0F:0B", /* switchMac */
               "68:00" /* connection handle */))};
       for (auto i = 0; i < kPortCount; ++i) {
-        auto intfId =
-            *cfg.ports()[i].logicalID() + *myNode.systemPortRange()->minimum();
+        auto intfId = *cfg.ports()[i].logicalID() + *sysPortRange.minimum();
         cfg.interfaces()[i].intfID() = intfId;
         cfg.interfaces()[i].routerID() = 0;
         cfg.interfaces()[i].type() = cfg::InterfaceType::SYSTEM_PORT;
@@ -359,9 +361,10 @@ cfg::SwitchConfig testConfigBImpl() {
     auto switchId = switchIndex + 1;
     cfg::DsfNode myNode = makeDsfNodeCfg(switchId);
     cfg.dsfNodes()->insert({*myNode.switchId(), myNode});
-    CHECK(myNode.systemPortRange().has_value());
     auto minPort = (switchIndex == 0) ? 0 : 16;
     auto maxPort = (switchIndex == 0) ? 12 : 28;
+    CHECK(!myNode.systemPortRanges()->systemPortRanges()->empty());
+    auto sysPortRange = *myNode.systemPortRanges()->systemPortRanges()->begin();
     cfg.switchSettings()->switchIdToSwitchInfo()->emplace(std::make_pair(
         switchId,
         createSwitchInfo(
@@ -370,8 +373,8 @@ cfg::SwitchConfig testConfigBImpl() {
             minPort, /* port id range min */
             maxPort, /* port id range max */
             switchIndex, /* switchIndex */
-            *myNode.systemPortRange()->minimum(),
-            *myNode.systemPortRange()->maximum(),
+            *sysPortRange.minimum(),
+            *sysPortRange.maximum(),
             "02:00:00:00:0F:0B", /* switchMac */
             "68:00" /* connection handle */)));
   }
@@ -496,7 +499,6 @@ cfg::DsfNode makeDsfNodeCfg(
     cfg::Range64 sysPortRange;
     sysPortRange.minimum() = switchId * kBlockSize;
     sysPortRange.maximum() = switchId * kBlockSize + kBlockSize;
-    dsfNodeCfg.systemPortRange() = sysPortRange;
     dsfNodeCfg.loopbackIps() = getLoopbackIps(switchId);
     dsfNodeCfg.nodeMac() = "02:00:00:00:0F:0B";
     dsfNodeCfg.localSystemPortOffset() = *sysPortRange.minimum();
diff --git a/fboss/agent/test/agent_hw_tests/AgentHwAclQualifierTest.cpp b/fboss/agent/test/agent_hw_tests/AgentHwAclQualifierTest.cpp
index efc5223012389..8861002c9083c 100644
--- a/fboss/agent/test/agent_hw_tests/AgentHwAclQualifierTest.cpp
+++ b/fboss/agent/test/agent_hw_tests/AgentHwAclQualifierTest.cpp
@@ -13,6 +13,7 @@ enum class QualifierType : uint8_t {
   LOOKUPCLASS_L2,
   LOOKUPCLASS_NEIGHBOR,
   LOOKUPCLASS_ROUTE,
+  LOOKUPCLASS_IGNORE,
 };
 
 template <typename T, typename U>
@@ -104,6 +105,8 @@ namespace facebook::fboss {
 
 class AgentHwAclQualifierTest : public AgentHwTest {
  public:
+  bool addQualifiers = false;
+
   std::vector<production_features::ProductionFeature>
   getProductionFeaturesVerified() const override {
     if (!FLAGS_enable_acl_table_group) {
@@ -202,8 +205,24 @@ class AgentHwAclQualifierTest : public AgentHwTest {
   void aclSetupHelper(
       bool isIpV4,
       QualifierType lookupClassType,
+      bool addQualifiers = false,
       SwitchID switchID = SwitchID(0)) {
+    this->addQualifiers = addQualifiers;
     auto newCfg = initialConfig(*getAgentEnsemble());
+    if (FLAGS_enable_acl_table_group) {
+      utility::addAclTableGroup(
+          &newCfg, cfg::AclStage::INGRESS, utility::getAclTableGroupName());
+      std::vector<cfg::AclTableActionType> actions = {};
+      std::vector<cfg::AclTableQualifier> qualifiers = addQualifiers
+          ? utility::genAclQualifiersConfig(this->getAsicType())
+          : std::vector<cfg::AclTableQualifier>();
+      utility::addAclTable(
+          &newCfg,
+          utility::kDefaultAclTable(),
+          0 /* priority */,
+          actions,
+          qualifiers);
+    }
     auto* acl = utility::addAcl(&newCfg, kAclName(), cfg::AclActionType::DENY);
 
     if (isIpV4) {
@@ -233,6 +252,9 @@ class AgentHwAclQualifierTest : public AgentHwTest {
             isIpV4 ? cfg::AclLookupClass::DST_CLASS_L3_LOCAL_1
                    : cfg::AclLookupClass::DST_CLASS_L3_LOCAL_2);
         break;
+      case QualifierType::LOOKUPCLASS_IGNORE:
+        // This case is here exactly to not do anything
+        break;
       default:
         CHECK(false);
     }
@@ -595,4 +617,35 @@ TEST_F(AgentHwAclQualifierTest, AclIp6LookupClassRoute) {
 
   this->verifyAcrossWarmBoots(setup, verify);
 }
+
+// canary on for qualifiers from default to coop
+TEST_F(AgentHwAclQualifierTest, AclQualifiersCanaryOn) {
+  auto setup = [=, this]() {
+    this->aclSetupHelper(true, QualifierType::LOOKUPCLASS_IGNORE, false);
+  };
+
+  auto verify = [=, this]() { this->aclVerifyHelper(); };
+
+  auto setupPostWarmboot = [=, this]() {
+    this->aclSetupHelper(true, QualifierType::LOOKUPCLASS_IGNORE, true);
+  };
+
+  this->verifyAcrossWarmBoots(setup, verify, setupPostWarmboot, []() {});
+}
+
+// canary off for qualifiers from coop to default
+TEST_F(AgentHwAclQualifierTest, AclQualifiersCanaryOff) {
+  auto setup = [=, this]() {
+    this->aclSetupHelper(true, QualifierType::LOOKUPCLASS_IGNORE, true);
+  };
+
+  auto verify = [=, this]() { this->aclVerifyHelper(); };
+
+  auto setupPostWarmboot = [=, this]() {
+    this->aclSetupHelper(true, QualifierType::LOOKUPCLASS_IGNORE, false);
+  };
+
+  this->verifyAcrossWarmBoots(setup, verify, setupPostWarmboot, []() {});
+}
+
 } // namespace facebook::fboss
diff --git a/fboss/agent/test/agent_hw_tests/AgentTunnelMgrTests.cpp b/fboss/agent/test/agent_hw_tests/AgentTunnelMgrTests.cpp
index 20a08debdd0b6..c0f6702a3ab61 100644
--- a/fboss/agent/test/agent_hw_tests/AgentTunnelMgrTests.cpp
+++ b/fboss/agent/test/agent_hw_tests/AgentTunnelMgrTests.cpp
@@ -22,16 +22,46 @@ class AgentTunnelMgrTest : public AgentHwTest {
   }
 
   // Clear any stale kernel entries
-  void clearKernelEntries(std::string intfIp) {
-    // Delete the source route rule entries from the kernel
-    auto cmd = folly::to<std::string>("ip rule delete table 1");
+  void clearKernelEntries(const std::string& intfIp) {
+    auto cmd = folly::to<std::string>("ip rule list | grep ", intfIp);
+
+    auto output = runShellCmd(cmd);
+
+    // There could be duplicate source route rule entries in the kernel. Clear
+    // all of them.
+    while (output.find(folly::to<std::string>(intfIp)) != std::string::npos) {
+      // Break the output string into words
+      std::istringstream iss(output);
+      std::string word;
+      std::string lastWord;
+
+      while (iss >> word) {
+        lastWord = folly::copy(word);
+      }
 
-    runShellCmd(cmd);
+      XLOG(DBG2) << "tableId: " << lastWord;
+
+      // Delete the source route rule entries from the kernel
+      cmd = folly::to<std::string>("ip rule delete table ", lastWord);
+
+      runShellCmd(cmd);
+
+      // Get the source route rule entries again
+      cmd = folly::to<std::string>("ip rule list | grep ", intfIp);
+
+      output = runShellCmd(cmd);
+
+      XLOG(DBG2) << "clearKernelEntries Cmd: " << cmd;
+      XLOG(DBG2) << "clearKernelEntries Output: \n" << output;
+    }
 
     // Get the String
     cmd = folly::to<std::string>("ip addr list | grep ", intfIp);
 
-    auto output = runShellCmd(cmd);
+    output = runShellCmd(cmd);
+
+    XLOG(DBG2) << "clearKernelEntries Cmd: " << cmd;
+    XLOG(DBG2) << "clearKernelEntries Output: \n" << output;
 
     // Break the output string into words
     std::istringstream iss(output);
@@ -43,6 +73,7 @@ class AgentTunnelMgrTest : public AgentHwTest {
       if (subs.find("fboss") != std::string::npos) {
         cmd = folly::to<std::string>("ip link delete ", subs);
         runShellCmd(cmd);
+        XLOG(DBG2) << "clearKernelEntries Cmd: " << cmd;
         break;
       }
     } while (iss);
@@ -59,6 +90,9 @@ class AgentTunnelMgrTest : public AgentHwTest {
 
     auto output = runShellCmd(cmd);
 
+    XLOG(DBG2) << "checkKernelEntriesRemoved Cmd: " << cmd;
+    XLOG(DBG2) << "checkKernelEntriesRemoved Output: \n" << output;
+
     EXPECT_TRUE(
         output.find(folly::to<std::string>(intfIp)) == std::string::npos);
 
@@ -67,6 +101,9 @@ class AgentTunnelMgrTest : public AgentHwTest {
 
     output = runShellCmd(cmd);
 
+    XLOG(DBG2) << "checkKernelEntriesRemoved Cmd: " << cmd;
+    XLOG(DBG2) << "checkKernelEntriesRemoved Output: \n" << output;
+
     EXPECT_TRUE(
         output.find(folly::to<std::string>(intfIp)) == std::string::npos);
 
@@ -75,6 +112,9 @@ class AgentTunnelMgrTest : public AgentHwTest {
 
     output = runShellCmd(cmd);
 
+    XLOG(DBG2) << "checkKernelEntriesRemoved Cmd: " << cmd;
+    XLOG(DBG2) << "checkKernelEntriesRemoved Output: \n" << output;
+
     EXPECT_TRUE(
         output.find(folly::to<std::string>(intfIp)) == std::string::npos);
   }
@@ -90,8 +130,8 @@ class AgentTunnelMgrTest : public AgentHwTest {
   }
 };
 
-// Test that the tunnel manager is able to create the source route rule entries,
-// tunnel address entries and default route entries in the kernel
+// Test that the tunnel manager is able to create the source route rule
+// entries, tunnel address entries and default route entries in the kernel
 TEST_F(AgentTunnelMgrTest, checkKernelEntries) {
   auto setup = [=]() {};
   auto verify = [=, this]() {
@@ -99,22 +139,27 @@ TEST_F(AgentTunnelMgrTest, checkKernelEntries) {
     auto intfIp = folly::IPAddress::createNetwork(
                       config.interfaces()[0].ipAddresses()[0], -1, false)
                       .first;
+
+    // Apply the config
+    applyNewConfig(config);
+    waitForStateUpdates(getAgentEnsemble()->getSw());
+
     // Get TunManager pointer
     auto tunMgr_ = getAgentEnsemble()->getSw()->getTunManager();
     auto status = tunMgr_->getIntfStatus(
         getProgrammedState(), (InterfaceID)config.interfaces()[0].get_intfID());
 
     // There is a known limitation in the kernel that the source route rule
-    // entries are not created if the interface is not up. So, checking for the
-    // kernel entries if the interface is  up
+    // entries are not created if the interface is not up. So, checking for
+    // the kernel entries if the interface is  up
     if (status) {
       // Check that the source route rule entries are present in the kernel
       auto cmd = folly::to<std::string>("ip rule list | grep ", intfIp);
 
       auto output = runShellCmd(cmd);
 
-      XLOG(DBG2) << "Cmd: " << cmd;
-      XLOG(DBG2) << "Output: \n" << output;
+      XLOG(DBG2) << "checkKernelEntries Cmd: " << cmd;
+      XLOG(DBG2) << "checkKernelEntries Output: \n" << output;
 
       EXPECT_TRUE(
           output.find(folly::to<std::string>(intfIp)) != std::string::npos);
@@ -124,6 +169,9 @@ TEST_F(AgentTunnelMgrTest, checkKernelEntries) {
 
       output = runShellCmd(cmd);
 
+      XLOG(DBG2) << "checkKernelEntries Cmd: " << cmd;
+      XLOG(DBG2) << "checkKernelEntries Output: \n" << output;
+
       EXPECT_TRUE(
           output.find(folly::to<std::string>(intfIp)) != std::string::npos);
 
@@ -132,6 +180,9 @@ TEST_F(AgentTunnelMgrTest, checkKernelEntries) {
 
       output = runShellCmd(cmd);
 
+      XLOG(DBG2) << "checkKernelEntries Cmd: " << cmd;
+      XLOG(DBG2) << "checkKernelEntries Output:" << output;
+
       EXPECT_TRUE(
           output.find(folly::to<std::string>(intfIp)) != std::string::npos);
     }
diff --git a/fboss/agent/test/utils/ConfigUtils.cpp b/fboss/agent/test/utils/ConfigUtils.cpp
index 80fcba2ec31be..9ecd26d3c22d3 100644
--- a/fboss/agent/test/utils/ConfigUtils.cpp
+++ b/fboss/agent/test/utils/ConfigUtils.cpp
@@ -452,18 +452,17 @@ cfg::DsfNode dsfNodeConfig(
   dsfNode.switchId() = *otherAsic->getSwitchId();
   dsfNode.name() = folly::sformat("hwTestSwitch{}", *dsfNode.switchId());
   switch (otherAsic->getSwitchType()) {
-    case cfg::SwitchType::VOQ:
+    case cfg::SwitchType::VOQ: {
       dsfNode.type() = cfg::DsfNodeType::INTERFACE_NODE;
       CHECK(otherAsic->getSystemPortRange().has_value());
-      dsfNode.systemPortRange() = *otherAsic->getSystemPortRange();
-      dsfNode.systemPortRanges()->systemPortRanges()->push_back(
-          dsfNode.systemPortRange().value());
+      auto sysPortRange = otherAsic->getSystemPortRange().value();
+      dsfNode.systemPortRanges()->systemPortRanges()->push_back(sysPortRange);
       dsfNode.nodeMac() = kLocalCpuMac().toString();
       dsfNode.loopbackIps() = getLoopbackIps(SwitchID(*dsfNode.switchId()));
-      dsfNode.localSystemPortOffset() = *dsfNode.systemPortRange()->minimum();
-      dsfNode.globalSystemPortOffset() = *dsfNode.systemPortRange()->minimum();
+      dsfNode.localSystemPortOffset() = *sysPortRange.minimum();
+      dsfNode.globalSystemPortOffset() = *sysPortRange.minimum();
       dsfNode.inbandPortId() = kSingleStageInbandPortId;
-      break;
+    } break;
     case cfg::SwitchType::FABRIC:
       dsfNode.type() = cfg::DsfNodeType::FABRIC_NODE;
       break;
diff --git a/fboss/agent/test/utils/PfcTestUtils.cpp b/fboss/agent/test/utils/PfcTestUtils.cpp
index e2efec6611e82..be449b4911921 100644
--- a/fboss/agent/test/utils/PfcTestUtils.cpp
+++ b/fboss/agent/test/utils/PfcTestUtils.cpp
@@ -208,6 +208,14 @@ void setupPfcBuffers(
   setupBufferPoolConfig(
       bufferPoolCfgMap, buffer.globalShared, buffer.globalHeadroom);
   cfg.bufferPoolConfigs() = std::move(bufferPoolCfgMap);
+  if (ensemble->getHwAsicTable()
+          ->getHwAsics()
+          .cbegin()
+          ->second->getAsicType() == cfg::AsicType::ASIC_TYPE_JERICHO3) {
+    // For J3, set the SRAM global PFC thresholds as well
+    cfg.switchSettings()->sramGlobalFreePercentXoffThreshold() = 10;
+    cfg.switchSettings()->sramGlobalFreePercentXonThreshold() = 20;
+  }
 }
 
 void addPuntPfcPacketAcl(cfg::SwitchConfig& cfg, uint16_t queueId) {
diff --git a/fboss/bcm_wrapper/code_gen/BUCK b/fboss/bcm_wrapper/code_gen/BUCK
deleted file mode 100644
index 36ce4bc37e992..0000000000000
--- a/fboss/bcm_wrapper/code_gen/BUCK
+++ /dev/null
@@ -1,34 +0,0 @@
-load("@fbcode_macros//build_defs:cpp_binary.bzl", "cpp_binary")
-load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library")
-
-cpp_library(
-    name = "libheader_to_thrift",
-    srcs = [
-        "HeaderParser.cpp",
-        "ThriftIDL.cpp",
-    ],
-    exported_deps = [
-        "//folly:format",
-        "//folly:string",
-    ],
-    exported_external_deps = [
-        ("boost", None, "boost_variant"),
-        ("llvm-fb", None, "clangASTMatchers"),
-        ("llvm-fb", None, "clangFrontend"),
-        ("llvm-fb", None, "clangTooling"),
-    ],
-)
-
-cpp_binary(
-    name = "header_to_thrift",
-    srcs = [
-        "HeaderToThrift.cpp",
-    ],
-    deps = [
-        ":libheader_to_thrift",
-    ],
-    external_deps = [
-        ("llvm-fb", None, "LLVMSupport"),
-        ("llvm-fb", None, "clangTooling"),
-    ],
-)
diff --git a/fboss/bcm_wrapper/code_gen/HeaderParser.cpp b/fboss/bcm_wrapper/code_gen/HeaderParser.cpp
deleted file mode 100644
index c326e7f0c02b4..0000000000000
--- a/fboss/bcm_wrapper/code_gen/HeaderParser.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  Copyright (c) 2004-present, Facebook, Inc.
- *  All rights reserved.
- *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
- *
- */
-#include "HeaderParser.h"
-
-#include <stdexcept>
-
-namespace facebook {
-namespace fboss {
-
-const clang::ast_matchers::DeclarationMatcher&
-HeaderParser::recordDeclMatcher() {
-  static const clang::ast_matchers::DeclarationMatcher matcher =
-      clang::ast_matchers::recordDecl().bind("rd");
-  return matcher;
-}
-
-const clang::ast_matchers::DeclarationMatcher& HeaderParser::enumDeclMatcher() {
-  static const clang::ast_matchers::DeclarationMatcher matcher =
-      clang::ast_matchers::enumDecl().bind("ed");
-  return matcher;
-}
-
-const clang::ast_matchers::DeclarationMatcher&
-HeaderParser::functionDeclMatcher() {
-  static const clang::ast_matchers::DeclarationMatcher matcher =
-      clang::ast_matchers::functionDecl().bind("fd");
-  return matcher;
-}
-
-HeaderParser::HeaderParser()
-    : file_(std::make_unique<ThriftFile>("BcmWrapper")) {}
-
-void HeaderParser::run(
-    const clang::ast_matchers::MatchFinder::MatchResult& result) {
-  // Parse structs, unions, and class declarations
-  const clang::RecordDecl* rd = result.Nodes.getNodeAs<clang::RecordDecl>("rd");
-  if (rd) {
-    try {
-      file_->addStruct(std::make_unique<ThriftStruct>(*rd));
-    } catch (const std::exception&) {
-      // TODO(borisb): this case should generate thrift comments calling for
-      // manual code that needs to be written.
-    }
-    return;
-  }
-  // Parse enum declarations
-  const clang::EnumDecl* ed = result.Nodes.getNodeAs<clang::EnumDecl>("ed");
-  if (ed) {
-    file_->addEnum(std::make_unique<ThriftEnum>(*ed));
-    return;
-  }
-  // Parse function declarations
-  const clang::FunctionDecl* fd =
-      result.Nodes.getNodeAs<clang::FunctionDecl>("fd");
-  if (fd) {
-    try {
-      auto tm = std::make_unique<ThriftMethod>(*fd);
-      auto ts = std::make_unique<ThriftStruct>(*fd);
-      if (ts->hasFields()) {
-        tm->resultTypeName = ts->name;
-        file_->addStruct(std::move(ts));
-      }
-      file_->addMethod(std::move(tm));
-    } catch (const std::exception&) {
-      // TODO(borisb): this case should generate thrift comments calling for
-      // manual code that needs to be written.
-    }
-    return;
-  }
-}
-
-std::string HeaderParser::getThrift() const {
-  return file_->getThrift();
-};
-
-} // namespace fboss
-} // namespace facebook
diff --git a/fboss/bcm_wrapper/code_gen/HeaderParser.h b/fboss/bcm_wrapper/code_gen/HeaderParser.h
deleted file mode 100644
index fe9675095d51d..0000000000000
--- a/fboss/bcm_wrapper/code_gen/HeaderParser.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  Copyright (c) 2004-present, Facebook, Inc.
- *  All rights reserved.
- *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
- *
- */
-
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include <clang/ASTMatchers/ASTMatchFinder.h>
-#include <clang/ASTMatchers/ASTMatchers.h>
-#include <clang/Frontend/FrontendActions.h>
-#include <clang/Tooling/Tooling.h>
-
-#include "ThriftIDL.h"
-
-namespace facebook {
-namespace fboss {
-/*
- * This class implements the visitor function that we run on matching nodes in
- * the clang AST. It also owns the matchers we use to determine whether to run
- * on a node or not. Currently, we visit record (class, union, struct)
- * declarations, enum declarations and function declarations.
- *
- * As we visit those declarations, we populate objects which represent ThrifIDL
- * objects corresponding to those declarations which we can finally use to
- * output thrift corresponding to the processed header file.
- */
-class HeaderParser : public clang::ast_matchers::MatchFinder::MatchCallback {
- public:
-  HeaderParser();
-  void run(
-      const clang::ast_matchers::MatchFinder::MatchResult& result) override;
-  // matcher for structs, unions, and classes
-  static const clang::ast_matchers::DeclarationMatcher& recordDeclMatcher();
-  // matcher for enums
-  static const clang::ast_matchers::DeclarationMatcher& enumDeclMatcher();
-  // matcher for functions
-  static const clang::ast_matchers::DeclarationMatcher& functionDeclMatcher();
-  // return the the thrift code we have generated while processing the header
-  std::string getThrift() const;
-
- private:
-  // These will store the generated Thrift IDL objects we parse as we go.
-  // We need to store because functions will result in methods (the function
-  // itself) and structs (the return type) so we have to write out the file
-  // at the end rather than as we go.
-  std::unique_ptr<ThriftFile> file_;
-};
-} // namespace fboss
-} // namespace facebook
diff --git a/fboss/bcm_wrapper/code_gen/HeaderToThrift.cpp b/fboss/bcm_wrapper/code_gen/HeaderToThrift.cpp
deleted file mode 100644
index ca646e85c344f..0000000000000
--- a/fboss/bcm_wrapper/code_gen/HeaderToThrift.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  Copyright (c) 2004-present, Facebook, Inc.
- *  All rights reserved.
- *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
- *
- */
-#include "HeaderParser.h"
-
-#include <clang/Tooling/CommonOptionsParser.h>
-#include <clang/Tooling/Tooling.h>
-#include <llvm/Support/CommandLine.h>
-
-static llvm::cl::extrahelp commonHelp(
-    clang::tooling::CommonOptionsParser::HelpMessage);
-static llvm::cl::OptionCategory headerToThriftCategory(
-    "HeaderToThrift options");
-
-int main(int argc, char** argv) {
-  clang::tooling::CommonOptionsParser optionsParser(
-      argc, const_cast<const char**>(argv), headerToThriftCategory);
-  clang::tooling::ClangTool tool(
-      optionsParser.getCompilations(), optionsParser.getSourcePathList());
-  facebook::fboss::HeaderParser hp;
-  clang::ast_matchers::MatchFinder mf;
-  mf.addMatcher(facebook::fboss::HeaderParser::recordDeclMatcher(), &hp);
-  mf.addMatcher(facebook::fboss::HeaderParser::enumDeclMatcher(), &hp);
-  mf.addMatcher(facebook::fboss::HeaderParser::functionDeclMatcher(), &hp);
-  tool.run(clang::tooling::newFrontendActionFactory(&mf).get());
-  llvm::outs() << hp.getThrift() << "\n";
-}
diff --git a/fboss/bcm_wrapper/code_gen/ThriftIDL.cpp b/fboss/bcm_wrapper/code_gen/ThriftIDL.cpp
deleted file mode 100644
index ef86c55a00a9e..0000000000000
--- a/fboss/bcm_wrapper/code_gen/ThriftIDL.cpp
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- *  Copyright (c) 2004-present, Facebook, Inc.
- *  All rights reserved.
- *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
- *
- */
-#include "ThriftIDL.h"
-
-#include <sstream>
-#include <stdexcept>
-
-#include <folly/Format.h>
-#include <folly/String.h>
-
-namespace {
-// struct_name -> structName
-void snakeToCamel(std::string& s) {
-  int numSeen = 0;
-  bool shouldCapitalize = false;
-  for (int i = 0; i < s.size(); ++i) {
-    int target = i + numSeen;
-    while (target < s.size() && s.at(target) == '_') {
-      ++target;
-      ++numSeen;
-      shouldCapitalize = true;
-    }
-    if (target < s.size() && numSeen) {
-      std::swap(s.at(i), s.at(target));
-      if (shouldCapitalize) {
-        auto upper = toupper(s.at(i));
-        s.at(i) = upper;
-        shouldCapitalize = false;
-      }
-    }
-  }
-  s.resize(s.size() - numSeen);
-}
-
-// fooBar -> FooBar
-void capitalize(std::string& s) {
-  if (s.empty()) {
-    return;
-  }
-  auto upper = toupper(s.at(0));
-  s.at(0) = upper;
-}
-
-// These various "stripping" functions are a bit of a kludge. I think I can fix
-// this by properly handling typedef declarations rather than relying on a
-// naming scheme pattern.
-void stripPrefix(std::string& s, const std::string& prefix) {
-  std::string::size_type structLoc = s.find(prefix);
-  if (structLoc != std::string::npos && structLoc == 0) {
-    s.erase(0, prefix.size());
-  }
-}
-
-// remove leading "struct "
-void stripStructPrefix(std::string& s) {
-  stripPrefix(s, "struct ");
-}
-
-// remove leading "enum "
-void stripEnumPrefix(std::string& s) {
-  stripPrefix(s, "enum ");
-}
-
-bool stripSuffix(std::string& s, const std::string& suffix) {
-  std::string::size_type loc = s.find_last_of(suffix);
-  if (loc == s.size() - suffix.size()) {
-    s.erase(loc, suffix.size());
-    return true;
-  }
-  return false;
-}
-
-// remove trailing "_t" or "_s"
-void stripStructSuffix(std::string& s) {
-  if (stripSuffix(s, "_t")) {
-    return;
-  }
-  stripSuffix(s, "_s");
-}
-
-// remove trailing "_t" or "_e"
-void stripEnumSuffix(std::string& s) {
-  if (stripSuffix(s, "_t")) {
-    return;
-  }
-  stripSuffix(s, "_e");
-}
-
-void normalizeEnumName(std::string& s) {
-  stripEnumPrefix(s);
-  stripEnumSuffix(s);
-  snakeToCamel(s);
-  capitalize(s);
-}
-
-void normalizeStructName(std::string& s) {
-  stripStructPrefix(s);
-  stripStructSuffix(s);
-  snakeToCamel(s);
-  capitalize(s);
-}
-} // namespace
-
-namespace facebook {
-namespace fboss {
-
-ThriftType::ThriftType(const clang::QualType& qt) {
-  if (qt->isStructureType()) {
-    std::string t = qt.getAsString();
-    normalizeStructName(t);
-    type = t;
-  } else if (qt->isEnumeralType()) {
-    std::string t = qt.getAsString();
-    normalizeEnumName(t);
-    type = t;
-  } else if (qt->isPointerType()) {
-    ThriftType elementType(qt->getPointeeType());
-    type = List(elementType.type);
-  } else if (qt->isIntegerType()) {
-    std::string t = qt.getAsString();
-    if (t == "bool") {
-      type = ThriftType::Primitive::Bool;
-    } else if (t == "int") {
-      type = ThriftType::Primitive::Int32;
-    }
-  } else if (qt->isVoidType()) {
-    type = "void";
-  } else {
-    type = "UNMATCHED_TYPE";
-  }
-  name = boost::apply_visitor(ThriftType::ThriftGenVisitor(), type);
-}
-
-ThriftType::ThriftType() {
-  type = "void";
-  name = boost::apply_visitor(ThriftType::ThriftGenVisitor(), type);
-}
-
-std::string ThriftType::getThrift() const {
-  return name;
-}
-
-ThriftType::List::List(const ThriftType::Type& elementType) {
-  this->elementType = elementType;
-}
-
-std::string ThriftType::ThriftGenVisitor::operator()(
-    const std::string& name) const {
-  return name;
-}
-
-std::string ThriftType::ThriftGenVisitor::operator()(
-    const ThriftType::Primitive& primitive) const {
-  switch (primitive) {
-    case ThriftType::Primitive::Bool:
-      return "bool";
-    case ThriftType::Primitive::Byte:
-      return "byte";
-    case ThriftType::Primitive::Int16:
-      return "i16";
-    case ThriftType::Primitive::Int32:
-      return "i32";
-    case ThriftType::Primitive::Int64:
-      return "i64";
-    case ThriftType::Primitive::Float:
-      return "float";
-    case ThriftType::Primitive::Double:
-      return "double";
-    case ThriftType::Primitive::Binary:
-      return "binary";
-    case ThriftType::Primitive::String:
-      return "string";
-    default:
-      return "unknown primitive";
-  }
-}
-
-std::string ThriftType::ThriftGenVisitor::operator()(
-    const ThriftType::List& list) const {
-  return folly::sformat(
-      "list<{}>",
-      boost::apply_visitor(ThriftType::ThriftGenVisitor(), list.elementType));
-}
-
-ThriftEnumerator::ThriftEnumerator(
-    const clang::EnumConstantDecl& enumConstant) {
-  name = enumConstant.getName().str();
-  value_ = enumConstant.getInitVal().getExtValue();
-}
-
-std::string ThriftEnumerator::getThrift() const {
-  return folly::sformat("{} = {}", name, value_);
-}
-
-ThriftEnum::ThriftEnum(const clang::EnumDecl& en) {
-  name = en.getName().str();
-  normalizeEnumName(name);
-  for (const clang::EnumConstantDecl* enumConstant : en.enumerators()) {
-    enumerators_.emplace_back(
-        std::make_unique<ThriftEnumerator>(*enumConstant));
-  }
-}
-
-std::string ThriftEnum::getThrift() const {
-  std::stringstream ss;
-  ss << "enum " << name << "\n{\n";
-  for (const auto& enumerator : enumerators_) {
-    ss << "    " << enumerator->getThrift() << ",\n";
-  }
-  ss << "}";
-  return ss.str();
-}
-
-ThriftField::ThriftField(int index, const clang::ValueDecl& decl)
-    : ThriftField(decl.getName().str(), index, decl.getType()) {}
-
-ThriftField::ThriftField(
-    const std::string& name,
-    int index,
-    const clang::QualType& qualifiedType)
-    : index_(index) {
-  if (qualifiedType->isFunctionPointerType()) {
-    throw std::runtime_error("can't make a thrift field with fn ptr");
-  }
-  this->name = name;
-  type_ = ThriftType(qualifiedType);
-}
-
-std::string ThriftField::getThrift() const {
-  return folly::sformat("{}: {} {}", index_, type_.getThrift(), name);
-}
-
-ThriftStruct::ThriftStruct(const clang::RecordDecl& record) {
-  name = record.getName().str();
-  normalizeStructName(name);
-  int index = 0;
-  for (const clang::FieldDecl* field : record.fields()) {
-    fields_.emplace_back(std::make_unique<ThriftField>(index, *field));
-    ++index;
-  }
-}
-
-ThriftStruct::ThriftStruct(const clang::FunctionDecl& function) {
-  name = folly::sformat(
-      "{}Result", ThriftMethod::methodName(function.getName().str()));
-  normalizeStructName(name);
-  int index = 0;
-  auto rt = function.getReturnType();
-  if (!rt->isVoidType()) {
-    fields_.emplace_back(std::make_unique<ThriftField>("retVal", index, rt));
-    ++index;
-  }
-  for (const clang::ParmVarDecl* param : function.parameters()) {
-    if (param->getType()->isPointerType()) {
-      fields_.emplace_back(std::make_unique<ThriftField>(
-          param->getName().str(), index, param->getType()));
-      ++index;
-    }
-  }
-}
-
-std::string ThriftStruct::getThrift() const {
-  std::stringstream ss;
-  ss << "struct " << name << "\n{\n";
-  for (const auto& field : fields_) {
-    ss << "    " << field->getThrift() << "\n";
-  }
-  ss << "}";
-  return ss.str();
-}
-
-bool ThriftStruct::hasFields() const {
-  return not fields_.empty();
-}
-
-ThriftMethod::ThriftMethod(const clang::FunctionDecl& function) {
-  name = methodName(function.getName().str());
-  resultTypeName = "void";
-  int index = 0;
-  for (const clang::ParmVarDecl* param : function.parameters()) {
-    parameters_.emplace_back(std::make_unique<ThriftField>(index, *param));
-    ++index;
-  }
-}
-
-std::string ThriftMethod::methodName(const std::string& functionName) {
-  std::string s = functionName;
-  snakeToCamel(s);
-  return s;
-}
-
-std::string ThriftMethod::getThrift() const {
-  std::stringstream ss;
-  ss << resultTypeName << " ";
-  ss << name << "(";
-  int i = 0;
-  for (const auto& param : parameters_) {
-    ss << param->getThrift();
-    if (++i < parameters_.size()) {
-      ss << ", ";
-    }
-  }
-  ss << ")";
-  return ss.str();
-}
-
-void ThriftService::addMethod(std::unique_ptr<ThriftMethod> method) {
-  methods_.push_back(std::move(method));
-}
-
-std::string ThriftService::getThrift() const {
-  std::stringstream ss;
-  ss << "service " << name << "\n{\n";
-  for (const auto& method : methods_) {
-    ss << "    " << method->getThrift() << "\n";
-  }
-  ss << "}";
-  return ss.str();
-}
-
-ThriftFile::ThriftFile(const std::string& name) {
-  this->name = name;
-  service_.name = folly::sformat("{}Service", name);
-}
-
-void ThriftFile::addEnum(std::unique_ptr<ThriftEnum> en) {
-  enums_.push_back(std::move(en));
-}
-
-void ThriftFile::addMethod(std::unique_ptr<ThriftMethod> method) {
-  service_.addMethod(std::move(method));
-}
-
-void ThriftFile::addStruct(std::unique_ptr<ThriftStruct> st) {
-  structs_.push_back(std::move(st));
-}
-
-std::string ThriftFile::getThrift() const {
-  std::stringstream ss;
-  for (const auto& en : enums_) {
-    ss << en->getThrift() << "\n";
-  }
-  for (const auto& st : structs_) {
-    ss << st->getThrift() << "\n";
-  }
-  ss << service_.getThrift() << "\n";
-  return ss.str();
-}
-
-} // namespace fboss
-} // namespace facebook
diff --git a/fboss/bcm_wrapper/code_gen/ThriftIDL.h b/fboss/bcm_wrapper/code_gen/ThriftIDL.h
deleted file mode 100644
index f5513cd7e11da..0000000000000
--- a/fboss/bcm_wrapper/code_gen/ThriftIDL.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- *  Copyright (c) 2004-present, Facebook, Inc.
- *  All rights reserved.
- *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
- *
- */
-#pragma once
-
-#include <boost/variant.hpp>
-#include <clang/Tooling/Tooling.h>
-#include <optional>
-#include <string>
-
-namespace facebook {
-namespace fboss {
-
-/*
- * Abstract base class for all the various Thrift IDL objects we support.
- * The concrete classes roughly follow the Thrift IDL grammar defined at
- * https://thrift.apache.org/docs/idl
- */
-class ThriftIDLObject {
- public:
-  virtual ~ThriftIDLObject() {}
-  virtual std::string getThrift() const = 0;
-  std::string name;
-};
-
-/*
- * Represents a thrift type as used in objects which give something
- * a type. Specifically this would be types in struct fields or in
- * method parameters.
- * ie: in a field line like: "0: i32 x", the "i32" portion is a ThriftType.
- *
- * Implementation Note:
- * Since we output list types, I found internally representing things with
- * boost::variant to be convenient. That way a type is either a name, a
- * primitive, or a list of some other valid type. We can support list<list<int>>
- * rather naturally this way.
- * (Lists are needed because all pointer types are treated as list<Pointee>)
- */
-class ThriftType : public ThriftIDLObject {
- public:
-  explicit ThriftType(const clang::QualType& qt);
-  ThriftType();
-  std::string getThrift() const override;
-  enum class Primitive {
-    Bool = 0,
-    Byte = 1,
-    Int16 = 2,
-    Int32 = 3,
-    Int64 = 4,
-    Float = 5,
-    Double = 6,
-    Binary = 7,
-    String = 8,
-  };
-
-  class List;
-  using Type = boost::variant<
-      std::string, // thrift type name (eg a struct)
-      Primitive,
-      boost::recursive_wrapper<List>>;
-
-  class List {
-   public:
-    explicit List(const Type& elementType);
-    Type elementType;
-  };
-  Type type;
-
- private:
-  class ThriftGenVisitor : public boost::static_visitor<std::string> {
-   public:
-    std::string operator()(const std::string& name) const;
-    std::string operator()(const Primitive& primitive) const;
-    std::string operator()(const List& list) const;
-  };
-};
-
-/*
- * Represents an indexed, typed entry in a list of fields. In particular,
- * this is used to represent fields in structs/unions and parameters of
- * methods.
- */
-class ThriftField : public ThriftIDLObject {
- public:
-  ThriftField(int index, const clang::ValueDecl& field);
-  ThriftField(
-      const std::string& name,
-      int index,
-      const clang::QualType& qualifiedType);
-  std::string getThrift() const override;
-
- private:
-  int index_;
-  ThriftType type_;
-};
-
-/*
- * Represents a struct. Can be constructed from a clang AST struct declaration
- * or directly from a clang ast function declaration in the case of generating a
- * struct for the return value of a method.
- */
-class ThriftStruct : public ThriftIDLObject {
- public:
-  explicit ThriftStruct(const clang::RecordDecl& record);
-  explicit ThriftStruct(const clang::FunctionDecl& function);
-  std::string getThrift() const override;
-  bool hasFields() const;
-
- private:
-  std::vector<std::unique_ptr<ThriftField>> fields_;
-};
-
-/*
- * Represents one possible value for an enum
- */
-class ThriftEnumerator : public ThriftIDLObject {
- public:
-  explicit ThriftEnumerator(const clang::EnumConstantDecl& enumConstant);
-  std::string getThrift() const override;
-
- private:
-  int value_;
-};
-
-/*
- * Represents an enum. Constructed from enum declarations in the clang AST
- */
-class ThriftEnum : public ThriftIDLObject {
- public:
-  explicit ThriftEnum(const clang::EnumDecl& en);
-  std::string getThrift() const override;
-
- private:
-  std::vector<std::unique_ptr<ThriftEnumerator>> enumerators_;
-};
-
-/*
- * Represents a method inside a service. Constructed from function
- * declarations in the clang AST.
- */
-class ThriftMethod : public ThriftIDLObject {
- public:
-  explicit ThriftMethod(const clang::FunctionDecl& function);
-  std::string getThrift() const override;
-  static std::string methodName(const std::string& functionName);
-  std::string resultTypeName;
-
- private:
-  std::vector<std::unique_ptr<ThriftField>> parameters_;
-};
-
-/*
- * Represents a service. Has a list of methods and exposes the ability to
- * extract all of their generated return types so that they can be included
- * in the file.
- */
-class ThriftService : public ThriftIDLObject {
- public:
-  std::string getThrift() const override;
-  void addMethod(std::unique_ptr<ThriftMethod> method);
-
- private:
-  std::vector<std::unique_ptr<ThriftMethod>> methods_;
-};
-
-/*
- * Represents the entire thrift file. This is the top level object which
- * will contain all the other IDL objects.
- */
-class ThriftFile : public ThriftIDLObject {
- public:
-  explicit ThriftFile(const std::string& name);
-  std::string getThrift() const override;
-  void addEnum(std::unique_ptr<ThriftEnum> en);
-  // Adding a method also adds the struct representing the return value
-  void addMethod(std::unique_ptr<ThriftMethod> method);
-  void addStruct(std::unique_ptr<ThriftStruct> st);
-
- private:
-  std::vector<std::unique_ptr<ThriftEnum>> enums_;
-  // While thrift supports multiple services in a file, for now we generate
-  // just one, so don't bother with the extra complication
-  ThriftService service_;
-  std::vector<std::unique_ptr<ThriftStruct>> structs_;
-};
-
-} // namespace fboss
-} // namespace facebook
diff --git a/fboss/cli/fboss2/commands/show/dsfnodes/CmdShowDsfNodes.h b/fboss/cli/fboss2/commands/show/dsfnodes/CmdShowDsfNodes.h
index ff28eb57c8501..8fc9d2408221e 100644
--- a/fboss/cli/fboss2/commands/show/dsfnodes/CmdShowDsfNodes.h
+++ b/fboss/cli/fboss2/commands/show/dsfnodes/CmdShowDsfNodes.h
@@ -52,7 +52,7 @@ class CmdShowDsfNodes
         "Name",
         "Switch Id",
         "Type",
-        "System port range",
+        "System port ranges",
     });
 
     for (auto const& entry : model.get_dsfNodes()) {
@@ -77,11 +77,13 @@ class CmdShowDsfNodes
       entry.type() =
           (node.type() == cfg::DsfNodeType::INTERFACE_NODE ? "Intf Node"
                                                            : "Fabric Node");
-      if (node.systemPortRange()) {
-        entry.systemPortRange() = folly::sformat(
-            "({}, {})",
-            *node.systemPortRange()->minimum(),
-            *node.systemPortRange()->maximum());
+      std::vector<std::string> ranges;
+      if (node.systemPortRanges()->systemPortRanges()->size()) {
+        for (const auto& range : *node.systemPortRanges()->systemPortRanges()) {
+          ranges.push_back(
+              folly::sformat("({}, {})", *range.minimum(), *range.maximum()));
+        }
+        entry.systemPortRange() = folly::join(", ", ranges);
       } else {
         entry.systemPortRange() = "--";
       }
diff --git a/fboss/cli/fboss2/commands/show/interface/CmdShowInterface.h b/fboss/cli/fboss2/commands/show/interface/CmdShowInterface.h
index 7dc523855abf3..da07fea1d51d6 100644
--- a/fboss/cli/fboss2/commands/show/interface/CmdShowInterface.h
+++ b/fboss/cli/fboss2/commands/show/interface/CmdShowInterface.h
@@ -115,12 +115,17 @@ class CmdShowInterface
     populateVlanToMtu(vlanToMtu, intfDetails);
     populateVlanToPrefixes(vlanToPrefixes, intfDetails);
 
-    int32_t minSystemPort = 0;
+    std::optional<int32_t> localSysPortOffset, globalSysPortOffset;
     for (const auto& idAndNode : dsfNodes) {
       const auto& node = idAndNode.second;
       if (utils::removeFbDomains(hostInfo.getName()) ==
           utils::removeFbDomains(*node.name())) {
-        minSystemPort = *node.systemPortRange()->minimum();
+        if (node.localSystemPortOffset().has_value()) {
+          localSysPortOffset = *node.localSystemPortOffset();
+        }
+        if (node.globalSystemPortOffset().has_value()) {
+          globalSysPortOffset = *node.globalSystemPortOffset();
+        }
         break;
       }
     }
@@ -151,8 +156,13 @@ class CmdShowInterface
           }
         }
 
-        if (dsfNodes.size() > 0) {
-          int systemPortId = minSystemPort + portId;
+        if (localSysPortOffset.has_value() && globalSysPortOffset.has_value()) {
+          // TODO factor in portId range for this switchId. Needed for
+          // multi-asic systems
+          int systemPortId =
+              (portInfo.scope() == cfg::Scope::GLOBAL ? *globalSysPortOffset
+                                                      : *localSysPortOffset) +
+              portId;
           ifModel.systemPortId() = systemPortId;
 
           // Extract IP addresses for DSF switches
diff --git a/fboss/fsdb/if/oss/fsdb_model_thriftpath.h b/fboss/fsdb/if/oss/fsdb_model_thriftpath.h
index a3dfd2ab7dc6b..e663c340a3578 100755
--- a/fboss/fsdb/if/oss/fsdb_model_thriftpath.h
+++ b/fboss/fsdb/if/oss/fsdb_model_thriftpath.h
@@ -3109,7 +3109,7 @@ std::pair<strings::icmpV4UnavailableSrcAddress, ChildThriftPath<::facebook::netw
 std::pair<strings::reachabilityGroupListSize, Child<::std::int32_t, ::apache::thrift::type_class::integral, ::apache::thrift::type::i32_t>>,
 std::pair<strings::sramGlobalFreePercentXoffThreshold, Child<::std::int8_t, ::apache::thrift::type_class::integral, ::apache::thrift::type::byte_t>>,
 std::pair<strings::sramGlobalFreePercentXonThreshold, Child<::std::int8_t, ::apache::thrift::type_class::integral, ::apache::thrift::type::byte_t>>,
-std::pair<strings::fabricCllfcTxCreditThreshold, Child<::std::int16_t, ::apache::thrift::type_class::integral, ::apache::thrift::type::i16_t>>,
+std::pair<strings::linkFlowControlCreditThreshold, Child<::std::int16_t, ::apache::thrift::type_class::integral, ::apache::thrift::type::i16_t>>,
 std::pair<strings::voqDramBoundThreshold, Child<::std::int32_t, ::apache::thrift::type_class::integral, ::apache::thrift::type::i32_t>>>;
   using ChildrenById = fatal::tuple<   std::pair<std::integral_constant<apache::thrift::field_id_t, 1>, Child<::facebook::fboss::cfg::L2LearningMode, ::apache::thrift::type_class::enumeration, ::apache::thrift::type::enum_t<::facebook::fboss::cfg::L2LearningMode>>>,
    std::pair<std::integral_constant<apache::thrift::field_id_t, 2>, Child<bool, ::apache::thrift::type_class::integral, ::apache::thrift::type::bool_t>>,
@@ -3202,7 +3202,7 @@ std::pair<strings::icmpV4UnavailableSrcAddress, std::integral_constant<apache::t
 std::pair<strings::reachabilityGroupListSize, std::integral_constant<apache::thrift::field_id_t, 43>>,
 std::pair<strings::sramGlobalFreePercentXoffThreshold, std::integral_constant<apache::thrift::field_id_t, 44>>,
 std::pair<strings::sramGlobalFreePercentXonThreshold, std::integral_constant<apache::thrift::field_id_t, 45>>,
-std::pair<strings::fabricCllfcTxCreditThreshold, std::integral_constant<apache::thrift::field_id_t, 46>>,
+std::pair<strings::linkFlowControlCreditThreshold, std::integral_constant<apache::thrift::field_id_t, 46>>,
 std::pair<strings::voqDramBoundThreshold, std::integral_constant<apache::thrift::field_id_t, 47>>>::template type_of<Name>;
 
   template <typename Name>
@@ -3253,7 +3253,7 @@ std::pair<strings::voqDramBoundThreshold, std::integral_constant<apache::thrift:
     STRUCT_CHILD_GETTERS(reachabilityGroupListSize, 43);
     STRUCT_CHILD_GETTERS(sramGlobalFreePercentXoffThreshold, 44);
     STRUCT_CHILD_GETTERS(sramGlobalFreePercentXonThreshold, 45);
-    STRUCT_CHILD_GETTERS(fabricCllfcTxCreditThreshold, 46);
+    STRUCT_CHILD_GETTERS(linkFlowControlCreditThreshold, 46);
     STRUCT_CHILD_GETTERS(voqDramBoundThreshold, 47);
 
   template <apache::thrift::field_id_t __id>
@@ -3302,7 +3302,7 @@ std::pair<strings::voqDramBoundThreshold, std::integral_constant<apache::thrift:
     else if constexpr (__id == 43) { return reachabilityGroupListSize(); }
     else if constexpr (__id == 44) { return sramGlobalFreePercentXoffThreshold(); }
     else if constexpr (__id == 45) { return sramGlobalFreePercentXonThreshold(); }
-    else if constexpr (__id == 46) { return fabricCllfcTxCreditThreshold(); }
+    else if constexpr (__id == 46) { return linkFlowControlCreditThreshold(); }
     else if constexpr (__id == 47) { return voqDramBoundThreshold(); }
   }
 
@@ -13082,7 +13082,7 @@ std::pair<strings::metaMacOuis, ChildThriftPath<::std::vector<::std::string>, ::
 std::pair<strings::needL2EntryForNeighbor, Child<bool, ::apache::thrift::type_class::integral, ::apache::thrift::type::bool_t>>,
 std::pair<strings::sramGlobalFreePercentXoffThreshold, Child<::std::int8_t, ::apache::thrift::type_class::integral, ::apache::thrift::type::byte_t>>,
 std::pair<strings::sramGlobalFreePercentXonThreshold, Child<::std::int8_t, ::apache::thrift::type_class::integral, ::apache::thrift::type::byte_t>>,
-std::pair<strings::fabricCllfcTxCreditThreshold, Child<::std::int16_t, ::apache::thrift::type_class::integral, ::apache::thrift::type::i16_t>>,
+std::pair<strings::linkFlowControlCreditThreshold, Child<::std::int16_t, ::apache::thrift::type_class::integral, ::apache::thrift::type::i16_t>>,
 std::pair<strings::voqDramBoundThreshold, Child<::std::int32_t, ::apache::thrift::type_class::integral, ::apache::thrift::type::i32_t>>>;
   using ChildrenById = fatal::tuple<   std::pair<std::integral_constant<apache::thrift::field_id_t, 1>, Child<::facebook::fboss::cfg::L2LearningMode, ::apache::thrift::type_class::enumeration, ::apache::thrift::type::enum_t<::facebook::fboss::cfg::L2LearningMode>>>,
    std::pair<std::integral_constant<apache::thrift::field_id_t, 2>, Child<bool, ::apache::thrift::type_class::integral, ::apache::thrift::type::bool_t>>,
@@ -13127,7 +13127,7 @@ std::pair<strings::metaMacOuis, std::integral_constant<apache::thrift::field_id_
 std::pair<strings::needL2EntryForNeighbor, std::integral_constant<apache::thrift::field_id_t, 18>>,
 std::pair<strings::sramGlobalFreePercentXoffThreshold, std::integral_constant<apache::thrift::field_id_t, 19>>,
 std::pair<strings::sramGlobalFreePercentXonThreshold, std::integral_constant<apache::thrift::field_id_t, 20>>,
-std::pair<strings::fabricCllfcTxCreditThreshold, std::integral_constant<apache::thrift::field_id_t, 21>>,
+std::pair<strings::linkFlowControlCreditThreshold, std::integral_constant<apache::thrift::field_id_t, 21>>,
 std::pair<strings::voqDramBoundThreshold, std::integral_constant<apache::thrift::field_id_t, 22>>>::template type_of<Name>;
 
   template <typename Name>
@@ -13154,7 +13154,7 @@ std::pair<strings::voqDramBoundThreshold, std::integral_constant<apache::thrift:
     STRUCT_CHILD_GETTERS(needL2EntryForNeighbor, 18);
     STRUCT_CHILD_GETTERS(sramGlobalFreePercentXoffThreshold, 19);
     STRUCT_CHILD_GETTERS(sramGlobalFreePercentXonThreshold, 20);
-    STRUCT_CHILD_GETTERS(fabricCllfcTxCreditThreshold, 21);
+    STRUCT_CHILD_GETTERS(linkFlowControlCreditThreshold, 21);
     STRUCT_CHILD_GETTERS(voqDramBoundThreshold, 22);
 
   template <apache::thrift::field_id_t __id>
@@ -13179,7 +13179,7 @@ std::pair<strings::voqDramBoundThreshold, std::integral_constant<apache::thrift:
     else if constexpr (__id == 18) { return needL2EntryForNeighbor(); }
     else if constexpr (__id == 19) { return sramGlobalFreePercentXoffThreshold(); }
     else if constexpr (__id == 20) { return sramGlobalFreePercentXonThreshold(); }
-    else if constexpr (__id == 21) { return fabricCllfcTxCreditThreshold(); }
+    else if constexpr (__id == 21) { return linkFlowControlCreditThreshold(); }
     else if constexpr (__id == 22) { return voqDramBoundThreshold(); }
   }
 
diff --git a/fboss/oss/link_known_bad_tests/fboss_link_known_bad_tests.materialized_JSON b/fboss/oss/link_known_bad_tests/fboss_link_known_bad_tests.materialized_JSON
index bca1dcf46d98a..ff9f4c6da9f37 100644
--- a/fboss/oss/link_known_bad_tests/fboss_link_known_bad_tests.materialized_JSON
+++ b/fboss/oss/link_known_bad_tests/fboss_link_known_bad_tests.materialized_JSON
@@ -7,9 +7,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -84,9 +81,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -161,9 +155,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -238,9 +229,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -315,9 +303,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -392,9 +377,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -469,9 +451,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -546,9 +525,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -623,9 +599,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -700,9 +673,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -774,9 +744,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -848,9 +815,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -922,9 +886,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -996,9 +957,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -1070,9 +1028,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -1144,9 +1099,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -1218,9 +1170,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -1292,9 +1241,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -1366,9 +1312,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -1440,9 +1383,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -1514,9 +1454,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -1588,9 +1525,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -1665,9 +1599,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -1742,9 +1673,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -1819,9 +1747,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -1896,9 +1821,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -1973,9 +1895,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -2050,9 +1969,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -2127,9 +2043,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -2204,9 +2117,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -2281,9 +2191,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -2355,9 +2262,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -2429,9 +2333,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -2503,9 +2404,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -2577,9 +2475,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -2651,9 +2546,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -2725,9 +2617,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -2799,9 +2688,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -2873,9 +2759,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -2947,9 +2830,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -3021,9 +2901,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -3095,9 +2972,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -3169,9 +3043,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -3246,9 +3117,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -3323,9 +3191,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -3400,9 +3265,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -3477,9 +3339,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -3554,9 +3413,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -3631,9 +3487,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -3708,9 +3561,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -3785,9 +3635,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -3862,9 +3709,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -3936,9 +3780,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -4010,9 +3851,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -4084,9 +3922,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -4158,9 +3993,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -4232,9 +4064,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -4306,9 +4135,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -4380,9 +4206,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -4454,9 +4277,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -4528,9 +4348,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -4602,9 +4419,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -4676,9 +4490,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -4750,9 +4561,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -4824,9 +4632,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -4898,9 +4703,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -4972,9 +4774,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -5046,9 +4845,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -5120,9 +4916,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -5194,9 +4987,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -5268,9 +5058,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -5342,9 +5129,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -5416,9 +5200,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -5487,9 +5268,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -5558,9 +5336,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -5629,9 +5404,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -5700,9 +5472,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -5771,9 +5540,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -5842,9 +5608,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -5913,9 +5676,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -5984,9 +5744,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -6055,9 +5812,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -6126,9 +5880,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -6197,9 +5948,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -6268,9 +6016,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -6342,9 +6087,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -6416,9 +6158,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -6490,9 +6229,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -6564,9 +6300,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -6638,9 +6371,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -6712,9 +6442,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -6786,9 +6513,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -6860,9 +6584,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -6934,9 +6655,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -7005,9 +6723,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -7076,9 +6791,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -7147,9 +6859,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -7218,9 +6927,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -7289,9 +6995,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -7360,9 +7063,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -7431,9 +7131,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -7502,9 +7199,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -7573,9 +7267,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -7644,9 +7335,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -7715,9 +7403,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "warm_boot.*$"
         },
@@ -7786,9 +7471,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -7887,9 +7569,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -7988,9 +7667,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -8089,9 +7765,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -8190,9 +7863,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -8291,9 +7961,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -8392,9 +8059,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -8493,9 +8157,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -8594,9 +8255,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -8695,9 +8353,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -8790,9 +8445,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -8885,9 +8537,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -8980,9 +8629,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -9075,9 +8721,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -9170,9 +8813,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -9265,9 +8905,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -9360,9 +8997,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -9455,9 +9089,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -9550,9 +9181,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -9645,9 +9273,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -9740,9 +9365,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -9835,9 +9457,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -9906,9 +9525,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -9977,9 +9593,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -10048,9 +9661,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -10119,9 +9729,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -10190,9 +9797,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -10261,9 +9865,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -10332,9 +9933,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -10403,9 +10001,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -10474,9 +10069,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -10545,9 +10137,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -10616,9 +10205,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -10687,9 +10273,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -10758,9 +10341,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -10829,9 +10409,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -10900,9 +10477,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -10971,9 +10545,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -11042,9 +10613,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -11113,9 +10681,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -11184,9 +10749,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -11255,9 +10817,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -11323,9 +10882,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -11391,9 +10947,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -11459,9 +11012,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -11527,9 +11077,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -11595,9 +11142,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -11663,9 +11207,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -11731,9 +11272,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -11792,16 +11330,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "janga800bic/sai/asicsdk-11.3.0.0_dnx_odp/11.3.0.0_dnx_odp": [
+    "janga800bic/sai/asicsdk-11.7.0.0_dnx_odp/11.7.0.0_dnx_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -11841,6 +11376,9 @@
         {
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -11854,16 +11392,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "janga800bic/sai/asicsdk-11.3.0.0_dnx_odp/11.3.0.0_dnx_odp/physdk-credo-0.7.2/credo-0.7.2": [
+    "janga800bic/sai/asicsdk-11.7.0.0_dnx_odp/11.7.0.0_dnx_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -11903,6 +11438,9 @@
         {
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -11916,16 +11454,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "janga800bic/sai/asicsdk-11.3.0.0_dnx_odp/11.3.0.0_dnx_odp/physdk-credo-0.8.4/credo-0.8.4": [
+    "janga800bic/sai/asicsdk-11.7.0.0_dnx_odp/11.7.0.0_dnx_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -11965,6 +11500,9 @@
         {
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -11978,16 +11516,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "janga800bic/sai/asicsdk-11.3.0.0_dnx_odp/12.0_ea_dnx_odp": [
+    "janga800bic/sai/asicsdk-11.7.0.0_dnx_odp/12.0_ea_dnx_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -12027,6 +11562,9 @@
         {
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -12040,16 +11578,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "janga800bic/sai/asicsdk-11.3.0.0_dnx_odp/12.0_ea_dnx_odp/physdk-credo-0.7.2/credo-0.7.2": [
+    "janga800bic/sai/asicsdk-11.7.0.0_dnx_odp/12.0_ea_dnx_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -12089,6 +11624,9 @@
         {
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -12102,16 +11640,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "janga800bic/sai/asicsdk-11.3.0.0_dnx_odp/12.0_ea_dnx_odp/physdk-credo-0.8.4/credo-0.8.4": [
+    "janga800bic/sai/asicsdk-11.7.0.0_dnx_odp/12.0_ea_dnx_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -12151,6 +11686,9 @@
         {
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -12171,9 +11709,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -12213,6 +11748,9 @@
         {
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -12233,9 +11771,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -12275,6 +11810,9 @@
         {
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -12295,9 +11833,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -12337,6 +11872,9 @@
         {
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -12350,16 +11888,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru400bfu/sai/asicsdk-11.3.0.0_dnx_odp/11.3.0.0_dnx_odp": [
+    "meru400bfu/sai/asicsdk-11.7.0.0_dnx_odp/11.7.0.0_dnx_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -12451,16 +11986,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru400bfu/sai/asicsdk-11.3.0.0_dnx_odp/11.3.0.0_dnx_odp/physdk-credo-0.7.2/credo-0.7.2": [
+    "meru400bfu/sai/asicsdk-11.7.0.0_dnx_odp/11.7.0.0_dnx_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -12552,16 +12084,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru400bfu/sai/asicsdk-11.3.0.0_dnx_odp/11.3.0.0_dnx_odp/physdk-credo-0.8.4/credo-0.8.4": [
+    "meru400bfu/sai/asicsdk-11.7.0.0_dnx_odp/11.7.0.0_dnx_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -12653,16 +12182,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru400bfu/sai/asicsdk-11.3.0.0_dnx_odp/12.0_ea_dnx_odp": [
+    "meru400bfu/sai/asicsdk-11.7.0.0_dnx_odp/12.0_ea_dnx_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -12754,16 +12280,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru400bfu/sai/asicsdk-11.3.0.0_dnx_odp/12.0_ea_dnx_odp/physdk-credo-0.7.2/credo-0.7.2": [
+    "meru400bfu/sai/asicsdk-11.7.0.0_dnx_odp/12.0_ea_dnx_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -12855,16 +12378,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru400bfu/sai/asicsdk-11.3.0.0_dnx_odp/12.0_ea_dnx_odp/physdk-credo-0.8.4/credo-0.8.4": [
+    "meru400bfu/sai/asicsdk-11.7.0.0_dnx_odp/12.0_ea_dnx_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -12963,9 +12483,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -13064,9 +12581,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -13165,9 +12679,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -13259,16 +12770,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru400biu/sai/asicsdk-11.3.0.0_dnx_odp/11.3.0.0_dnx_odp": [
+    "meru400biu/sai/asicsdk-11.7.0.0_dnx_odp/11.7.0.0_dnx_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -13357,16 +12865,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru400biu/sai/asicsdk-11.3.0.0_dnx_odp/11.3.0.0_dnx_odp/physdk-credo-0.7.2/credo-0.7.2": [
+    "meru400biu/sai/asicsdk-11.7.0.0_dnx_odp/11.7.0.0_dnx_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -13455,16 +12960,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru400biu/sai/asicsdk-11.3.0.0_dnx_odp/11.3.0.0_dnx_odp/physdk-credo-0.8.4/credo-0.8.4": [
+    "meru400biu/sai/asicsdk-11.7.0.0_dnx_odp/11.7.0.0_dnx_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -13553,16 +13055,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru400biu/sai/asicsdk-11.3.0.0_dnx_odp/12.0_ea_dnx_odp": [
+    "meru400biu/sai/asicsdk-11.7.0.0_dnx_odp/12.0_ea_dnx_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -13651,16 +13150,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru400biu/sai/asicsdk-11.3.0.0_dnx_odp/12.0_ea_dnx_odp/physdk-credo-0.7.2/credo-0.7.2": [
+    "meru400biu/sai/asicsdk-11.7.0.0_dnx_odp/12.0_ea_dnx_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -13749,16 +13245,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru400biu/sai/asicsdk-11.3.0.0_dnx_odp/12.0_ea_dnx_odp/physdk-credo-0.8.4/credo-0.8.4": [
+    "meru400biu/sai/asicsdk-11.7.0.0_dnx_odp/12.0_ea_dnx_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -13854,9 +13347,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -13952,9 +13442,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -14050,9 +13537,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -14141,16 +13625,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru800bfa/sai/asicsdk-11.3.0.0_dnx_odp/11.3.0.0_dnx_odp": [
+    "meru800bfa/sai/asicsdk-11.7.0.0_dnx_odp/11.7.0.0_dnx_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -14211,6 +13692,9 @@
         {
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -14224,16 +13708,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru800bfa/sai/asicsdk-11.3.0.0_dnx_odp/11.3.0.0_dnx_odp/physdk-credo-0.7.2/credo-0.7.2": [
+    "meru800bfa/sai/asicsdk-11.7.0.0_dnx_odp/11.7.0.0_dnx_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -14294,6 +13775,9 @@
         {
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -14307,16 +13791,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru800bfa/sai/asicsdk-11.3.0.0_dnx_odp/11.3.0.0_dnx_odp/physdk-credo-0.8.4/credo-0.8.4": [
+    "meru800bfa/sai/asicsdk-11.7.0.0_dnx_odp/11.7.0.0_dnx_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -14377,6 +13858,9 @@
         {
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -14390,16 +13874,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru800bfa/sai/asicsdk-11.3.0.0_dnx_odp/12.0_ea_dnx_odp": [
+    "meru800bfa/sai/asicsdk-11.7.0.0_dnx_odp/12.0_ea_dnx_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -14460,6 +13941,9 @@
         {
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -14473,16 +13957,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru800bfa/sai/asicsdk-11.3.0.0_dnx_odp/12.0_ea_dnx_odp/physdk-credo-0.7.2/credo-0.7.2": [
+    "meru800bfa/sai/asicsdk-11.7.0.0_dnx_odp/12.0_ea_dnx_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -14543,6 +14024,9 @@
         {
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -14556,16 +14040,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru800bfa/sai/asicsdk-11.3.0.0_dnx_odp/12.0_ea_dnx_odp/physdk-credo-0.8.4/credo-0.8.4": [
+    "meru800bfa/sai/asicsdk-11.7.0.0_dnx_odp/12.0_ea_dnx_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -14626,6 +14107,9 @@
         {
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -14646,9 +14130,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -14709,6 +14190,9 @@
         {
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -14729,9 +14213,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -14792,6 +14273,9 @@
         {
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -14812,9 +14296,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -14875,6 +14356,9 @@
         {
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -14888,16 +14372,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru800bia/sai/asicsdk-11.3.0.0_dnx_odp/11.3.0.0_dnx_odp": [
+    "meru800bia/sai/asicsdk-11.7.0.0_dnx_odp/11.7.0.0_dnx_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -14937,6 +14418,9 @@
         {
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -14950,16 +14434,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru800bia/sai/asicsdk-11.3.0.0_dnx_odp/11.3.0.0_dnx_odp/physdk-credo-0.7.2/credo-0.7.2": [
+    "meru800bia/sai/asicsdk-11.7.0.0_dnx_odp/11.7.0.0_dnx_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -14999,6 +14480,9 @@
         {
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -15012,16 +14496,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru800bia/sai/asicsdk-11.3.0.0_dnx_odp/11.3.0.0_dnx_odp/physdk-credo-0.8.4/credo-0.8.4": [
+    "meru800bia/sai/asicsdk-11.7.0.0_dnx_odp/11.7.0.0_dnx_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -15061,6 +14542,9 @@
         {
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -15074,16 +14558,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru800bia/sai/asicsdk-11.3.0.0_dnx_odp/12.0_ea_dnx_odp": [
+    "meru800bia/sai/asicsdk-11.7.0.0_dnx_odp/12.0_ea_dnx_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -15123,6 +14604,9 @@
         {
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -15136,16 +14620,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru800bia/sai/asicsdk-11.3.0.0_dnx_odp/12.0_ea_dnx_odp/physdk-credo-0.7.2/credo-0.7.2": [
+    "meru800bia/sai/asicsdk-11.7.0.0_dnx_odp/12.0_ea_dnx_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -15185,6 +14666,9 @@
         {
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -15198,16 +14682,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "meru800bia/sai/asicsdk-11.3.0.0_dnx_odp/12.0_ea_dnx_odp/physdk-credo-0.8.4/credo-0.8.4": [
+    "meru800bia/sai/asicsdk-11.7.0.0_dnx_odp/12.0_ea_dnx_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -15247,6 +14728,9 @@
         {
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -15267,9 +14751,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -15309,6 +14790,9 @@
         {
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -15329,9 +14813,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -15371,6 +14852,9 @@
         {
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -15391,9 +14875,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -15433,6 +14914,9 @@
         {
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -15453,9 +14937,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -15521,9 +15002,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -15589,9 +15067,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -15657,9 +15132,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -15725,9 +15197,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -15793,9 +15262,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -15861,9 +15327,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -15926,9 +15389,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -15991,9 +15451,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -16056,9 +15513,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -16121,9 +15575,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -16186,9 +15637,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -16251,9 +15699,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -16316,9 +15761,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -16381,9 +15823,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -16435,6 +15874,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
@@ -16458,9 +15900,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -16512,6 +15951,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
@@ -16535,9 +15977,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -16589,6 +16028,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
@@ -16612,9 +16054,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -16666,6 +16105,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
@@ -16689,9 +16131,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -16743,6 +16182,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
@@ -16766,9 +16208,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -16820,6 +16259,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
@@ -16843,9 +16285,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -16897,6 +16336,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
@@ -16920,9 +16362,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -16974,6 +16413,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
@@ -16997,9 +16439,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -17051,6 +16490,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
@@ -17074,9 +16516,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -17128,6 +16567,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -17148,9 +16590,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -17202,6 +16641,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -17222,9 +16664,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -17276,6 +16715,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -17296,9 +16738,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -17350,6 +16789,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -17370,9 +16812,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -17424,6 +16863,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -17444,9 +16886,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -17498,6 +16937,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -17518,9 +16960,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -17572,6 +17011,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -17592,9 +17034,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -17646,6 +17085,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -17666,9 +17108,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -17720,6 +17159,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -17740,9 +17182,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -17794,6 +17233,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -17814,9 +17256,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -17868,6 +17307,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -17888,9 +17330,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -17942,6 +17381,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -17962,9 +17404,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -18019,6 +17458,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -18042,9 +17484,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -18099,6 +17538,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -18122,9 +17564,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -18179,6 +17618,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -18195,16 +17637,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "morgan800cc/sai/asicsdk-1.42.8/24.4.90": [
+    "morgan800cc/sai/asicsdk-1.42.8/24.8.3001": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -18259,6 +17698,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -18275,16 +17717,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "morgan800cc/sai/asicsdk-1.42.8/24.4.90/physdk-credo-0.7.2/credo-0.7.2": [
+    "morgan800cc/sai/asicsdk-1.42.8/24.8.3001/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -18339,6 +17778,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -18355,16 +17797,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "morgan800cc/sai/asicsdk-1.42.8/24.4.90/physdk-credo-0.8.4/credo-0.8.4": [
+    "morgan800cc/sai/asicsdk-1.42.8/24.8.3001/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -18419,6 +17858,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -18435,16 +17877,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "morgan800cc/sai/asicsdk-1.42.8/24.4.90_yuba": [
+    "morgan800cc/sai/asicsdk-24.8.3001/24.8.3001": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -18499,6 +17938,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -18515,16 +17957,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "morgan800cc/sai/asicsdk-1.42.8/24.4.90_yuba/physdk-credo-0.7.2/credo-0.7.2": [
+    "morgan800cc/sai/asicsdk-24.8.3001/24.8.3001/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -18579,6 +18018,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -18595,16 +18037,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "morgan800cc/sai/asicsdk-1.42.8/24.4.90_yuba/physdk-credo-0.8.4/credo-0.8.4": [
+    "morgan800cc/sai/asicsdk-24.8.3001/24.8.3001/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -18659,6 +18098,9 @@
         {
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
+        {
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
+        },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
@@ -18675,16 +18117,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "morgan800cc/sai/asicsdk-1.42.8/24.8.3001": [
+    "tahan800bc/bcm/asicsdk-6.5.26/6.5.26": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -18701,13 +18140,13 @@
           "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "PtpTests.verifyPtpTc.*$"
@@ -18725,46 +18164,43 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "morgan800cc/sai/asicsdk-1.42.8/24.8.3001/physdk-credo-0.7.2/credo-0.7.2": [
+    "tahan800bc/bcm/asicsdk-6.5.26/6.5.26/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -18781,13 +18217,13 @@
           "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "PtpTests.verifyPtpTc.*$"
@@ -18805,46 +18241,43 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "morgan800cc/sai/asicsdk-1.42.8/24.8.3001/physdk-credo-0.8.4/credo-0.8.4": [
+    "tahan800bc/bcm/asicsdk-6.5.26/6.5.26/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -18861,13 +18294,13 @@
           "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "PtpTests.verifyPtpTc.*$"
@@ -18885,46 +18318,43 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "morgan800cc/sai/asicsdk-24.4.90/24.4.90": [
+    "tahan800bc/bcm/asicsdk-6.5.26/6.5.28": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -18941,13 +18371,13 @@
           "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "PtpTests.verifyPtpTc.*$"
@@ -18965,46 +18395,43 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "morgan800cc/sai/asicsdk-24.4.90/24.4.90/physdk-credo-0.7.2/credo-0.7.2": [
+    "tahan800bc/bcm/asicsdk-6.5.26/6.5.28/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -19021,13 +18448,13 @@
           "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "PtpTests.verifyPtpTc.*$"
@@ -19045,46 +18472,43 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "morgan800cc/sai/asicsdk-24.4.90/24.4.90/physdk-credo-0.8.4/credo-0.8.4": [
+    "tahan800bc/bcm/asicsdk-6.5.26/6.5.28/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -19101,13 +18525,13 @@
           "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "PtpTests.verifyPtpTc.*$"
@@ -19125,46 +18549,43 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "morgan800cc/sai/asicsdk-24.4.90_yuba/24.4.90_yuba": [
+    "tahan800bc/bcm/asicsdk-6.5.28/6.5.28": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -19181,13 +18602,13 @@
           "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "PtpTests.verifyPtpTc.*$"
@@ -19205,46 +18626,43 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "morgan800cc/sai/asicsdk-24.4.90_yuba/24.4.90_yuba/physdk-credo-0.7.2/credo-0.7.2": [
+    "tahan800bc/bcm/asicsdk-6.5.28/6.5.28/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -19261,13 +18679,13 @@
           "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "PtpTests.verifyPtpTc.*$"
@@ -19285,46 +18703,43 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "morgan800cc/sai/asicsdk-24.4.90_yuba/24.4.90_yuba/physdk-credo-0.8.4/credo-0.8.4": [
+    "tahan800bc/bcm/asicsdk-6.5.28/6.5.28/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -19341,13 +18756,13 @@
           "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "PtpTests.verifyPtpTc.*$"
@@ -19365,46 +18780,43 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "morgan800cc/sai/asicsdk-24.8.3001/24.8.3001": [
+    "tahan800bc/sai/asicsdk-10.2.0.0_odp/10.2.0.0_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -19421,13 +18833,13 @@
           "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "PtpTests.verifyPtpTc.*$"
@@ -19445,19 +18857,19 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
@@ -19466,25 +18878,19 @@
           "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "morgan800cc/sai/asicsdk-24.8.3001/24.8.3001/physdk-credo-0.7.2/credo-0.7.2": [
+    "tahan800bc/sai/asicsdk-10.2.0.0_odp/10.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -19501,13 +18907,13 @@
           "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "PtpTests.verifyPtpTc.*$"
@@ -19525,19 +18931,19 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
@@ -19546,25 +18952,19 @@
           "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "morgan800cc/sai/asicsdk-24.8.3001/24.8.3001/physdk-credo-0.8.4/credo-0.8.4": [
+    "tahan800bc/sai/asicsdk-10.2.0.0_odp/10.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -19581,13 +18981,13 @@
           "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "PtpTests.verifyPtpTc.*$"
@@ -19605,19 +19005,19 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
@@ -19626,25 +19026,19 @@
           "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "tahan800bc/bcm/asicsdk-6.5.26/6.5.26": [
+    "tahan800bc/sai/asicsdk-8.2.0.0_odp/8.2.0.0_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -19697,31 +19091,28 @@
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
+          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "tahan800bc/bcm/asicsdk-6.5.26/6.5.26/physdk-credo-0.7.2/credo-0.7.2": [
+    "tahan800bc/sai/asicsdk-8.2.0.0_odp/8.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -19774,31 +19165,28 @@
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
+          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "tahan800bc/bcm/asicsdk-6.5.26/6.5.26/physdk-credo-0.8.4/credo-0.8.4": [
+    "tahan800bc/sai/asicsdk-8.2.0.0_odp/8.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -19851,31 +19239,28 @@
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
+          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "tahan800bc/bcm/asicsdk-6.5.26/6.5.28": [
+    "tahan800bc/sai/asicsdk-8.2.0.0_odp/9.2.0.0_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -19928,31 +19313,28 @@
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
+          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "tahan800bc/bcm/asicsdk-6.5.26/6.5.28/physdk-credo-0.7.2/credo-0.7.2": [
+    "tahan800bc/sai/asicsdk-8.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -20005,31 +19387,28 @@
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
+          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "tahan800bc/bcm/asicsdk-6.5.26/6.5.28/physdk-credo-0.8.4/credo-0.8.4": [
+    "tahan800bc/sai/asicsdk-8.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -20082,31 +19461,28 @@
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
+          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "tahan800bc/bcm/asicsdk-6.5.28/6.5.28": [
+    "tahan800bc/sai/asicsdk-9.2.0.0_odp/9.2.0.0_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -20159,31 +19535,28 @@
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
+          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "tahan800bc/bcm/asicsdk-6.5.28/6.5.28/physdk-credo-0.7.2/credo-0.7.2": [
+    "tahan800bc/sai/asicsdk-9.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -20236,31 +19609,28 @@
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
+          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "tahan800bc/bcm/asicsdk-6.5.28/6.5.28/physdk-credo-0.8.4/credo-0.8.4": [
+    "tahan800bc/sai/asicsdk-9.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -20313,31 +19683,28 @@
           "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
+          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "tahan800bc/sai/asicsdk-10.2.0.0_odp/10.2.0.0_odp": [
+    "wedge100s/bcm/asicsdk-6.5.26/6.5.26": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -20347,27 +19714,39 @@
         {
           "test_name_regex": "MacsecStatTest.*$"
         },
+        {
+          "test_name_regex": "LinkTest.xPhyInfoTest"
+        },
         {
           "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "LinkTest.getTransceivers"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.testOpticsRemediation"
+        },
+        {
+          "test_name_regex": "Prbs.*$"
         },
         {
           "test_name_regex": "SpeedChangeTest.*$"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTc.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
           "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
+        {
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+        },
+        {
+          "test_name_regex": "Prbs.*ASIC.*$"
+        },
         {
           "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
@@ -20378,40 +19757,34 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
+          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
+          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "LacpTest.lacpFlap$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "tahan800bc/sai/asicsdk-10.2.0.0_odp/10.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
+    "wedge100s/bcm/asicsdk-6.5.26/6.5.26/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -20421,27 +19794,39 @@
         {
           "test_name_regex": "MacsecStatTest.*$"
         },
+        {
+          "test_name_regex": "LinkTest.xPhyInfoTest"
+        },
         {
           "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "LinkTest.getTransceivers"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.testOpticsRemediation"
+        },
+        {
+          "test_name_regex": "Prbs.*$"
         },
         {
           "test_name_regex": "SpeedChangeTest.*$"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTc.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
           "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
+        {
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+        },
+        {
+          "test_name_regex": "Prbs.*ASIC.*$"
+        },
         {
           "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
@@ -20452,40 +19837,34 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
+          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
+          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "LacpTest.lacpFlap$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "tahan800bc/sai/asicsdk-10.2.0.0_odp/10.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
+    "wedge100s/bcm/asicsdk-6.5.26/6.5.26/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -20495,27 +19874,39 @@
         {
           "test_name_regex": "MacsecStatTest.*$"
         },
+        {
+          "test_name_regex": "LinkTest.xPhyInfoTest"
+        },
         {
           "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "LinkTest.getTransceivers"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.testOpticsRemediation"
+        },
+        {
+          "test_name_regex": "Prbs.*$"
         },
         {
           "test_name_regex": "SpeedChangeTest.*$"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTc.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
           "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
+        {
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+        },
+        {
+          "test_name_regex": "Prbs.*ASIC.*$"
+        },
         {
           "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
@@ -20526,40 +19917,34 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
+          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
+          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "LacpTest.lacpFlap$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "tahan800bc/sai/asicsdk-8.2.0.0_odp/8.2.0.0_odp": [
+    "wedge100s/bcm/asicsdk-6.5.26/6.5.28": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -20569,27 +19954,39 @@
         {
           "test_name_regex": "MacsecStatTest.*$"
         },
+        {
+          "test_name_regex": "LinkTest.xPhyInfoTest"
+        },
         {
           "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "LinkTest.getTransceivers"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.testOpticsRemediation"
+        },
+        {
+          "test_name_regex": "Prbs.*$"
         },
         {
           "test_name_regex": "SpeedChangeTest.*$"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTc.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
           "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
+        {
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+        },
+        {
+          "test_name_regex": "Prbs.*ASIC.*$"
+        },
         {
           "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
@@ -20600,40 +19997,34 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
+          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
+          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "LacpTest.lacpFlap$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "tahan800bc/sai/asicsdk-8.2.0.0_odp/8.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
+    "wedge100s/bcm/asicsdk-6.5.26/6.5.28/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -20643,27 +20034,39 @@
         {
           "test_name_regex": "MacsecStatTest.*$"
         },
+        {
+          "test_name_regex": "LinkTest.xPhyInfoTest"
+        },
         {
           "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "LinkTest.getTransceivers"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.testOpticsRemediation"
+        },
+        {
+          "test_name_regex": "Prbs.*$"
         },
         {
           "test_name_regex": "SpeedChangeTest.*$"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTc.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
           "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
+        {
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+        },
+        {
+          "test_name_regex": "Prbs.*ASIC.*$"
+        },
         {
           "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
@@ -20674,40 +20077,34 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
+          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
         },
         {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
+          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "LacpTest.lacpFlap$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "tahan800bc/sai/asicsdk-8.2.0.0_odp/8.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
+    "wedge100s/bcm/asicsdk-6.5.26/6.5.28/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -20717,27 +20114,39 @@
         {
           "test_name_regex": "MacsecStatTest.*$"
         },
+        {
+          "test_name_regex": "LinkTest.xPhyInfoTest"
+        },
         {
           "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "LinkTest.getTransceivers"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.testOpticsRemediation"
+        },
+        {
+          "test_name_regex": "Prbs.*$"
         },
         {
           "test_name_regex": "SpeedChangeTest.*$"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTc.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
           "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
+        {
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+        },
+        {
+          "test_name_regex": "Prbs.*ASIC.*$"
+        },
         {
           "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
@@ -20748,40 +20157,34 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
+          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
+          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "LacpTest.lacpFlap$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "tahan800bc/sai/asicsdk-8.2.0.0_odp/9.2.0.0_odp": [
+    "wedge100s/bcm/asicsdk-6.5.28/6.5.28": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -20791,27 +20194,39 @@
         {
           "test_name_regex": "MacsecStatTest.*$"
         },
+        {
+          "test_name_regex": "LinkTest.xPhyInfoTest"
+        },
         {
           "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "LinkTest.getTransceivers"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.testOpticsRemediation"
+        },
+        {
+          "test_name_regex": "Prbs.*$"
         },
         {
           "test_name_regex": "SpeedChangeTest.*$"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTc.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
           "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
+        {
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+        },
+        {
+          "test_name_regex": "Prbs.*ASIC.*$"
+        },
         {
           "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
@@ -20822,40 +20237,34 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
+          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
+          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "LacpTest.lacpFlap$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "tahan800bc/sai/asicsdk-8.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
+    "wedge100s/bcm/asicsdk-6.5.28/6.5.28/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -20865,27 +20274,39 @@
         {
           "test_name_regex": "MacsecStatTest.*$"
         },
+        {
+          "test_name_regex": "LinkTest.xPhyInfoTest"
+        },
         {
           "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "LinkTest.getTransceivers"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.testOpticsRemediation"
+        },
+        {
+          "test_name_regex": "Prbs.*$"
         },
         {
           "test_name_regex": "SpeedChangeTest.*$"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTc.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
           "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
+        {
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+        },
+        {
+          "test_name_regex": "Prbs.*ASIC.*$"
+        },
         {
           "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
@@ -20896,40 +20317,34 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
+          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
+          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "LacpTest.lacpFlap$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "tahan800bc/sai/asicsdk-8.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
+    "wedge100s/bcm/asicsdk-6.5.28/6.5.28/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -20939,27 +20354,39 @@
         {
           "test_name_regex": "MacsecStatTest.*$"
         },
+        {
+          "test_name_regex": "LinkTest.xPhyInfoTest"
+        },
         {
           "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "LinkTest.getTransceivers"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.testOpticsRemediation"
+        },
+        {
+          "test_name_regex": "Prbs.*$"
         },
         {
           "test_name_regex": "SpeedChangeTest.*$"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTc.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
           "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
+        {
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+        },
+        {
+          "test_name_regex": "Prbs.*ASIC.*$"
+        },
         {
           "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
@@ -20970,40 +20397,34 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
+          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
+          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "LacpTest.lacpFlap$"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "tahan800bc/sai/asicsdk-9.2.0.0_odp/9.2.0.0_odp": [
+    "wedge100s/sai/asicsdk-10.2.0.0_odp/10.2.0.0_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -21013,47 +20434,53 @@
         {
           "test_name_regex": "MacsecStatTest.*$"
         },
+        {
+          "test_name_regex": "LinkTest.xPhyInfoTest"
+        },
         {
           "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "LinkTest.getTransceivers"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.testOpticsRemediation"
+        },
+        {
+          "test_name_regex": "Prbs.*$"
         },
         {
           "test_name_regex": "SpeedChangeTest.*$"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTc.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
           "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
+          "test_name_regex": "Prbs.*ASIC.*$"
         },
         {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
+          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
         },
         {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
+          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
         },
         {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
+          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
@@ -21068,16 +20495,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "tahan800bc/sai/asicsdk-9.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
+    "wedge100s/sai/asicsdk-10.2.0.0_odp/10.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -21087,47 +20511,53 @@
         {
           "test_name_regex": "MacsecStatTest.*$"
         },
+        {
+          "test_name_regex": "LinkTest.xPhyInfoTest"
+        },
         {
           "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "LinkTest.getTransceivers"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.testOpticsRemediation"
+        },
+        {
+          "test_name_regex": "Prbs.*$"
         },
         {
           "test_name_regex": "SpeedChangeTest.*$"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTc.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
           "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
+          "test_name_regex": "Prbs.*ASIC.*$"
         },
         {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
+          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
         },
         {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
+          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
         },
         {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
+          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
@@ -21142,16 +20572,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "tahan800bc/sai/asicsdk-9.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
+    "wedge100s/sai/asicsdk-10.2.0.0_odp/10.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -21161,27 +20588,39 @@
         {
           "test_name_regex": "MacsecStatTest.*$"
         },
+        {
+          "test_name_regex": "LinkTest.xPhyInfoTest"
+        },
         {
           "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "LinkTest.getTransceivers"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "LinkTest.testOpticsRemediation"
+        },
+        {
+          "test_name_regex": "Prbs.*$"
         },
         {
           "test_name_regex": "SpeedChangeTest.*$"
         },
         {
-          "test_name_regex": "PtpTests.verifyPtpTc.*$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
           "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
+        {
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+        },
+        {
+          "test_name_regex": "Prbs.*ASIC.*$"
+        },
         {
           "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
@@ -21192,16 +20631,10 @@
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
+          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
         },
         {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
+          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
           "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
@@ -21216,99 +20649,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge100s/bcm/asicsdk-6.5.26/6.5.26": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable"
-        },
-        {
-          "test_name_regex": "LinkTest.getTransceivers"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation"
-        },
-        {
-          "test_name_regex": "Prbs.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
-        },
-        {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge100s/bcm/asicsdk-6.5.26/6.5.26/physdk-credo-0.7.2/credo-0.7.2": [
+    "wedge100s/sai/asicsdk-8.2.0.0_odp/8.2.0.0_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -21367,31 +20714,25 @@
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
+          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge100s/bcm/asicsdk-6.5.26/6.5.26/physdk-credo-0.8.4/credo-0.8.4": [
+    "wedge100s/sai/asicsdk-8.2.0.0_odp/8.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -21450,31 +20791,25 @@
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
+          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge100s/bcm/asicsdk-6.5.26/6.5.28": [
+    "wedge100s/sai/asicsdk-8.2.0.0_odp/8.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -21533,31 +20868,25 @@
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
+          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge100s/bcm/asicsdk-6.5.26/6.5.28/physdk-credo-0.7.2/credo-0.7.2": [
+    "wedge100s/sai/asicsdk-8.2.0.0_odp/9.2.0.0_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -21616,31 +20945,25 @@
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
+          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge100s/bcm/asicsdk-6.5.26/6.5.28/physdk-credo-0.8.4/credo-0.8.4": [
+    "wedge100s/sai/asicsdk-8.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -21699,31 +21022,25 @@
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
+          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge100s/bcm/asicsdk-6.5.28/6.5.28": [
+    "wedge100s/sai/asicsdk-8.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -21782,31 +21099,25 @@
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
+          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge100s/bcm/asicsdk-6.5.28/6.5.28/physdk-credo-0.7.2/credo-0.7.2": [
+    "wedge100s/sai/asicsdk-9.2.0.0_odp/9.2.0.0_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -21865,22 +21176,19 @@
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
+          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "SpeedChangeTest.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge100s/bcm/asicsdk-6.5.28/6.5.28/physdk-credo-0.8.4/credo-0.8.4": [
+    "wedge100s/sai/asicsdk-9.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
@@ -21888,2039 +21196,37 @@
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
         {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable"
-        },
-        {
-          "test_name_regex": "LinkTest.getTransceivers"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation"
-        },
-        {
-          "test_name_regex": "Prbs.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
-        },
-        {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge100s/sai/asicsdk-10.2.0.0_odp/10.2.0.0_odp": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable"
-        },
-        {
-          "test_name_regex": "LinkTest.getTransceivers"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation"
-        },
-        {
-          "test_name_regex": "Prbs.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge100s/sai/asicsdk-10.2.0.0_odp/10.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable"
-        },
-        {
-          "test_name_regex": "LinkTest.getTransceivers"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation"
-        },
-        {
-          "test_name_regex": "Prbs.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge100s/sai/asicsdk-10.2.0.0_odp/10.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable"
-        },
-        {
-          "test_name_regex": "LinkTest.getTransceivers"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation"
-        },
-        {
-          "test_name_regex": "Prbs.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge100s/sai/asicsdk-8.2.0.0_odp/8.2.0.0_odp": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable"
-        },
-        {
-          "test_name_regex": "LinkTest.getTransceivers"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation"
-        },
-        {
-          "test_name_regex": "Prbs.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge100s/sai/asicsdk-8.2.0.0_odp/8.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable"
-        },
-        {
-          "test_name_regex": "LinkTest.getTransceivers"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation"
-        },
-        {
-          "test_name_regex": "Prbs.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge100s/sai/asicsdk-8.2.0.0_odp/8.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable"
-        },
-        {
-          "test_name_regex": "LinkTest.getTransceivers"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation"
-        },
-        {
-          "test_name_regex": "Prbs.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge100s/sai/asicsdk-8.2.0.0_odp/9.2.0.0_odp": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable"
-        },
-        {
-          "test_name_regex": "LinkTest.getTransceivers"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation"
-        },
-        {
-          "test_name_regex": "Prbs.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge100s/sai/asicsdk-8.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable"
-        },
-        {
-          "test_name_regex": "LinkTest.getTransceivers"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation"
-        },
-        {
-          "test_name_regex": "Prbs.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge100s/sai/asicsdk-8.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable"
-        },
-        {
-          "test_name_regex": "LinkTest.getTransceivers"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation"
-        },
-        {
-          "test_name_regex": "Prbs.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge100s/sai/asicsdk-9.2.0.0_odp/9.2.0.0_odp": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable"
-        },
-        {
-          "test_name_regex": "LinkTest.getTransceivers"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation"
-        },
-        {
-          "test_name_regex": "Prbs.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge100s/sai/asicsdk-9.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable"
-        },
-        {
-          "test_name_regex": "LinkTest.getTransceivers"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation"
-        },
-        {
-          "test_name_regex": "Prbs.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge100s/sai/asicsdk-9.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable"
-        },
-        {
-          "test_name_regex": "LinkTest.getTransceivers"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation"
-        },
-        {
-          "test_name_regex": "Prbs.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge400/bcm/asicsdk-6.5.26/6.5.26": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
-        },
-        {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge400/bcm/asicsdk-6.5.26/6.5.26/physdk-credo-0.7.2/credo-0.7.2": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
-        },
-        {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge400/bcm/asicsdk-6.5.26/6.5.26/physdk-credo-0.8.4/credo-0.8.4": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
-        },
-        {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge400/bcm/asicsdk-6.5.26/6.5.28": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
-        },
-        {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge400/bcm/asicsdk-6.5.26/6.5.28/physdk-credo-0.7.2/credo-0.7.2": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
-        },
-        {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge400/bcm/asicsdk-6.5.26/6.5.28/physdk-credo-0.8.4/credo-0.8.4": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
-        },
-        {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge400/bcm/asicsdk-6.5.28/6.5.28": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
-        },
-        {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge400/bcm/asicsdk-6.5.28/6.5.28/physdk-credo-0.7.2/credo-0.7.2": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
-        },
-        {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge400/bcm/asicsdk-6.5.28/6.5.28/physdk-credo-0.8.4/credo-0.8.4": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
-        },
-        {
-          "test_name_regex": "MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge400/sai/asicsdk-10.2.0.0_odp/10.2.0.0_odp": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
-        },
-        {
-          "test_name_regex": "PortStatsTest.xphySanity"
-        },
-        {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
-        },
-        {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
-        },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
-        },
-        {
-          "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
-        },
-        {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
-        },
-        {
-          "test_name_regex": "LacpTest.lacpFlap$"
-        },
-        {
-          "test_name_regex": "LinkTest.verifyIphyFecCounters$"
-        }
-    ],
-    "wedge400/sai/asicsdk-10.2.0.0_odp/10.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
-        {
-          "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
-        },
-        {
-          "test_name_regex": "FsdbTest.statsPublishSubscribe$"
-        },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
-        {
-          "test_name_regex": "MacsecTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecFsdbTest.*$"
-        },
-        {
-          "test_name_regex": "MacsecStatTest.*$"
-        },
-        {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
+          "test_name_regex": "MacsecTest.*$"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "MacsecFsdbTest.*$"
         },
         {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
+          "test_name_regex": "MacsecStatTest.*$"
         },
         {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
+          "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
+          "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
+          "test_name_regex": "LinkTest.getTransceivers"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
+          "test_name_regex": "LinkTest.testOpticsRemediation"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
+          "test_name_regex": "Prbs.*$"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
-          "test_name_regex": "PortStatsTest.xphySanity"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
           "test_name_regex": "roundtrip.*.testOpticsRemediation$"
@@ -23928,6 +21234,9 @@
         {
           "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
         },
+        {
+          "test_name_regex": "Prbs.*ASIC.*$"
+        },
         {
           "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
@@ -23937,12 +21246,6 @@
         {
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
-        },
         {
           "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
         },
@@ -23962,16 +21265,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400/sai/asicsdk-10.2.0.0_odp/10.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
+    "wedge100s/sai/asicsdk-9.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -23982,37 +21282,28 @@
           "test_name_regex": "MacsecStatTest.*$"
         },
         {
-          "test_name_regex": "LinkTest.ptpEnableIsHitless$"
-        },
-        {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
-        },
-        {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
+          "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
+          "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
+          "test_name_regex": "LinkTest.getTransceivers"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
+          "test_name_regex": "LinkTest.testOpticsRemediation"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
+          "test_name_regex": "Prbs.*$"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
-          "test_name_regex": "PortStatsTest.xphySanity"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
           "test_name_regex": "roundtrip.*.testOpticsRemediation$"
@@ -24020,6 +21311,9 @@
         {
           "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
         },
+        {
+          "test_name_regex": "Prbs.*ASIC.*$"
+        },
         {
           "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
@@ -24029,12 +21323,6 @@
         {
           "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
-        {
-          "test_name_regex": "Prbs.*ASIC.*$"
-        },
-        {
-          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
-        },
         {
           "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
         },
@@ -24054,16 +21342,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400/sai/asicsdk-8.2.0.0_odp/8.2.0.0_odp": [
+    "wedge400/bcm/asicsdk-6.5.26/6.5.26": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -24134,28 +21419,28 @@
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "LacpTest.lacpFlap$"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
+        },
+        {
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400/sai/asicsdk-8.2.0.0_odp/8.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
+    "wedge400/bcm/asicsdk-6.5.26/6.5.26/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -24226,28 +21511,28 @@
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "LacpTest.lacpFlap$"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
+        },
+        {
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400/sai/asicsdk-8.2.0.0_odp/8.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
+    "wedge400/bcm/asicsdk-6.5.26/6.5.26/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -24318,28 +21603,28 @@
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "LacpTest.lacpFlap$"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
+        },
+        {
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400/sai/asicsdk-8.2.0.0_odp/9.2.0.0_odp": [
+    "wedge400/bcm/asicsdk-6.5.26/6.5.28": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -24410,28 +21695,28 @@
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "LacpTest.lacpFlap$"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
+        },
+        {
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400/sai/asicsdk-8.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
+    "wedge400/bcm/asicsdk-6.5.26/6.5.28/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -24502,28 +21787,28 @@
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "LacpTest.lacpFlap$"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
+        },
+        {
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400/sai/asicsdk-8.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
+    "wedge400/bcm/asicsdk-6.5.26/6.5.28/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -24594,28 +21879,28 @@
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "LacpTest.lacpFlap$"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
+        },
+        {
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400/sai/asicsdk-9.2.0.0_odp/9.2.0.0_odp": [
+    "wedge400/bcm/asicsdk-6.5.28/6.5.28": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -24686,28 +21971,28 @@
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "LacpTest.lacpFlap$"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
+        },
+        {
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400/sai/asicsdk-9.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
+    "wedge400/bcm/asicsdk-6.5.28/6.5.28/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -24778,28 +22063,28 @@
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "LacpTest.lacpFlap$"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
+        },
+        {
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400/sai/asicsdk-9.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
+    "wedge400/bcm/asicsdk-6.5.28/6.5.28/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -24870,28 +22155,28 @@
           "test_name_regex": "LinkTest.verifyIphyFecBerCounters$"
         },
         {
-          "test_name_regex": "warm_boot.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
         },
         {
-          "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
+          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
         },
         {
-          "test_name_regex": "LacpTest.lacpFlap$"
+          "test_name_regex": "MacLearningTest.l2EntryFlap"
+        },
+        {
+          "test_name_regex": "SpeedChangeTest.*$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400c/sai/asicsdk-1.42.8/1.42.8": [
+    "wedge400/sai/asicsdk-10.2.0.0_odp/10.2.0.0_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -24905,55 +22190,55 @@
           "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "PortStatsTest.xphySanity"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "roundtrip.preprod_2_.*_2_preprod.warm_boot.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
+          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
+          "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
+          "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
+          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.HUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "Prbs.*ASIC.*$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.TWOHUNDREDGToHUNDREDG$"
+          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
         },
         {
           "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
@@ -24968,25 +22253,19 @@
           "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400c/sai/asicsdk-1.42.8/1.42.8/physdk-credo-0.7.2/credo-0.7.2": [
+    "wedge400/sai/asicsdk-10.2.0.0_odp/10.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -25000,29 +22279,41 @@
           "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "PortStatsTest.xphySanity"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "roundtrip.preprod_2_.*_2_preprod.warm_boot.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
+        },
+        {
+          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
+        },
+        {
+          "test_name_regex": "LinkTest.xPhyInfoTest"
+        },
+        {
+          "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
           "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
+        {
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+        },
         {
           "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
@@ -25036,19 +22327,7 @@
           "test_name_regex": "Prbs.*ASIC.*$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.HUNDREDGToTWOHUNDREDG$"
-        },
-        {
-          "test_name_regex": "cold_boot.SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
-        },
-        {
-          "test_name_regex": "cold_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
-        },
-        {
-          "test_name_regex": "warm_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
-        },
-        {
-          "test_name_regex": "warm_boot.SpeedChangeTest.TWOHUNDREDGToHUNDREDG$"
+          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
         },
         {
           "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
@@ -25063,25 +22342,19 @@
           "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400c/sai/asicsdk-1.42.8/1.42.8/physdk-credo-0.8.4/credo-0.8.4": [
+    "wedge400/sai/asicsdk-10.2.0.0_odp/10.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -25095,55 +22368,55 @@
           "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "PortStatsTest.xphySanity"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "roundtrip.preprod_2_.*_2_preprod.warm_boot.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
+          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
+          "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
+          "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
+          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.HUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "Prbs.*ASIC.*$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.TWOHUNDREDGToHUNDREDG$"
+          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
         },
         {
           "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
@@ -25158,25 +22431,19 @@
           "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400c/sai/asicsdk-1.42.8/24.4.90": [
+    "wedge400/sai/asicsdk-8.2.0.0_odp/8.2.0.0_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -25190,55 +22457,55 @@
           "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "PortStatsTest.xphySanity"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "roundtrip.preprod_2_.*_2_preprod.warm_boot.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
+          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
+          "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
+          "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
+          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.HUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "Prbs.*ASIC.*$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.TWOHUNDREDGToHUNDREDG$"
+          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
         },
         {
           "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
@@ -25253,25 +22520,19 @@
           "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400c/sai/asicsdk-1.42.8/24.4.90/physdk-credo-0.7.2/credo-0.7.2": [
+    "wedge400/sai/asicsdk-8.2.0.0_odp/8.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -25285,55 +22546,55 @@
           "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "PortStatsTest.xphySanity"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "roundtrip.preprod_2_.*_2_preprod.warm_boot.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
+          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
+          "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
+          "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
+          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.HUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "Prbs.*ASIC.*$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.TWOHUNDREDGToHUNDREDG$"
+          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
         },
         {
           "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
@@ -25348,25 +22609,19 @@
           "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400c/sai/asicsdk-1.42.8/24.4.90/physdk-credo-0.8.4/credo-0.8.4": [
+    "wedge400/sai/asicsdk-8.2.0.0_odp/8.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -25380,55 +22635,55 @@
           "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "PortStatsTest.xphySanity"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "roundtrip.preprod_2_.*_2_preprod.warm_boot.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
+          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
+          "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
+          "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
+          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.HUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "Prbs.*ASIC.*$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.TWOHUNDREDGToHUNDREDG$"
+          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
         },
         {
           "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
@@ -25443,25 +22698,19 @@
           "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400c/sai/asicsdk-1.42.8/24.4.90_yuba": [
+    "wedge400/sai/asicsdk-8.2.0.0_odp/9.2.0.0_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -25475,55 +22724,55 @@
           "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "PortStatsTest.xphySanity"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "roundtrip.preprod_2_.*_2_preprod.warm_boot.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
+          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
+          "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
+          "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
+          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.HUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "Prbs.*ASIC.*$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.TWOHUNDREDGToHUNDREDG$"
+          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
         },
         {
           "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
@@ -25538,25 +22787,19 @@
           "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400c/sai/asicsdk-1.42.8/24.4.90_yuba/physdk-credo-0.7.2/credo-0.7.2": [
+    "wedge400/sai/asicsdk-8.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -25570,55 +22813,55 @@
           "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "PortStatsTest.xphySanity"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "roundtrip.preprod_2_.*_2_preprod.warm_boot.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
+          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
+          "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
+          "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
+          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.HUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "Prbs.*ASIC.*$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.TWOHUNDREDGToHUNDREDG$"
+          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
         },
         {
           "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
@@ -25633,25 +22876,19 @@
           "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400c/sai/asicsdk-1.42.8/24.4.90_yuba/physdk-credo-0.8.4/credo-0.8.4": [
+    "wedge400/sai/asicsdk-8.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -25665,55 +22902,55 @@
           "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "PortStatsTest.xphySanity"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "roundtrip.preprod_2_.*_2_preprod.warm_boot.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
+          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
+          "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
+          "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
+          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.HUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "Prbs.*ASIC.*$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.TWOHUNDREDGToHUNDREDG$"
+          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
         },
         {
           "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
@@ -25728,25 +22965,19 @@
           "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400c/sai/asicsdk-1.42.8/24.8.3001": [
+    "wedge400/sai/asicsdk-9.2.0.0_odp/9.2.0.0_odp": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -25760,55 +22991,55 @@
           "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "PortStatsTest.xphySanity"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "roundtrip.preprod_2_.*_2_preprod.warm_boot.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
+          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
+          "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
+          "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
+          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.HUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "Prbs.*ASIC.*$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.TWOHUNDREDGToHUNDREDG$"
+          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
         },
         {
           "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
@@ -25823,25 +23054,19 @@
           "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400c/sai/asicsdk-1.42.8/24.8.3001/physdk-credo-0.7.2/credo-0.7.2": [
+    "wedge400/sai/asicsdk-9.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -25855,55 +23080,55 @@
           "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "PortStatsTest.xphySanity"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "roundtrip.preprod_2_.*_2_preprod.warm_boot.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
+          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
+          "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
+          "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
+          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.HUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "Prbs.*ASIC.*$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.TWOHUNDREDGToHUNDREDG$"
+          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
         },
         {
           "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
@@ -25918,25 +23143,19 @@
           "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400c/sai/asicsdk-1.42.8/24.8.3001/physdk-credo-0.8.4/credo-0.8.4": [
+    "wedge400/sai/asicsdk-9.2.0.0_odp/9.2.0.0_odp/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -25950,55 +23169,55 @@
           "test_name_regex": "LinkTest.ptpEnableIsHitless$"
         },
         {
-          "test_name_regex": "warm_boot.PtpTests.verifyPtpTcDelayRequest$"
+          "test_name_regex": "LinkTest.fabricLinkHealth$"
         },
         {
-          "test_name_regex": "LinkTest.fabricLinkHealth$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "Prbs.*$"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "LinkTest.xPhyInfoTest"
+          "test_name_regex": "Prbs.*TRANSCEIVER_LINE.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "PortStatsTest.xphySanity"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR1_100G.*$"
         },
         {
-          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_200G.*$"
         },
         {
-          "test_name_regex": "roundtrip.preprod_2_.*_2_preprod.warm_boot.*$"
+          "test_name_regex": "Prbs.*ASIC.*TRANSCEIVER_SYS.*FR4_400G.*$"
         },
         {
-          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
+          "test_name_regex": "Prbs.*ASIC.*ASIC.*$"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
+          "test_name_regex": "LinkTest.xPhyInfoTest"
         },
         {
-          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
+          "test_name_regex": "PortStatsTest.xphySanity"
         },
         {
-          "test_name_regex": "LinkTest.testOpticsRemediation$"
+          "test_name_regex": "roundtrip.*.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "Prbs.*ASIC.*$"
+          "test_name_regex": "warm_boot.LacpTest.lacpFlap$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.HUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableRandomPorts$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
+          "test_name_regex": "LinkTest.opticsTxDisableEnable$"
         },
         {
-          "test_name_regex": "cold_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "LinkTest.testOpticsRemediation$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.FOURHUNDREDGToTWOHUNDREDG$"
+          "test_name_regex": "Prbs.*ASIC.*$"
         },
         {
-          "test_name_regex": "warm_boot.SpeedChangeTest.TWOHUNDREDGToHUNDREDG$"
+          "test_name_regex": "SpeedChangeTest.TWOHUNDREDGToFOURHUNDREDG$"
         },
         {
           "test_name_regex": "LinkTest.opticsVdmPerformanceMonitoring$"
@@ -26013,25 +23232,19 @@
           "test_name_regex": "CheckInit.MacLearningTest.l2EntryFlap"
         },
         {
-          "test_name_regex": "PtpTests.enablePtpPortDown.*$"
-        },
-        {
-          "test_name_regex": "PtpTests.verifyPtpTcAfterLinkFlap.*$"
+          "test_name_regex": "LacpTest.lacpFlap$"
         },
         {
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400c/sai/asicsdk-24.4.90/24.4.90": [
+    "wedge400c/sai/asicsdk-1.42.8/1.42.8": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -26117,16 +23330,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400c/sai/asicsdk-24.4.90/24.4.90/physdk-credo-0.7.2/credo-0.7.2": [
+    "wedge400c/sai/asicsdk-1.42.8/1.42.8/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -26212,16 +23422,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400c/sai/asicsdk-24.4.90/24.4.90/physdk-credo-0.8.4/credo-0.8.4": [
+    "wedge400c/sai/asicsdk-1.42.8/1.42.8/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -26307,16 +23514,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400c/sai/asicsdk-24.4.90_yuba/24.4.90_yuba": [
+    "wedge400c/sai/asicsdk-1.42.8/24.8.3001": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -26402,16 +23606,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400c/sai/asicsdk-24.4.90_yuba/24.4.90_yuba/physdk-credo-0.7.2/credo-0.7.2": [
+    "wedge400c/sai/asicsdk-1.42.8/24.8.3001/physdk-credo-0.7.2/credo-0.7.2": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -26497,16 +23698,13 @@
           "test_name_regex": "LinkTest.verifyIphyFecCounters$"
         }
     ],
-    "wedge400c/sai/asicsdk-24.4.90_yuba/24.4.90_yuba/physdk-credo-0.8.4/credo-0.8.4": [
+    "wedge400c/sai/asicsdk-1.42.8/24.8.3001/physdk-credo-0.8.4/credo-0.8.4": [
         {
           "test_name_regex": "LinkSanityTestDataPlaneFlood.*$"
         },
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -26599,9 +23797,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -26694,9 +23889,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -26789,9 +23981,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -26884,9 +24073,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -26973,9 +24159,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -27062,9 +24245,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -27151,9 +24331,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -27240,9 +24417,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -27329,9 +24503,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -27418,9 +24589,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -27507,9 +24675,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -27596,9 +24761,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -27685,9 +24847,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -27771,9 +24930,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -27857,9 +25013,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -27943,9 +25096,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -28029,9 +25179,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -28115,9 +25262,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -28201,9 +25345,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -28287,9 +25428,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -28373,9 +25511,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -28459,9 +25594,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -28545,9 +25677,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
@@ -28631,9 +25760,6 @@
         {
           "test_name_regex": "FsdbTest.statsPublishSubscribe$"
         },
-        {
-          "test_name_regex": "cold_boot.QsfpFsdbTest.tcvr$"
-        },
         {
           "test_name_regex": "MacsecTest.*$"
         },
diff --git a/fboss/oss/sai_hw_unsupported_tests/sai_hw_unsupported_tests.materialized_JSON b/fboss/oss/sai_hw_unsupported_tests/sai_hw_unsupported_tests.materialized_JSON
index 58aff04fb06b8..07f44f1ffd7ae 100644
--- a/fboss/oss/sai_hw_unsupported_tests/sai_hw_unsupported_tests.materialized_JSON
+++ b/fboss/oss/sai_hw_unsupported_tests/sai_hw_unsupported_tests.materialized_JSON
@@ -734,6 +734,239 @@
           "test_name_regex": "HwLoadBalancerNegativeTestV6RoCE.*$"
         }
     ],
+    "brcm/11.7.0.0_dnx_odp/11.7.0.0_dnx_odp/jericho3": [
+        {
+          "test_name_regex": "HwFlowletAclCounterTest.*$"
+        },
+        {
+          "test_name_regex": "HwFlowletSwitching.*$"
+        },
+        {
+          "test_name_regex": "HwEcmpFlowletSwitching.*$"
+        },
+        {
+          "test_name_regex": "HwLoadBalancerTestV6Flowlet.*$"
+        },
+        {
+          "test_name_regex": "HwLoadBalancerTestV6EcmpToFlowlet.*$"
+        },
+        {
+          "test_name_regex": "AgentFlowletSwitchingTest.*$"
+        },
+        {
+          "test_name_regex": "HwTeFlowTest.*$"
+        },
+        {
+          "test_name_regex": "HwTeFlowTrafficTest.*$"
+        },
+        {
+          "test_name_regex": "HwUdfAcl.*$"
+        },
+        {
+          "test_name_regex": "HwEcmpTest.Ucmp.*"
+        },
+        {
+          "test_name_regex": "HwLoadBalancerTestV[46].*Ucmp.*"
+        },
+        {
+          "test_name_regex": "HwVlanTest.VlanApplyConfig"
+        },
+        {
+          "test_name_regex": "HwPacketFloodTest.*"
+        },
+        {
+          "test_name_regex": "HwPacketSendTest.ArpRequestToFrontPanelPortSwitched"
+        },
+        {
+          "test_name_regex": "HwPacketSendReceiveLagTest.LacpPacketReceiveSrcPort"
+        },
+        {
+          "test_name_regex": "HwTrunkLoadBalancerTest.*"
+        },
+        {
+          "test_name_regex": "HwNeighborTest/[1357].*"
+        },
+        {
+          "test_name_regex": "HwHashTrunk.*"
+        },
+        {
+          "test_name_regex": "HwEcmpTrunkTest.*"
+        },
+        {
+          "test_name_regex": "HwTrunkTest.*"
+        },
+        {
+          "test_name_regex": "HwFlexPortTest.*"
+        },
+        {
+          "test_name_regex": "HwCoppTest/1.*"
+        },
+        {
+          "test_name_regex": "HwRouteCounterOverflowTest.*"
+        },
+        {
+          "test_name_regex": "HwRouteStatTest.*"
+        },
+        {
+          "test_name_regex": "HwPortBandwidthTest.*"
+        },
+        {
+          "test_name_regex": "HwMPLSTest/[01].*"
+        },
+        {
+          "test_name_regex": "HwLabelSwitchRouteTest/[01].*"
+        },
+        {
+          "test_name_regex": "HwLabelEdgeRouteTest/[01].*"
+        },
+        {
+          "test_name_regex": "HwRouteScaleTest.turboFabricScaleTest"
+        },
+        {
+          "test_name_regex": "HwLoadBalancerTestsV[46]InMplsPhp.*"
+        },
+        {
+          "test_name_regex": "HwLoadBalancerTestsV[46]InMplsSwap.*"
+        },
+        {
+          "test_name_regex": "HwLoadBalancerTestV[46]ToMpls.*"
+        },
+        {
+          "test_name_regex": "HwLabelSwitchRouteTest/[01].*"
+        },
+        {
+          "test_name_regex": "HwLabelEdgeRouteTest/[01].*"
+        },
+        {
+          "test_name_regex": "HwTest_PROFILE*"
+        },
+        {
+          "test_name_regex": "HwFlexPortTest.*"
+        },
+        {
+          "test_name_regex": "HwMacLearningAndNeighborResolutionTest.*"
+        },
+        {
+          "test_name_regex": "HwMacSwLearningModeTest.*"
+        },
+        {
+          "test_name_regex": "HwMacLearningTest.*"
+        },
+        {
+          "test_name_regex": "HwMacLearningMacMoveTest.*"
+        },
+        {
+          "test_name_regex": "HwMacLearningStaticEntriesTest.*"
+        },
+        {
+          "test_name_regex": "HwMacLearningAndMyStationInteractionTest.*"
+        },
+        {
+          "test_name_regex": "HwMacLearningBatchEntriesTest.*"
+        },
+        {
+          "test_name_regex": "HwL2ClassIDTest.*"
+        },
+        {
+          "test_name_regex": "HwQueuePerHostL2Test.*"
+        },
+        {
+          "test_name_regex": "HwAclQualifierTest/[01].*VlanID*"
+        },
+        {
+          "test_name_regex": "HwAclQualifierTest.*VlanID*"
+        },
+        {
+          "test_name_regex": "HwPtpTcTest.*"
+        },
+        {
+          "test_name_regex": "HwIpInIpTunnelTest.*"
+        },
+        {
+          "test_name_regex": "HwNeighborTest/[01234567].ResolvePendingEntryThenChangeLookupClass"
+        },
+        {
+          "test_name_regex": "HwQueuePerHostRouteTest/[01].*"
+        },
+        {
+          "test_name_regex": "HwQueuePerHostTest/[0123].*"
+        },
+        {
+          "test_name_regex": "SaiQPHRollbackTest.*"
+        },
+        {
+          "test_name_regex": "HwRouteTest/[01].VerifyClassID*"
+        },
+        {
+          "test_name_regex": "HwRouteTest/[01].StaticIp2MplsRoutes"
+        },
+        {
+          "test_name_regex": "HwRouteTest/[01].VerifyClassIdWithNhopResolutionFlap"
+        },
+        {
+          "test_name_regex": "HwAclQualifierTest/[01].*LookupClass*"
+        },
+        {
+          "test_name_regex": "HwAclQualifierTest.*LookupClass*"
+        },
+        {
+          "test_name_regex": "HwFabricSwitchTest.*"
+        },
+        {
+          "test_name_regex": "HwProdInvariantsRswStrictPriorityTest.verifyInvariants"
+        },
+        {
+          "test_name_regex": "HwProdInvariantsRswTest.verifyInvariants"
+        },
+        {
+          "test_name_regex": "HwPortLedTest.*"
+        },
+        {
+          "test_name_regex": "HwUdfTest.*"
+        },
+        {
+          "test_name_regex": "HwL3Test.*"
+        },
+        {
+          "test_name_regex": "HwMmuTuningTest.*"
+        },
+        {
+          "test_name_regex": "HwFabricSwitchTest.*"
+        },
+        {
+          "test_name_regex": "HwDscpMarkingTest.*"
+        },
+        {
+          "test_name_regex": "HwProdInvariants.*"
+        },
+        {
+          "test_name_regex": "HwAqmTest.verifyPerQueueWredDropStats"
+        },
+        {
+          "test_name_regex": "HwAqmTest.verifyWredThreshold"
+        },
+        {
+          "test_name_regex": "HwSflowMirrorTest.*"
+        },
+        {
+          "test_name_regex": "HwSflowTest.*"
+        },
+        {
+          "test_name_regex": "HwMirrorTest/[01].*"
+        },
+        {
+          "test_name_regex": "HwSplitAgentCallbackTest.*"
+        },
+        {
+          "test_name_regex": "HwIngressBufferTest.validatePGQueueChanges$"
+        },
+        {
+          "test_name_regex": "HwInPauseFloodTest.*$"
+        },
+        {
+          "test_name_regex": "HwLoadBalancerNegativeTestV6RoCE.*$"
+        }
+    ],
     "brcm/12.0_ea_dnx_odp/12.0_ea_dnx_odp/jericho3": [
         {
           "test_name_regex": "HwFlowletAclCounterTest.*$"
diff --git a/fboss/platform/configs/morgan800cc/fan_service.json b/fboss/platform/configs/morgan800cc/fan_service.json
index e350e8293c776..13cbdf154d963 100644
--- a/fboss/platform/configs/morgan800cc/fan_service.json
+++ b/fboss/platform/configs/morgan800cc/fan_service.json
@@ -8,7 +8,7 @@
   "pwmUpperThreshold": 100,
   "sensors": [
     {
-      "sensorName": "INLET",
+      "sensorName": "SCM_INLET",
       "access": {
         "accessType": "ACCESS_TYPE_THRIFT"
       },
diff --git a/fboss/platform/configs/morgan800cc/sensor_service.json b/fboss/platform/configs/morgan800cc/sensor_service.json
index f74bb75612a91..b84a76c88e1ba 100644
--- a/fboss/platform/configs/morgan800cc/sensor_service.json
+++ b/fboss/platform/configs/morgan800cc/sensor_service.json
@@ -5,7 +5,7 @@
       "pmUnitName": "MCB",
       "sensors": [
         {
-          "name": "P12V_BP_ADC0_A",
+          "name": "MCB_P12V_BP_ADC0_A",
           "sysfsPath": "/run/devmap/sensors/MCB_LTC2979_0X60/in1_input",
           "type": 1,
           "thresholds": {
@@ -35,7 +35,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "A3_3V",
+          "name": "MCB_A3_3V",
           "sysfsPath": "/run/devmap/sensors/MCB_LTC2979_0X60/in3_input",
           "type": 1,
           "thresholds": {
@@ -45,7 +45,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "A1_2V",
+          "name": "MCB_A1_2V",
           "sysfsPath": "/run/devmap/sensors/MCB_LTC2979_0X60/in4_input",
           "type": 1,
           "thresholds": {
@@ -55,7 +55,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "A1_8V",
+          "name": "MCB_A1_8V",
           "sysfsPath": "/run/devmap/sensors/MCB_LTC2979_0X60/in5_input",
           "type": 1,
           "thresholds": {
@@ -65,7 +65,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "P12V_BP_ADC0_B",
+          "name": "MCB_P12V_BP_ADC0_B",
           "sysfsPath": "/run/devmap/sensors/MCB_LTC2979_0X60/in1_input",
           "type": 1,
           "thresholds": {
@@ -85,7 +85,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "P1_0V",
+          "name": "MCB_P1_0V",
           "sysfsPath": "/run/devmap/sensors/MCB_LTC2979_0X61/in2_input",
           "type": 1,
           "thresholds": {
@@ -105,7 +105,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "P1_2V",
+          "name": "MCB_P1_2V",
           "sysfsPath": "/run/devmap/sensors/MCB_LTC2979_0X61/in4_input",
           "type": 1,
           "thresholds": {
@@ -125,7 +125,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "TMP421_LOCAL_BB",
+          "name": "MCB_TMP421_LOCAL_BB",
           "sysfsPath": "/run/devmap/sensors/MCB_TMP421_0X4C/temp1_input",
           "type": 3,
           "thresholds": {
@@ -135,7 +135,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "P12V_1",
+          "name": "MCB_P12V_1",
           "sysfsPath": "/run/devmap/sensors/MCB_ADM1278_0X12/in1_input",
           "type": 1,
           "thresholds": {
@@ -145,7 +145,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "P12V_SCM",
+          "name": "MCB_P12V_SCM",
           "sysfsPath": "/run/devmap/sensors/MCB_ADM1278_0X12/in2_input",
           "type": 1,
           "thresholds": {
@@ -155,7 +155,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "FCB0_P3_3V",
+          "name": "MCB_FCB0_P3_3V",
           "sysfsPath": "/run/devmap/sensors/FAN0_LTC2497_0X4C/in_voltage1_raw",
           "type": 1,
           "thresholds": {
@@ -165,7 +165,7 @@
           "compute": "@/1000*0.05735"
         },
         {
-          "name": "FCB0_P12V",
+          "name": "MCB_FCB0_P12V",
           "sysfsPath": "/run/devmap/sensors/FAN0_LTC2497_0X4C/in_voltage4_raw",
           "type": 1,
           "thresholds": {
@@ -175,7 +175,7 @@
           "compute": "@/1000*0.2078"
         },
         {
-          "name": "FCB0_FAN0",
+          "name": "FAN0_FCB0",
           "sysfsPath": "/run/devmap/sensors/FAN0_LTC2497_0X4C/in_voltage5_raw",
           "type": 2,
           "thresholds": {
@@ -185,7 +185,7 @@
           "compute": "@/1000*0.2670288"
         },
         {
-          "name": "FCB0_FAN1",
+          "name": "FAN1_FCB0",
           "sysfsPath": "/run/devmap/sensors/FAN0_LTC2497_0X4C/in_voltage6_raw",
           "type": 2,
           "thresholds": {
@@ -195,7 +195,7 @@
           "compute": "@/1000*0.2670288"
         },
         {
-          "name": "FCB0_FAN2",
+          "name": "FAN2_FCB0",
           "sysfsPath": "/run/devmap/sensors/FAN0_LTC2497_0X4C/in_voltage7_raw",
           "type": 2,
           "thresholds": {
@@ -205,7 +205,7 @@
           "compute": "@/1000*0.2670288"
         },
         {
-          "name": "FCB0_FAN3",
+          "name": "FAN3_FCB0",
           "sysfsPath": "/run/devmap/sensors/FAN0_LTC2497_0X4C/in_voltage8_raw",
           "type": 2,
           "thresholds": {
@@ -215,7 +215,7 @@
           "compute": "@/1000*0.2670288"
         },
         {
-          "name": "FCB1_P3_3V",
+          "name": "MCB_FCB1_P3_3V",
           "sysfsPath": "/run/devmap/sensors/FAN1_LTC2497_0X4C/in_voltage1_raw",
           "type": 1,
           "thresholds": {
@@ -225,7 +225,7 @@
           "compute": "@/1000*0.05735"
         },
         {
-          "name": "FCB1_P12V",
+          "name": "MCB_FCB1_P12V",
           "sysfsPath": "/run/devmap/sensors/FAN1_LTC2497_0X4C/in_voltage4_raw",
           "type": 1,
           "thresholds": {
@@ -235,7 +235,7 @@
           "compute": "@/1000*0.2078"
         },
         {
-          "name": "FCB1_FAN0",
+          "name": "FAN0_FCB1",
           "sysfsPath": "/run/devmap/sensors/FAN1_LTC2497_0X4C/in_voltage5_raw",
           "type": 2,
           "thresholds": {
@@ -245,7 +245,7 @@
           "compute": "@/1000*0.2670288"
         },
         {
-          "name": "FCB1_FAN1",
+          "name": "FAN1_FCB1",
           "sysfsPath": "/run/devmap/sensors/FAN1_LTC2497_0X4C/in_voltage6_raw",
           "type": 2,
           "thresholds": {
@@ -255,7 +255,7 @@
           "compute": "@/1000*0.2670288"
         },
         {
-          "name": "FCB1_FAN2",
+          "name": "FAN2_FCB1",
           "sysfsPath": "/run/devmap/sensors/FAN1_LTC2497_0X4C/in_voltage7_raw",
           "type": 2,
           "thresholds": {
@@ -265,7 +265,7 @@
           "compute": "@/1000*0.2670288"
         },
         {
-          "name": "FCB1_FAN3",
+          "name": "FAN3_FCB1",
           "sysfsPath": "/run/devmap/sensors/FAN1_LTC2497_0X4C/in_voltage8_raw",
           "type": 2,
           "thresholds": {
@@ -274,7 +274,6 @@
           },
           "compute": "@/1000*0.2670288"
         }
-
       ]
     },
     {
@@ -282,7 +281,7 @@
       "pmUnitName": "SCM",
       "sensors": [
         {
-          "name": "INLET",
+          "name": "SCM_INLET",
           "sysfsPath": "/run/devmap/sensors/SCM_TMP451_0X4C/temp1_input",
           "type": 3,
           "thresholds": {
@@ -292,7 +291,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "VP3P3_STBY_BMC",
+          "name": "SCM_VP3P3_STBY_BMC",
           "sysfsPath": "/run/devmap/sensors/SCM_LTC2497_0X14/in_voltage0_raw",
           "type": 1,
           "thresholds": {
@@ -302,7 +301,7 @@
           "compute": "@/1000*0.057815344000000005"
         },
         {
-          "name": "VP1P0_PCIE4",
+          "name": "SCM_VP1P0_PCIE4",
           "sysfsPath": "/run/devmap/sensors/SCM_LTC2497_0X14/in_voltage1_raw",
           "type": 1,
           "thresholds": {
@@ -312,7 +311,7 @@
           "compute": "@/1000*0.017486839"
         },
         {
-          "name": "AV3P3",
+          "name": "SCM_AV3P3",
           "sysfsPath": "/run/devmap/sensors/SCM_LTC2497_0X14/in_voltage2_raw",
           "type": 1,
           "thresholds": {
@@ -322,7 +321,7 @@
           "compute": "@/1000*0.057936412"
         },
         {
-          "name": "VP3P3_CPU_DUP",
+          "name": "SCM_VP3P3_CPU_DUP",
           "sysfsPath": "/run/devmap/sensors/SCM_LTC2497_0X14/in_voltage3_raw",
           "type": 1,
           "thresholds": {
@@ -332,7 +331,7 @@
           "compute": "@/1000*0.057936412"
         },
         {
-          "name": "VP2V5_VPP",
+          "name": "SCM_VP2V5_VPP",
           "sysfsPath": "/run/devmap/sensors/SCM_LTC2497_0X14/in_voltage4_raw",
           "type": 1,
           "thresholds": {
@@ -342,7 +341,7 @@
           "compute": "@/1000*0.043657757000000005"
         },
         {
-          "name": "SATA_VSENSE_P",
+          "name": "SCM_SATA_VSENSE_P",
           "sysfsPath": "/run/devmap/sensors/SCM_LTC2497_0X14/in_voltage6_raw",
           "type": 1,
           "thresholds": {
@@ -352,7 +351,7 @@
           "compute": "@/1000*0.057216189"
         },
         {
-          "name": "P1P8_Z0",
+          "name": "SCM_P1P8_Z0",
           "sysfsPath": "/run/devmap/sensors/SCM_LTC2497_0X14/in_voltage7_raw",
           "type": 1,
           "thresholds": {
@@ -362,7 +361,7 @@
           "compute": "@/1000*0.031433585"
         },
         {
-          "name": "P3V3_Z0",
+          "name": "SCM_P3V3_Z0",
           "sysfsPath": "/run/devmap/sensors/SCM_LTC2497_0X14/in_voltage8_raw",
           "type": 1,
           "thresholds": {
@@ -372,7 +371,7 @@
           "compute": "@/1000*0.057628239"
         },
         {
-          "name": "P1V0_Z0",
+          "name": "SCM_P1V0_Z0",
           "sysfsPath": "/run/devmap/sensors/SCM_LTC2497_0X14/in_voltage9_raw",
           "type": 1,
           "thresholds": {
@@ -382,7 +381,7 @@
           "compute": "@/1000*0.017486839"
         },
         {
-          "name": "P12V",
+          "name": "SCM_P12V",
           "sysfsPath": "/run/devmap/sensors/SCM_LTC2497_0X14/in_voltage10_raw",
           "type": 1,
           "thresholds": {
@@ -392,7 +391,7 @@
           "compute": "@/1000*0.20880881499999998"
         },
         {
-          "name": "VP3P3_TPM",
+          "name": "SCM_VP3P3_TPM",
           "sysfsPath": "/run/devmap/sensors/SCM_LTC2497_0X14/in_voltage11_raw",
           "type": 1,
           "thresholds": {
@@ -402,7 +401,7 @@
           "compute": "@/1000*0.057628239"
         },
         {
-          "name": "VP0P6_VTT",
+          "name": "SCM_VP0P6_VTT",
           "sysfsPath": "/run/devmap/sensors/SCM_LTC2497_0X14/in_voltage12_raw",
           "type": 1,
           "thresholds": {
@@ -422,7 +421,7 @@
           "compute": "@/1000*0.08721279000000001"
         },
         {
-          "name": "VP3P3_STBY",
+          "name": "SCM_VP3P3_STBY",
           "sysfsPath": "/run/devmap/sensors/SCM_LTC2497_0X14/in_voltage14_raw",
           "type": 1,
           "thresholds": {
@@ -432,7 +431,7 @@
           "compute": "@/1000*0.057740302"
         },
         {
-          "name": "CPU_CORE_TEMP_0",
+          "name": "SCM_CPU_CORE_TEMP_0",
           "sysfsPath": "/run/devmap/sensors/CPU_CORE_TEMP/temp1_input",
           "type": 3,
           "thresholds": {
@@ -442,7 +441,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "SSD",
+          "name": "SCM_SSD",
           "sysfsPath": "/run/devmap/sensors/NVME/temp1_input",
           "type": 3,
           "thresholds": {
@@ -458,7 +457,7 @@
       "pmUnitName": "SMB",
       "sensors": [
         {
-          "name": "P12_KMAC1",
+          "name": "SMB_P12_KMAC1",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X50/in1_input",
           "type": 1,
           "thresholds": {
@@ -468,7 +467,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_CVDDC1",
+          "name": "SMB_NP_CVDDC1",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X50/in2_input",
           "type": 1,
           "thresholds": {
@@ -478,7 +477,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_CVDDC1_K0INT",
+          "name": "SMB_NP_CVDDC1_K0INT",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X50/temp1_input",
           "type": 3,
           "thresholds": {
@@ -488,7 +487,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_CVDDC1_K0EXT",
+          "name": "SMB_NP_CVDDC1_K0EXT",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X50/temp2_input",
           "type": 3,
           "thresholds": {
@@ -498,7 +497,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "P12_KMAC2",
+          "name": "SMB_P12_KMAC2",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X51/in1_input",
           "type": 1,
           "thresholds": {
@@ -508,7 +507,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_CVDDC2",
+          "name": "SMB_NP_CVDDC2",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X51/in2_input",
           "type": 1,
           "thresholds": {
@@ -518,7 +517,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_CVDDC2_K1INT",
+          "name": "SMB_NP_CVDDC2_K1INT",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X51/temp1_input",
           "type": 3,
           "thresholds": {
@@ -528,7 +527,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_CVDDC2_K1EXT",
+          "name": "SMB_NP_CVDDC2_K1EXT",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X51/temp2_input",
           "type": 3,
           "thresholds": {
@@ -538,7 +537,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_IFG_VDDM",
+          "name": "SMB_NP_IFG_VDDM",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X51/in3_input",
           "type": 1,
           "thresholds": {
@@ -548,7 +547,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "P12_KMAC3",
+          "name": "SMB_P12_KMAC3",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X52/in1_input",
           "type": 1,
           "thresholds": {
@@ -558,7 +557,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_CVDDC3",
+          "name": "SMB_NP_CVDDC3",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X52/in2_input",
           "type": 1,
           "thresholds": {
@@ -568,7 +567,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_CVDDC3_K2INT",
+          "name": "SMB_NP_CVDDC3_K2INT",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X52/temp1_input",
           "type": 3,
           "thresholds": {
@@ -578,7 +577,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_CVDDC3_K2EXT",
+          "name": "SMB_NP_CVDDC3_K2EXT",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X52/temp2_input",
           "type": 3,
           "thresholds": {
@@ -588,7 +587,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_D2D_VDDA",
+          "name": "SMB_NP_D2D_VDDA",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X52/in3_input",
           "type": 1,
           "thresholds": {
@@ -598,7 +597,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_D2D_VDDA_K0",
+          "name": "SMB_NP_D2D_VDDA_K0",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X52/curr2_input",
           "type": 2,
           "thresholds": {
@@ -608,7 +607,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "P12_KMAC4",
+          "name": "SMB_P12_KMAC4",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X53/in1_input",
           "type": 1,
           "thresholds": {
@@ -618,7 +617,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_IFG_VDDI",
+          "name": "SMB_NP_IFG_VDDI",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X53/in2_input",
           "type": 1,
           "thresholds": {
@@ -628,7 +627,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_IFG_VDDI_K0INT",
+          "name": "SMB_NP_IFG_VDDI_K0INT",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X53/temp1_input",
           "type": 3,
           "thresholds": {
@@ -638,7 +637,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_IFG_VDDI_K0EXT",
+          "name": "SMB_NP_IFG_VDDI_K0EXT",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X53/temp2_input",
           "type": 3,
           "thresholds": {
@@ -648,7 +647,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_IFG_VDDA",
+          "name": "SMB_NP_IFG_VDDA",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X53/in3_input",
           "type": 1,
           "thresholds": {
@@ -658,7 +657,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_IFG_VDDA_K0",
+          "name": "SMB_NP_IFG_VDDA_K0",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X53/curr2_input",
           "type": 2,
           "thresholds": {
@@ -668,7 +667,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "P12_KMAC5",
+          "name": "SMB_P12_KMAC5",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X54/in1_input",
           "type": 1,
           "thresholds": {
@@ -678,7 +677,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_IFG_VDDS",
+          "name": "SMB_NP_IFG_VDDS",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X54/in2_input",
           "type": 1,
           "thresholds": {
@@ -688,7 +687,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_IFG_VDDS_K0INT",
+          "name": "SMB_NP_IFG_VDDS_K0INT",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X54/temp1_input",
           "type": 3,
           "thresholds": {
@@ -698,7 +697,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_IFG_VDDS_K0EXT",
+          "name": "SMB_NP_IFG_VDDS_K0EXT",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X54/temp2_input",
           "type": 3,
           "thresholds": {
@@ -708,7 +707,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "P12V_KMAC_OSFP_L",
+          "name": "SMB_P12V_KMAC_OSFP_L",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X55/in1_input",
           "type": 1,
           "thresholds": {
@@ -718,7 +717,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "OSFP_P3V3_L",
+          "name": "SMB_OSFP_P3V3_L",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X55/in2_input",
           "type": 1,
           "thresholds": {
@@ -728,7 +727,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "OSFP_P3V3_L_K0INT",
+          "name": "SMB_OSFP_P3V3_L_K0INT",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X55/temp1_input",
           "type": 3,
           "thresholds": {
@@ -738,7 +737,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "OSFP_P3V3_L_K0EXT",
+          "name": "SMB_OSFP_P3V3_L_K0EXT",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X55/temp2_input",
           "type": 3,
           "thresholds": {
@@ -748,7 +747,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "P12V_KMAC_OSFP_R",
+          "name": "SMB_P12V_KMAC_OSFP_R",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X56/in1_input",
           "type": 1,
           "thresholds": {
@@ -758,7 +757,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "OSFP_P3V3_R",
+          "name": "SMB_OSFP_P3V3_R",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X56/in2_input",
           "type": 1,
           "thresholds": {
@@ -768,7 +767,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "OSFP_P3V3_R_K0INT",
+          "name": "SMB_OSFP_P3V3_R_K0INT",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X56/temp1_input",
           "type": 3,
           "thresholds": {
@@ -778,7 +777,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "OSFP_P3V3_R_K0EXT",
+          "name": "SMB_OSFP_P3V3_R_K0EXT",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC3888-1_0X56/temp2_input",
           "type": 3,
           "thresholds": {
@@ -788,7 +787,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "P12V_MAIN_ADC0A",
+          "name": "SMB_P12V_MAIN_ADC0A",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC2979_0X5C/in1_input",
           "type": 1,
           "thresholds": {
@@ -808,7 +807,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_IFG_VDDI_VSNS",
+          "name": "SMB_NP_IFG_VDDI_VSNS",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC2979_0X5C/in2_input",
           "type": 1,
           "thresholds": {
@@ -818,7 +817,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_IFG_VDDA_VSNS",
+          "name": "SMB_NP_IFG_VDDA_VSNS",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC2979_0X5C/in3_input",
           "type": 1,
           "thresholds": {
@@ -828,7 +827,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_IFG_VDDS_VSNS",
+          "name": "SMB_NP_IFG_VDDS_VSNS",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC2979_0X5C/in4_input",
           "type": 1,
           "thresholds": {
@@ -838,7 +837,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_IFG_VDDM_VSNS",
+          "name": "SMB_NP_IFG_VDDM_VSNS",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC2979_0X5C/in5_input",
           "type": 1,
           "thresholds": {
@@ -848,7 +847,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_PCIE_VDDH_VSNS",
+          "name": "SMB_NP_PCIE_VDDH_VSNS",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC2979_0X5C/in7_input",
           "type": 1,
           "thresholds": {
@@ -858,7 +857,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_PCIE_VDDACK_VSNS",
+          "name": "SMB_NP_PCIE_VDDACK_VSNS",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC2979_0X5C/in8_input",
           "type": 1,
           "thresholds": {
@@ -868,7 +867,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "P12V_MAIN_ADC0B",
+          "name": "SMB_P12V_MAIN_ADC0B",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC2979_0X5D/in1_input",
           "type": 1,
           "thresholds": {
@@ -888,7 +887,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_D2D_VDDA_VSNS",
+          "name": "SMB_NP_D2D_VDDA_VSNS",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC2979_0X5D/in2_input",
           "type": 1,
           "thresholds": {
@@ -898,7 +897,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "NP_CVDDC_VSNS",
+          "name": "SMB_NP_CVDDC_VSNS",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC2979_0X5D/in3_input",
           "type": 1,
           "thresholds": {
@@ -908,7 +907,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "OSFP_LEFT_VSNS",
+          "name": "SMB_OSFP_LEFT_VSNS",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC2979_0X5D/in4_input",
           "type": 1,
           "thresholds": {
@@ -918,7 +917,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "OSFP_RIGHT_VSNS",
+          "name": "SMB_OSFP_RIGHT_VSNS",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC2979_0X5D/in5_input",
           "type": 1,
           "thresholds": {
@@ -928,7 +927,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "P12V_MAIN_ADC1A",
+          "name": "SMB_P12V_MAIN_ADC1A",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC2979_0X5E/in1_input",
           "type": 1,
           "thresholds": {
@@ -938,7 +937,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "U1_ADC1_A_DIE",
+          "name": "SMB_U1_ADC1_A_DIE",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC2979_0X5E/temp1_input",
           "type": 3,
           "thresholds": {
@@ -948,7 +947,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "A3P3V",
+          "name": "SMB_A3P3V",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC2979_0X5E/in2_input",
           "type": 1,
           "thresholds": {
@@ -958,7 +957,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "A1P8V",
+          "name": "SMB_A1P8V",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC2979_0X5E/in3_input",
           "type": 1,
           "thresholds": {
@@ -978,7 +977,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "A1P2V",
+          "name": "SMB_A1P2V",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC2979_0X5E/in6_input",
           "type": 1,
           "thresholds": {
@@ -988,7 +987,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "VP3P3_PS_STBY",
+          "name": "SMB_VP3P3_PS_STBY",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC2979_0X5E/in7_input",
           "type": 1,
           "thresholds": {
@@ -998,7 +997,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "P12V_MAIN_ADC1B",
+          "name": "SMB_P12V_MAIN_ADC1B",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC2979_0X5F/in1_input",
           "type": 1,
           "thresholds": {
@@ -1008,7 +1007,7 @@
           "compute": "@/1000"
         },
         {
-          "name": "U1_ADC1_B_DIE",
+          "name": "SMB_U1_ADC1_B_DIE",
           "sysfsPath": "/run/devmap/sensors/SMB_LTC2979_0X5F/temp1_input",
           "type": 3,
           "thresholds": {
diff --git a/fboss/platform/fan_service/PidLogic.cpp b/fboss/platform/fan_service/PidLogic.cpp
index fb797a72688ce..1f91b75adfc65 100644
--- a/fboss/platform/fan_service/PidLogic.cpp
+++ b/fboss/platform/fan_service/PidLogic.cpp
@@ -7,7 +7,7 @@
 namespace facebook::fboss::platform::fan_service {
 
 int16_t PidLogic::calculatePwm(float measurement) {
-  float newPwm;
+  float newPwm, pwmDelta{0};
   float minVal = *pidSetting_.setPoint() - *pidSetting_.negHysteresis();
   float maxVal = *pidSetting_.setPoint() + *pidSetting_.posHysteresis();
   std::optional<float> error{};
@@ -21,27 +21,25 @@ int16_t PidLogic::calculatePwm(float measurement) {
   if (error.has_value()) {
     integral_ = integral_ + *error * dT_;
     auto derivative = (*error - lastError_) / dT_;
-    newPwm = (*pidSetting_.kp() * error.value()) +
+    pwmDelta = (*pidSetting_.kp() * error.value()) +
         (*pidSetting_.ki() * integral_) + (*pidSetting_.kd() * derivative);
+    newPwm = lastPwm_ + pwmDelta;
   } else {
     newPwm = lastPwm_;
   }
 
-  if (measurement <= maxVal) {
-    integral_ = newPwm / *pidSetting_.ki();
-  }
-
   if (newPwm < 0) {
     newPwm = 0;
   } else if (newPwm > 100) {
     newPwm = 100;
   }
 
-  XLOG(DBG1) << fmt::format(
-      "Measurement: {}, Error: {}, Last PWM: {}, New PWM: {}",
+  XLOG(DBG2) << fmt::format(
+      "Measurement: {}, Error: {}, Last PWM: {}, PWM Delta: {}, New PWM: {}",
       measurement,
       error.value_or(0),
       lastPwm_,
+      pwmDelta,
       newPwm);
 
   lastPwm_ = newPwm;
diff --git a/fboss/platform/fan_service/tests/PidLogicTests.cpp b/fboss/platform/fan_service/tests/PidLogicTests.cpp
index de272cb6fb526..6c62437346c8f 100644
--- a/fboss/platform/fan_service/tests/PidLogicTests.cpp
+++ b/fboss/platform/fan_service/tests/PidLogicTests.cpp
@@ -19,10 +19,10 @@ TEST(PIDLogicTest, Basic) {
   pidSetting.posHysteresis() = 0;
 
   // CASE 1: The read value is lower than setPoint, and the previous target PWM
-  //         is too high. PWM should go down. (60 -> 0)
+  //         is too high. PWM should go down. (60 -> 35)
   auto pidLogic1 = PidLogic(pidSetting, 5);
   pidLogic1.updateLastPwm(60);
-  EXPECT_EQ(pidLogic1.calculatePwm(50), 0);
+  EXPECT_EQ(pidLogic1.calculatePwm(50), 35);
   EXPECT_EQ(pidLogic1.getLastError(), 8);
 
   // CASE 2: The read value is within desired range.
@@ -33,17 +33,16 @@ TEST(PIDLogicTest, Basic) {
   EXPECT_EQ(pidLogic2.getLastError(), 0);
 
   // CASE 3: The read value is higher than setPoint, and the current target PWM
-  //         is too low. PWM should go up a bit. (30 -> 24)
+  //         is too low. PWM should go up a bit. (30 -> 54)
   auto pidLogic3 = PidLogic(pidSetting, 5);
   pidLogic3.updateLastPwm(30);
-  EXPECT_EQ(pidLogic3.calculatePwm(68), 24);
+  EXPECT_EQ(pidLogic3.calculatePwm(68), 54);
   EXPECT_EQ(pidLogic3.getLastError(), -8);
 
-  // CASE 4: Though read value is higher than setPoint, the current target PWM
-  //         is overly high. PWM should go down. (99 -> 24)
+  // CASE 4: Read value is higher than setPoint, PWM should go up (99 -> 100)
   auto pidLogic4 = PidLogic(pidSetting, 5);
   pidLogic4.updateLastPwm(99);
-  EXPECT_EQ(pidLogic4.calculatePwm(68), 24);
+  EXPECT_EQ(pidLogic4.calculatePwm(68), 100);
   EXPECT_EQ(pidLogic4.getLastError(), -8);
 }