[Nexthop][fboss2-dev] Save the config commands to CLI metadata and in session commit.

cmake/CliFboss2.cmake

@@ -3,6 +3,13 @@
 # In general, libraries and binaries in fboss/foo/bar are built by
 # cmake/FooBar.cmake
 
+add_fbthrift_cpp_library(
+  cli_metadata
+  fboss/cli/fboss2/cli_metadata.thrift
+  OPTIONS
+    json
+)
+
 add_fbthrift_cpp_library(
   cli_model
   fboss/cli/fboss2/cli.thrift
@@ -479,6 +486,8 @@ add_library(fboss2_lib
   fboss/cli/fboss2/utils/PortMap.cpp
   fboss/cli/fboss2/utils/Table.cpp
   fboss/cli/fboss2/utils/HostInfo.h
+  fboss/cli/fboss2/utils/InterfaceList.h
+  fboss/cli/fboss2/utils/InterfaceList.cpp
   fboss/cli/fboss2/utils/FilterOp.h
   fboss/cli/fboss2/utils/AggregateOp.h
   fboss/cli/fboss2/utils/AggregateUtils.h
@@ -575,6 +584,27 @@ add_library(fboss2_config_lib
   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/interface/switchport/CmdConfigInterfaceSwitchport.h
+  fboss/cli/fboss2/commands/config/interface/switchport/access/CmdConfigInterfaceSwitchportAccess.h
+  fboss/cli/fboss2/commands/config/interface/switchport/access/vlan/CmdConfigInterfaceSwitchportAccessVlan.h
+  fboss/cli/fboss2/commands/config/interface/switchport/access/vlan/CmdConfigInterfaceSwitchportAccessVlan.cpp
+  fboss/cli/fboss2/commands/config/qos/CmdConfigQos.h
+  fboss/cli/fboss2/commands/config/qos/buffer_pool/CmdConfigQosBufferPool.h
+  fboss/cli/fboss2/commands/config/qos/buffer_pool/CmdConfigQosBufferPoolHeadroomBytes.h
+  fboss/cli/fboss2/commands/config/qos/buffer_pool/CmdConfigQosBufferPoolHeadroomBytes.cpp
+  fboss/cli/fboss2/commands/config/qos/buffer_pool/CmdConfigQosBufferPoolReservedBytes.h
+  fboss/cli/fboss2/commands/config/qos/buffer_pool/CmdConfigQosBufferPoolReservedBytes.cpp
+  fboss/cli/fboss2/commands/config/qos/buffer_pool/CmdConfigQosBufferPoolSharedBytes.h
+  fboss/cli/fboss2/commands/config/qos/buffer_pool/CmdConfigQosBufferPoolSharedBytes.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
@@ -586,6 +616,7 @@ add_library(fboss2_config_lib
 )
 
 target_link_libraries(fboss2_config_lib
+  cli_metadata
   fboss2_lib
   agent_dir_util
 )

cmake/CliFboss2Test.cmake

@@ -2,11 +2,19 @@
 
 # cmd_test - Command tests from BUCK file
 add_executable(fboss2_cmd_test
+  fboss/cli/fboss2/oss/CmdListConfig.cpp
   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/CmdConfigInterfaceSwitchportAccessVlanTest.cpp
+  fboss/cli/fboss2/test/CmdConfigQosBufferPoolTest.cpp
   fboss/cli/fboss2/test/CmdConfigReloadTest.cpp
   fboss/cli/fboss2/test/CmdConfigSessionDiffTest.cpp
   fboss/cli/fboss2/test/CmdConfigSessionTest.cpp
+  fboss/cli/fboss2/test/CmdGetPcapTest.cpp
+  fboss/cli/fboss2/test/CmdListConfigTest.cpp
   fboss/cli/fboss2/test/CmdSetPortStateTest.cpp
   fboss/cli/fboss2/test/CmdShowAclTest.cpp
   fboss/cli/fboss2/test/CmdShowAgentSslTest.cpp
@@ -18,7 +26,6 @@ add_executable(fboss2_cmd_test
   fboss/cli/fboss2/test/CmdShowL2Test.cpp
   fboss/cli/fboss2/test/CmdShowLldpTest.cpp
   fboss/cli/fboss2/test/CmdShowNdpTest.cpp
-  fboss/cli/fboss2/test/CmdGetPcapTest.cpp
   fboss/cli/fboss2/test/CmdShowAggregatePortTest.cpp
   fboss/cli/fboss2/test/CmdShowCpuPortTest.cpp
   fboss/cli/fboss2/test/CmdShowExampleTest.cpp

fboss/cli/fboss2/BUCK

@@ -15,6 +15,15 @@ thrift_library(
     thrift_srcs = {"cli.thrift": []},
 )
 
+thrift_library(
+    name = "cli_metadata",
+    languages = [
+        "cpp2",
+    ],
+    thrift_cpp2_options = "json",
+    thrift_srcs = {"cli_metadata.thrift": []},
+)
+
 # NOTE: all of the actual command tree is managed inside CmdList.cpp
 # CmdList.h defines the data structure
 cpp_library(
@@ -146,6 +155,7 @@ cpp_library(
     name = "cmd-common-utils",
     srcs = [
         "utils/CmdUtilsCommon.cpp",
+        "utils/InterfaceList.cpp",
     ],
     headers = [
         "commands/clear/CmdClearUtils.h",
@@ -154,6 +164,7 @@ cpp_library(
         "utils/CmdUtilsCommon.h",
         "utils/FilterUtils.h",
         "utils/HostInfo.h",
+        "utils/InterfaceList.h",
     ],
     exported_deps = [
         ":cmd-global-options",
@@ -771,20 +782,42 @@ cpp_library(
         "CmdListConfig.cpp",
         "commands/config/CmdConfigAppliedInfo.cpp",
         "commands/config/CmdConfigReload.cpp",
+        "commands/config/history/CmdConfigHistory.cpp",
+        "commands/config/interface/CmdConfigInterfaceDescription.cpp",
+        "commands/config/interface/CmdConfigInterfaceMtu.cpp",
+        "commands/config/interface/switchport/access/vlan/CmdConfigInterfaceSwitchportAccessVlan.cpp",
+        "commands/config/qos/buffer_pool/CmdConfigQosBufferPoolHeadroomBytes.cpp",
+        "commands/config/qos/buffer_pool/CmdConfigQosBufferPoolReservedBytes.cpp",
+        "commands/config/qos/buffer_pool/CmdConfigQosBufferPoolSharedBytes.cpp",
+        "commands/config/rollback/CmdConfigRollback.cpp",
         "commands/config/session/CmdConfigSessionCommit.cpp",
         "commands/config/session/CmdConfigSessionDiff.cpp",
         "session/ConfigSession.cpp",
     ],
     headers = [
         "commands/config/CmdConfigAppliedInfo.h",
         "commands/config/CmdConfigReload.h",
+        "commands/config/history/CmdConfigHistory.h",
+        "commands/config/interface/CmdConfigInterface.h",
+        "commands/config/interface/CmdConfigInterfaceDescription.h",
+        "commands/config/interface/CmdConfigInterfaceMtu.h",
+        "commands/config/interface/switchport/CmdConfigInterfaceSwitchport.h",
+        "commands/config/interface/switchport/access/CmdConfigInterfaceSwitchportAccess.h",
+        "commands/config/interface/switchport/access/vlan/CmdConfigInterfaceSwitchportAccessVlan.h",
+        "commands/config/qos/CmdConfigQos.h",
+        "commands/config/qos/buffer_pool/CmdConfigQosBufferPool.h",
+        "commands/config/qos/buffer_pool/CmdConfigQosBufferPoolHeadroomBytes.h",
+        "commands/config/qos/buffer_pool/CmdConfigQosBufferPoolReservedBytes.h",
+        "commands/config/qos/buffer_pool/CmdConfigQosBufferPoolSharedBytes.h",
+        "commands/config/rollback/CmdConfigRollback.h",
         "commands/config/session/CmdConfigSessionCommit.h",
         "commands/config/session/CmdConfigSessionDiff.h",
         "session/ConfigSession.h",
     ],
     exported_deps = [
         "fbsource//third-party/fmt:fmt",
         "fbsource//third-party/re2:re2",
+        ":cli_metadata-cpp2-types",
         ":cmd-common-utils",
         ":cmd-handler",
         ":fboss2-lib",

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

@@ -12,6 +12,19 @@
 
 #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/interface/switchport/CmdConfigInterfaceSwitchport.h"
+#include "fboss/cli/fboss2/commands/config/interface/switchport/access/CmdConfigInterfaceSwitchportAccess.h"
+#include "fboss/cli/fboss2/commands/config/interface/switchport/access/vlan/CmdConfigInterfaceSwitchportAccessVlan.h"
+#include "fboss/cli/fboss2/commands/config/qos/CmdConfigQos.h"
+#include "fboss/cli/fboss2/commands/config/qos/buffer_pool/CmdConfigQosBufferPool.h"
+#include "fboss/cli/fboss2/commands/config/qos/buffer_pool/CmdConfigQosBufferPoolHeadroomBytes.h"
+#include "fboss/cli/fboss2/commands/config/qos/buffer_pool/CmdConfigQosBufferPoolReservedBytes.h"
+#include "fboss/cli/fboss2/commands/config/qos/buffer_pool/CmdConfigQosBufferPoolSharedBytes.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"
 
@@ -20,9 +33,38 @@ 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<
+    CmdConfigInterfaceSwitchport,
+    CmdConfigInterfaceSwitchportTraits>::run();
+template void CmdHandler<
+    CmdConfigInterfaceSwitchportAccess,
+    CmdConfigInterfaceSwitchportAccessTraits>::run();
+template void CmdHandler<
+    CmdConfigInterfaceSwitchportAccessVlan,
+    CmdConfigInterfaceSwitchportAccessVlanTraits>::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();
+template void CmdHandler<CmdConfigQos, CmdConfigQosTraits>::run();
+template void
+CmdHandler<CmdConfigQosBufferPool, CmdConfigQosBufferPoolTraits>::run();
+template void CmdHandler<
+    CmdConfigQosBufferPoolSharedBytes,
+    CmdConfigQosBufferPoolSharedBytesTraits>::run();
+template void CmdHandler<
+    CmdConfigQosBufferPoolHeadroomBytes,
+    CmdConfigQosBufferPoolHeadroomBytesTraits>::run();
+template void CmdHandler<
+    CmdConfigQosBufferPoolReservedBytes,
+    CmdConfigQosBufferPoolReservedBytesTraits>::run();
 
 } // namespace facebook::fboss

fboss/cli/fboss2/CmdListConfig.cpp

@@ -13,6 +13,19 @@
 #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/interface/switchport/CmdConfigInterfaceSwitchport.h"
+#include "fboss/cli/fboss2/commands/config/interface/switchport/access/CmdConfigInterfaceSwitchportAccess.h"
+#include "fboss/cli/fboss2/commands/config/interface/switchport/access/vlan/CmdConfigInterfaceSwitchportAccessVlan.h"
+#include "fboss/cli/fboss2/commands/config/qos/CmdConfigQos.h"
+#include "fboss/cli/fboss2/commands/config/qos/buffer_pool/CmdConfigQosBufferPool.h"
+#include "fboss/cli/fboss2/commands/config/qos/buffer_pool/CmdConfigQosBufferPoolHeadroomBytes.h"
+#include "fboss/cli/fboss2/commands/config/qos/buffer_pool/CmdConfigQosBufferPoolReservedBytes.h"
+#include "fboss/cli/fboss2/commands/config/qos/buffer_pool/CmdConfigQosBufferPoolSharedBytes.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"
 
@@ -26,6 +39,83 @@ const CommandTree& kConfigCommandTree() {
        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>,
+           },
+           {
+               "switchport",
+               "Configure switchport settings",
+               commandHandler<CmdConfigInterfaceSwitchport>,
+               argTypeHandler<CmdConfigInterfaceSwitchportTraits>,
+               {{
+                   "access",
+                   "Configure access mode settings",
+                   commandHandler<CmdConfigInterfaceSwitchportAccess>,
+                   argTypeHandler<CmdConfigInterfaceSwitchportAccessTraits>,
+                   {{
+                       "vlan",
+                       "Set access VLAN (ingressVlan) for the interface",
+                       commandHandler<CmdConfigInterfaceSwitchportAccessVlan>,
+                       argTypeHandler<
+                           CmdConfigInterfaceSwitchportAccessVlanTraits>,
+                   }},
+               }},
+           }},
+      },
+
+      {
+          "config",
+          "qos",
+          "Configure QoS settings",
+          commandHandler<CmdConfigQos>,
+          argTypeHandler<CmdConfigQosTraits>,
+          {{
+              "buffer-pool",
+              "Configure buffer pool settings",
+              commandHandler<CmdConfigQosBufferPool>,
+              argTypeHandler<CmdConfigQosBufferPoolTraits>,
+              {{
+                   "shared-bytes",
+                   "Set buffer pool shared bytes",
+                   commandHandler<CmdConfigQosBufferPoolSharedBytes>,
+                   argTypeHandler<CmdConfigQosBufferPoolSharedBytesTraits>,
+               },
+               {
+                   "headroom-bytes",
+                   "Set buffer pool headroom bytes",
+                   commandHandler<CmdConfigQosBufferPoolHeadroomBytes>,
+                   argTypeHandler<CmdConfigQosBufferPoolHeadroomBytesTraits>,
+               },
+               {
+                   "reserved-bytes",
+                   "Set buffer pool reserved bytes",
+                   commandHandler<CmdConfigQosBufferPoolReservedBytes>,
+                   argTypeHandler<CmdConfigQosBufferPoolReservedBytesTraits>,
+               }},
+          }},
+      },
+
       {
           "config",
           "session",
@@ -49,6 +139,12 @@ const CommandTree& kConfigCommandTree() {
        "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;

fboss/cli/fboss2/CmdSubcommands.cpp

@@ -219,10 +219,25 @@ 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_BUFFER_POOL_NAME:
+          subCmd->add_option("buffer_pool_name", args, "Buffer pool name");
+          break;
+        case utils::ObjectArgTypeId::OBJECT_ARG_TYPE_ID_BUFFER_BYTES:
+          subCmd->add_option("bytes", args, "Buffer size in bytes");
+          break;
+        case utils::ObjectArgTypeId::OBJECT_ARG_TYPE_VLAN_ID:
+          subCmd->add_option("vlan_id", args, "VLAN ID (1-4094)");
+          break;
         case utils::ObjectArgTypeId::OBJECT_ARG_TYPE_ID_UNINITIALIZE:
         case utils::ObjectArgTypeId::OBJECT_ARG_TYPE_ID_NONE:
           break;