[Nexthop][fboss2-dev] Add CLI commands: config vlan port taggingMode and config l2 learning-mode

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
@@ -466,6 +473,8 @@ add_library(fboss2_lib
   fboss/cli/fboss2/commands/show/interface/prbs/stats/CmdShowInterfacePrbsStats.h
   fboss/cli/fboss2/commands/show/rif/CmdShowRif.h
   fboss/cli/fboss2/commands/show/rif/CmdShowRif.cpp
+  fboss/cli/fboss2/commands/show/running_config/CmdShowRunningConfig.cpp
+  fboss/cli/fboss2/commands/show/running_config/CmdShowRunningConfig.h
   fboss/cli/fboss2/commands/show/sdk/dump/CmdShowSdkDump.h
   fboss/cli/fboss2/commands/show/systemport/CmdShowSystemPort.h
   fboss/cli/fboss2/commands/show/systemport/CmdShowSystemPort.cpp
@@ -476,6 +485,7 @@ add_library(fboss2_lib
   fboss/cli/fboss2/commands/show/transceiver/CmdShowTransceiver.cpp
   fboss/cli/fboss2/commands/start/pcap/CmdStartPcap.h
   fboss/cli/fboss2/commands/stop/pcap/CmdStopPcap.h
+  fboss/cli/fboss2/CliAppInit.h
   fboss/cli/fboss2/CmdSubcommands.cpp
   fboss/cli/fboss2/oss/CmdGlobalOptions.cpp
   fboss/cli/fboss2/oss/CmdList.cpp
@@ -584,10 +594,34 @@ add_library(fboss2_config_lib
   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/CmdConfigInterfaceDescription.h
   fboss/cli/fboss2/commands/config/interface/CmdConfigInterfaceMtu.cpp
+  fboss/cli/fboss2/commands/config/interface/CmdConfigInterfaceMtu.h
+  fboss/cli/fboss2/commands/config/interface/CmdConfigInterfaceQueuingPolicy.cpp
+  fboss/cli/fboss2/commands/config/interface/CmdConfigInterfaceQueuingPolicy.h
+  fboss/cli/fboss2/commands/config/interface/pfc_config/CmdConfigInterfacePfcConfig.cpp
+  fboss/cli/fboss2/commands/config/interface/pfc_config/CmdConfigInterfacePfcConfig.h
+  fboss/cli/fboss2/commands/config/interface/pfc_config/PfcConfigUtils.h
+  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.cpp
+  fboss/cli/fboss2/commands/config/interface/switchport/access/vlan/CmdConfigInterfaceSwitchportAccessVlan.h
+  fboss/cli/fboss2/commands/config/l2/CmdConfigL2.h
+  fboss/cli/fboss2/commands/config/l2/learning_mode/CmdConfigL2LearningMode.h
+  fboss/cli/fboss2/commands/config/l2/learning_mode/CmdConfigL2LearningMode.cpp
+  fboss/cli/fboss2/commands/config/qos/CmdConfigQos.h
+  fboss/cli/fboss2/commands/config/qos/buffer_pool/CmdConfigQosBufferPool.cpp
+  fboss/cli/fboss2/commands/config/qos/buffer_pool/CmdConfigQosBufferPool.h
+  fboss/cli/fboss2/commands/config/qos/policy/CmdConfigQosPolicy.h
+  fboss/cli/fboss2/commands/config/qos/policy/CmdConfigQosPolicyMap.cpp
+  fboss/cli/fboss2/commands/config/qos/policy/CmdConfigQosPolicyMap.h
+  fboss/cli/fboss2/commands/config/qos/priority_group_policy/CmdConfigQosPriorityGroupPolicy.h
+  fboss/cli/fboss2/commands/config/qos/priority_group_policy/CmdConfigQosPriorityGroupPolicyGroupId.cpp
+  fboss/cli/fboss2/commands/config/qos/priority_group_policy/CmdConfigQosPriorityGroupPolicyGroupId.h
+  fboss/cli/fboss2/commands/config/qos/queuing_policy/CmdConfigQosQueuingPolicy.h
+  fboss/cli/fboss2/commands/config/qos/queuing_policy/CmdConfigQosQueuingPolicyQueueId.cpp
+  fboss/cli/fboss2/commands/config/qos/queuing_policy/CmdConfigQosQueuingPolicyQueueId.h
   fboss/cli/fboss2/commands/config/history/CmdConfigHistory.h
   fboss/cli/fboss2/commands/config/history/CmdConfigHistory.cpp
   fboss/cli/fboss2/commands/config/rollback/CmdConfigRollback.h
@@ -596,15 +630,29 @@ add_library(fboss2_config_lib
   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/commands/config/session/CmdConfigSessionRebase.h
+  fboss/cli/fboss2/commands/config/session/CmdConfigSessionRebase.cpp
+  fboss/cli/fboss2/commands/config/vlan/CmdConfigVlan.h
+  fboss/cli/fboss2/commands/config/vlan/port/CmdConfigVlanPort.h
+  fboss/cli/fboss2/commands/config/vlan/port/tagging_mode/CmdConfigVlanPortTaggingMode.h
+  fboss/cli/fboss2/commands/config/vlan/port/tagging_mode/CmdConfigVlanPortTaggingMode.cpp
+  fboss/cli/fboss2/commands/config/vlan/static_mac/CmdConfigVlanStaticMac.h
+  fboss/cli/fboss2/commands/config/vlan/static_mac/add/CmdConfigVlanStaticMacAdd.h
+  fboss/cli/fboss2/commands/config/vlan/static_mac/add/CmdConfigVlanStaticMacAdd.cpp
+  fboss/cli/fboss2/commands/config/vlan/static_mac/delete/CmdConfigVlanStaticMacDelete.h
+  fboss/cli/fboss2/commands/config/vlan/static_mac/delete/CmdConfigVlanStaticMacDelete.cpp
   fboss/cli/fboss2/session/ConfigSession.h
   fboss/cli/fboss2/session/ConfigSession.cpp
+  fboss/cli/fboss2/session/Git.h
+  fboss/cli/fboss2/session/Git.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
+  cli_metadata
   fboss2_lib
   agent_dir_util
 )

cmake/CliFboss2Test.cmake

@@ -33,14 +33,22 @@ gtest_discover_tests(fboss2_framework_test)
 
 # 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/CmdConfigL2LearningModeTest.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/CmdConfigVlanPortTaggingModeTest.cpp
+  fboss/cli/fboss2/test/CmdConfigVlanStaticMacTest.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
@@ -52,7 +60,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
@@ -69,10 +76,12 @@ add_executable(fboss2_cmd_test
   fboss/cli/fboss2/test/CmdShowProductTest.cpp
   fboss/cli/fboss2/test/CmdShowRouteDetailsTest.cpp
   fboss/cli/fboss2/test/CmdShowRouteSummaryTest.cpp
+  fboss/cli/fboss2/test/CmdShowRunningConfigTest.cpp
   fboss/cli/fboss2/test/CmdShowTeFlowTest.cpp
   # 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/GitTest.cpp
   fboss/cli/fboss2/test/PortMapTest.cpp
 )
 
@@ -105,3 +114,33 @@ target_link_libraries(thrift_latency_test
   Folly::folly
   FBThrift::thriftcpp2
 )
+
+# cli_test - CLI E2E test binary
+#
+# CLI tests are platform/SAI independent - they test the CLI binary which
+# communicates with the agent via Thrift, without running the actual fboss2-dev
+# binary.
+add_executable(cli_test
+  fboss/cli/fboss2/oss/CmdListConfig.cpp
+  fboss/cli/test/CliTest.cpp
+  fboss/cli/test/ConfigInterfaceDescriptionTest.cpp
+  fboss/cli/test/ConfigInterfaceMtuTest.cpp
+)
+
+target_link_libraries(cli_test
+  fboss2_lib
+  fboss2_config_lib
+  thrift_service_utils
+  CLI11::CLI11
+  ${GTEST}
+  ${LIBGMOCK_LIBRARIES}
+  Folly::folly
+  Folly::folly_test_util
+  FBThrift::thriftcpp2
+  gflags
+  fmt::fmt
+)
+
+target_include_directories(cli_test PUBLIC
+  ${CMAKE_SOURCE_DIR}
+)

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(
@@ -70,6 +79,7 @@ cpp_library(
         "CmdSubcommands.cpp",
     ],
     headers = [
+        "CliAppInit.h",
         "CmdArgsLists.h",
         "CmdSubcommands.h",
     ],
@@ -321,6 +331,7 @@ cpp_library(
         "commands/show/port/CmdShowPortQueue.cpp",
         "commands/show/rif/CmdShowRif.cpp",
         "commands/show/route/utils.cpp",
+        "commands/show/running_config/CmdShowRunningConfig.cpp",
         "commands/show/systemport/CmdShowSystemPort.cpp",
         "commands/show/transceiver/CmdShowTransceiver.cpp",
         "facebook/CmdHandlerImpl.cpp",
@@ -495,6 +506,7 @@ cpp_library(
         "commands/show/product/CmdShowProduct.h",
         "commands/show/product/CmdShowProductDetails.h",
         "commands/show/rif/CmdShowRif.h",
+        "commands/show/running_config/CmdShowRunningConfig.h",
         "commands/show/route/CmdShowRoute.h",
         "commands/show/route/CmdShowRouteDetails.h",
         "commands/show/route/CmdShowRouteSummary.h",
@@ -792,10 +804,23 @@ cpp_library(
         "commands/config/history/CmdConfigHistory.cpp",
         "commands/config/interface/CmdConfigInterfaceDescription.cpp",
         "commands/config/interface/CmdConfigInterfaceMtu.cpp",
+        "commands/config/interface/CmdConfigInterfaceQueuingPolicy.cpp",
+        "commands/config/interface/pfc_config/CmdConfigInterfacePfcConfig.cpp",
+        "commands/config/interface/switchport/access/vlan/CmdConfigInterfaceSwitchportAccessVlan.cpp",
+        "commands/config/l2/learning_mode/CmdConfigL2LearningMode.cpp",
+        "commands/config/qos/buffer_pool/CmdConfigQosBufferPool.cpp",
+        "commands/config/qos/policy/CmdConfigQosPolicyMap.cpp",
+        "commands/config/qos/priority_group_policy/CmdConfigQosPriorityGroupPolicyGroupId.cpp",
+        "commands/config/qos/queuing_policy/CmdConfigQosQueuingPolicyQueueId.cpp",
         "commands/config/rollback/CmdConfigRollback.cpp",
         "commands/config/session/CmdConfigSessionCommit.cpp",
         "commands/config/session/CmdConfigSessionDiff.cpp",
+        "commands/config/session/CmdConfigSessionRebase.cpp",
+        "commands/config/vlan/port/tagging_mode/CmdConfigVlanPortTaggingMode.cpp",
+        "commands/config/vlan/static_mac/add/CmdConfigVlanStaticMacAdd.cpp",
+        "commands/config/vlan/static_mac/delete/CmdConfigVlanStaticMacDelete.cpp",
         "session/ConfigSession.cpp",
+        "session/Git.cpp",
         "utils/InterfaceList.cpp",
     ],
     headers = [
@@ -805,16 +830,41 @@ cpp_library(
         "commands/config/interface/CmdConfigInterface.h",
         "commands/config/interface/CmdConfigInterfaceDescription.h",
         "commands/config/interface/CmdConfigInterfaceMtu.h",
+        "commands/config/interface/CmdConfigInterfaceQueuingPolicy.h",
+        "commands/config/interface/pfc_config/CmdConfigInterfacePfcConfig.h",
+        "commands/config/interface/pfc_config/PfcConfigUtils.h",
+        "commands/config/interface/switchport/CmdConfigInterfaceSwitchport.h",
+        "commands/config/interface/switchport/access/CmdConfigInterfaceSwitchportAccess.h",
+        "commands/config/interface/switchport/access/vlan/CmdConfigInterfaceSwitchportAccessVlan.h",
+        "commands/config/l2/CmdConfigL2.h",
+        "commands/config/l2/learning_mode/CmdConfigL2LearningMode.h",
+        "commands/config/qos/CmdConfigQos.h",
+        "commands/config/qos/buffer_pool/CmdConfigQosBufferPool.h",
+        "commands/config/qos/policy/CmdConfigQosPolicy.h",
+        "commands/config/qos/policy/CmdConfigQosPolicyMap.h",
+        "commands/config/qos/priority_group_policy/CmdConfigQosPriorityGroupPolicy.h",
+        "commands/config/qos/priority_group_policy/CmdConfigQosPriorityGroupPolicyGroupId.h",
+        "commands/config/qos/queuing_policy/CmdConfigQosQueuingPolicy.h",
+        "commands/config/qos/queuing_policy/CmdConfigQosQueuingPolicyQueueId.h",
         "commands/config/rollback/CmdConfigRollback.h",
         "commands/config/session/CmdConfigSessionCommit.h",
         "commands/config/session/CmdConfigSessionDiff.h",
+        "commands/config/session/CmdConfigSessionRebase.h",
+        "commands/config/vlan/CmdConfigVlan.h",
+        "commands/config/vlan/port/CmdConfigVlanPort.h",
+        "commands/config/vlan/port/tagging_mode/CmdConfigVlanPortTaggingMode.h",
+        "commands/config/vlan/static_mac/CmdConfigVlanStaticMac.h",
+        "commands/config/vlan/static_mac/add/CmdConfigVlanStaticMacAdd.h",
+        "commands/config/vlan/static_mac/delete/CmdConfigVlanStaticMacDelete.h",
         "session/ConfigSession.h",
+        "session/Git.h",
         "utils/InterfaceList.h",
     ],
     exported_deps = [
         "fbsource//third-party/fmt:fmt",
         "fbsource//third-party/glog:glog",
         "fbsource//third-party/re2:re2",
+        ":cli_metadata-cpp2-types",
         ":cmd-common-utils",
         ":cmd-handler",
         ":fboss2-lib",

fboss/cli/fboss2/CliAppInit.h

@@ -0,0 +1,37 @@
+/*
+ *  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 <CLI/App.hpp>
+#include "fboss/cli/fboss2/CmdGlobalOptions.h"
+#include "fboss/cli/fboss2/CmdList.h"
+#include "fboss/cli/fboss2/CmdSubcommands.h"
+
+namespace facebook::fboss::utils {
+
+/**
+ * Initialize the CLI app with global options and command tree.
+ * This sets up the CLI infrastructure and should be called before parsing.
+ *
+ * This function is shared between the main CLI binary and CLI E2E tests
+ * to ensure consistent CLI initialization.
+ */
+inline void initApp(CLI::App& app) {
+  app.require_subcommand();
+
+  // Initialize global options (--fmt, --host, etc.)
+  CmdGlobalOptions::getInstance()->init(app);
+
+  // Initialize command tree with all available commands
+  CmdSubcommands::getInstance()->init(
+      app, kCommandTree(), kAdditionalCommandTree(), kSpecialCommands());
+}
+
+} // namespace facebook::fboss::utils