Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cmake/CliFboss2.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions cmake/CliFboss2TestConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions fboss/cli/fboss2/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
14 changes: 14 additions & 0 deletions fboss/cli/fboss2/CmdListConfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -692,6 +694,12 @@ const CommandTree& kConfigCommandTree() {
commandHandler<CmdConfigMirror>,
argRegistrar<CmdConfigMirrorTraits>},

{"config",
"sflow-collector",
"Add an sFlow collector: <ip> <port>",
commandHandler<CmdConfigSflowCollector>,
argRegistrar<CmdConfigSflowCollectorTraits>},

{
"config",
"srv6",
Expand Down Expand Up @@ -1131,6 +1139,12 @@ const CommandTree& kConfigCommandTree() {
}},
},

{"delete",
"sflow-collector",
"Delete an sFlow collector: <ip> <port>",
commandHandler<CmdDeleteSflowCollector>,
argRegistrar<CmdDeleteSflowCollectorTraits>},

{
"delete",
"mirror",
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <fmt/format.h>
#include <folly/Conv.h>
#include <algorithm>
#include <iostream>
#include <limits>

#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<std::string> v) {
if (v.size() != 2) {
throw std::invalid_argument(
"Expected exactly two arguments: <collector-ip> <udp-port>");
}

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<int64_t>(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<int16_t>::max()));
}
if (parsedPort < 1 || parsedPort > std::numeric_limits<int16_t>::max()) {
throw std::invalid_argument(
fmt::format(
"Invalid sFlow collector port '{}': must be from 1 to {}",
v[1],
std::numeric_limits<int16_t>::max()));
}
port_ = static_cast<int16_t>(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<CmdConfigSflowCollector, CmdConfigSflowCollectorTraits>::run();

} // namespace facebook::fboss
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
// Copyright (c) Meta Platforms, Inc. and affiliates.

#pragma once

#include <folly/IPAddress.h>
#include <cstdint>
#include <string>
#include <vector>

#include "fboss/cli/fboss2/CmdHandler.h"

namespace facebook::fboss {

// Parses the <ip> <port> 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<std::string> {
public:
/* implicit */ SflowCollectorArg( // NOLINT(google-explicit-constructor)
std::vector<std::string> 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<std::string>& 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
Original file line number Diff line number Diff line change
@@ -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 <fmt/format.h>
#include <folly/IPAddress.h>
#include <algorithm>
#include <iostream>

#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<CmdDeleteSflowCollector, CmdDeleteSflowCollectorTraits>::run();

} // namespace facebook::fboss
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// Copyright (c) Meta Platforms, Inc. and affiliates.

#pragma once

#include <string>
#include <vector>

#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<std::string>& 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
1 change: 1 addition & 0 deletions fboss/cli/fboss2/test/config/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ cpp_unittest(
"CmdConfigLoadBalancingTest.cpp",
"CmdConfigMacAgingTimeTest.cpp",
"CmdConfigMirrorTest.cpp",
"CmdConfigSflowCollectorTest.cpp",
"CmdConfigPtpTransparentClockTest.cpp",
"CmdConfigQosBufferPoolTest.cpp",
"CmdConfigQosDefaultPolicyTest.cpp",
Expand Down
Loading
Loading