Skip to content

[FEC] Adding support for vs testing for SAI_PORT_ATTR_AUTO_NEG_FEC_MODE_OVERRIDE #1271

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
merged 3 commits into from
Aug 9, 2023
Merged

[FEC] Adding support for vs testing for SAI_PORT_ATTR_AUTO_NEG_FEC_MODE_OVERRIDE #1271

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
4a4c8b7
[FEC] Adding support for vs testing for SAI_PORT_ATTR_AUTO_NEG_FEC_MO…
dgsudharsan Jun 23, 2023
b87789c
Removing redundant return statement
dgsudharsan Aug 3, 2023
3e09603
Merge branch 'master' into auto_fec
kcudnik Aug 6, 2023
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
35 changes: 35 additions & 0 deletions unittest/vslib/TestSwitchBCM56850.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,3 +479,38 @@ TEST(SwitchBCM56850, test_nexthop_group_type_enum_values_capability)

EXPECT_EQ(nexthop_group_types_found, 5);
}

TEST(SwitchBCM56850, test_port_autoneg_fec_override_support)
{
auto sc = std::make_shared<SwitchConfig>(0, "");
auto signal = std::make_shared<Signal>();
auto eventQueue = std::make_shared<EventQueue>(signal);

sc->m_saiSwitchType = SAI_SWITCH_TYPE_NPU;
sc->m_switchType = SAI_VS_SWITCH_TYPE_BCM56850;
sc->m_bootType = SAI_VS_BOOT_TYPE_COLD;
sc->m_useTapDevice = false;
sc->m_laneMap = LaneMap::getDefaultLaneMap(0);
sc->m_eventQueue = eventQueue;

auto scc = std::make_shared<SwitchConfigContainer>();

scc->insert(sc);

SwitchBCM56850 sw(
0x2100000000,
std::make_shared<RealObjectIdManager>(0, scc),
sc);

sai_attr_capability_t attr_capability;

EXPECT_EQ(sw.queryAttributeCapability(0x2100000000,
SAI_OBJECT_TYPE_PORT,
SAI_PORT_ATTR_AUTO_NEG_FEC_MODE_OVERRIDE,
&attr_capability),
SAI_STATUS_SUCCESS);

EXPECT_EQ(attr_capability.create_implemented, false);
EXPECT_EQ(attr_capability.set_implemented, false);
EXPECT_EQ(attr_capability.get_implemented, false);
}
35 changes: 35 additions & 0 deletions unittest/vslib/TestSwitchMLNX2700.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,3 +542,38 @@ TEST(SwitchMLNX2700, test_vlan_flood_capability)

EXPECT_EQ(flood_types_found, 4);
}

TEST(SwitchMLNX2700, test_port_autoneg_fec_override_support)
{
auto sc = std::make_shared<SwitchConfig>(0, "");
auto signal = std::make_shared<Signal>();
auto eventQueue = std::make_shared<EventQueue>(signal);

sc->m_saiSwitchType = SAI_SWITCH_TYPE_NPU;
sc->m_switchType = SAI_VS_SWITCH_TYPE_MLNX2700;
sc->m_bootType = SAI_VS_BOOT_TYPE_COLD;
sc->m_useTapDevice = false;
sc->m_laneMap = LaneMap::getDefaultLaneMap(0);
sc->m_eventQueue = eventQueue;

auto scc = std::make_shared<SwitchConfigContainer>();

scc->insert(sc);

SwitchMLNX2700 sw(
0x2100000000,
std::make_shared<RealObjectIdManager>(0, scc),
sc);

sai_attr_capability_t attr_capability;

EXPECT_EQ(sw.queryAttributeCapability(0x2100000000,
SAI_OBJECT_TYPE_PORT,
SAI_PORT_ATTR_AUTO_NEG_FEC_MODE_OVERRIDE,
&attr_capability),
SAI_STATUS_SUCCESS);

EXPECT_EQ(attr_capability.create_implemented, true);
EXPECT_EQ(attr_capability.set_implemented, true);
EXPECT_EQ(attr_capability.get_implemented, true);
}
11 changes: 11 additions & 0 deletions vslib/SwitchMLNX2700.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,17 @@ sai_status_t SwitchMLNX2700::queryTunnelPeerModeCapability(
return SAI_STATUS_SUCCESS;
}

sai_status_t SwitchMLNX2700::queryPortAutonegFecOverrideSupportCapability(
_Out_ sai_attr_capability_t *capability)
{
SWSS_LOG_ENTER();

capability->create_implemented = true;
capability->set_implemented = true;
capability->get_implemented = true;
return SAI_STATUS_SUCCESS;
}

sai_status_t SwitchMLNX2700::create_port_serdes()
{
SWSS_LOG_ENTER();
Expand Down
3 changes: 2 additions & 1 deletion vslib/SwitchMLNX2700.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ namespace saivs
_Inout_ sai_s32_list_t *enum_values_capability) override;
virtual sai_status_t queryVlanfloodTypeCapability(
_Inout_ sai_s32_list_t *enum_values_capability) override;

virtual sai_status_t queryPortAutonegFecOverrideSupportCapability(
_Out_ sai_attr_capability_t *attr_capability) override;
};
}
30 changes: 30 additions & 0 deletions vslib/SwitchStateBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3641,6 +3641,17 @@ sai_status_t SwitchStateBase::queryTunnelPeerModeCapability(
return SAI_STATUS_SUCCESS;
}

sai_status_t SwitchStateBase::queryPortAutonegFecOverrideSupportCapability(
_Out_ sai_attr_capability_t *capability)
{
SWSS_LOG_ENTER();

capability->create_implemented = false;
capability->set_implemented = false;
capability->get_implemented = false;
return SAI_STATUS_SUCCESS;
}

sai_status_t SwitchStateBase::queryVlanfloodTypeCapability(
_Inout_ sai_s32_list_t *enum_values_capability)
{
Expand Down Expand Up @@ -3742,3 +3753,22 @@ sai_status_t SwitchStateBase::queryAttrEnumValuesCapability(

return SAI_STATUS_NOT_SUPPORTED;
}

sai_status_t SwitchStateBase::queryAttributeCapability(
_In_ sai_object_id_t switch_id,
_In_ sai_object_type_t object_type,
_In_ sai_attr_id_t attr_id,
_Out_ sai_attr_capability_t *capability)
{
SWSS_LOG_ENTER();

if (object_type == SAI_OBJECT_TYPE_PORT && attr_id == SAI_PORT_ATTR_AUTO_NEG_FEC_MODE_OVERRIDE)
{
return queryPortAutonegFecOverrideSupportCapability(capability);
}
capability->create_implemented = true;
capability->set_implemented = true;
capability->get_implemented = true;

return SAI_STATUS_SUCCESS;
}
9 changes: 9 additions & 0 deletions vslib/SwitchStateBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,12 @@ namespace saivs
_In_ sai_attr_id_t attr_id,
_Inout_ sai_s32_list_t *enum_values_capability);

virtual sai_status_t queryAttributeCapability(
_In_ sai_object_id_t switch_id,
_In_ sai_object_type_t object_type,
_In_ sai_attr_id_t attr_id,
_Out_ sai_attr_capability_t *attr_capability);

protected:

virtual sai_status_t remove_internal(
Expand Down Expand Up @@ -689,6 +695,9 @@ namespace saivs
virtual sai_status_t queryHashNativeHashFieldListCapability(
_Inout_ sai_s32_list_t *enum_values_capability);

virtual sai_status_t queryPortAutonegFecOverrideSupportCapability(
_Out_ sai_attr_capability_t *attr_capability);

public: // TODO private

std::set<FdbInfo> m_fdb_info_set;
Expand Down
12 changes: 2 additions & 10 deletions vslib/VirtualSwitchSaiInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,16 +859,8 @@ sai_status_t VirtualSwitchSaiInterface::queryAttributeCapability(
{
SWSS_LOG_ENTER();

// TODO: We should generate this metadata for the virtual switch rather
// than hard-coding it here.

// in virtual switch by default all apis are implemented for all objects. SUCCESS for all attributes

capability->create_implemented = true;
capability->set_implemented = true;
capability->get_implemented = true;

return SAI_STATUS_SUCCESS;
auto ss = m_switchStateMap.at(switch_id);
return ss->queryAttributeCapability(switch_id, object_type, attr_id, capability);
}

sai_status_t VirtualSwitchSaiInterface::queryAattributeEnumValuesCapability(
Expand Down