BLACKWOLF800BANW: Platform definition & Platform Mapping

cmake/Agent.cmake

@@ -149,7 +149,7 @@ add_library(utils
 target_link_libraries(utils
   agent_dir_util
   asic_utils
-  fboss_error
+  error
   ctrl_cpp2
   hw_switch_fb303_stats
   load_agent_config
@@ -162,6 +162,7 @@ target_link_libraries(utils
   meru800bia_platform_mapping
   meru800bfa_platform_mapping
   janga800bic_platform_mapping
+  blackwolf800banw_platform_mapping
   icecube800bc_platform_mapping
   icetea800bc_platform_mapping
   tahansb800bc_platform_mapping
@@ -261,7 +262,7 @@ add_library(hw_switch_thrift_client_table
 )
 
 target_link_libraries(hw_switch_thrift_client_table
-  fboss_error
+  error
   fboss_types
   hw_ctrl_cpp2
   Folly::folly
@@ -433,6 +434,15 @@ set(core_libs
 
 target_link_libraries(core ${core_libs})
 
+add_library(error
+  fboss/agent/FbossError.h
+)
+
+target_link_libraries(error
+  ctrl_cpp2
+  Folly::folly
+)
+
 add_library(thrifthandler_utils
   fboss/agent/ThriftHandlerUtils.cpp
 )
@@ -483,12 +493,12 @@ target_link_libraries(fboss_event_base
 
 add_library(fboss_error
   fboss/agent/FbossError.h
-  fboss/agent/FbossHwUpdateError.h
   fboss/agent/SysError.h
 )
 
 target_link_libraries(fboss_error
   fboss_cpp2
+  fboss_types
   Folly::folly
 )
 
@@ -506,7 +516,7 @@ target_link_libraries(platform_base
   agent_config_cpp2
   agent_dir_util
   ctrl_cpp2
-  fboss_error
+  error
   fboss_event_base
   fboss_types
   Folly::folly

cmake/AgentPlatformsCommon.cmake

@@ -11,7 +11,7 @@ add_library(platform_mapping
 
 target_link_libraries(platform_mapping
   agent_features
-  fboss_error
+  error
   fboss_config_utils
   platform_config_cpp2
   state
@@ -23,7 +23,7 @@ add_library(platform_mapping_utils
 )
 
 target_link_libraries(platform_mapping_utils
-  fboss_error
+  error
   minipack_platform_mapping
   elbert_platform_mapping
   yamp_platform_mapping
@@ -54,6 +54,7 @@ target_link_libraries(platform_mapping_utils
   tahansb800bc_platform_mapping
   wedge800cact_platform_mapping
   ladakh800bcls_platform_mapping
+  blackwolf800banw_platform_mapping
   platform_mode
   ${RE2}
 )

cmake/AgentPlatformsCommonBlackwolf800banw.cmake

@@ -0,0 +1,12 @@
+# CMake to build libraries and binaries in fboss/agent/platforms/common/blackwolf800banw
+
+# In general, libraries and binaries in fboss/foo/bar are built by
+# cmake/FooBar.cmake
+
+add_library(blackwolf800banw_platform_mapping
+  fboss/agent/platforms/common/blackwolf800banw/Blackwolf800banwPlatformMapping.cpp
+)
+
+target_link_libraries(blackwolf800banw_platform_mapping
+  platform_mapping
+)

cmake/AgentPlatformsSai.cmake

@@ -53,6 +53,8 @@ set(SAI_PLATFORM_SRC
   fboss/agent/platforms/sai/SaiMinipack3NPlatform.cpp
   fboss/agent/platforms/sai/SaiYangraPlatformPort.cpp
   fboss/agent/platforms/sai/SaiMinipack3NPlatformPort.cpp
+  fboss/agent/platforms/sai/SaiBcmBlackwolf800banwPlatform.cpp
+  fboss/agent/platforms/sai/SaiBcmBlackwolf800banwPlatformPort.cpp
 # platform oss srcs (== fake_srcs)
   fboss/agent/platforms/sai/oss/SaiBcmMinipackPlatform.cpp
   fboss/agent/platforms/sai/oss/SaiBcmPlatform.cpp
@@ -122,6 +124,7 @@ target_link_libraries(sai_platform
   tahan800bc_platform_mapping
   tahansb800bc_platform_mapping
   ladakh800bcls_platform_mapping
+  blackwolf800banw_platform_mapping
   icecube800bc_platform_mapping
   icetea800bc_platform_mapping
   led_structs_types_cpp2

fboss/agent/platforms/common/BUCK

@@ -34,6 +34,7 @@ cpp_library(
     exported_deps = [
         ":platform_mapping",
         "//fboss/agent:fboss-error",
+        "//fboss/agent/platforms/common/blackwolf800banw:blackwolf800banw_platform_mapping",
         "//fboss/agent/platforms/common/darwin:darwin_platform_mapping",
         "//fboss/agent/platforms/common/elbert:elbert_platform_mapping",
         "//fboss/agent/platforms/common/fake_test:fake_test_platform_mapping",

fboss/agent/platforms/common/PlatformMappingUtils.cpp

@@ -14,6 +14,7 @@
 #include "fboss/agent/FbossError.h"
 #include "fboss/agent/platforms/common/PlatformMapping.h"
 #include "fboss/agent/platforms/common/PlatformMappingUtils.h"
+#include "fboss/agent/platforms/common/blackwolf800banw/Blackwolf800banwPlatformMapping.h"
 #include "fboss/agent/platforms/common/darwin/DarwinPlatformMapping.h"
 #include "fboss/agent/platforms/common/elbert/ElbertPlatformMapping.h"
 #include "fboss/agent/platforms/common/fake_test/FakeTestPlatformMapping.h"
@@ -209,6 +210,11 @@ std::unique_ptr<PlatformMapping> initPlatformMapping(PlatformType type) {
       return platformMappingStr.empty()
           ? std::make_unique<Ladakh800bclsPlatformMapping>()
           : std::make_unique<Ladakh800bclsPlatformMapping>(platformMappingStr);
+    case PlatformType::PLATFORM_BLACKWOLF800BANW:
+      return platformMappingStr.empty()
+          ? std::make_unique<Blackwolf800banwPlatformMapping>()
+          : std::make_unique<Blackwolf800banwPlatformMapping>(
+                platformMappingStr);
     case PlatformType::PLATFORM_FAKE_SAI: {
       std::vector<int> controllingPorts = getFakeSaiControllingPortIDs();
       return std::make_unique<FakeTestPlatformMapping>(controllingPorts);

fboss/agent/platforms/common/blackwolf800banw/BUCK

@@ -0,0 +1,16 @@
+load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library")
+
+oncall("fboss_agent_push")
+
+cpp_library(
+    name = "blackwolf800banw_platform_mapping",
+    srcs = [
+        "Blackwolf800banwPlatformMapping.cpp",
+    ],
+    headers = [
+        "Blackwolf800banwPlatformMapping.h",
+    ],
+    exported_deps = [
+        "//fboss/agent/platforms/common:platform_mapping",
+    ],
+)