[Nexthop][fboss2-dev] Move the config commands to a new fboss2-dev target.

cmake/CliFboss2.cmake

@@ -472,7 +472,6 @@ add_library(fboss2_lib
   fboss/cli/fboss2/commands/stop/pcap/CmdStopPcap.h
   fboss/cli/fboss2/CmdSubcommands.cpp
   fboss/cli/fboss2/oss/CmdGlobalOptions.cpp
-  fboss/cli/fboss2/oss/CmdList.cpp
   fboss/cli/fboss2/utils/CmdUtils.cpp
   fboss/cli/fboss2/utils/CLIParserUtils.cpp
   fboss/cli/fboss2/utils/CmdClientUtils.cpp
@@ -559,6 +558,7 @@ target_link_libraries(fboss2_lib
 
 add_executable(fboss2
   fboss/cli/fboss2/Main.cpp
+  fboss/cli/fboss2/oss/CmdList.cpp
 )
 
 target_link_libraries(fboss2
@@ -567,3 +567,50 @@ target_link_libraries(fboss2
 )
 
 install(TARGETS fboss2)
+
+# Config commands library for fboss2-dev
+add_library(fboss2_config_lib
+  fboss/cli/fboss2/commands/config/CmdConfigAppliedInfo.h
+  fboss/cli/fboss2/commands/config/CmdConfigAppliedInfo.cpp
+  fboss/cli/fboss2/commands/config/CmdConfigReload.h
+  fboss/cli/fboss2/commands/config/CmdConfigReload.cpp
+  fboss/cli/fboss2/commands/config/interface/CmdConfigInterface.h
+  fboss/cli/fboss2/commands/config/interface/CmdConfigInterfaceDescription.h
+  fboss/cli/fboss2/commands/config/interface/CmdConfigInterfaceDescription.cpp
+  fboss/cli/fboss2/commands/config/interface/CmdConfigInterfaceMtu.h
+  fboss/cli/fboss2/commands/config/interface/CmdConfigInterfaceMtu.cpp
+  fboss/cli/fboss2/commands/config/history/CmdConfigHistory.h
+  fboss/cli/fboss2/commands/config/history/CmdConfigHistory.cpp
+  fboss/cli/fboss2/commands/config/rollback/CmdConfigRollback.h
+  fboss/cli/fboss2/commands/config/rollback/CmdConfigRollback.cpp
+  fboss/cli/fboss2/commands/config/session/CmdConfigSessionCommit.h
+  fboss/cli/fboss2/commands/config/session/CmdConfigSessionCommit.cpp
+  fboss/cli/fboss2/commands/config/session/CmdConfigSessionDiff.h
+  fboss/cli/fboss2/commands/config/session/CmdConfigSessionDiff.cpp
+  fboss/cli/fboss2/session/ConfigSession.h
+  fboss/cli/fboss2/session/ConfigSession.cpp
+  fboss/cli/fboss2/utils/PortMap.h
+  fboss/cli/fboss2/utils/PortMap.cpp
+  fboss/cli/fboss2/utils/InterfaceList.h
+  fboss/cli/fboss2/utils/InterfaceList.cpp
+  fboss/cli/fboss2/CmdListConfig.cpp
+  fboss/cli/fboss2/CmdHandlerImplConfig.cpp
+)
+
+target_link_libraries(fboss2_config_lib
+  fboss2_lib
+  agent_dir_util
+)
+
+add_executable(fboss2-dev
+  fboss/cli/fboss2/Main.cpp
+  fboss/cli/fboss2/oss/CmdListConfig.cpp
+)
+
+target_link_libraries(fboss2-dev
+  fboss2_config_lib
+  fboss2_lib
+  Folly::folly
+)
+
+install(TARGETS fboss2-dev)

cmake/CliFboss2Test.cmake

@@ -3,6 +3,13 @@
 # cmd_test - Command tests from BUCK file
 add_executable(fboss2_cmd_test
   fboss/cli/fboss2/test/TestMain.cpp
+  fboss/cli/fboss2/test/CmdConfigAppliedInfoTest.cpp
+  fboss/cli/fboss2/test/CmdConfigHistoryTest.cpp
+  fboss/cli/fboss2/test/CmdConfigInterfaceDescriptionTest.cpp
+  fboss/cli/fboss2/test/CmdConfigInterfaceMtuTest.cpp
+  fboss/cli/fboss2/test/CmdConfigReloadTest.cpp
+  fboss/cli/fboss2/test/CmdConfigSessionDiffTest.cpp
+  fboss/cli/fboss2/test/CmdConfigSessionTest.cpp
   fboss/cli/fboss2/test/CmdSetPortStateTest.cpp
   fboss/cli/fboss2/test/CmdShowAclTest.cpp
   fboss/cli/fboss2/test/CmdShowAgentSslTest.cpp
@@ -35,10 +42,12 @@ add_executable(fboss2_cmd_test
   # fboss/cli/fboss2/test/CmdShowTransceiverTest.cpp - excluded (depends on configerator bgp namespace)
   fboss/cli/fboss2/test/CmdStartPcapTest.cpp
   fboss/cli/fboss2/test/CmdStopPcapTest.cpp
+  fboss/cli/fboss2/test/PortMapTest.cpp
 )
 
 target_link_libraries(fboss2_cmd_test
   fboss2_lib
+  fboss2_config_lib
   ${GTEST}
   ${LIBGMOCK_LIBRARIES}
   Folly::folly

fboss/cli/fboss2/BUCK

@@ -146,6 +146,7 @@ cpp_library(
     name = "cmd-common-utils",
     srcs = [
         "utils/CmdUtilsCommon.cpp",
+        "utils/InterfaceList.cpp",
     ],
     headers = [
         "commands/clear/CmdClearUtils.h",
@@ -154,6 +155,7 @@ cpp_library(
         "utils/CmdUtilsCommon.h",
         "utils/FilterUtils.h",
         "utils/HostInfo.h",
+        "utils/InterfaceList.h",
     ],
     exported_deps = [
         ":cmd-global-options",
@@ -313,6 +315,7 @@ cpp_library(
         "utils/CmdClientUtils.cpp",
         "utils/CmdUtils.cpp",
         "utils/NetwhoamiUtils.cpp",
+        "utils/PortMap.cpp",
         "utils/PrbsUtils.cpp",
         "utils/TeFlowUtils.cpp",
         "utils/clients/BmcClient.cpp",
@@ -337,6 +340,26 @@ cpp_library(
         "commands/clear/interface/counters/phy/CmdClearInterfaceCountersPhy.h",
         "commands/clear/interface/prbs/CmdClearInterfacePrbs.h",
         "commands/clear/interface/prbs/stats/CmdClearInterfacePrbsStats.h",
+        "commands/config/CmdConfigAppliedInfo.h",
+        "commands/config/CmdConfigAppliedInfo.cpp",
+        "commands/config/CmdConfigReload.h",
+        "commands/config/CmdConfigReload.cpp",
+        "commands/config/history/CmdConfigHistory.h",
+        "commands/config/history/CmdConfigHistory.cpp",
+        "commands/config/rollback/CmdConfigRollback.h",
+        "commands/config/rollback/CmdConfigRollback.cpp",
+        "commands/config/interface/CmdConfigInterface.h",
+        "commands/config/interface/CmdConfigInterfaceBase.h",
+        "commands/config/interface/CmdConfigInterfaceDescription.h",
+        "commands/config/interface/CmdConfigInterfaceDescription.cpp",
+        "commands/config/interface/CmdConfigInterfaceMtu.h",
+        "commands/config/interface/CmdConfigInterfaceMtu.cpp",
+        "commands/config/session/CmdConfigSessionCommit.h",
+        "commands/config/session/CmdConfigSessionCommit.cpp",
+        "commands/config/session/CmdConfigSessionDiff.h",
+        "commands/config/session/CmdConfigSessionDiff.cpp",
+        "session/ConfigSession.h",
+        "session/ConfigSession.cpp",
         "commands/create/facebook/CmdCreateConfig.h",
         "commands/create/facebook/CmdCreateMirror.h",
         "commands/create/facebook/config/CmdCreateConfigPatcherAgent.h",

fboss/cli/fboss2/CmdHandler.h

@@ -169,6 +169,8 @@ class CmdHandler {
     RetType result;
     try {
       result = queryClientHelper(hostInfo);
+    } catch (std::invalid_argument const& err) {
+      errStr = folly::to<std::string>("Invalid argument: ", err.what());
     } catch (std::exception const& err) {
       errStr = folly::to<std::string>("Thrift call failed: '", err.what(), "'");
     }

fboss/cli/fboss2/CmdHandlerImplConfig.cpp

@@ -0,0 +1,41 @@
+/*
+ *  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 "fboss/cli/fboss2/CmdHandler.cpp"
+
+#include "fboss/cli/fboss2/commands/config/CmdConfigAppliedInfo.h"
+#include "fboss/cli/fboss2/commands/config/CmdConfigReload.h"
+#include "fboss/cli/fboss2/commands/config/history/CmdConfigHistory.h"
+#include "fboss/cli/fboss2/commands/config/interface/CmdConfigInterface.h"
+#include "fboss/cli/fboss2/commands/config/interface/CmdConfigInterfaceDescription.h"
+#include "fboss/cli/fboss2/commands/config/interface/CmdConfigInterfaceMtu.h"
+#include "fboss/cli/fboss2/commands/config/rollback/CmdConfigRollback.h"
+#include "fboss/cli/fboss2/commands/config/session/CmdConfigSessionCommit.h"
+#include "fboss/cli/fboss2/commands/config/session/CmdConfigSessionDiff.h"
+
+namespace facebook::fboss {
+
+template void
+CmdHandler<CmdConfigAppliedInfo, CmdConfigAppliedInfoTraits>::run();
+template void CmdHandler<CmdConfigReload, CmdConfigReloadTraits>::run();
+template void CmdHandler<CmdConfigInterface, CmdConfigInterfaceTraits>::run();
+template void CmdHandler<
+    CmdConfigInterfaceDescription,
+    CmdConfigInterfaceDescriptionTraits>::run();
+template void
+CmdHandler<CmdConfigInterfaceMtu, CmdConfigInterfaceMtuTraits>::run();
+template void CmdHandler<CmdConfigHistory, CmdConfigHistoryTraits>::run();
+template void CmdHandler<CmdConfigRollback, CmdConfigRollbackTraits>::run();
+template void
+CmdHandler<CmdConfigSessionCommit, CmdConfigSessionCommitTraits>::run();
+template void
+CmdHandler<CmdConfigSessionDiff, CmdConfigSessionDiffTraits>::run();
+
+} // namespace facebook::fboss

fboss/cli/fboss2/CmdListConfig.cpp

@@ -0,0 +1,94 @@
+/*
+ *  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 "fboss/cli/fboss2/CmdList.h"
+
+#include "fboss/cli/fboss2/CmdHandler.h"
+#include "fboss/cli/fboss2/commands/config/CmdConfigAppliedInfo.h"
+#include "fboss/cli/fboss2/commands/config/CmdConfigReload.h"
+#include "fboss/cli/fboss2/commands/config/history/CmdConfigHistory.h"
+#include "fboss/cli/fboss2/commands/config/interface/CmdConfigInterface.h"
+#include "fboss/cli/fboss2/commands/config/interface/CmdConfigInterfaceDescription.h"
+#include "fboss/cli/fboss2/commands/config/interface/CmdConfigInterfaceMtu.h"
+#include "fboss/cli/fboss2/commands/config/rollback/CmdConfigRollback.h"
+#include "fboss/cli/fboss2/commands/config/session/CmdConfigSessionCommit.h"
+#include "fboss/cli/fboss2/commands/config/session/CmdConfigSessionDiff.h"
+
+namespace facebook::fboss {
+
+const CommandTree& kConfigCommandTree() {
+  static CommandTree root = {
+      {"config",
+       "applied-info",
+       "Show config applied information",
+       commandHandler<CmdConfigAppliedInfo>,
+       argTypeHandler<CmdConfigAppliedInfoTraits>},
+
+      {"config",
+       "history",
+       "Show history of committed config revisions",
+       commandHandler<CmdConfigHistory>,
+       argTypeHandler<CmdConfigHistoryTraits>},
+
+      {
+          "config",
+          "interface",
+          "Configure interface settings",
+          commandHandler<CmdConfigInterface>,
+          argTypeHandler<CmdConfigInterfaceTraits>,
+          {{
+               "description",
+               "Set interface description",
+               commandHandler<CmdConfigInterfaceDescription>,
+               argTypeHandler<CmdConfigInterfaceDescriptionTraits>,
+           },
+           {
+               "mtu",
+               "Set interface MTU",
+               commandHandler<CmdConfigInterfaceMtu>,
+               argTypeHandler<CmdConfigInterfaceMtuTraits>,
+           }},
+      },
+
+      {
+          "config",
+          "session",
+          "Manage config session",
+          {{
+               "commit",
+               "Commit the current config session",
+               commandHandler<CmdConfigSessionCommit>,
+               argTypeHandler<CmdConfigSessionCommitTraits>,
+           },
+           {
+               "diff",
+               "Show diff between configs (session vs live, session vs revision, or revision vs revision)",
+               commandHandler<CmdConfigSessionDiff>,
+               argTypeHandler<CmdConfigSessionDiffTraits>,
+           }},
+      },
+
+      {"config",
+       "reload",
+       "Reload agent configuration",
+       commandHandler<CmdConfigReload>,
+       argTypeHandler<CmdConfigReloadTraits>},
+
+      {"config",
+       "rollback",
+       "Rollback to a previous config revision",
+       commandHandler<CmdConfigRollback>,
+       argTypeHandler<CmdConfigRollbackTraits>},
+  };
+  sort(root.begin(), root.end());
+  return root;
+}
+
+} // namespace facebook::fboss

fboss/cli/fboss2/CmdSubcommands.cpp

@@ -34,6 +34,8 @@ const std::map<std::string, std::string>& kSupportedVerbs() {
       {"stop", "Stop event"},
       {"get", "Get object"},
       {"reload", "Reload object"},
+      // Only implemented in fboss2-dev for now.
+      {"config", "Configuration commands"},
   };
 
   return supportedVerbs;
@@ -217,6 +219,16 @@ CLI::App* CmdSubcommands::addCommand(
         case utils::ObjectArgTypeId::OBJECT_ARG_TYPE_FAN_PWM:
           subCmd->add_option("pwm", args, "Fan PWM (0..100) or 'disable'");
           break;
+        case utils::ObjectArgTypeId::OBJECT_ARG_TYPE_MTU:
+          subCmd->add_option("mtu", args, "MTU value (68-9216)");
+          break;
+        case utils::ObjectArgTypeId::OBJECT_ARG_TYPE_ID_INTERFACE_LIST:
+          subCmd->add_option("interfaces", args, "Interface(s)");
+          break;
+        case utils::ObjectArgTypeId::OBJECT_ARG_TYPE_ID_REVISION_LIST:
+          subCmd->add_option(
+              "revisions", args, "Revision(s) in the form 'rN' or 'current'");
+          break;
         case utils::ObjectArgTypeId::OBJECT_ARG_TYPE_ID_UNINITIALIZE:
         case utils::ObjectArgTypeId::OBJECT_ARG_TYPE_ID_NONE:
           break;

fboss/cli/fboss2/commands/config/CmdConfigAppliedInfo.cpp

@@ -0,0 +1,69 @@
+/*
+ *  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 "fboss/cli/fboss2/commands/config/CmdConfigAppliedInfo.h"
+#include <folly/Conv.h>
+#include <ctime>
+#include <iomanip>
+#include <sstream>
+
+namespace facebook::fboss {
+
+namespace {
+std::string formatTimestamp(int64_t timestampMs) {
+  if (timestampMs == 0) {
+    return "Never";
+  }
+
+  // Convert milliseconds to seconds
+  std::time_t timeInSeconds = timestampMs / 1000;
+  int64_t milliseconds = timestampMs % 1000;
+
+  // Convert to local time
+  std::tm* localTime = std::localtime(&timeInSeconds);
+
+  // Format the timestamp
+  std::ostringstream oss;
+  oss << std::put_time(localTime, "%Y-%m-%d %H:%M:%S");
+  oss << "." << std::setfill('0') << std::setw(3) << milliseconds;
+
+  return oss.str();
+}
+} // namespace
+
+CmdConfigAppliedInfoTraits::RetType CmdConfigAppliedInfo::queryClient(
+    const HostInfo& hostInfo) {
+  auto client =
+      utils::createClient<facebook::fboss::FbossCtrlAsyncClient>(hostInfo);
+
+  ConfigAppliedInfo configAppliedInfo;
+  client->sync_getConfigAppliedInfo(configAppliedInfo);
+
+  return configAppliedInfo;
+}
+
+void CmdConfigAppliedInfo::printOutput(const RetType& configAppliedInfo) {
+  std::cout << "Config Applied Information:" << std::endl;
+  std::cout << "===========================" << std::endl;
+
+  std::cout << "Last Applied Time: "
+            << formatTimestamp(*configAppliedInfo.lastAppliedInMs())
+            << std::endl;
+
+  std::cout << "Last Coldboot Applied Time: ";
+  if (configAppliedInfo.lastColdbootAppliedInMs()) {
+    std::cout << formatTimestamp(*configAppliedInfo.lastColdbootAppliedInMs())
+              << std::endl;
+  } else {
+    std::cout << "Not available (warmboot)" << std::endl;
+  }
+}
+
+} // namespace facebook::fboss