Skip to content

Update ip commands for MACsec for Bookworm #1368

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

Merged
saiarcot895 merged 3 commits into from
Apr 4, 2024
Merged

Update ip commands for MACsec for Bookworm #1368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4edc6d6
Update ip commands for MACsec for Bookworm
saiarcot895 Apr 2, 2024
8e224b3
Add more test
Pterosaur Apr 3, 2024
1c1b6f9
Merge remote-tracking branch 'origin/master' into update-macsec-for-b…
saiarcot895 Apr 3, 2024
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
21 changes: 21 additions & 0 deletions unittest/vslib/TestMACsecManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,27 @@ TEST(MACsecManager, create_macsec_ingress_sa)
manager.create_macsec_ingress_sa(attr);
}

TEST(MACsecManager, create_macsec_egress_sa)
{
// This is a system call that may not be valid in the test environment,
// So, this case is just for the testing coverage checking.

MACsecManager manager;

MACsecAttr attr;
attr.m_vethName = "eth0";
attr.m_macsecName = "macsec_eth0";
attr.m_sci = "02:42:ac:11:00:03";
attr.m_an = 0;
attr.m_pn = 1;
attr.m_cipher = MACsecAttr::CIPHER_NAME_GCM_AES_XPN_128;
attr.m_ssci = 0x1;
attr.m_salt = "";
attr.m_authKey = "";
attr.m_sak = "";
manager.create_macsec_egress_sa(attr);
}

TEST(MACsecManager, update_macsec_sa_pn)
{
// This is a system call that may not be valid in the test environment,
Expand Down
6 changes: 3 additions & 3 deletions vslib/MACsecManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ bool MACsecManager::update_macsec_sa_pn(
ostream << " ssci " << attr.m_ssci;
}

ostream << " pn " << pn;
ostream << ( attr.is_xpn() ? " xpn " : " pn " ) << pn;

SWSS_LOG_NOTICE("%s", ostream.str().c_str());

Expand Down Expand Up @@ -447,7 +447,7 @@ bool MACsecManager::create_macsec_egress_sa(
<< shellquote(attr.m_macsecName)
<< " tx sa "
<< attr.m_an
<< " pn "
<< ( attr.is_xpn() ? " xpn " : " pn ")
<< attr.m_pn
<< ( attr.is_xpn() ? " ssci " : "" )
<< ( attr.is_xpn() ? std::to_string(attr.m_ssci) : "" )
Expand Down Expand Up @@ -484,7 +484,7 @@ bool MACsecManager::create_macsec_ingress_sa(
<< attr.m_sci
<< " sa "
<< attr.m_an
<< " pn "
<< ( attr.is_xpn() ? " xpn " : " pn " )
<< attr.m_pn
<< ( attr.is_xpn() ? " ssci " : "" )
<< ( attr.is_xpn() ? std::to_string(attr.m_ssci) : "" )
Expand Down