[Nexthop][fboss2-dev] fboss2 config/delete protocol bgp peer-group commands - #1395
Open
hillol-nexthop wants to merge 8 commits into
Open
[Nexthop][fboss2-dev] fboss2 config/delete protocol bgp peer-group commands#1395hillol-nexthop wants to merge 8 commits into
hillol-nexthop wants to merge 8 commits into
Conversation
hillol-nexthop
force-pushed
the
bgp-peer-group
branch
from
July 20, 2026 07:08
208842a to
7699625
Compare
hillol-nexthop
force-pushed
the
bgp-peer-group
branch
from
July 21, 2026 15:14
856a6d5 to
4f223c9
Compare
hillol-nexthop
force-pushed
the
bgp-peer-group
branch
2 times, most recently
from
July 31, 2026 16:14
71ada08 to
92a6082
Compare
|
@hillol-nexthop has updated the pull request. You must reimport the pull request before landing. |
Contributor
|
This pull request has been imported. If you are a Meta employee, you can view this in D114376290. (Because this pull request was imported automatically, there will not be any future comments.) |
hillol-nexthop
force-pushed
the
bgp-peer-group
branch
from
August 3, 2026 03:14
92a6082 to
84951af
Compare
|
@hillol-nexthop has updated the pull request. You must reimport the pull request before landing. |
1 similar comment
|
@hillol-nexthop has updated the pull request. You must reimport the pull request before landing. |
hillol-nexthop
force-pushed
the
bgp-peer-group
branch
from
August 4, 2026 07:24
a7d3e63 to
690f8a8
Compare
|
@hillol-nexthop has updated the pull request. You must reimport the pull request before landing. |
hillol-nexthop
force-pushed
the
bgp-peer-group
branch
from
August 6, 2026 09:21
690f8a8 to
84a208a
Compare
|
@hillol-nexthop has updated the pull request. You must reimport the pull request before landing. |
hillol-nexthop
marked this pull request as draft
August 7, 2026 18:15
hillol-nexthop
force-pushed
the
bgp-peer-group
branch
from
August 7, 2026 19:29
84a208a to
c868417
Compare
|
@hillol-nexthop has updated the pull request. You must reimport the pull request before landing. |
Follow-up cleanups to the BGP-aware config session infra (facebook#1344): - Collapse the BGP_RESTART action level into AGENT_WARMBOOT (bgpd has no hitless reload; its restart already runs the agent-warmboot code path). - Introduce a single ConfigDomain descriptor + configDomains() and shared per-domain helpers so commit(), rollback() and `config session diff` handle the agent and BGP domains uniformly (private DiffDomain removed). - Make the agent skip-when-unchanged like BGP: a commit whose staged config equals what is already promoted is a true no-op (no git revision, no symlink churn, no reloadConfig()/bgpd restart). Change detection is semantic (compare the deserialized thrift structs), so formatting-only diffs don't count. - Consolidate `config session clear` onto a static stagedSessionFilePaths() and reuse ConfigSession::readStagedContent() in diff. - Make ConfigSession::saveConfig(service, level) generic over the service and reduce saveBgpConfig() to a thin wrapper. - Keep the heavy generated thrift headers out of ConfigSession.h: use the *_types_fwd.h forward-declaration headers, hold agentConfig_/bgpConfig_ by std::unique_ptr, and drop the configLoaded_/bgpConfigLoaded_ bools (null == not loaded). - clang-tidy: use auto for the SimpleJSONSerializer template-cast results. Built fboss2-dev + the config unit tests; config-session/commit/diff/BGP/clear tests pass. Verified the agent no-op behaviour live on test switches.
Removed comments about the destructor definition in ConfigSession.h.
…thInterface call main renamed findFirstEthInterface() to getRandomInterfacePortName() (virtual-management-port fix); convert the branch-added no-op-commit test to the new helper. Drop the three includes ConfigSession.cpp no longer uses directly (misc-include-cleaner runs as errors in CI).
hillol-nexthop
force-pushed
the
bgp-peer-group
branch
from
August 10, 2026 04:44
c868417 to
f3d968b
Compare
|
@hillol-nexthop has updated the pull request. You must reimport the pull request before landing. |
This was referenced Aug 10, 2026
This was referenced Aug 10, 2026
hillol-nexthop
force-pushed
the
bgp-peer-group
branch
from
August 10, 2026 05:43
f3d968b to
17e8d73
Compare
|
@hillol-nexthop has updated the pull request. You must reimport the pull request before landing. |
hillol-nexthop
marked this pull request as ready for review
August 10, 2026 09:54
Add `fboss2-dev config protocol bgp global <attr> <value>` on top of the BGP-aware ConfigSession (base PR). Edits the typed bgp::thrift::BgpConfig via ConfigSession::getBgpConfig()/saveBgpConfig() -- the whole-config, scope-agnostic typed API (no global/peer/peer-group special-casing in ConfigSession). - Collapse the 10 per-attribute global command classes into one dispatcher; reject cluster-id (no BgpConfig field) instead of writing dead config; bound switch-limit / max_golden_vips so out-of-range values aren't truncated. - Integration tests: ConfigBgpGlobalTest (each attr set+commit, verified in the promoted /etc/coop/bgpcpp/bgpcpp.conf) and ConfigBgpSessionTest (clear/diff/commit/rollback + a no-op-restart regression), sharing ConfigBgpTestBase. Test Plan: - bazel test //fboss/cli/fboss2/test/config:cmd_config_test - bazel build //fboss/cli/fboss2/test/integration_test:fboss2_integration_test - fboss2_integration_test on a DUT with bgp_pp active: ConfigBgpSessionTest 6/6 pass (clear, diff, commit-restarts-bgp_pp, rollback-restores-config, and the unchanged-config does-not-restart case); agent-session regression (ConfigInterfaceMtuTest) passes.
- Extract the value parsers (parseBool/parseInt/parseNonNegInt32, handler Result) into a shared BgpCliValueParsers.h so sibling BGP dispatchers can reuse them, and add a bounded parseAsn4Byte: local-asn/confed-asn accepted any uint64 and silently persisted out-of-range ASNs (>= 2^32 wrap the i64 field negative). - positionals_at_end() on the global command: CLI11's parent-chain subcommand fallthrough steals value tokens that match a sibling command name (e.g. a policy named "peer-group") and misparses the command. - Integration test base: probe the bgpd unit, and pass -c safe.directory=/etc/coop on the raw git invocations (gitHead / bgpTrackedAtRevision), mirroring the CLI's Git class -- /etc/coop is owned by another user (e.g. coop) on provisioned devices, which git otherwise rejects as dubious ownership and the helpers silently return empty results.
The commit-path global-attribute tests asserted on the promoted /etc/coop/bgpcpp/bgpcpp.conf, which only proves what the CLI wrote to disk. Route ConfigBgpTestBase::setAndCommit() through a new readRunningBgpConfigViaRpc() -- TBgpService::getRunningConfig against the local bgpd -- so every positive ConfigBgpGlobalTest asserts its attribute in the daemon's own view of its config, proving bgpd parsed and adopted the promoted file after the commit-triggered restart. The helper retries briefly on connection errors: systemd reports bgpd active as soon as the process starts, but its thrift server binds the port a few seconds later, so an RPC issued right after a restart races that window. Test Plan: - bazel build //fboss/cli/fboss2/test/integration_test:fboss2_integration_test - fboss2_integration_test on a DUT with bgpd active: ConfigBgpGlobalTest 7/7 pass (each attribute set+commit verified in bgpd's getRunningConfig view, plus the invalid-bool and negative-graceful-restart-time reject paths).
hillol-nexthop
force-pushed
the
bgp-peer-group
branch
from
August 10, 2026 10:12
17e8d73 to
372a647
Compare
|
@hillol-nexthop has updated the pull request. You must reimport the pull request before landing. |
Adds `config protocol bgp neighbor <ip-address> [<attribute> <value> ...]` and `delete protocol bgp neighbor <ip-address>` — the first per-peer BGP config family, beneath the `protocol bgp` grouping node. - neighbor dispatcher keyed by peer address, writing bgp_config.BgpPeer through the typed ConfigSession. Attributes cover the peer identity (remote/local ASN, description, peer-tag, peer-group), policy bindings (ingress/egress policy), session tunables (timers, route limits, next-hop, add-path, RR client, and the rest of the documented set), and the sheet-documented attributes bgpd does not support, which are rejected with an explanatory message rather than staged. - delete removes the peer by address. - ConfigBgpTestBase restores the committed BGP config after every test, so a failed run cannot leave a device carrying test config; commit-path integration tests verify each value through bgpd's own getRunningConfig RPC rather than only the staged file. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
…ands Collapses the 18 per-attribute `config protocol bgp peer-group` command classes (built on the deprecated `folly::dynamic` BgpConfigSession) into a single typed dispatcher, mirroring CmdConfigProtocolBgpNeighbor. Also adds `delete protocol bgp peer-group <name>`. The group name is the first positional token; the next one or two tokens name the attribute, matched longest-prefix-first so `timers hold-time` wins over any `timers` prefix; the rest are its value(s). Handlers mutate the typed bgp::thrift::PeerGroup through ConfigSession::getBgpConfig() / saveBgpConfig(), so adding a tunable is a one-entry change in the dispatch table rather than a new command class. 36 command files are deleted. - Covers the 29 dispatch keys that map to a PeerGroup thrift field: remote-asn / local-asn (4-byte-bounded), description, peer-tag, ingress-policy / egress-policy, rr-client, confed-peer, redistribute-peer, enhanced-route-refresh, connect-mode, add-path send|receive, afi disable-ipv4-afi|disable-ipv6-afi|ipv4-over-ipv6-nh, graceful-restart restart-time|stateful-ha, max-route pre-filter|post-filter (plus the warning-threshold / warning-only knobs), timers hold-time|keepalive|out-delay|withdraw-unprog-delay, and next-hop-self. - Rejected rather than persisted as dead config (precedent: cluster-id in the global command, connect-mode BOTH in the neighbor command): connect-mode BOTH, since thrift only models is_passive. add-path send|receive merges into the AddPath enum bitmask, and clearing the last direction unsets the field. - Attributes with no per-peer-group thrift field (afi ipv4-labeled-unicast, afi ipv6-labeled-unicast, peer-port) are absent from the dispatch table, so they are refused at parse time as unknown attributes; a rejected value never lands on disk. - positionals_at_end() stops parent-chain subcommand fallthrough from reclassifying an attribute token that matches a sibling command name once the group name has been consumed (same fix as the neighbor command). - unit tests (16): CmdConfigBgpPeerGroupTest (12) covering arg validation, longest-prefix match, the add-path merge matrix, connect-mode, the bool/string/route-limit attributes, value validation and unknown-attribute rejection, plus CmdDeleteBgpPeerGroupTest (4). - integration tests (3): ConfigBgpPeerGroupTest asserts the committed peer_groups through bgpd's getRunningConfig RPC, proving the daemon parsed and adopted the promoted config rather than only checking the file the CLI wrote. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
hillol-nexthop
force-pushed
the
bgp-peer-group
branch
from
August 10, 2026 13:56
372a647 to
e1c116a
Compare
|
@hillol-nexthop has updated the pull request. You must reimport the pull request before landing. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Collapses the ~20 legacy per-attribute
config protocol bgp peer-groupcommand classes (built on the deprecatedfolly::dynamicBgpConfigSession) into a single typed dispatcher, mirroringCmdConfigProtocolBgpNeighbor(#1391). The group name is the first positional token; the next one or two tokens name the attribute (matched longest-prefix-first, sotimers hold-timewins over anytimersprefix); the rest are its value(s). Handlers mutate the typedbgp::thrift::PeerGroupdirectly viaConfigSession::getBgpConfig()/saveBgpConfig(), so adding a tunable is a one-entry change in the dispatch table rather than a new command class.Also adds
delete protocol bgp peer-group <name>.Covers the 29 dispatch keys that map to a
PeerGroupthrift field:remote-asn/local-asn(4-byte-bounded),description,peer-tag,ingress-policy/egress-policy,rr-client,confed-peer,redistribute-peer,enhanced-route-refresh,connect-mode,add-path send|receive,afi disable-ipv4-afi|disable-ipv6-afi|ipv4-over-ipv6-nh,graceful-restart restart-time|stateful-ha,max-route pre-filter|post-filter(+ the warning-threshold/warning-only knobs),timers hold-time|keepalive|out-delay|withdraw-unprog-delay, andnext-hop-self.Behavior notes
cluster-idin the global PR,connect-mode BOTHin the neighbor PR):connect-mode BOTH(thrift only modelsis_passive).add-path send|receivemerges into theAddPathenum bitmask (RECEIVE/SEND/BOTH), and clearing the last direction unsets the field.afi ipv4-labeled-unicast,afi ipv6-labeled-unicast,peer-port— are not part of the dispatch table, so they are refused at parse time as unknown attributes; a rejected value never lands on disk.positionals_at_end()stops parent-chain subcommand fallthrough from reclassifying an attribute token that matches a sibling command name once the group name has been consumed.getRunningConfigRPC — provingbgpdparsed and adopted the promotedpeer_groupsrather than only checking the file the CLI wrote.Test Plan
Unit —
CmdConfigBgpPeerGroupTestFixture(12 tests: arg validation, longest-prefix match, add-path merge matrix, connect-mode, bool/string/route-limit attributes, value validation, unknown-attribute rejection) andCmdDeleteBgpPeerGroupTestFixture(4 tests). 16/16 pass.Integration on device (real
bgpddaemon),ConfigBgpPeerGroupTest: 11/11 pass, including commit-path tests that assertbgpdparses and adoptspeer_groupsvia itsgetRunningConfigRPC.Sample usage: