Add default object map after switch init

Author: kcudnik

syncd/syncd_applyview.cpp

@@ -3998,22 +3998,45 @@ bool performObjectSetTransition(
                 if (meta->objecttype == SAI_OBJECT_TYPE_SCHEDULER_GROUP &&
                         meta->attrid == SAI_SCHEDULER_GROUP_ATTR_SCHEDULER_PROFILE_ID)
                 {
-                    // XXX this is workaround, FIXME
-
-                    SWSS_LOG_WARN("workaround for %s, we will bring default value as NULL, but need previous from dep TREE, FIXME",
-                            meta->attridname);
-
                     /*
                      * This attribute can hold reference to user created
                      * objects which maybe required to be destroyed, thats why
                      * we need to bring real value. What if real value were
                      * removed?
                      */
 
+                    sai_object_id_t def = SAI_NULL_OBJECT_ID;
+
+                    auto sw = switches.begin()->second;
+
+                    sai_object_id_t vid = currentBestMatch->getVid();
+
+                    if (currentView.hasVid(vid))
+                    {
+                        // scheduler_group RID
+                        sai_object_id_t rid = currentView.vidToRid.at(vid);
+
+                        rid = sw->getDefaultValueForOidAttr(rid, SAI_SCHEDULER_GROUP_ATTR_SCHEDULER_PROFILE_ID);
+
+                        if (rid != SAI_NULL_OBJECT_ID && currentView.hasRid(rid))
+                        {
+                            /*
+                             * We found default value
+                             */
+
+                            SWSS_LOG_DEBUG("found default rid %s, vid %s for %s",
+                                    sai_serialize_object_id(rid).c_str(),
+                                    sai_serialize_object_id(vid).c_str(),
+                                    meta->attridname);
+
+                            def = currentView.ridToVid.at(rid);
+                        }
+                    }
+
                     sai_attribute_t defattr;
 
                     defattr.id = meta->attrid;
-                    defattr.value.oid = SAI_NULL_OBJECT_ID;
+                    defattr.value.oid = def;
 
                     std::string str_attr_value = sai_serialize_attr_value(*meta, defattr, false);
 
@@ -5521,6 +5544,8 @@ void executeOperationsOnAsic(
 
     try
     {
+        swss::Logger::getInstance().setMinPrio(swss::Logger::SWSS_INFO);
+
         SWSS_LOG_TIMER("asic apply");
 
         for (const auto &op: currentView.asicGetOperations())

syncd/syncd_saiswitch.cpp

@@ -951,6 +951,8 @@ void SaiSwitch::saiDiscover(
                 continue;
             }
 
+            m_defaultOidMap[rid][attr.id] = attr.value.oid;
+
             if (!md->allownullobjectid && attr.value.oid == SAI_NULL_OBJECT_ID)
             {
                 // SWSS_LOG_WARN("got null on %s, but not allowed", md->attridname);
@@ -1168,6 +1170,29 @@ void SaiSwitch::helperInternalOids()
     }
 }
 
+sai_object_id_t SaiSwitch::getDefaultValueForOidAttr(
+        _In_ sai_object_id_t rid,
+        _In_ sai_attr_id_t attr_id)
+{
+    SWSS_LOG_ENTER();
+
+    auto it = m_defaultOidMap.find(rid);
+
+    if (it == m_defaultOidMap.end())
+    {
+        return SAI_NULL_OBJECT_ID;
+    }
+
+    auto ita = it->second.find(attr_id);
+
+    if (ita == it->second.end())
+    {
+        return SAI_NULL_OBJECT_ID;
+    }
+
+    return ita->second;
+}
+
 /*
  * NOTE: If real ID will change during hard restarts, then we need to remap all
  * VID/RID, but we can only do that if we will save entire tree with all

syncd/syncd_saiswitch.h

@@ -145,6 +145,18 @@ class SaiSwitch
         void getDefaultMacAddress(
                 _Out_ sai_mac_t& mac);
 
+        /**
+         * @brief Gets default value of attribute for given object.
+         *
+         * This applies to objects discovered after switch init like
+         * SAI_SCHEDULER_GROUP_ATTR_SCHEDULER_PROFILE_ID.
+         *
+         * If object or attribute is not found, SAI_NULL_OBJECT_ID is returned.
+         */
+        sai_object_id_t getDefaultValueForOidAttr(
+                _In_ sai_object_id_t rid,
+                _In_ sai_attr_id_t attr_id);
+
     private:
 
         /*
@@ -298,6 +310,25 @@ class SaiSwitch
 
         std::string getRedisLanesKey() const;
         std::string getRedisHiddenKey() const;
+
+        /**
+         * @brief Default oid map.
+         *
+         * This map will contain default created objects and all their "oid"
+         * attributes and it's default value. This will be needed for bringing
+         * default values.
+         *
+         * TODO later on we need to make this for all attributes.
+         *
+         * Example:
+         * SAI_OBJECT_TYPE_SCHEDULER: oid:0x16
+         *
+         * SAI_OBJECT_TYPE_SCHEDULER_GROUP: oid:0x17
+         *     SAI_SCHEDULER_GROUP_ATTR_SCHEDULER_PROFILE_ID: oid:0x16
+         *
+         * m_defaultOidMap[0x17][SAI_SCHEDULER_GROUP_ATTR_SCHEDULER_PROFILE_ID] == 0x16
+         */
+        std::unordered_map<sai_object_id_t, std::unordered_map<sai_attr_id_t, sai_object_id_t>> m_defaultOidMap;
 };
 
 extern std::map<sai_object_id_t, std::shared_ptr<SaiSwitch>> switches;