Update SAI version to 1.16.1

.github/workflows/codeql-analysis.yml

@@ -16,7 +16,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     permissions:
       actions: read
       contents: read
@@ -55,11 +55,11 @@ jobs:
             libzmq3-dev \
             libzmq5 \
             swig4.0 \
-            libpython2.7-dev \
+            libpython3-dev \
             libgtest-dev \
             libgmock-dev \
-            libboost1.71-dev \
-            libboost-serialization1.71-dev \
+            libboost-dev \
+            libboost-serialization-dev \
             dh-exec \
             doxygen \
             cdbs \
@@ -69,8 +69,7 @@ jobs:
             autoconf-archive \
             uuid-dev \
             libjansson-dev \
-            nlohmann-json3-dev \
-            python
+            nlohmann-json3-dev
 
     - if: matrix.language == 'cpp'
       name: Build sonic-swss-common
@@ -79,7 +78,7 @@ jobs:
         git clone https://github.com/sonic-net/sonic-swss-common
         pushd sonic-swss-common
         ./autogen.sh
-        dpkg-buildpackage -rfakeroot -us -uc -b -j$(nproc)
+        dpkg-buildpackage -rfakeroot -us -uc -b -Pnoyangmod,nopython2 -j$(nproc)
         popd
         dpkg-deb -x libswsscommon_${SWSSCOMMON_VER}_amd64.deb $(dirname $GITHUB_WORKSPACE)
         dpkg-deb -x libswsscommon-dev_${SWSSCOMMON_VER}_amd64.deb $(dirname $GITHUB_WORKSPACE)

.gitmodules

@@ -2,4 +2,4 @@
 	path = SAI
 	url = https://github.com/opencomputeproject/SAI.git
 	ignore = dirty
-	branch = v1.3
+	branch = v1.16

meta/Meta.cpp

@@ -8,6 +8,8 @@
 
 #include <inttypes.h>
 
+#include <boost/algorithm/string/join.hpp>
+
 #include <set>
 
 // TODO add validation for all oids belong to the same switch
@@ -3093,6 +3095,25 @@ sai_status_t Meta::meta_sai_validate_pa_validation_entry(
     return SAI_STATUS_SUCCESS;
 }
 
+sai_status_t Meta::meta_sai_validate_outbound_port_map_port_range_entry(
+    _In_ const sai_outbound_port_map_port_range_entry_t* outbound_port_map_entry,
+    _In_ bool create,
+    _In_ bool get)
+{
+    SWSS_LOG_ENTER();
+
+    if (outbound_port_map_entry == NULL)
+    {
+        SWSS_LOG_ERROR("outbound_port_map_entry pointer is NULL");
+
+        return SAI_STATUS_INVALID_PARAMETER;
+    }
+
+    // TODO FIX ME
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 sai_status_t Meta::meta_sai_validate_outbound_routing_entry(
         _In_ const sai_outbound_routing_entry_t* outbound_routing_entry,
         _In_ bool create,
@@ -3139,6 +3160,44 @@ sai_status_t Meta::meta_sai_validate_outbound_routing_entry(
     return SAI_STATUS_SUCCESS;
 }
 
+sai_status_t Meta::meta_sai_validate_global_trusted_vni_entry(
+    _In_ const sai_global_trusted_vni_entry_t* global_trusted_vni_entry,
+    _In_ bool create,
+    _In_ bool get)
+{
+    SWSS_LOG_ENTER();
+
+    if (global_trusted_vni_entry == NULL)
+    {
+        SWSS_LOG_ERROR("global_trusted_vni_entry pointer is NULL");
+
+        return SAI_STATUS_INVALID_PARAMETER;
+    }
+
+    // TODO FIX ME
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
+sai_status_t Meta::meta_sai_validate_eni_trusted_vni_entry(
+    _In_ const sai_eni_trusted_vni_entry_t* eni_trusted_vni_entry,
+    _In_ bool create,
+    _In_ bool get)
+{
+    SWSS_LOG_ENTER();
+
+    if (eni_trusted_vni_entry == NULL)
+    {
+        SWSS_LOG_ERROR("eni_trusted_vni_entry pointer is NULL");
+
+        return SAI_STATUS_INVALID_PARAMETER;
+    }
+
+    // TODO FIX ME
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 sai_status_t Meta::meta_sai_validate_outbound_ca_to_pa_entry(
         _In_ const sai_outbound_ca_to_pa_entry_t* outbound_ca_to_pa_entry,
         _In_ bool create,
@@ -3223,6 +3282,25 @@ sai_status_t Meta::meta_sai_validate_meter_bucket_entry(
     return SAI_STATUS_NOT_IMPLEMENTED;
 }
 
+sai_status_t Meta::meta_sai_validate_prefix_compression_entry(
+        _In_ const sai_prefix_compression_entry_t* prefix_compression_entry,
+        _In_ bool create,
+        _In_ bool get)
+{
+    SWSS_LOG_ENTER();
+
+    if (prefix_compression_entry == NULL)
+    {
+        SWSS_LOG_ERROR("prefix_compression_entry pointer is NULL");
+
+        return SAI_STATUS_INVALID_PARAMETER;
+    }
+
+    // TODO FIX ME
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 sai_status_t Meta::meta_generic_validation_create(
         _In_ const sai_object_meta_key_t& meta_key,
         _In_ sai_object_id_t switch_id,
@@ -6744,24 +6822,14 @@ void Meta::meta_sai_on_port_state_change_single(
 
     auto ot = objectTypeQuery(data.port_id);
 
-    bool valid = false;
+    bool valid = isPortObjectIdValid(ot);
 
-    switch (ot)
+    if (!valid)
     {
-        // TODO hardcoded types, must advance SAI repository commit to get metadata for this
-        case SAI_OBJECT_TYPE_PORT:
-        case SAI_OBJECT_TYPE_BRIDGE_PORT:
-        case SAI_OBJECT_TYPE_LAG:
-
-            valid = true;
-            break;
-
-        default:
-
-            SWSS_LOG_ERROR("data.port_id %s has unexpected type: %s, expected PORT, BRIDGE_PORT or LAG",
-                    sai_serialize_object_id(data.port_id).c_str(),
-                    sai_serialize_object_type(ot).c_str());
-            break;
+        SWSS_LOG_ERROR("data.port_id %s has unexpected type: %s, expected: %s",
+                sai_serialize_object_id(data.port_id).c_str(),
+                sai_serialize_object_type(ot).c_str(),
+                boost::algorithm::join(getValidPortObjectTypes(), ",").c_str());
     }
 
     if (valid && !m_oids.objectReferenceExists(data.port_id))
@@ -7181,3 +7249,46 @@ void Meta::populate(
         }
     }
 }
+
+bool Meta::isPortObjectIdValid(
+        _In_ sai_object_type_t object_type)
+{
+    SWSS_LOG_ENTER();
+
+    auto members = sai_metadata_struct_members_sai_port_oper_status_notification_t;
+
+    for (size_t i = 0; members[i]; i++)
+    {
+        auto* mb = members[i];
+
+        if (mb->membername != std::string("port_id"))
+            continue;
+
+        for (size_t idx = 0; idx < mb->allowedobjecttypeslength; idx++)
+        {
+            if (mb->allowedobjecttypes[idx] == object_type)
+                return true;
+        }
+
+        return false;
+    }
+
+    SWSS_LOG_THROW("port_id member not found on sai_port_oper_status_notification");
+}
+
+std::vector<std::string> Meta::getValidPortObjectTypes()
+{
+    SWSS_LOG_ENTER();
+
+    auto md = sai_metadata_enum_sai_object_type_t;
+
+    std::vector<std::string> v;
+
+    for (size_t i = 0; i < md.valuescount; i++)
+    {
+        if (isPortObjectIdValid((sai_object_type_t)md.values[i]))
+            v.push_back(md.valuesshortnames[i]);
+    }
+
+    return v;
+}

meta/Meta.h

@@ -320,6 +320,11 @@ namespace saimeta
             static bool is_ipv6_mask_valid(
                     _In_ const uint8_t* mask);
 
+            static bool isPortObjectIdValid(
+                    _In_ sai_object_type_t object_type);
+
+            static std::vector<std::string> getValidPortObjectTypes();
+
         private: // unit tests helpers
 
             bool meta_unittests_get_and_erase_set_readonly_flag(
@@ -544,11 +549,26 @@ namespace saimeta
                     _In_ bool create,
                     _In_ bool get = false);
 
+             sai_status_t meta_sai_validate_outbound_port_map_port_range_entry(
+                        _In_ const sai_outbound_port_map_port_range_entry_t* outbound_port_map_entry,
+                        _In_ bool create,
+                        _In_ bool get = false);
+
              sai_status_t meta_sai_validate_outbound_routing_entry(
                     _In_ const sai_outbound_routing_entry_t* outbound_routing_entry,
                     _In_ bool create,
                     _In_ bool get = false);
 
+             sai_status_t meta_sai_validate_global_trusted_vni_entry(
+                    _In_ const sai_global_trusted_vni_entry_t* global_trusted_vni_entry,
+                    _In_ bool create,
+                    _In_ bool get = false);
+
+             sai_status_t meta_sai_validate_eni_trusted_vni_entry(
+                    _In_ const sai_eni_trusted_vni_entry_t* eni_trusted_vni_entry,
+                    _In_ bool create,
+                    _In_ bool get = false);
+
              sai_status_t meta_sai_validate_outbound_ca_to_pa_entry(
                     _In_ const sai_outbound_ca_to_pa_entry_t* outbound_ca_to_pa_entry,
                     _In_ bool create,
@@ -564,6 +584,11 @@ namespace saimeta
                      _In_ bool create,
                      _In_ bool get = false);
 
+             sai_status_t meta_sai_validate_prefix_compression_entry(
+                     _In_ const sai_prefix_compression_entry_t* prefix_compression_entry,
+                     _In_ bool create,
+                     _In_ bool get = false);
+
         public:
 
             /*

meta/SaiInterface.cpp

@@ -378,3 +378,20 @@ sai_status_t SaiInterface::clearStats(
 
     return SAI_STATUS_NOT_IMPLEMENTED;
 }
+
+std::shared_ptr<SaiOptions> SaiInterface::getOptions(
+        _In_ const std::string& key)
+{
+    SWSS_LOG_ENTER();
+
+    return m_optionsMap[key];
+}
+
+void SaiInterface::setOptions(
+        _In_ const std::string& key,
+        _In_ std::shared_ptr<SaiOptions> options)
+{
+    SWSS_LOG_ENTER();
+
+    m_optionsMap[key] = options;
+}

meta/SaiInterface.h

@@ -5,6 +5,12 @@ extern "C" {
 #include "saimetadata.h"
 }
 
+#include "SaiOptions.h"
+
+#include <map>
+#include <memory>
+#include <string>
+
 #define SAIREDIS_DECLARE_EVERY_ENTRY(_X)                                     \
     SAI_METADATA_DECLARE_EVERY_ENTRY(_X)
 
@@ -345,5 +351,18 @@ namespace sairedis
 
             virtual sai_log_level_t logGet(
                     _In_ sai_api_t api);
+
+        public: // non SAI API - options helper
+
+            std::shared_ptr<SaiOptions> getOptions(
+                    _In_ const std::string& key);
+
+            void setOptions(
+                    _In_ const std::string& key,
+                    _In_ std::shared_ptr<SaiOptions> options);
+
+        private:
+
+            std::map<std::string, std::shared_ptr<SaiOptions>> m_optionsMap;
     };
 }

meta/SaiOptions.h

@@ -0,0 +1,11 @@
+#pragma once
+
+namespace sairedis
+{
+    class SaiOptions
+    {
+        public:
+
+            virtual ~SaiOptions() = default;
+    };
+}