-
Notifications
You must be signed in to change notification settings - Fork 406
[Nexthop][fboss2-dev] Add fboss2-dev delete copp subcommands (cpu-queue, reason) #1466
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
vybhav-nexthop
wants to merge
3
commits into
facebook:main
Choose a base branch
from
nexthop-ai:delete-copp-subtree
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| /* | ||
| * 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/copp/CoppUtils.h" | ||
|
|
||
| #include <fmt/format.h> | ||
| #include <folly/Conv.h> | ||
| #include <folly/String.h> | ||
| #include <thrift/lib/cpp/util/EnumUtils.h> | ||
| #include <algorithm> | ||
| #include <cctype> | ||
| #include <stdexcept> | ||
|
|
||
| namespace facebook::fboss { | ||
|
|
||
| namespace copp_cpu_queue { | ||
|
|
||
| int16_t parseQueueId(const std::string& s, std::string_view context) { | ||
| int16_t parsed = 0; | ||
| try { | ||
| parsed = folly::to<int16_t>(s); | ||
| } catch (const folly::ConversionError&) { | ||
| throw std::invalid_argument( | ||
| fmt::format("Queue ID ({}) must be an integer, got '{}'", context, s)); | ||
| } | ||
| if (parsed < 0 || parsed > kMaxCpuQueueId) { | ||
| throw std::invalid_argument( | ||
| fmt::format( | ||
| "Queue ID ({}) must be in [0, {}], got {}", | ||
| context, | ||
| kMaxCpuQueueId, | ||
| parsed)); | ||
| } | ||
| return parsed; | ||
| } | ||
|
|
||
| std::vector<cfg::PortQueue>::iterator findCpuQueue( | ||
| std::vector<cfg::PortQueue>& queues, | ||
| int16_t id) { | ||
| return std::find_if( | ||
| queues.begin(), queues.end(), [id](const cfg::PortQueue& q) { | ||
| return *q.id() == id; | ||
| }); | ||
| } | ||
|
|
||
| } // namespace copp_cpu_queue | ||
|
|
||
| namespace copp_reason { | ||
|
|
||
| std::string normalizeReason(const std::string& v) { | ||
| std::string out; | ||
| out.reserve(v.size()); | ||
| for (unsigned char c : v) { | ||
| out.push_back(c == '-' ? '_' : std::toupper(c)); | ||
| } | ||
| return out; | ||
| } | ||
|
|
||
| std::string validReasonNames() { | ||
| std::vector<std::string> names; | ||
| for (auto value : apache::thrift::TEnumTraits<cfg::PacketRxReason>::values) { | ||
| names.push_back(apache::thrift::util::enumNameSafe(value)); | ||
| } | ||
| return folly::join(", ", names); | ||
| } | ||
|
|
||
| cfg::PacketRxReason parseReason(const std::string& s) { | ||
| cfg::PacketRxReason reason{}; | ||
| if (!apache::thrift::TEnumTraits<cfg::PacketRxReason>::findValue( | ||
| normalizeReason(s), &reason)) { | ||
| throw std::invalid_argument( | ||
| fmt::format( | ||
| "Unknown reason name '{}'. Valid: {}", s, validReasonNames())); | ||
| } | ||
| return reason; | ||
| } | ||
|
|
||
| } // namespace copp_reason | ||
|
|
||
| } // namespace facebook::fboss | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /* | ||
| * 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 <cstdint> | ||
| #include <string> | ||
| #include <string_view> | ||
| #include <vector> | ||
| #include "fboss/agent/gen-cpp2/switch_config_types.h" | ||
|
|
||
| namespace facebook::fboss { | ||
|
|
||
| // Shared vocabulary for the copp cpu-queue commands, used by both the | ||
| // `config` and `delete` command trees so queue-id parsing and lookup live | ||
| // in one place. | ||
| namespace copp_cpu_queue { | ||
|
|
||
| // CPU queue IDs are a small platform-bounded set; reject anything that is | ||
| // clearly out of range before touching the config. The actual per-ASIC cap | ||
| // is enforced by the agent (SaiHostifManager::getMaxCpuQueues) at apply | ||
| // time. | ||
| constexpr int16_t kMaxCpuQueueId = 255; | ||
|
|
||
| int16_t parseQueueId(const std::string& s, std::string_view context); | ||
|
|
||
| // Return an iterator to the cpuQueues entry with `id`, or end(). | ||
| std::vector<cfg::PortQueue>::iterator findCpuQueue( | ||
| std::vector<cfg::PortQueue>& queues, | ||
| int16_t id); | ||
|
|
||
| } // namespace copp_cpu_queue | ||
|
|
||
| // Shared vocabulary for the copp reason commands, used by both the `config` | ||
| // and `delete` command trees so reason-name parsing stays consistent. | ||
| namespace copp_reason { | ||
|
|
||
| // Normalize a user-typed reason name: uppercase + dashes->underscores, so | ||
| // that "arp", "ARP", "ttl-1", "ttl_1" all match the cfg::PacketRxReason | ||
| // enum names ("ARP", "TTL_1", ...). | ||
| std::string normalizeReason(const std::string& v); | ||
|
|
||
| std::string validReasonNames(); | ||
|
|
||
| cfg::PacketRxReason parseReason(const std::string& s); | ||
|
|
||
| } // namespace copp_reason | ||
|
|
||
| } // namespace facebook::fboss |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| /* | ||
| * 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/delete/copp/CmdDeleteCopp.h" | ||
|
|
||
| #include "fboss/cli/fboss2/CmdHandler.cpp" | ||
|
|
||
| namespace facebook::fboss { | ||
|
|
||
| // Explicit template instantiation | ||
| template void CmdHandler<CmdDeleteCopp, CmdDeleteCoppTraits>::run(); | ||
|
|
||
| } // namespace facebook::fboss |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you create another PR to simplify the subcommand here to just be
copp_queueor replace all thecpu_queuewith justqueue?copp already means control plane so the queue used in here already means cpu queue, I think we can make the whole command less verbose.
I think these should work: