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

Jump to bottom

Create fabric ports for switch_type fabric. #1114

Merged
merged 3 commits into from
Sep 7, 2022
Merged

Create fabric ports for switch_type fabric. #1114

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
a9b6b92
Create fabric ports for switch_type fabric.
jfeng-arista Aug 24, 2022
05a3ba7
Add unittest
jfeng-arista Aug 30, 2022
271d008
Fix format comments.
jfeng-arista Sep 6, 2022
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 unittest/vslib/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ tests_SOURCES = main.cpp \
TestSwitchBCM56850.cpp \
TestSwitchBCM81724.cpp \
TestSwitchStateBaseMACsec.cpp \
TestMACsecManager.cpp
TestMACsecManager.cpp \
TestSwitchStateBase.cpp

tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) -fno-access-control
tests_LDADD = $(LDADD_GTEST) $(top_srcdir)/vslib/libSaiVS.a -lhiredis -lswsscommon -lnl-genl-3 -lnl-nf-3 -lnl-route-3 -lnl-3 \
Expand Down
34 changes: 34 additions & 0 deletions unittest/vslib/TestSwitchStateBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#include "SwitchStateBase.h"
#include "MACsecAttr.h"

#include <gtest/gtest.h>

#include <vector>

using namespace saivs;

//Test the following function:
//sai_status_t initialize_voq_switch_objects(
// _In_ uint32_t attr_count,
// _In_ const sai_attribute_t *attr_list);

TEST(SwitchStateBase, initialize_voq_switch_objects)
{
auto sc = std::make_shared<SwitchConfig>(0, "");
auto scc = std::make_shared<SwitchConfigContainer>();

SwitchStateBase ss(
0x2100000000,
std::make_shared<RealObjectIdManager>(0, scc),
sc);

sai_attribute_t attr;

attr.id = SAI_SWITCH_ATTR_TYPE;
attr.value.u32 = SAI_SWITCH_TYPE_FABRIC;
sc->m_fabricLaneMap = LaneMap::getDefaultLaneMap(0);
// Check the result of the initialize_voq_switch_objects
EXPECT_EQ(SAI_STATUS_SUCCESS,
ss.initialize_voq_switch_objects(1, &attr));
}

10 changes: 10 additions & 0 deletions vslib/SwitchStateBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3034,6 +3034,16 @@ sai_status_t SwitchStateBase::initialize_voq_switch_objects(
if (attr_list[i].value.u32 != SAI_SWITCH_TYPE_VOQ)
{
// Switch is not being set as VOQ type.
SWSS_LOG_NOTICE("initialize_voq_switch_objects the value is %d", attr_list[i].value.u32);
if (attr_list[i].value.u32 == SAI_SWITCH_TYPE_FABRIC)
{
SWSS_LOG_NOTICE("about to config fabric ports");
if (m_switchConfig->m_fabricLaneMap)
{
CHECK_STATUS(create_fabric_ports());
CHECK_STATUS(set_fabric_port_list());
}
}
return SAI_STATUS_SUCCESS;
}
else
Expand Down