Skip to content
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.

Sign up for GitHub

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

[orchagent]: Add MACsec Orchagent #1474

Merged
merged 37 commits into from
Jan 29, 2021
Merged

[orchagent]: Add MACsec Orchagent #1474

Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
28072f7
MACsec Orch init
Pterosaur Aug 27, 2020
8023b21
Add flex counter and ACL table
Pterosaur Sep 2, 2020
23335e0
Add Debugging information
Pterosaur Sep 3, 2020
17d40af
Fix bug
Pterosaur Sep 4, 2020
0c2e766
Refactor context fetch
Pterosaur Sep 7, 2020
47d8fac
Polish flex counter name
Pterosaur Sep 10, 2020
8b8c7ee
Polish flex counter name
Pterosaur Sep 10, 2020
2a53cb5
Polish flex counter name
Pterosaur Sep 11, 2020
5637850
add macsecorch to Makefile
Pterosaur Sep 16, 2020
750c2a1
Merge commit '65f63c1647f59b75b3d06b1cb293efbbc5472012' of https://gi…
Pterosaur Sep 17, 2020
8474ad4
Fix uninstall macsec counter
Pterosaur Sep 17, 2020
d7d4878
Integrate with Redis SAI
Pterosaur Sep 22, 2020
6ef8bf6
fix typo bug
Pterosaur Oct 2, 2020
cedf185
Remove gearbox
Pterosaur Oct 12, 2020
a065524
polish macro
Pterosaur Oct 19, 2020
3fa3b13
Merge commit 'e4df' into macsecorch
Pterosaur Oct 19, 2020
3ec4815
Add auth key support
Pterosaur Oct 20, 2020
89012eb
Add SEND_SCI to MACsec SC
Pterosaur Oct 22, 2020
9ab3e21
Remove debuging code
Pterosaur Oct 29, 2020
57eef12
Merge branch 'master' into macsecorch
Pterosaur Nov 3, 2020
bb608b7
Update to support the latest SWSS library
Pterosaur Nov 3, 2020
a0397b4
Fixbug: Duplicate set ACL Entry
Pterosaur Nov 19, 2020
52d7e35
Clean modification about MACsec gearbox
Pterosaur Nov 20, 2020
897bdff
Rename ACL to MACsec ACL
Pterosaur Nov 20, 2020
d7409ac
Polish function getAclPriority
Pterosaur Nov 20, 2020
f5c9cbf
[tests]: test_macsec_term_orch (#3)
Pterosaur Nov 25, 2020
787b699
Merge branch 'master' into macsecorch
Pterosaur Nov 25, 2020
d9d583c
Change the name for clarity
Pterosaur Nov 26, 2020
a1e7d80
Fix copy-n-paste error and polish print format
Pterosaur Dec 21, 2020
142d20a
Fix default value and typo
Pterosaur Dec 22, 2020
24a7b3a
rename task functions
Pterosaur Dec 22, 2020
497b72d
Adapt MACsec SAI 1.7.1
Pterosaur Dec 22, 2020
e1da4a5
Move common functions to swss-common
Pterosaur Dec 30, 2020
03a404a
Merge branch 'master' into macsecorch
Pterosaur Dec 30, 2020
abd4068
Fix test script
Pterosaur Jan 19, 2021
04f94b6
Merge branch 'master' into macsecorch
Pterosaur Jan 19, 2021
a035ec4
Trigger CI
Pterosaur Jan 24, 2021
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
3 changes: 2 additions & 1 deletion orchagent/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ orchagent_SOURCES = \
sfloworch.cpp \
chassisorch.cpp \
debugcounterorch.cpp \
natorch.cpp
natorch.cpp \
macsecorch.cpp

orchagent_SOURCES += flex_counter/flex_counter_manager.cpp flex_counter/flex_counter_stat_manager.cpp
orchagent_SOURCES += debug_counter/debug_counter.cpp debug_counter/drop_counter.cpp
Expand Down
11 changes: 7 additions & 4 deletions orchagent/flex_counter/flex_counter_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#include "logger.h"
#include "sai_serialize.h"

#include <macsecorch.h>

using std::shared_ptr;
using std::string;
using std::unordered_map;
Expand All @@ -32,10 +34,11 @@ const unordered_map<bool, string> FlexCounterManager::status_lookup =

const unordered_map<CounterType, string> FlexCounterManager::counter_id_field_lookup =
{
{ CounterType::PORT_DEBUG, PORT_DEBUG_COUNTER_ID_LIST },
{ CounterType::SWITCH_DEBUG, SWITCH_DEBUG_COUNTER_ID_LIST },
{ CounterType::PORT, PORT_COUNTER_ID_LIST },
{ CounterType::QUEUE, QUEUE_COUNTER_ID_LIST }
{ CounterType::PORT_DEBUG, PORT_DEBUG_COUNTER_ID_LIST },
{ CounterType::SWITCH_DEBUG, SWITCH_DEBUG_COUNTER_ID_LIST },
{ CounterType::PORT, PORT_COUNTER_ID_LIST },
{ CounterType::QUEUE, QUEUE_COUNTER_ID_LIST },
{ CounterType::MACSEC_SA_ATTR, MACSEC_SA_ATTR_ID_LIST },
};

FlexCounterManager::FlexCounterManager(
Expand Down
3 changes: 2 additions & 1 deletion orchagent/flex_counter/flex_counter_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ enum class CounterType
PORT,
QUEUE,
PORT_DEBUG,
SWITCH_DEBUG
SWITCH_DEBUG,
MACSEC_SA_ATTR,
};

// FlexCounterManager allows users to manage a group of flex counters.
Expand Down
Loading