[action] [PR:1610] [trim]: Add Packet Trimming Asym DSCP to VS lib

tests/aspell.en.pws

@@ -430,6 +430,7 @@ TXSC
 typedef
 uint
 uncomment
+unicast
 uninitialize
 unistd
 unittest

unittest/vslib/Makefile.am

@@ -40,6 +40,7 @@ tests_SOURCES = main.cpp \
 				TestSwitch.cpp \
 				TestSwitchMLNX2700.cpp \
 				TestSwitchNvdaMBF2H536C.cpp \
+				TestSwitchBCM56971B0.cpp \
 				TestSwitchBCM56850.cpp \
 				TestSwitchBCM81724.cpp \
 				TestSwitchStateBaseMACsec.cpp \

unittest/vslib/TestSwitchBCM56850.cpp

@@ -212,6 +212,53 @@ static bool getWarmBootState(
     return true;
 }
 
+TEST(SwitchBCM56850, test_queue_number_get)
+{
+    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);
+
+    // Initialize switch state
+    ASSERT_EQ(sw.initialize_default_objects(0, nullptr), SAI_STATUS_SUCCESS);
+
+    const sai_uint32_t uqNum = 10;
+    const sai_uint32_t mqNum = 10;
+    const sai_uint32_t qNum = uqNum + mqNum;
+
+    sai_attribute_t attr;
+
+    // Verify unicast queue number
+    attr.id = SAI_SWITCH_ATTR_NUMBER_OF_UNICAST_QUEUES;
+    ASSERT_EQ(sw.get(SAI_OBJECT_TYPE_SWITCH, 0x2100000000, 1, &attr), SAI_STATUS_SUCCESS);
+    ASSERT_EQ(attr.value.u32, uqNum);
+
+    // Verify multicast queue number
+    attr.id = SAI_SWITCH_ATTR_NUMBER_OF_MULTICAST_QUEUES;
+    ASSERT_EQ(sw.get(SAI_OBJECT_TYPE_SWITCH, 0x2100000000, 1, &attr), SAI_STATUS_SUCCESS);
+    ASSERT_EQ(attr.value.u32, mqNum);
+
+    // Verify total queue number
+    attr.id = SAI_SWITCH_ATTR_NUMBER_OF_QUEUES;
+    ASSERT_EQ(sw.get(SAI_OBJECT_TYPE_SWITCH, 0x2100000000, 1, &attr), SAI_STATUS_SUCCESS);
+    ASSERT_EQ(attr.value.u32, qNum);
+}
+
 TEST(SwitchBCM56850, warm_update_queues)
 {
     auto sc = std::make_shared<SwitchConfig>(0, "");

unittest/vslib/TestSwitchBCM56971B0.cpp

@@ -0,0 +1,52 @@
+#include <gtest/gtest.h>
+
+#include "SwitchBCM56971B0.h"
+
+using namespace saivs;
+
+TEST(SwitchBCM56971B0, test_queue_number_get)
+{
+    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_BCM56971B0;
+    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);
+
+    SwitchBCM56971B0 sw(
+            0x2100000000,
+            std::make_shared<RealObjectIdManager>(0, scc),
+            sc);
+
+    // Initialize switch state
+    ASSERT_EQ(sw.initialize_default_objects(0, nullptr), SAI_STATUS_SUCCESS);
+
+    const sai_uint32_t uqNum = 10;
+    const sai_uint32_t mqNum = 10;
+    const sai_uint32_t qNum = uqNum + mqNum;
+
+    sai_attribute_t attr;
+
+    // Verify unicast queue number
+    attr.id = SAI_SWITCH_ATTR_NUMBER_OF_UNICAST_QUEUES;
+    ASSERT_EQ(sw.get(SAI_OBJECT_TYPE_SWITCH, 0x2100000000, 1, &attr), SAI_STATUS_SUCCESS);
+    ASSERT_EQ(attr.value.u32, uqNum);
+
+    // Verify multicast queue number
+    attr.id = SAI_SWITCH_ATTR_NUMBER_OF_MULTICAST_QUEUES;
+    ASSERT_EQ(sw.get(SAI_OBJECT_TYPE_SWITCH, 0x2100000000, 1, &attr), SAI_STATUS_SUCCESS);
+    ASSERT_EQ(attr.value.u32, mqNum);
+
+    // Verify total queue number
+    attr.id = SAI_SWITCH_ATTR_NUMBER_OF_QUEUES;
+    ASSERT_EQ(sw.get(SAI_OBJECT_TYPE_SWITCH, 0x2100000000, 1, &attr), SAI_STATUS_SUCCESS);
+    ASSERT_EQ(attr.value.u32, qNum);
+}

unittest/vslib/TestSwitchMLNX2700.cpp

@@ -139,6 +139,33 @@ TEST_F(SwitchMLNX2700Test, portBulkAddRemove)
     }
 }
 
+TEST_F(SwitchMLNX2700Test, switchQueueNumberGet)
+{
+    // Initialize switch state
+    ASSERT_EQ(m_ss->initialize_default_objects(0, nullptr), SAI_STATUS_SUCCESS);
+
+    const sai_uint32_t uqNum = 8;
+    const sai_uint32_t mqNum = 8;
+    const sai_uint32_t qNum = uqNum + mqNum;
+
+    sai_attribute_t attr;
+
+    // Verify unicast queue number
+    attr.id = SAI_SWITCH_ATTR_NUMBER_OF_UNICAST_QUEUES;
+    ASSERT_EQ(m_ss->get(SAI_OBJECT_TYPE_SWITCH, m_swid, 1, &attr), SAI_STATUS_SUCCESS);
+    ASSERT_EQ(attr.value.u32, uqNum);
+
+    // Verify multicast queue number
+    attr.id = SAI_SWITCH_ATTR_NUMBER_OF_MULTICAST_QUEUES;
+    ASSERT_EQ(m_ss->get(SAI_OBJECT_TYPE_SWITCH, m_swid, 1, &attr), SAI_STATUS_SUCCESS);
+    ASSERT_EQ(attr.value.u32, mqNum);
+
+    // Verify total queue number
+    attr.id = SAI_SWITCH_ATTR_NUMBER_OF_QUEUES;
+    ASSERT_EQ(m_ss->get(SAI_OBJECT_TYPE_SWITCH, m_swid, 1, &attr), SAI_STATUS_SUCCESS);
+    ASSERT_EQ(attr.value.u32, qNum);
+}
+
 TEST(SwitchMLNX2700, ctr)
 {
     auto sc = std::make_shared<SwitchConfig>(0, "");

unittest/vslib/TestSwitchStateBase.cpp

@@ -174,6 +174,37 @@ TEST_F(SwitchStateBaseTest, switchHashAlgorithmCapabilitiesGet)
     ASSERT_EQ(haSet1, haSet2);
 }
 
+TEST_F(SwitchStateBaseTest, switchPacketTrimmingDscpModeCapabilitiesGet)
+{
+    sai_s32_list_t data = { .count = 0, .list = nullptr };
+
+    auto status = m_ss->queryAttrEnumValuesCapability(
+        m_swid, SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_RESOLUTION_MODE, &data
+    );
+    ASSERT_EQ(status, SAI_STATUS_BUFFER_OVERFLOW);
+
+    std::vector<sai_int32_t> qmList(data.count);
+    data.list = qmList.data();
+
+    status = m_ss->queryAttrEnumValuesCapability(
+        m_swid, SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_RESOLUTION_MODE, &data
+    );
+    ASSERT_EQ(status, SAI_STATUS_SUCCESS);
+
+    const std::set<sai_packet_trim_dscp_resolution_mode_t> qmSet1 = {
+        SAI_PACKET_TRIM_DSCP_RESOLUTION_MODE_DSCP_VALUE,
+        SAI_PACKET_TRIM_DSCP_RESOLUTION_MODE_FROM_TC
+    };
+
+    std::set<sai_packet_trim_dscp_resolution_mode_t> qmSet2;
+
+    std::transform(
+        qmList.cbegin(), qmList.cend(), std::inserter(qmSet2, qmSet2.begin()),
+        [](sai_int32_t value) { return static_cast<sai_packet_trim_dscp_resolution_mode_t>(value); }
+    );
+    ASSERT_EQ(qmSet1, qmSet2);
+}
+
 TEST_F(SwitchStateBaseTest, switchPacketTrimmingQueueModeCapabilitiesGet)
 {
     sai_s32_list_t data = { .count = 0, .list = nullptr };
@@ -236,6 +267,18 @@ TEST_F(SwitchStateBaseTest, bufferProfilePacketAdmissionFailActionCapabilitiesGe
     ASSERT_EQ(paSet1, paSet2);
 }
 
+TEST_F(SwitchStateBaseTest, switchQoSMaxNumOfTrafficClasses)
+{
+    ASSERT_EQ(m_ss->set_maximum_number_of_traffic_classes(), SAI_STATUS_SUCCESS);
+
+    sai_attribute_t attr;
+    attr.id = SAI_SWITCH_ATTR_QOS_MAX_NUMBER_OF_TRAFFIC_CLASSES;
+    ASSERT_EQ(m_ss->get(SAI_OBJECT_TYPE_SWITCH, sai_serialize_object_id(m_swid), 1, &attr), SAI_STATUS_SUCCESS);
+
+    const sai_uint8_t maxTcNum = 16;
+    ASSERT_EQ(attr.value.u8, maxTcNum);
+}
+
 //Test the following function:
 //sai_status_t initialize_voq_switch_objects(
 //             _In_ uint32_t attr_count,

vslib/SwitchBCM56850.cpp

@@ -36,7 +36,7 @@ sai_status_t SwitchBCM56850::create_qos_queues_per_port(
     sai_attribute_t attr;
 
     // 10 in and 10 out queues per port
-    const uint32_t port_qos_queues_count = 20;
+    const uint32_t port_qos_queues_count = m_unicastQueueNumber + m_multicastQueueNumber;
 
     std::vector<sai_object_id_t> queues;
 
@@ -146,6 +146,36 @@ sai_status_t SwitchBCM56850::create_qos_queues()
     return SAI_STATUS_SUCCESS;
 }
 
+sai_status_t SwitchBCM56850::set_number_of_queues()
+{
+    SWSS_LOG_ENTER();
+
+    SWSS_LOG_INFO("set number of unicast queues");
+
+    sai_attribute_t attr;
+
+    attr.id = SAI_SWITCH_ATTR_NUMBER_OF_UNICAST_QUEUES;
+    attr.value.u32 = m_unicastQueueNumber;
+
+    CHECK_STATUS(set(SAI_OBJECT_TYPE_SWITCH, m_switch_id, &attr));
+
+    SWSS_LOG_INFO("set number of multicast queues");
+
+    attr.id = SAI_SWITCH_ATTR_NUMBER_OF_MULTICAST_QUEUES;
+    attr.value.u32 = m_multicastQueueNumber;
+
+    CHECK_STATUS(set(SAI_OBJECT_TYPE_SWITCH, m_switch_id, &attr));
+
+    SWSS_LOG_INFO("set number of queues");
+
+    attr.id = SAI_SWITCH_ATTR_NUMBER_OF_QUEUES;
+    attr.value.u32 = m_unicastQueueNumber + m_multicastQueueNumber;
+
+    CHECK_STATUS(set(SAI_OBJECT_TYPE_SWITCH, m_switch_id, &attr));
+
+    return SAI_STATUS_SUCCESS;
+}
+
 sai_status_t SwitchBCM56850::create_port_serdes()
 {
     SWSS_LOG_ENTER();

vslib/SwitchBCM56850.h

@@ -32,6 +32,8 @@ namespace saivs
 
             virtual sai_status_t create_qos_queues() override;
 
+            virtual sai_status_t set_number_of_queues() override;
+
             virtual sai_status_t create_scheduler_group_tree(
                     _In_ const std::vector<sai_object_id_t>& sgs,
                     _In_ sai_object_id_t port_id) override;
@@ -51,5 +53,10 @@ namespace saivs
 
             virtual sai_status_t create_port_serdes_per_port(
                     _In_ sai_object_id_t port_id) override;
+
+        protected:
+
+            constexpr static const uint32_t m_unicastQueueNumber = 10;
+            constexpr static const uint32_t m_multicastQueueNumber = 10;
     };
 }

vslib/SwitchBCM56971B0.cpp

@@ -36,7 +36,7 @@ sai_status_t SwitchBCM56971B0::create_qos_queues_per_port(
     sai_attribute_t attr;
 
     // 10 in and 10 out queues per port
-    const uint32_t port_qos_queues_count = 20;
+    const uint32_t port_qos_queues_count = m_unicastQueueNumber + m_multicastQueueNumber;
 
     std::vector<sai_object_id_t> queues;
 
@@ -146,6 +146,36 @@ sai_status_t SwitchBCM56971B0::create_qos_queues()
     return SAI_STATUS_SUCCESS;
 }
 
+sai_status_t SwitchBCM56971B0::set_number_of_queues()
+{
+    SWSS_LOG_ENTER();
+
+    SWSS_LOG_INFO("set number of unicast queues");
+
+    sai_attribute_t attr;
+
+    attr.id = SAI_SWITCH_ATTR_NUMBER_OF_UNICAST_QUEUES;
+    attr.value.u32 = m_unicastQueueNumber;
+
+    CHECK_STATUS(set(SAI_OBJECT_TYPE_SWITCH, m_switch_id, &attr));
+
+    SWSS_LOG_INFO("set number of multicast queues");
+
+    attr.id = SAI_SWITCH_ATTR_NUMBER_OF_MULTICAST_QUEUES;
+    attr.value.u32 = m_multicastQueueNumber;
+
+    CHECK_STATUS(set(SAI_OBJECT_TYPE_SWITCH, m_switch_id, &attr));
+
+    SWSS_LOG_INFO("set number of queues");
+
+    attr.id = SAI_SWITCH_ATTR_NUMBER_OF_QUEUES;
+    attr.value.u32 = m_unicastQueueNumber + m_multicastQueueNumber;
+
+    CHECK_STATUS(set(SAI_OBJECT_TYPE_SWITCH, m_switch_id, &attr));
+
+    return SAI_STATUS_SUCCESS;
+}
+
 sai_status_t SwitchBCM56971B0::create_port_serdes()
 {
     SWSS_LOG_ENTER();

vslib/SwitchBCM56971B0.h

@@ -32,6 +32,8 @@ namespace saivs
 
             virtual sai_status_t create_qos_queues() override;
 
+            virtual sai_status_t set_number_of_queues() override;
+
             virtual sai_status_t create_scheduler_group_tree(
                     _In_ const std::vector<sai_object_id_t>& sgs,
                     _In_ sai_object_id_t port_id) override;
@@ -51,5 +53,10 @@ namespace saivs
 
             virtual sai_status_t create_port_serdes_per_port(
                     _In_ sai_object_id_t port_id) override;
+
+        protected:
+
+            constexpr static const uint32_t m_unicastQueueNumber = 10;
+            constexpr static const uint32_t m_multicastQueueNumber = 10;
     };
 }

vslib/SwitchMLNX2700.cpp

@@ -34,7 +34,7 @@ sai_status_t SwitchMLNX2700::create_qos_queues_per_port(
     SWSS_LOG_ENTER();
 
     // 8 in and 8 out queues per port
-    const uint32_t port_qos_queues_count = 16;
+    const uint32_t port_qos_queues_count = m_unicastQueueNumber + m_multicastQueueNumber;
     std::vector<sai_object_id_t> queues;
 
     for (uint32_t i = 0; i < port_qos_queues_count; ++i)
@@ -91,6 +91,36 @@ sai_status_t SwitchMLNX2700::create_qos_queues()
     return SAI_STATUS_SUCCESS;
 }
 
+sai_status_t SwitchMLNX2700::set_number_of_queues()
+{
+    SWSS_LOG_ENTER();
+
+    SWSS_LOG_INFO("set number of unicast queues");
+
+    sai_attribute_t attr;
+
+    attr.id = SAI_SWITCH_ATTR_NUMBER_OF_UNICAST_QUEUES;
+    attr.value.u32 = m_unicastQueueNumber;
+
+    CHECK_STATUS(set(SAI_OBJECT_TYPE_SWITCH, m_switch_id, &attr));
+
+    SWSS_LOG_INFO("set number of multicast queues");
+
+    attr.id = SAI_SWITCH_ATTR_NUMBER_OF_MULTICAST_QUEUES;
+    attr.value.u32 = m_multicastQueueNumber;
+
+    CHECK_STATUS(set(SAI_OBJECT_TYPE_SWITCH, m_switch_id, &attr));
+
+    SWSS_LOG_INFO("set number of queues");
+
+    attr.id = SAI_SWITCH_ATTR_NUMBER_OF_QUEUES;
+    attr.value.u32 = m_unicastQueueNumber + m_multicastQueueNumber;
+
+    CHECK_STATUS(set(SAI_OBJECT_TYPE_SWITCH, m_switch_id, &attr));
+
+    return SAI_STATUS_SUCCESS;
+}
+
 sai_status_t SwitchMLNX2700::create_scheduler_group_tree(
         _In_ const std::vector<sai_object_id_t>& sgs,
         _In_ sai_object_id_t port_id)