diff --git a/cmake/CliFboss2.cmake b/cmake/CliFboss2.cmake index eb61602dcc8..78d42dbf0c3 100644 --- a/cmake/CliFboss2.cmake +++ b/cmake/CliFboss2.cmake @@ -1374,6 +1374,8 @@ add_library(fboss2_config_lib fboss/cli/fboss2/commands/config/session/CmdConfigSessionRebase.cpp fboss/cli/fboss2/commands/config/mirror/CmdConfigMirror.cpp fboss/cli/fboss2/commands/config/mirror/CmdConfigMirror.h + fboss/cli/fboss2/commands/config/sflow_collector/CmdConfigSflowCollector.cpp + fboss/cli/fboss2/commands/config/sflow_collector/CmdConfigSflowCollector.h fboss/cli/fboss2/commands/config/traffic_counter/CmdConfigTrafficCounter.cpp fboss/cli/fboss2/commands/config/traffic_counter/CmdConfigTrafficCounter.h fboss/cli/fboss2/commands/config/tunnel/CmdConfigTunnel.cpp @@ -1490,6 +1492,8 @@ add_library(fboss2_config_lib fboss/cli/fboss2/commands/delete/switch/admin_distance/CmdDeleteAdminDistance.h fboss/cli/fboss2/commands/delete/switch/icmpv4_unavailable_src_addr/CmdDeleteIcmpV4UnavailableSrcAddr.cpp fboss/cli/fboss2/commands/delete/switch/icmpv4_unavailable_src_addr/CmdDeleteIcmpV4UnavailableSrcAddr.h + fboss/cli/fboss2/commands/delete/sflow_collector/CmdDeleteSflowCollector.cpp + fboss/cli/fboss2/commands/delete/sflow_collector/CmdDeleteSflowCollector.h fboss/cli/fboss2/commands/delete/traffic_counter/CmdDeleteTrafficCounter.cpp fboss/cli/fboss2/commands/delete/traffic_counter/CmdDeleteTrafficCounter.h fboss/cli/fboss2/commands/delete/tunnel/CmdDeleteTunnel.cpp diff --git a/cmake/CliFboss2TestConfig.cmake b/cmake/CliFboss2TestConfig.cmake index 117741ff150..6138ad1f418 100644 --- a/cmake/CliFboss2TestConfig.cmake +++ b/cmake/CliFboss2TestConfig.cmake @@ -37,6 +37,7 @@ add_executable(fboss2_cmd_config_test fboss/cli/fboss2/test/config/CmdConfigPtpTransparentClockTest.cpp fboss/cli/fboss2/test/config/CmdConfigMacAgingTimeTest.cpp fboss/cli/fboss2/test/config/CmdConfigMirrorTest.cpp + fboss/cli/fboss2/test/config/CmdConfigSflowCollectorTest.cpp fboss/cli/fboss2/test/config/CmdConfigLoadBalancingTest.cpp fboss/cli/fboss2/test/config/CmdConfigQosBufferPoolTest.cpp fboss/cli/fboss2/test/config/CmdConfigQosDefaultPolicyTest.cpp diff --git a/fboss/cli/fboss2/BUCK b/fboss/cli/fboss2/BUCK index aad2e7709f2..19957ed8cc8 100644 --- a/fboss/cli/fboss2/BUCK +++ b/fboss/cli/fboss2/BUCK @@ -1303,6 +1303,7 @@ cpp_library( "commands/config/switch/admin_distance/CmdConfigAdminDistance.cpp", "commands/config/switch/hostname/CmdConfigHostname.cpp", "commands/config/switch/icmpv4_unavailable_src_addr/CmdConfigIcmpV4UnavailableSrcAddr.cpp", + "commands/config/sflow_collector/CmdConfigSflowCollector.cpp", "commands/config/traffic_counter/CmdConfigTrafficCounter.cpp", "commands/config/tunnel/CmdConfigTunnel.cpp", "commands/config/tunnel/ip_in_ip/CmdConfigTunnelIpInIp.cpp", @@ -1369,6 +1370,7 @@ cpp_library( "commands/delete/switch/CmdDeleteSwitch.cpp", "commands/delete/switch/admin_distance/CmdDeleteAdminDistance.cpp", "commands/delete/switch/icmpv4_unavailable_src_addr/CmdDeleteIcmpV4UnavailableSrcAddr.cpp", + "commands/delete/sflow_collector/CmdDeleteSflowCollector.cpp", "commands/delete/traffic_counter/CmdDeleteTrafficCounter.cpp", "commands/delete/tunnel/CmdDeleteTunnel.cpp", "commands/delete/tunnel/ip_in_ip/CmdDeleteTunnelIpInIp.cpp", @@ -1471,6 +1473,7 @@ cpp_library( "commands/config/switch/admin_distance/CmdConfigAdminDistance.h", "commands/config/switch/hostname/CmdConfigHostname.h", "commands/config/switch/icmpv4_unavailable_src_addr/CmdConfigIcmpV4UnavailableSrcAddr.h", + "commands/config/sflow_collector/CmdConfigSflowCollector.h", "commands/config/traffic_counter/CmdConfigTrafficCounter.h", "commands/config/tunnel/CmdConfigTunnel.h", "commands/config/tunnel/ip_in_ip/CmdConfigTunnelIpInIp.h", @@ -1537,6 +1540,7 @@ cpp_library( "commands/delete/switch/CmdDeleteSwitch.h", "commands/delete/switch/admin_distance/CmdDeleteAdminDistance.h", "commands/delete/switch/icmpv4_unavailable_src_addr/CmdDeleteIcmpV4UnavailableSrcAddr.h", + "commands/delete/sflow_collector/CmdDeleteSflowCollector.h", "commands/delete/traffic_counter/CmdDeleteTrafficCounter.h", "commands/delete/tunnel/CmdDeleteTunnel.h", "commands/delete/tunnel/ip_in_ip/CmdDeleteTunnelIpInIp.h", diff --git a/fboss/cli/fboss2/CmdListConfig.cpp b/fboss/cli/fboss2/CmdListConfig.cpp index f688e2c4289..140b050a366 100644 --- a/fboss/cli/fboss2/CmdListConfig.cpp +++ b/fboss/cli/fboss2/CmdListConfig.cpp @@ -71,6 +71,7 @@ #include "fboss/cli/fboss2/commands/config/session/CmdConfigSessionCommit.h" #include "fboss/cli/fboss2/commands/config/session/CmdConfigSessionDiff.h" #include "fboss/cli/fboss2/commands/config/session/CmdConfigSessionRebase.h" +#include "fboss/cli/fboss2/commands/config/sflow_collector/CmdConfigSflowCollector.h" #include "fboss/cli/fboss2/commands/config/srv6/CmdConfigSrv6.h" #include "fboss/cli/fboss2/commands/config/srv6/my_sid/CmdConfigSrv6MySid.h" #include "fboss/cli/fboss2/commands/config/srv6/my_sid/entry/CmdConfigSrv6MySidEntry.h" @@ -137,6 +138,7 @@ #include "fboss/cli/fboss2/commands/delete/qos/priority_group_policy/CmdDeleteQosPriorityGroupPolicy.h" #include "fboss/cli/fboss2/commands/delete/qos/queue_config/CmdDeleteQosQueueConfig.h" #include "fboss/cli/fboss2/commands/delete/qos/queue_config/CmdDeleteQosQueueConfigQueueId.h" +#include "fboss/cli/fboss2/commands/delete/sflow_collector/CmdDeleteSflowCollector.h" #include "fboss/cli/fboss2/commands/delete/srv6/CmdDeleteSrv6.h" #include "fboss/cli/fboss2/commands/delete/srv6/my_sid/CmdDeleteSrv6MySid.h" #include "fboss/cli/fboss2/commands/delete/srv6/my_sid/entry/CmdDeleteSrv6MySidEntry.h" @@ -692,6 +694,12 @@ const CommandTree& kConfigCommandTree() { commandHandler, argRegistrar}, + {"config", + "sflow-collector", + "Add an sFlow collector: ", + commandHandler, + argRegistrar}, + { "config", "srv6", @@ -1131,6 +1139,12 @@ const CommandTree& kConfigCommandTree() { }}, }, + {"delete", + "sflow-collector", + "Delete an sFlow collector: ", + commandHandler, + argRegistrar}, + { "delete", "mirror", diff --git a/fboss/cli/fboss2/commands/config/sflow_collector/CmdConfigSflowCollector.cpp b/fboss/cli/fboss2/commands/config/sflow_collector/CmdConfigSflowCollector.cpp new file mode 100644 index 00000000000..9c6e3b1b718 --- /dev/null +++ b/fboss/cli/fboss2/commands/config/sflow_collector/CmdConfigSflowCollector.cpp @@ -0,0 +1,104 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. + +#include "fboss/cli/fboss2/commands/config/sflow_collector/CmdConfigSflowCollector.h" + +#include "fboss/cli/fboss2/CmdHandler.cpp" + +#include +#include +#include +#include +#include + +#include "fboss/agent/gen-cpp2/switch_config_types.h" +#include "fboss/cli/fboss2/session/ConfigSession.h" + +namespace facebook::fboss { + +namespace { + +bool collectorMatches( + const cfg::SflowCollector& configured, + const SflowCollectorArg& requested) { + auto configuredIp = folly::IPAddress::tryFromString(*configured.ip()); + return configuredIp.hasValue() && + configuredIp.value() == requested.getIpAddress() && + *configured.port() == requested.getPort(); +} + +} // namespace + +SflowCollectorArg::SflowCollectorArg(std::vector v) { + if (v.size() != 2) { + throw std::invalid_argument( + "Expected exactly two arguments: "); + } + + auto parsedIp = folly::IPAddress::tryFromString(v[0]); + if (!parsedIp.hasValue()) { + throw std::invalid_argument( + fmt::format("Invalid sFlow collector IP address '{}'", v[0])); + } + ipAddress_ = parsedIp.value(); + canonicalIp_ = ipAddress_.str(); + + int64_t parsedPort; + try { + parsedPort = folly::to(v[1]); + } catch (const std::exception&) { + throw std::invalid_argument( + fmt::format( + "Invalid sFlow collector port '{}': must be an integer from 1 to {}", + v[1], + std::numeric_limits::max())); + } + if (parsedPort < 1 || parsedPort > std::numeric_limits::max()) { + throw std::invalid_argument( + fmt::format( + "Invalid sFlow collector port '{}': must be from 1 to {}", + v[1], + std::numeric_limits::max())); + } + port_ = static_cast(parsedPort); + + data_ = {canonicalIp_, std::to_string(port_)}; +} + +CmdConfigSflowCollectorTraits::RetType CmdConfigSflowCollector::queryClient( + const HostInfo& /* hostInfo */, + const ObjectArgType& collector) { + auto& session = ConfigSession::getInstance(); + auto& collectors = *session.getAgentConfig().sw()->sFlowCollectors(); + + auto existing = std::find_if( + collectors.begin(), collectors.end(), [&](const auto& configured) { + return collectorMatches(configured, collector); + }); + if (existing != collectors.end()) { + return fmt::format( + "sFlow collector {} port {} is already configured", + collector.getCanonicalIp(), + collector.getPort()); + } + + cfg::SflowCollector configured; + configured.ip() = collector.getCanonicalIp(); + configured.port() = collector.getPort(); + collectors.push_back(std::move(configured)); + + session.saveConfig(cli::ServiceType::AGENT, cli::ConfigActionLevel::HITLESS); + + return fmt::format( + "Successfully added sFlow collector {} port {}", + collector.getCanonicalIp(), + collector.getPort()); +} + +void CmdConfigSflowCollector::printOutput(const RetType& output) { + std::cout << output << std::endl; +} + +template void +CmdHandler::run(); + +} // namespace facebook::fboss diff --git a/fboss/cli/fboss2/commands/config/sflow_collector/CmdConfigSflowCollector.h b/fboss/cli/fboss2/commands/config/sflow_collector/CmdConfigSflowCollector.h new file mode 100644 index 00000000000..f2ebfffc3f1 --- /dev/null +++ b/fboss/cli/fboss2/commands/config/sflow_collector/CmdConfigSflowCollector.h @@ -0,0 +1,64 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. + +#pragma once + +#include +#include +#include +#include + +#include "fboss/cli/fboss2/CmdHandler.h" + +namespace facebook::fboss { + +// Parses the tuple shared by config/delete sflow-collector. +// cfg::SflowCollector.port is an i16, so the largest positive port that can be +// represented by the current schema is 32767. +class SflowCollectorArg : public utils::BaseObjectArgType { + public: + /* implicit */ SflowCollectorArg( // NOLINT(google-explicit-constructor) + std::vector v); + + const folly::IPAddress& getIpAddress() const { + return ipAddress_; + } + + const std::string& getCanonicalIp() const { + return canonicalIp_; + } + + int16_t getPort() const { + return port_; + } + + private: + folly::IPAddress ipAddress_; + std::string canonicalIp_; + int16_t port_{0}; +}; + +struct CmdConfigSflowCollectorTraits : public WriteCommandTraits { + static void addCliArg(CLI::App& cmd, std::vector& args) { + cmd.add_option( + "ip_and_port", + args, + "Collector IP address followed by UDP port (1-32767)") + ->expected(2); + } + using ObjectArgType = SflowCollectorArg; + using RetType = std::string; +}; + +class CmdConfigSflowCollector : public CmdHandler< + CmdConfigSflowCollector, + CmdConfigSflowCollectorTraits> { + public: + using ObjectArgType = CmdConfigSflowCollectorTraits::ObjectArgType; + using RetType = CmdConfigSflowCollectorTraits::RetType; + + RetType queryClient(const HostInfo& hostInfo, const ObjectArgType& collector); + + void printOutput(const RetType& output); +}; + +} // namespace facebook::fboss diff --git a/fboss/cli/fboss2/commands/delete/sflow_collector/CmdDeleteSflowCollector.cpp b/fboss/cli/fboss2/commands/delete/sflow_collector/CmdDeleteSflowCollector.cpp new file mode 100644 index 00000000000..801ab6941a9 --- /dev/null +++ b/fboss/cli/fboss2/commands/delete/sflow_collector/CmdDeleteSflowCollector.cpp @@ -0,0 +1,75 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. + +#include "fboss/cli/fboss2/commands/delete/sflow_collector/CmdDeleteSflowCollector.h" + +#include "fboss/cli/fboss2/CmdHandler.cpp" + +#include +#include +#include +#include + +#include "fboss/agent/FbossError.h" +#include "fboss/agent/gen-cpp2/switch_config_types.h" +#include "fboss/cli/fboss2/session/ConfigSession.h" + +namespace facebook::fboss { + +namespace { + +bool collectorMatches( + const cfg::SflowCollector& configured, + const SflowCollectorArg& requested) { + auto configuredIp = folly::IPAddress::tryFromString(*configured.ip()); + return configuredIp.hasValue() && + configuredIp.value() == requested.getIpAddress() && + *configured.port() == requested.getPort(); +} + +} // namespace + +CmdDeleteSflowCollectorTraits::RetType CmdDeleteSflowCollector::queryClient( + const HostInfo& /* hostInfo */, + const ObjectArgType& collector) { + auto& session = ConfigSession::getInstance(); + auto& collectors = *session.getAgentConfig().sw()->sFlowCollectors(); + + auto firstMatch = std::find_if( + collectors.begin(), collectors.end(), [&](const auto& configured) { + return collectorMatches(configured, collector); + }); + if (firstMatch == collectors.end()) { + throw FbossError( + "No sFlow collector ", + collector.getCanonicalIp(), + " port ", + collector.getPort()); + } + + // Remove all semantically identical entries so legacy configs containing + // equivalent IPv6 spellings cannot retain a duplicate collector. + collectors.erase( + std::remove_if( + firstMatch, + collectors.end(), + [&](const auto& configured) { + return collectorMatches(configured, collector); + }), + collectors.end()); + + session.saveConfig(cli::ServiceType::AGENT, cli::ConfigActionLevel::HITLESS); + + return fmt::format( + "Successfully deleted sFlow collector {} port {}", + collector.getCanonicalIp(), + collector.getPort()); +} + +void CmdDeleteSflowCollector::printOutput(const RetType& output) { + std::cout << output << std::endl; +} + +template void +CmdHandler::run(); + +} // namespace facebook::fboss diff --git a/fboss/cli/fboss2/commands/delete/sflow_collector/CmdDeleteSflowCollector.h b/fboss/cli/fboss2/commands/delete/sflow_collector/CmdDeleteSflowCollector.h new file mode 100644 index 00000000000..7f024f608fa --- /dev/null +++ b/fboss/cli/fboss2/commands/delete/sflow_collector/CmdDeleteSflowCollector.h @@ -0,0 +1,37 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. + +#pragma once + +#include +#include + +#include "fboss/cli/fboss2/CmdHandler.h" +#include "fboss/cli/fboss2/commands/config/sflow_collector/CmdConfigSflowCollector.h" + +namespace facebook::fboss { + +struct CmdDeleteSflowCollectorTraits : public WriteCommandTraits { + static void addCliArg(CLI::App& cmd, std::vector& args) { + cmd.add_option( + "ip_and_port", + args, + "Collector IP address followed by UDP port (1-32767)") + ->expected(2); + } + using ObjectArgType = SflowCollectorArg; + using RetType = std::string; +}; + +class CmdDeleteSflowCollector : public CmdHandler< + CmdDeleteSflowCollector, + CmdDeleteSflowCollectorTraits> { + public: + using ObjectArgType = CmdDeleteSflowCollectorTraits::ObjectArgType; + using RetType = CmdDeleteSflowCollectorTraits::RetType; + + RetType queryClient(const HostInfo& hostInfo, const ObjectArgType& collector); + + void printOutput(const RetType& output); +}; + +} // namespace facebook::fboss diff --git a/fboss/cli/fboss2/test/config/BUCK b/fboss/cli/fboss2/test/config/BUCK index 273cced88c3..35736dd2399 100644 --- a/fboss/cli/fboss2/test/config/BUCK +++ b/fboss/cli/fboss2/test/config/BUCK @@ -39,6 +39,7 @@ cpp_unittest( "CmdConfigLoadBalancingTest.cpp", "CmdConfigMacAgingTimeTest.cpp", "CmdConfigMirrorTest.cpp", + "CmdConfigSflowCollectorTest.cpp", "CmdConfigPtpTransparentClockTest.cpp", "CmdConfigQosBufferPoolTest.cpp", "CmdConfigQosDefaultPolicyTest.cpp", diff --git a/fboss/cli/fboss2/test/config/CmdConfigSflowCollectorTest.cpp b/fboss/cli/fboss2/test/config/CmdConfigSflowCollectorTest.cpp new file mode 100644 index 00000000000..bcd834f680d --- /dev/null +++ b/fboss/cli/fboss2/test/config/CmdConfigSflowCollectorTest.cpp @@ -0,0 +1,172 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. + +#include +#include +#include +#include + +#include "fboss/agent/FbossError.h" +#include "fboss/cli/fboss2/commands/config/sflow_collector/CmdConfigSflowCollector.h" +#include "fboss/cli/fboss2/commands/delete/sflow_collector/CmdDeleteSflowCollector.h" +#include "fboss/cli/fboss2/session/ConfigSession.h" +#include "fboss/cli/fboss2/test/config/CmdConfigTestBase.h" + +using namespace ::testing; + +namespace facebook::fboss { + +class CmdConfigSflowCollectorTestFixture : public CmdConfigTestBase { + public: + CmdConfigSflowCollectorTestFixture() + : CmdConfigTestBase( + "fboss_sflow_collector_test_%%%%-%%%%-%%%%-%%%%", + R"({ + "sw": { + "sFlowCollectors": [ + {"ip": "192.0.2.10", "port": 6343}, + {"ip": "2001:db8::1", "port": 6343} + ] + } +})") {} + + protected: + static const std::vector& collectors() { + return *ConfigSession::getInstance() + .getAgentConfig() + .sw() + ->sFlowCollectors(); + } +}; + +TEST_F(CmdConfigSflowCollectorTestFixture, validatesAndCanonicalizesArguments) { + { + SflowCollectorArg arg({"172.25.165.41", "6343"}); + EXPECT_EQ(arg.getCanonicalIp(), "172.25.165.41"); + EXPECT_EQ(arg.getPort(), 6343); + } + { + SflowCollectorArg arg({"2001:0db8:0:0:0:0:0:2", "32767"}); + EXPECT_EQ(arg.getCanonicalIp(), "2001:db8::2"); + EXPECT_EQ(arg.getPort(), std::numeric_limits::max()); + } +} + +TEST_F(CmdConfigSflowCollectorTestFixture, rejectsInvalidArguments) { + EXPECT_THROW(SflowCollectorArg({}), std::invalid_argument); + EXPECT_THROW(SflowCollectorArg({"192.0.2.1"}), std::invalid_argument); + EXPECT_THROW( + SflowCollectorArg({"192.0.2.1", "6343", "extra"}), std::invalid_argument); + EXPECT_THROW(SflowCollectorArg({"not-an-ip", "6343"}), std::invalid_argument); + EXPECT_THROW( + SflowCollectorArg({"192.0.2.1", "not-a-port"}), std::invalid_argument); + EXPECT_THROW(SflowCollectorArg({"192.0.2.1", "0"}), std::invalid_argument); + EXPECT_THROW(SflowCollectorArg({"192.0.2.1", "-1"}), std::invalid_argument); + EXPECT_THROW( + SflowCollectorArg({"192.0.2.1", "32768"}), std::invalid_argument); + EXPECT_THROW( + SflowCollectorArg({"192.0.2.1", "999999999999999999999"}), + std::invalid_argument); +} + +TEST_F(CmdConfigSflowCollectorTestFixture, addsCollectorAndPreservesExisting) { + setupTestableConfigSession("config sflow-collector", "172.25.165.41 6343"); + + CmdConfigSflowCollector cmd; + auto result = cmd.queryClient( + HostInfo("testhost"), SflowCollectorArg({"172.25.165.41", "6343"})); + + EXPECT_THAT(result, HasSubstr("Successfully added")); + ASSERT_EQ(collectors().size(), 3); + EXPECT_EQ(*collectors()[0].ip(), "192.0.2.10"); + EXPECT_EQ(*collectors()[1].ip(), "2001:db8::1"); + EXPECT_EQ(*collectors()[2].ip(), "172.25.165.41"); + EXPECT_EQ(*collectors()[2].port(), 6343); + + auto staged = folly::parseJson(readFile(getSessionConfigPath())); + ASSERT_EQ(staged["sw"]["sFlowCollectors"].size(), 3); + EXPECT_EQ( + staged["sw"]["sFlowCollectors"][2]["ip"].asString(), "172.25.165.41"); + EXPECT_EQ(staged["sw"]["sFlowCollectors"][2]["port"].asInt(), 6343); +} + +TEST_F(CmdConfigSflowCollectorTestFixture, identicalCollectorIsIdempotent) { + setupTestableConfigSession( + "config sflow-collector", "2001:0db8:0:0:0:0:0:1 6343"); + + CmdConfigSflowCollector cmd; + auto result = cmd.queryClient( + HostInfo("testhost"), + SflowCollectorArg({"2001:0db8:0:0:0:0:0:1", "6343"})); + + EXPECT_THAT(result, HasSubstr("already configured")); + EXPECT_EQ(collectors().size(), 2); +} + +TEST_F(CmdConfigSflowCollectorTestFixture, sameIpDifferentPortIsDistinct) { + setupTestableConfigSession("config sflow-collector", "192.0.2.10 1234"); + + CmdConfigSflowCollector cmd; + cmd.queryClient( + HostInfo("testhost"), SflowCollectorArg({"192.0.2.10", "1234"})); + + ASSERT_EQ(collectors().size(), 3); + EXPECT_EQ(*collectors()[2].ip(), "192.0.2.10"); + EXPECT_EQ(*collectors()[2].port(), 1234); +} + +TEST_F(CmdConfigSflowCollectorTestFixture, deletesExactCollectorOnly) { + setupTestableConfigSession("delete sflow-collector", "192.0.2.10 6343"); + + CmdDeleteSflowCollector cmd; + auto result = cmd.queryClient( + HostInfo("testhost"), SflowCollectorArg({"192.0.2.10", "6343"})); + + EXPECT_THAT(result, HasSubstr("Successfully deleted")); + ASSERT_EQ(collectors().size(), 1); + EXPECT_EQ(*collectors()[0].ip(), "2001:db8::1"); + EXPECT_EQ(*collectors()[0].port(), 6343); +} + +TEST_F(CmdConfigSflowCollectorTestFixture, deleteMatchesCanonicalAddress) { + setupTestableConfigSession( + "delete sflow-collector", "2001:0db8:0:0:0:0:0:1 6343"); + + CmdDeleteSflowCollector cmd; + cmd.queryClient( + HostInfo("testhost"), + SflowCollectorArg({"2001:0db8:0:0:0:0:0:1", "6343"})); + + ASSERT_EQ(collectors().size(), 1); + EXPECT_EQ(*collectors()[0].ip(), "192.0.2.10"); +} + +TEST_F(CmdConfigSflowCollectorTestFixture, deleteRemovesCanonicalDuplicates) { + setupTestableConfigSession("delete sflow-collector", "2001:db8::1 6343"); + + auto& mutableCollectors = + *ConfigSession::getInstance().getAgentConfig().sw()->sFlowCollectors(); + cfg::SflowCollector duplicate; + duplicate.ip() = "2001:0db8:0:0:0:0:0:1"; + duplicate.port() = 6343; + mutableCollectors.push_back(std::move(duplicate)); + + CmdDeleteSflowCollector cmd; + cmd.queryClient( + HostInfo("testhost"), SflowCollectorArg({"2001:db8::1", "6343"})); + + ASSERT_EQ(collectors().size(), 1); + EXPECT_EQ(*collectors()[0].ip(), "192.0.2.10"); +} + +TEST_F(CmdConfigSflowCollectorTestFixture, deleteMissingCollectorFailsSafely) { + setupTestableConfigSession("delete sflow-collector", "192.0.2.99 6343"); + + CmdDeleteSflowCollector cmd; + EXPECT_THROW( + cmd.queryClient( + HostInfo("testhost"), SflowCollectorArg({"192.0.2.99", "6343"})), + FbossError); + EXPECT_EQ(collectors().size(), 2); +} + +} // namespace facebook::fboss