fboss2 config/delete protocol bgp policy as-path-list commands

Adds `config protocol bgp policy as-path-list <name> [entry <seq-num>]
[<attribute> <value> ...]` and `delete protocol bgp policy as-path-list
<name>` — the first of the BGP policy object-type command families,
under a new `policy` grouping node (config + delete) beneath
`protocol bgp` (sibling to global/neighbor/peer-group).

- as-path-list dispatcher with a two-level key (list name + entry
  sequence-number) writing bgp_policy.BgpPolicies.aspath_lists[] through
  the typed ConfigSession; asn-regexp sets the AsPathType union's inline
  AsPath arm (.as_path.as_path.asn_regexp), match-logic maps to
  MatchValueLogicOperator, plus per-list and per-entry description.
- shared template attribute-handler factories (BgpCliAttrHandlers.h),
  reused by the upcoming community-list/prefix-list/routing-policy types.
- unit tests (16) + integration (10/10) on an NH-4010-F device. The
  commit-path integration tests confirm bgpd accepts and adopts the
  .policies blob end-to-end via the getRunningConfig RPC.

Author: hillol-nexthop

cmake/CliFboss2.cmake

@@ -866,6 +866,11 @@ add_library(fboss2_config_lib
   fboss/cli/fboss2/commands/config/protocol/bgp/neighbor/CmdConfigProtocolBgpNeighbor.h
   fboss/cli/fboss2/commands/config/protocol/bgp/peer-group/CmdConfigProtocolBgpPeerGroup.cpp
   fboss/cli/fboss2/commands/config/protocol/bgp/peer-group/CmdConfigProtocolBgpPeerGroup.h
+  fboss/cli/fboss2/commands/config/protocol/bgp/BgpCliAttrHandlers.h
+  fboss/cli/fboss2/commands/config/protocol/bgp/policy/CmdConfigProtocolBgpPolicy.cpp
+  fboss/cli/fboss2/commands/config/protocol/bgp/policy/CmdConfigProtocolBgpPolicy.h
+  fboss/cli/fboss2/commands/config/protocol/bgp/policy/as-path-list/CmdConfigProtocolBgpPolicyAsPathList.cpp
+  fboss/cli/fboss2/commands/config/protocol/bgp/policy/as-path-list/CmdConfigProtocolBgpPolicyAsPathList.h
   fboss/cli/fboss2/commands/config/ptp/CmdConfigPtp.cpp
   fboss/cli/fboss2/commands/config/ptp/CmdConfigPtp.h
   fboss/cli/fboss2/commands/config/ptp/transparent_clock/CmdConfigPtpTransparentClock.cpp
@@ -964,6 +969,10 @@ add_library(fboss2_config_lib
   fboss/cli/fboss2/commands/delete/protocol/bgp/neighbor/CmdDeleteProtocolBgpNeighbor.h
   fboss/cli/fboss2/commands/delete/protocol/bgp/peer-group/CmdDeleteProtocolBgpPeerGroup.cpp
   fboss/cli/fboss2/commands/delete/protocol/bgp/peer-group/CmdDeleteProtocolBgpPeerGroup.h
+  fboss/cli/fboss2/commands/delete/protocol/bgp/policy/CmdDeleteProtocolBgpPolicy.cpp
+  fboss/cli/fboss2/commands/delete/protocol/bgp/policy/CmdDeleteProtocolBgpPolicy.h
+  fboss/cli/fboss2/commands/delete/protocol/bgp/policy/as-path-list/CmdDeleteProtocolBgpPolicyAsPathList.cpp
+  fboss/cli/fboss2/commands/delete/protocol/bgp/policy/as-path-list/CmdDeleteProtocolBgpPolicyAsPathList.h
   fboss/cli/fboss2/commands/delete/protocol/CmdDeleteProtocol.h
   fboss/cli/fboss2/commands/delete/protocol/static/CmdDeleteProtocolStatic.cpp
   fboss/cli/fboss2/commands/delete/protocol/static/CmdDeleteProtocolStatic.h

fboss/cli/fboss2/BUCK

@@ -1071,6 +1071,8 @@ cpp_library(
         "commands/config/protocol/bgp/global/CmdConfigProtocolBgpGlobal.cpp",
         "commands/config/protocol/bgp/neighbor/CmdConfigProtocolBgpNeighbor.cpp",
         "commands/config/protocol/bgp/peer-group/CmdConfigProtocolBgpPeerGroup.cpp",
+        "commands/config/protocol/bgp/policy/CmdConfigProtocolBgpPolicy.cpp",
+        "commands/config/protocol/bgp/policy/as-path-list/CmdConfigProtocolBgpPolicyAsPathList.cpp",
         "commands/config/protocol/static/CmdConfigProtocolStatic.cpp",
         "commands/config/protocol/static/route/add/CmdConfigProtocolStaticRouteAdd.cpp",
         "commands/config/ptp/CmdConfigPtp.cpp",
@@ -1112,6 +1114,8 @@ cpp_library(
         "commands/delete/protocol/bgp/CmdDeleteProtocolBgp.cpp",
         "commands/delete/protocol/bgp/neighbor/CmdDeleteProtocolBgpNeighbor.cpp",
         "commands/delete/protocol/bgp/peer-group/CmdDeleteProtocolBgpPeerGroup.cpp",
+        "commands/delete/protocol/bgp/policy/CmdDeleteProtocolBgpPolicy.cpp",
+        "commands/delete/protocol/bgp/policy/as-path-list/CmdDeleteProtocolBgpPolicyAsPathList.cpp",
         "commands/delete/protocol/static/CmdDeleteProtocolStatic.cpp",
         "commands/delete/protocol/static/route/CmdDeleteProtocolStaticRoute.cpp",
         "commands/delete/tunnel/CmdDeleteTunnel.cpp",
@@ -1162,6 +1166,9 @@ cpp_library(
         "commands/config/protocol/bgp/global/CmdConfigProtocolBgpGlobal.h",
         "commands/config/protocol/bgp/neighbor/CmdConfigProtocolBgpNeighbor.h",
         "commands/config/protocol/bgp/peer-group/CmdConfigProtocolBgpPeerGroup.h",
+        "commands/config/protocol/bgp/BgpCliAttrHandlers.h",
+        "commands/config/protocol/bgp/policy/CmdConfigProtocolBgpPolicy.h",
+        "commands/config/protocol/bgp/policy/as-path-list/CmdConfigProtocolBgpPolicyAsPathList.h",
         "commands/config/protocol/static/CmdConfigProtocolStatic.h",
         "commands/config/protocol/static/route/StaticRouteUtils.h",
         "commands/config/protocol/static/route/add/CmdConfigProtocolStaticRouteAdd.h",
@@ -1204,6 +1211,8 @@ cpp_library(
         "commands/delete/protocol/bgp/CmdDeleteProtocolBgp.h",
         "commands/delete/protocol/bgp/neighbor/CmdDeleteProtocolBgpNeighbor.h",
         "commands/delete/protocol/bgp/peer-group/CmdDeleteProtocolBgpPeerGroup.h",
+        "commands/delete/protocol/bgp/policy/CmdDeleteProtocolBgpPolicy.h",
+        "commands/delete/protocol/bgp/policy/as-path-list/CmdDeleteProtocolBgpPolicyAsPathList.h",
         "commands/delete/protocol/static/CmdDeleteProtocolStatic.h",
         "commands/delete/protocol/static/route/CmdDeleteProtocolStaticRoute.h",
         "commands/delete/tunnel/CmdDeleteTunnel.h",

fboss/cli/fboss2/CmdListConfig.cpp

@@ -39,6 +39,8 @@
 #include "fboss/cli/fboss2/commands/config/protocol/bgp/global/CmdConfigProtocolBgpGlobal.h"
 #include "fboss/cli/fboss2/commands/config/protocol/bgp/neighbor/CmdConfigProtocolBgpNeighbor.h"
 #include "fboss/cli/fboss2/commands/config/protocol/bgp/peer-group/CmdConfigProtocolBgpPeerGroup.h"
+#include "fboss/cli/fboss2/commands/config/protocol/bgp/policy/CmdConfigProtocolBgpPolicy.h"
+#include "fboss/cli/fboss2/commands/config/protocol/bgp/policy/as-path-list/CmdConfigProtocolBgpPolicyAsPathList.h"
 #include "fboss/cli/fboss2/commands/config/protocol/static/CmdConfigProtocolStatic.h"
 #include "fboss/cli/fboss2/commands/config/protocol/static/route/add/CmdConfigProtocolStaticRouteAdd.h"
 #include "fboss/cli/fboss2/commands/config/ptp/CmdConfigPtp.h"
@@ -79,6 +81,8 @@
 #include "fboss/cli/fboss2/commands/delete/protocol/bgp/CmdDeleteProtocolBgp.h"
 #include "fboss/cli/fboss2/commands/delete/protocol/bgp/neighbor/CmdDeleteProtocolBgpNeighbor.h"
 #include "fboss/cli/fboss2/commands/delete/protocol/bgp/peer-group/CmdDeleteProtocolBgpPeerGroup.h"
+#include "fboss/cli/fboss2/commands/delete/protocol/bgp/policy/CmdDeleteProtocolBgpPolicy.h"
+#include "fboss/cli/fboss2/commands/delete/protocol/bgp/policy/as-path-list/CmdDeleteProtocolBgpPolicyAsPathList.h"
 #include "fboss/cli/fboss2/commands/delete/protocol/static/CmdDeleteProtocolStatic.h"
 #include "fboss/cli/fboss2/commands/delete/protocol/static/route/CmdDeleteProtocolStaticRoute.h"
 #include "fboss/cli/fboss2/commands/delete/tunnel/CmdDeleteTunnel.h"
@@ -357,6 +361,23 @@ const CommandTree& kConfigCommandTree() {
                           commandHandler<CmdConfigProtocolBgpNeighbor>,
                           argRegistrar<CmdConfigProtocolBgpNeighborTraits>,
                       },
+                      {
+                          "policy",
+                          "Configure BGP policy objects",
+                          commandHandler<CmdConfigProtocolBgpPolicy>,
+                          argRegistrar<CmdConfigProtocolBgpPolicyTraits>,
+                          {{
+                              "as-path-list",
+                              "Configure BGP AS-path list: <name> "
+                              "[entry <seq-num>] [<attribute> <value> ...] "
+                              "(description; entry <seq-num> "
+                              "asn-regexp|description|match-logic)",
+                              commandHandler<
+                                  CmdConfigProtocolBgpPolicyAsPathList>,
+                              argRegistrar<
+                                  CmdConfigProtocolBgpPolicyAsPathListTraits>,
+                          }},
+                      },
                   },
               },
               {
@@ -615,6 +636,19 @@ const CommandTree& kConfigCommandTree() {
                     "Delete a BGP peer-group: <name>",
                     commandHandler<CmdDeleteProtocolBgpPeerGroup>,
                     argRegistrar<CmdDeleteProtocolBgpPeerGroupTraits>,
+                },
+                {
+                    "policy",
+                    "Delete BGP policy objects",
+                    commandHandler<CmdDeleteProtocolBgpPolicy>,
+                    argTypeHandler<CmdDeleteProtocolBgpPolicyTraits>,
+                    {{
+                        "as-path-list",
+                        "Delete a BGP AS-path list: <name>",
+                        commandHandler<CmdDeleteProtocolBgpPolicyAsPathList>,
+                        argRegistrar<
+                            CmdDeleteProtocolBgpPolicyAsPathListTraits>,
+                    }},
                 }},
            },
            {

fboss/cli/fboss2/commands/config/protocol/bgp/BgpCliAttrHandlers.h

@@ -0,0 +1,108 @@
+/*
+ *  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 <fmt/core.h>
+#include <cstddef>
+#include <functional>
+#include <optional>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
+#include "fboss/cli/fboss2/commands/config/protocol/bgp/BgpCliValueParsers.h"
+#include "fmt/format.h"
+
+/**
+ * Generic, target-typed per-attribute handler factories shared by the BGP
+ * `config protocol bgp policy ...` dispatchers.
+ *
+ * Unlike the per-command factories in the neighbor/peer-group dispatchers
+ * (which are hard-wired to a single thrift struct), these are templated on the
+ * target type T so the same parsing/validation logic can mutate any policy
+ * object (AsPathList, AsPathListEntry, and — as later object types land —
+ * CommunityList, PrefixList, BgpPolicyTerm, ...). A handler validates its
+ * tokens and either mutates T or returns an error the caller surfaces without
+ * persisting.
+ */
+namespace facebook::fboss::bgpcli {
+
+using Tokens = std::vector<std::string>;
+
+// A per-attribute handler mutating a typed thrift target T in place.
+template <typename T>
+using AttrHandler = std::function<Result(T&, const Tokens&)>;
+
+// A single-token string value (names, regex patterns, policy names).
+template <typename T>
+AttrHandler<T> stringAttr(
+    std::string_view name,
+    std::string_view valueName,
+    std::function<void(T&, const std::string&)> set) {
+  return [name, valueName, set = std::move(set)](
+             T& target, const Tokens& values) -> Result {
+    if (values.size() != 1) {
+      return err(fmt::format("Error: {} requires <{}>", name, valueName));
+    }
+    set(target, values[0]);
+    return ok(fmt::format("Successfully set {} to: {}", name, values[0]));
+  };
+}
+
+// A free-text string value that may span multiple CLI tokens (descriptions);
+// the tokens are re-joined with single spaces.
+template <typename T>
+AttrHandler<T> joinedStringAttr(
+    std::string_view name,
+    std::function<void(T&, const std::string&)> set) {
+  return
+      [name, set = std::move(set)](T& target, const Tokens& values) -> Result {
+        if (values.empty()) {
+          return err(fmt::format("Error: {} requires <string>", name));
+        }
+        std::string joined = values[0];
+        for (size_t i = 1; i < values.size(); ++i) {
+          joined += " " + values[i];
+        }
+        set(target, joined);
+        return ok(fmt::format("Successfully set {} to: {}", name, joined));
+      };
+}
+
+// A value drawn from a fixed set of names, mapped to an enum by `lookup`
+// (returns std::nullopt for an unrecognized name). `valueDesc` documents the
+// accepted names in both the usage and the rejection message.
+template <typename T, typename Enum>
+AttrHandler<T> enumAttr(
+    std::string_view name,
+    std::string_view valueDesc,
+    std::function<std::optional<Enum>(const std::string&)> lookup,
+    std::function<void(T&, Enum)> set) {
+  return [name, valueDesc, lookup = std::move(lookup), set = std::move(set)](
+             T& target, const Tokens& values) -> Result {
+    if (values.size() != 1) {
+      return err(fmt::format("Error: {} requires <{}>", name, valueDesc));
+    }
+    auto parsed = lookup(values[0]);
+    if (!parsed) {
+      return err(
+          fmt::format(
+              "Error: Invalid {} value '{}'; expected {}",
+              name,
+              values[0],
+              valueDesc));
+    }
+    set(target, *parsed);
+    return ok(fmt::format("Successfully set {} to: {}", name, values[0]));
+  };
+}
+
+} // namespace facebook::fboss::bgpcli

fboss/cli/fboss2/commands/config/protocol/bgp/policy/CmdConfigProtocolBgpPolicy.cpp

@@ -0,0 +1,30 @@
+/*
+ *  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/protocol/bgp/policy/CmdConfigProtocolBgpPolicy.h"
+
+#include "fboss/cli/fboss2/CmdHandler.cpp"
+
+namespace facebook::fboss {
+
+CmdConfigProtocolBgpPolicyTraits::RetType
+CmdConfigProtocolBgpPolicy::queryClient(const HostInfo& /* hostInfo */) {
+  return "BGP policy configuration. Use subcommands: as-path-list";
+}
+
+void CmdConfigProtocolBgpPolicy::printOutput(const RetType& output) {
+  std::cout << output << std::endl;
+}
+
+// Explicit template instantiation
+template void
+CmdHandler<CmdConfigProtocolBgpPolicy, CmdConfigProtocolBgpPolicyTraits>::run();
+
+} // namespace facebook::fboss

fboss/cli/fboss2/commands/config/protocol/bgp/policy/CmdConfigProtocolBgpPolicy.h

@@ -0,0 +1,40 @@
+/*
+ *  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 "fboss/cli/fboss2/CmdHandler.h"
+#include "fboss/cli/fboss2/commands/config/protocol/bgp/CmdConfigProtocolBgp.h"
+
+namespace facebook::fboss {
+
+// Grouping node for `config protocol bgp policy <object-type> ...`. Holds no
+// state of its own; the per-object-type dispatchers (as-path-list, and later
+// community-list/prefix-list/routing-policy) are its subcommands. Mirrors
+// CmdConfigProtocolBgp.
+struct CmdConfigProtocolBgpPolicyTraits : public WriteCommandTraits {
+  using ParentCmd = CmdConfigProtocolBgp;
+  using ObjectArgType = std::monostate;
+  using RetType = std::string;
+};
+
+class CmdConfigProtocolBgpPolicy : public CmdHandler<
+                                       CmdConfigProtocolBgpPolicy,
+                                       CmdConfigProtocolBgpPolicyTraits> {
+ public:
+  using ObjectArgType = CmdConfigProtocolBgpPolicyTraits::ObjectArgType;
+  using RetType = CmdConfigProtocolBgpPolicyTraits::RetType;
+
+  RetType queryClient(const HostInfo& hostInfo);
+
+  void printOutput(const RetType& output);
+};
+
+} // namespace facebook::fboss