Add support for stp instance (sonic-net#142)

* Add support for stp instance

* Enable missing vlan mirror attribute

* Fix if/else for stp

Author: kcudnik

meta/sai_meta_sanity.cpp

@@ -619,7 +619,7 @@ std::unordered_map<int32_t, std::unordered_map<int32_t, std::string>> get_attr_n
     ATTR_MAP_SET(MIRROR,SAI_MIRROR_SESSION_ATTR_VLAN_TPID);
     ATTR_MAP_SET(MIRROR,SAI_MIRROR_SESSION_ATTR_VLAN_ID);
     ATTR_MAP_SET(MIRROR,SAI_MIRROR_SESSION_ATTR_VLAN_PRI);
-    //ATTR_MAP_SET(MIRROR,SAI_MIRROR_SESSION_ATTR_VLAN_CFI);
+    ATTR_MAP_SET(MIRROR,SAI_MIRROR_SESSION_ATTR_VLAN_CFI);
     ATTR_MAP_SET(MIRROR,SAI_MIRROR_SESSION_ATTR_ENCAP_TYPE);
     ATTR_MAP_SET(MIRROR,SAI_MIRROR_SESSION_ATTR_IPHDR_VERSION);
     ATTR_MAP_SET(MIRROR,SAI_MIRROR_SESSION_ATTR_TOS);

saiplayer/saiplayer.cpp

@@ -1011,7 +1011,7 @@ void performNotifySyncd(const std::string& request, const std::string response)
 
     if (status != response_status)
     {
-        SWSS_LOG_ERROR("response status %s is differnt than syncd status %s", responseStatus.c_str(), sai_serialize_status(status).c_str());
+        SWSS_LOG_ERROR("response status %s is different than syncd status %s", responseStatus.c_str(), sai_serialize_status(status).c_str());
         exit(EXIT_FAILURE);
     }
 

syncd/syncd.cpp

@@ -970,11 +970,13 @@ void clearTempView()
     }
 }
 
-void syncdApplyView()
+sai_status_t syncdApplyView()
 {
     SWSS_LOG_ENTER();
 
     SWSS_LOG_ERROR("apply view is not implemented yet");
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
 }
 
 sai_status_t notifySyncd(const std::string& op)

syncd/syncd.h

@@ -49,6 +49,7 @@ extern "C" {
 #define HIDDEN                      "HIDDEN"
 #define DEFAULT_VIRTUAL_ROUTER_ID   "DEFAULT_VIRTUAL_ROUTER_ID"
 #define DEFAULT_TRAP_GROUP_ID       "DEFAULT_TRAP_GROUP_ID"
+#define DEFAULT_STP_INSTANCE_ID     "DEFAULT_STP_INSTANCE_ID"
 #define CPU_PORT_ID                 "CPU_PORT_ID"
 
 #define SAI_COLD_BOOT               0
@@ -75,6 +76,8 @@ std::unordered_map<sai_object_id_t, sai_object_id_t> redisGetRidToVidMap();
 std::vector<std::string> redisGetAsicStateKeys();
 sai_object_id_t redisGetDefaultVirtualRouterId();
 sai_object_id_t redisGetDefaultTrapGroupId();
+sai_object_id_t redisGetDefaultStpInstanceId();
+sai_object_id_t redisGetCpuId();
 void redisClearVidToRidMap();
 void redisClearRidToVidMap();
 
@@ -160,4 +163,7 @@ sai_object_type_t getObjectTypeFromVid(sai_object_id_t sai_object_id);
 void start_cli();
 void stop_cli();
 
+sai_status_t applyViewTransition();
+sai_status_t syncdApplyView();
+
 #endif // __SYNCD_H__

syncd/syncd_hard_reinit.cpp

@@ -435,6 +435,13 @@ sai_object_id_t processSingleVid(sai_object_id_t vid)
             SWSS_LOG_INFO("default virtual router will not be created, processed VID 0x%lx to RID 0x%lx", vid, rid);
         }
     }
+    else if (objectType == SAI_OBJECT_TYPE_STP_INSTANCE)
+    {
+        if (shouldSkipCreateion(vid, rid, createObject, [](sai_object_id_t id) { return id == redisGetDefaultStpInstanceId(); }))
+        {
+            SWSS_LOG_INFO("default virtual router will not be created, processed VID 0x%lx to RID 0x%lx", vid, rid);
+        }
+    }
     else if (objectType == SAI_OBJECT_TYPE_QUEUE)
     {
         if (shouldSkipCreateion(vid, rid, createObject, [&](sai_object_id_t queueId) { return g_defaultQueuesRids.find(queueId) != g_defaultQueuesRids.end(); }))

syncd/syncd_init.cpp

@@ -70,6 +70,7 @@ void initialize_common_api_pointers()
     common_create[SAI_OBJECT_TYPE_NEIGHBOR] = NULL;
     common_create[SAI_OBJECT_TYPE_ROUTE] = NULL;
     common_create[SAI_OBJECT_TYPE_VLAN] = NULL;
+    common_create[SAI_OBJECT_TYPE_STP_INSTANCE] = (sai_stp_api) ? sai_stp_api->create_stp : NULL;
 
     common_remove[SAI_OBJECT_TYPE_NULL] = NULL;
     common_remove[SAI_OBJECT_TYPE_PORT] = NULL;
@@ -105,6 +106,7 @@ void initialize_common_api_pointers()
     common_remove[SAI_OBJECT_TYPE_NEIGHBOR] = NULL;
     common_remove[SAI_OBJECT_TYPE_ROUTE] = NULL;
     common_remove[SAI_OBJECT_TYPE_VLAN] = NULL;
+    common_remove[SAI_OBJECT_TYPE_STP_INSTANCE] = (sai_stp_api) ? sai_stp_api->remove_stp : NULL;
 
     common_set_attribute[SAI_OBJECT_TYPE_NULL] = NULL;
     common_set_attribute[SAI_OBJECT_TYPE_PORT] = (sai_port_api) ? sai_port_api->set_port_attribute : NULL;
@@ -140,6 +142,7 @@ void initialize_common_api_pointers()
     common_set_attribute[SAI_OBJECT_TYPE_NEIGHBOR] = NULL;
     common_set_attribute[SAI_OBJECT_TYPE_ROUTE] = NULL;
     common_set_attribute[SAI_OBJECT_TYPE_VLAN] = NULL;
+    common_set_attribute[SAI_OBJECT_TYPE_STP_INSTANCE] = (sai_stp_api) ? sai_stp_api->set_stp_attribute: NULL;
 
     common_get_attribute[SAI_OBJECT_TYPE_NULL] = NULL;
     common_get_attribute[SAI_OBJECT_TYPE_PORT] = (sai_port_api) ? sai_port_api->get_port_attribute : NULL;
@@ -175,6 +178,7 @@ void initialize_common_api_pointers()
     common_get_attribute[SAI_OBJECT_TYPE_NEIGHBOR] = NULL;
     common_get_attribute[SAI_OBJECT_TYPE_ROUTE] = NULL;
     common_get_attribute[SAI_OBJECT_TYPE_VLAN] = NULL;
+    common_get_attribute[SAI_OBJECT_TYPE_STP_INSTANCE] = (sai_stp_api) ? sai_stp_api->get_stp_attribute: NULL;
 }
 
 void populate_sai_apis()

syncd/syncd_reinit.cpp

@@ -141,6 +141,26 @@ sai_object_id_t saiGetDefaultTrapGroup()
     return attr.value.oid;
 }
 
+sai_object_id_t saiGetDefaultStpInstance()
+{
+    SWSS_LOG_ENTER();
+
+    sai_attribute_t attr;
+
+    attr.id = SAI_SWITCH_ATTR_DEFAULT_STP_INST_ID;
+
+    sai_status_t status = sai_switch_api->get_switch_attribute(1, &attr);
+
+    if (status != SAI_STATUS_SUCCESS)
+    {
+         SWSS_LOG_ERROR("failed to get switch default stp instance %d", status);
+
+         exit_and_notify(EXIT_FAILURE);
+    }
+
+    return attr.value.oid;
+}
+
 sai_object_id_t saiGetDefaultVirtualRouter()
 {
     SWSS_LOG_ENTER();
@@ -355,6 +375,22 @@ sai_object_id_t redisGetDefaultTrapGroupId()
     return vr_id;
 }
 
+sai_object_id_t redisGetDefaultStpInstanceId()
+{
+    SWSS_LOG_ENTER();
+
+    auto redisStpId = g_redisClient->hget(HIDDEN, DEFAULT_STP_INSTANCE_ID);
+
+    if (redisStpId == NULL)
+        return SAI_NULL_OBJECT_ID;
+
+    sai_object_id_t stp_id;
+
+    sai_deserialize_object_id(*redisStpId, stp_id);
+
+    return stp_id;
+}
+
 sai_object_id_t redisGetCpuId()
 {
     SWSS_LOG_ENTER();
@@ -389,6 +425,15 @@ void redisSetDefaultTrapGroup(sai_object_id_t vr_id)
     g_redisClient->hset(HIDDEN, DEFAULT_TRAP_GROUP_ID, strVrId);
 }
 
+void redisSetDefaultStpInstance(sai_object_id_t stp_id)
+{
+    SWSS_LOG_ENTER();
+
+    std::string strStpId = sai_serialize_object_id(stp_id);
+
+    g_redisClient->hset(HIDDEN, DEFAULT_STP_INSTANCE_ID, strStpId);
+}
+
 void redisCreateRidAndVidMapping(sai_object_id_t rid, sai_object_id_t vid)
 {
     SWSS_LOG_ENTER();
@@ -484,6 +529,34 @@ void helperCheckDefaultTrapGroup()
     }
 }
 
+void helperCheckDefaultStpInstance()
+{
+    SWSS_LOG_ENTER();
+
+    sai_object_id_t stpId = saiGetDefaultStpInstance();
+
+    sai_object_id_t redisStpId = redisGetDefaultStpInstanceId();
+
+    if (redisStpId == SAI_NULL_OBJECT_ID)
+    {
+        redisSetDummyAsicStateForRealObjectId(stpId);
+
+        SWSS_LOG_INFO("redis default stp instance id is not defined yet");
+
+        redisSetDefaultStpInstance(stpId);
+
+        redisStpId = stpId;
+    }
+
+    if (stpId != redisStpId)
+    {
+        // if this happens, we need to remap VIDTORID and RIDTOVID
+        SWSS_LOG_ERROR("FIXME: default stp instance id differs: 0x%lx vs 0x%lx, ids must be remapped", stpId, redisStpId);
+
+        exit_and_notify(EXIT_FAILURE);
+    }
+}
+
 void redisSetCpuId(sai_object_id_t cpuId)
 {
     SWSS_LOG_ENTER();
@@ -923,6 +996,8 @@ void onSyncdStart(bool warmStart)
 
     helperCheckDefaultTrapGroup();
 
+    helperCheckDefaultStpInstance();
+
     helperCheckVlanId();
 
     helperCheckPortIds();

vslib/src/sai_vs_init.cpp

@@ -206,6 +206,24 @@ sai_status_t create_default_virtual_router()
     return vs_generic_set_switch(&attr);
 }
 
+sai_status_t create_default_stp_instance()
+{
+    SWSS_LOG_ENTER();
+
+    SWSS_LOG_INFO("create default stp instance");
+
+    sai_object_id_t stp_instance_id;
+
+    CHECK_STATUS(vs_generic_create(SAI_OBJECT_TYPE_STP_INSTANCE, &stp_instance_id, 0, NULL));
+
+    sai_attribute_t attr;
+
+    attr.id = SAI_SWITCH_ATTR_DEFAULT_STP_INST_ID;
+    attr.value.oid = stp_instance_id;
+
+    return vs_generic_set_switch(&attr);
+}
+
 sai_status_t create_vlan_members_for_default_vlan(
         std::vector<sai_object_id_t>& port_list,
         std::vector<sai_object_id_t>& vlan_member_list)
@@ -641,6 +659,8 @@ sai_status_t initialize_default_objects()
 
     CHECK_STATUS(create_default_virtual_router());
 
+    CHECK_STATUS(create_default_stp_instance());
+
     std::vector<sai_object_id_t> vlan_member_list;
 
     CHECK_STATUS(create_vlan_members_for_default_vlan(port_list, vlan_member_list));