Move SAI_MACSEC_ATTR_SCI_IN_INGRESS_MACSEC_ACL from get to refresh

Signed-off-by: Ze Gan <ganze718@gmail.com>

Author: Pterosaur

vslib/inc/SwitchStateBase.h

@@ -138,6 +138,9 @@ namespace saivs
             virtual sai_status_t refresh_system_port_list(
                     _In_ const sai_attr_metadata_t *meta);
 
+            virtual sai_status_t refresh_macsec_sci_in_ingress_macsec_acl(
+                    _In_ sai_object_id_t object_id);
+
         public:
 
             virtual sai_status_t warm_boot_initialize_objects();
@@ -542,11 +545,6 @@ namespace saivs
                     _In_ sai_object_type_t object_type,
                     _Out_ std::vector<MACsecAttr> &macsec_attrs);
 
-            sai_status_t getMACsecAttr(
-                    _In_ const std::string &serializedObjectId,
-                    _In_ uint32_t attr_count,
-                    _Out_ sai_attribute_t *attr_list);
-
             sai_status_t getMACsecSAAttr(
                     _In_ const std::string &serializedObjectId,
                     _In_ uint32_t attr_count,

vslib/src/SwitchStateBase.cpp

@@ -701,14 +701,6 @@ sai_status_t SwitchStateBase::get(
             attr_list);
     }
 
-    if (objectType == SAI_OBJECT_TYPE_MACSEC)
-    {
-        return getMACsecAttr(
-            serializedObjectId,
-            attr_count,
-            attr_list);
-    }
-
     return get_internal(objectType, serializedObjectId, attr_count, attr_list);
 }
 
@@ -1806,6 +1798,20 @@ sai_status_t SwitchStateBase::refresh_port_list(
     return SAI_STATUS_SUCCESS;
 }
 
+sai_status_t SwitchStateBase::refresh_macsec_sci_in_ingress_macsec_acl(
+        _In_ sai_object_id_t object_id)
+{
+    SWSS_LOG_ENTER();
+
+    sai_attribute_t attr;
+    attr.id = SAI_MACSEC_ATTR_SCI_IN_INGRESS_MACSEC_ACL;
+    attr.value.booldata = true;
+
+    CHECK_STATUS(set(SAI_OBJECT_TYPE_MACSEC, object_id, &attr));
+
+    return SAI_STATUS_SUCCESS;
+}
+
 // XXX extra work may be needed on GET api if N on list will be > then actual
 
 /*
@@ -1939,6 +1945,11 @@ sai_status_t SwitchStateBase::refresh_read_only(
         return SAI_STATUS_SUCCESS;
     }
 
+    if (meta->objecttype == SAI_OBJECT_TYPE_MACSEC && meta->attrid == SAI_MACSEC_ATTR_SCI_IN_INGRESS_MACSEC_ACL)
+    {
+        return refresh_macsec_sci_in_ingress_macsec_acl(object_id);
+    }
+
     auto mmeta = m_meta.lock();
 
     if (mmeta)

vslib/src/SwitchStateBaseMACsec.cpp

@@ -748,32 +748,6 @@ sai_status_t SwitchStateBase::loadMACsecAttrsFromACLEntry(
     return SAI_STATUS_NOT_IMPLEMENTED;
 }
 
-sai_status_t SwitchStateBase::getMACsecAttr(
-        _In_ const std::string &serializedObjectId,
-        _In_ uint32_t attrCount,
-        _Out_ sai_attribute_t *attrList)
-{
-    SWSS_LOG_ENTER();
-
-    for (uint32_t i = 0; i < attrCount; i++)
-    {
-        if (attrList[i].id == SAI_MACSEC_ATTR_SCI_IN_INGRESS_MACSEC_ACL)
-        {
-            attrList[i].value.booldata = true;
-        }
-        else
-        {
-            auto meta = sai_metadata_get_attr_metadata(SAI_OBJECT_TYPE_MACSEC, attrList[i].id);
-
-            SWSS_LOG_WARN("Cannot get attribute %s", meta->attridname);
-
-            return SAI_STATUS_NOT_IMPLEMENTED;
-        }
-    }
-
-    return SAI_STATUS_SUCCESS;
-}
-
 sai_status_t SwitchStateBase::getMACsecSAAttr(
         _In_ const std::string &serializedObjectId,
         _In_ uint32_t attrCount,