[syncd] Add workaround for port error status notification

lib/Recorder.h

@@ -7,27 +7,28 @@ extern "C" {
 #include "swss/table.h"
 
 #include "sairedis.h"
+#include "meta/SaiInterface.h"
 
 #include <string>
 #include <fstream>
 #include <vector>
 
-#define SAI_REDIS_RECORDER_DECLARE_RECORD_REMOVE(ot)    \
-    void recordRemove(                                  \
+#define SAI_REDIS_RECORDER_DECLARE_RECORD_REMOVE(X,ot)   \
+    void recordRemove(                                   \
             _In_ const sai_ ## ot ## _t* ot);
 
-#define SAI_REDIS_RECORDER_DECLARE_RECORD_CREATE(ot)    \
+#define SAI_REDIS_RECORDER_DECLARE_RECORD_CREATE(X,ot)  \
     void recordCreate(                                  \
             _In_ const sai_ ## ot ## _t* ot,            \
             _In_ uint32_t attr_count,                   \
             _In_ const sai_attribute_t *attr_list);
 
-#define SAI_REDIS_RECORDER_DECLARE_RECORD_SET(ot)       \
+#define SAI_REDIS_RECORDER_DECLARE_RECORD_SET(X,ot)     \
     void recordSet(                                     \
             _In_ const sai_ ## ot ## _t* ot,            \
             _In_ const sai_attribute_t *attr);
 
-#define SAI_REDIS_RECORDER_DECLARE_RECORD_GET(ot)       \
+#define SAI_REDIS_RECORDER_DECLARE_RECORD_GET(X,ot)     \
     void recordGet(                                     \
             _In_ const sai_ ## ot ## _t* ot,            \
             _In_ uint32_t attr_count,                   \
@@ -162,79 +163,19 @@ namespace sairedis
 
         public: // create ENTRY
 
-            SAI_REDIS_RECORDER_DECLARE_RECORD_CREATE(fdb_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_CREATE(inseg_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_CREATE(ipmc_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_CREATE(l2mc_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_CREATE(mcast_fdb_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_CREATE(neighbor_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_CREATE(route_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_CREATE(nat_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_CREATE(my_sid_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_CREATE(direction_lookup_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_CREATE(eni_ether_address_map_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_CREATE(vip_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_CREATE(inbound_routing_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_CREATE(pa_validation_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_CREATE(outbound_routing_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_CREATE(outbound_ca_to_pa_entry);
+            SAIREDIS_DECLARE_EVERY_ENTRY(SAI_REDIS_RECORDER_DECLARE_RECORD_CREATE);
 
         public: // remove ENTRY
 
-            SAI_REDIS_RECORDER_DECLARE_RECORD_REMOVE(fdb_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_REMOVE(inseg_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_REMOVE(ipmc_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_REMOVE(l2mc_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_REMOVE(mcast_fdb_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_REMOVE(neighbor_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_REMOVE(route_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_REMOVE(nat_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_REMOVE(my_sid_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_REMOVE(direction_lookup_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_REMOVE(eni_ether_address_map_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_REMOVE(vip_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_REMOVE(inbound_routing_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_REMOVE(pa_validation_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_REMOVE(outbound_routing_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_REMOVE(outbound_ca_to_pa_entry);
+            SAIREDIS_DECLARE_EVERY_ENTRY(SAI_REDIS_RECORDER_DECLARE_RECORD_REMOVE);
 
         public: // set ENTRY
 
-            SAI_REDIS_RECORDER_DECLARE_RECORD_SET(fdb_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_SET(inseg_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_SET(ipmc_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_SET(l2mc_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_SET(mcast_fdb_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_SET(neighbor_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_SET(route_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_SET(nat_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_SET(my_sid_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_SET(direction_lookup_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_SET(eni_ether_address_map_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_SET(vip_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_SET(inbound_routing_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_SET(pa_validation_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_SET(outbound_routing_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_SET(outbound_ca_to_pa_entry);
+            SAIREDIS_DECLARE_EVERY_ENTRY(SAI_REDIS_RECORDER_DECLARE_RECORD_SET);
 
         public: // get ENTRY
 
-            SAI_REDIS_RECORDER_DECLARE_RECORD_GET(fdb_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_GET(inseg_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_GET(ipmc_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_GET(l2mc_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_GET(mcast_fdb_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_GET(neighbor_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_GET(route_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_GET(nat_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_GET(my_sid_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_GET(direction_lookup_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_GET(eni_ether_address_map_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_GET(vip_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_GET(inbound_routing_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_GET(pa_validation_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_GET(outbound_routing_entry);
-            SAI_REDIS_RECORDER_DECLARE_RECORD_GET(outbound_ca_to_pa_entry);
+            SAIREDIS_DECLARE_EVERY_ENTRY(SAI_REDIS_RECORDER_DECLARE_RECORD_GET);
 
         public: // SAI stats API
 

meta/Meta.cpp

@@ -3116,6 +3116,44 @@ sai_status_t Meta::meta_sai_validate_outbound_ca_to_pa_entry(
     return SAI_STATUS_SUCCESS;
 }
 
+sai_status_t Meta::meta_sai_validate_flow_entry(
+        _In_ const sai_flow_entry_t* flow_entry,
+        _In_ bool create,
+        _In_ bool get)
+{
+    SWSS_LOG_ENTER();
+
+    if (flow_entry == NULL)
+    {
+        SWSS_LOG_ERROR("flow_entry pointer is NULL");
+
+        return SAI_STATUS_INVALID_PARAMETER;
+    }
+
+    // TODO FIX ME
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
+sai_status_t Meta::meta_sai_validate_meter_bucket_entry(
+        _In_ const sai_meter_bucket_entry_t* meter_bucket_entry,
+        _In_ bool create,
+        _In_ bool get)
+{
+    SWSS_LOG_ENTER();
+
+    if (meter_bucket_entry == NULL)
+    {
+        SWSS_LOG_ERROR("meter_bucket_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,

meta/Meta.h

@@ -553,6 +553,16 @@ namespace saimeta
                     _In_ bool create,
                     _In_ bool get = false);
 
+             sai_status_t meta_sai_validate_flow_entry(
+                     _In_ const sai_flow_entry_t* flow_entry,
+                     _In_ bool create,
+                     _In_ bool get = false);
+
+             sai_status_t meta_sai_validate_meter_bucket_entry(
+                     _In_ const sai_meter_bucket_entry_t* meter_bucket_entry,
+                     _In_ bool create,
+                     _In_ bool get = false);
+
         public:
 
             /*

meta/SaiInterface.cpp

@@ -339,3 +339,42 @@ sai_log_level_t SaiInterface::logGet(
 
     return SAI_LOG_LEVEL_NOTICE;
 }
+
+sai_status_t SaiInterface::getStats(
+        _In_ const sai_meter_bucket_entry_t* entry,
+        _In_ uint32_t number_of_counters,
+        _In_ const sai_stat_id_t *counter_ids,
+        _Out_ uint64_t *counters)
+{
+    SWSS_LOG_ENTER();
+
+    SWSS_LOG_ERROR("not implemented");
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
+sai_status_t SaiInterface::getStatsExt(
+        _In_ const sai_meter_bucket_entry_t* entry,
+        _In_ uint32_t number_of_counters,
+        _In_ const sai_stat_id_t *counter_ids,
+        _In_ sai_stats_mode_t mode,
+        _Out_ uint64_t *counters)
+{
+    SWSS_LOG_ENTER();
+
+    SWSS_LOG_ERROR("not implemented");
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
+sai_status_t SaiInterface::clearStats(
+        _In_ const sai_meter_bucket_entry_t* entry,
+        _In_ uint32_t number_of_counters,
+        _In_ const sai_stat_id_t *counter_ids)
+{
+    SWSS_LOG_ENTER();
+
+    SWSS_LOG_ERROR("not implemented");
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}

meta/SaiInterface.h

@@ -6,37 +6,10 @@ extern "C" {
 }
 
 #define SAIREDIS_DECLARE_EVERY_ENTRY(_X)                                     \
-    _X(FDB_ENTRY,fdb_entry);                                                 \
-    _X(INSEG_ENTRY,inseg_entry);                                             \
-    _X(IPMC_ENTRY,ipmc_entry);                                               \
-    _X(L2MC_ENTRY,l2mc_entry);                                               \
-    _X(MCAST_FDB_ENTRY,mcast_fdb_entry);                                     \
-    _X(NEIGHBOR_ENTRY,neighbor_entry);                                       \
-    _X(ROUTE_ENTRY,route_entry);                                             \
-    _X(NAT_ENTRY,nat_entry);                                                 \
-    _X(MY_SID_ENTRY,my_sid_entry);                                           \
-    _X(DIRECTION_LOOKUP_ENTRY,direction_lookup_entry);                       \
-    _X(ENI_ETHER_ADDRESS_MAP_ENTRY,eni_ether_address_map_entry);             \
-    _X(VIP_ENTRY,vip_entry);                                                 \
-    _X(INBOUND_ROUTING_ENTRY,inbound_routing_entry);                         \
-    _X(PA_VALIDATION_ENTRY,pa_validation_entry);                             \
-    _X(OUTBOUND_ROUTING_ENTRY,outbound_routing_entry);                       \
-    _X(OUTBOUND_CA_TO_PA_ENTRY,outbound_ca_to_pa_entry);                     \
+    SAI_METADATA_DECLARE_EVERY_ENTRY(_X)
 
 #define SAIREDIS_DECLARE_EVERY_BULK_ENTRY(_X)                                \
-    _X(FDB_ENTRY,fdb_entry);                                                 \
-    _X(INSEG_ENTRY,inseg_entry);                                             \
-    _X(NAT_ENTRY,nat_entry);                                                 \
-    _X(ROUTE_ENTRY,route_entry);                                             \
-    _X(MY_SID_ENTRY,my_sid_entry);                                           \
-    _X(NEIGHBOR_ENTRY,neighbor_entry);                                       \
-    _X(DIRECTION_LOOKUP_ENTRY,direction_lookup_entry);                       \
-    _X(ENI_ETHER_ADDRESS_MAP_ENTRY,eni_ether_address_map_entry);             \
-    _X(VIP_ENTRY,vip_entry);                                                 \
-    _X(INBOUND_ROUTING_ENTRY,inbound_routing_entry);                         \
-    _X(PA_VALIDATION_ENTRY,pa_validation_entry);                             \
-    _X(OUTBOUND_ROUTING_ENTRY,outbound_routing_entry);                       \
-    _X(OUTBOUND_CA_TO_PA_ENTRY,outbound_ca_to_pa_entry);                     \
+    SAI_METADATA_DECLARE_EVERY_BULK_ENTRY(_X)
 
 #define SAIREDIS_SAIINTERFACE_DECLARE_QUAD_ENTRY_VIRTUAL(OT,ot)     \
     virtual sai_status_t create(                                    \
@@ -274,6 +247,26 @@ namespace sairedis
                     _In_ sai_stats_mode_t mode,
                     _Inout_ sai_status_t *object_statuses) = 0;
 
+        public: // entry stats
+
+            virtual sai_status_t getStats(
+                    _In_ const sai_meter_bucket_entry_t* entry,
+                    _In_ uint32_t number_of_counters,
+                    _In_ const sai_stat_id_t *counter_ids,
+                    _Out_ uint64_t *counters);
+
+            virtual sai_status_t getStatsExt(
+                    _In_ const sai_meter_bucket_entry_t* entry,
+                    _In_ uint32_t number_of_counters,
+                    _In_ const sai_stat_id_t *counter_ids,
+                    _In_ sai_stats_mode_t mode,
+                    _Out_ uint64_t *counters);
+
+            virtual sai_status_t clearStats(
+                    _In_ const sai_meter_bucket_entry_t* entry,
+                    _In_ uint32_t number_of_counters,
+                    _In_ const sai_stat_id_t *counter_ids);
+
         public: // non QUAD API
 
             virtual sai_status_t flushFdbEntries(

meta/SaiSerialize.cpp

@@ -961,6 +961,26 @@ std::string sai_serialize_fdb_entry(
     return j.dump();
 }
 
+__attribute__((__noreturn__)) std::string sai_serialize_meter_bucket_entry(
+        _In_ const sai_meter_bucket_entry_t &meter_bucket_entry)
+{
+    SWSS_LOG_ENTER();
+
+    json j;
+
+    SWSS_LOG_THROW("not implemented, FIXME");
+}
+
+__attribute__((__noreturn__)) std::string sai_serialize_flow_entry(
+        _In_ const sai_flow_entry_t &flow_entry)
+{
+    SWSS_LOG_ENTER();
+
+    json j;
+
+    SWSS_LOG_THROW("not implemented, FIXME");
+}
+
 std::string sai_serialize_l2mc_entry_type(
         _In_ const sai_l2mc_entry_type_t type)
 {
@@ -2180,6 +2200,14 @@ std::string sai_serialize_port_oper_status(
     return sai_serialize_enum(status, &sai_metadata_enum_sai_port_oper_status_t);
 }
 
+std::string sai_serialize_port_error_status(
+        _In_ sai_port_error_status_t status)
+{
+    SWSS_LOG_ENTER();
+
+    return sai_serialize_enum(status, &sai_metadata_enum_sai_port_error_status_t);
+}
+
 std::string sai_serialize_port_host_tx_ready(
         _In_ sai_port_host_tx_ready_status_t host_tx_ready_status)
 {
@@ -4152,6 +4180,15 @@ void sai_deserialize_port_oper_status(
     sai_deserialize_enum(s, &sai_metadata_enum_sai_port_oper_status_t, (int32_t&)status);
 }
 
+void sai_deserialize_port_error_status(
+        _In_ const std::string& s,
+        _Out_ sai_port_error_status_t& status)
+{
+    SWSS_LOG_ENTER();
+
+    sai_deserialize_enum(s, &sai_metadata_enum_sai_port_error_status_t, (int32_t&)status);
+}
+
 void sai_deserialize_port_host_tx_ready_status(
         _In_ const std::string& s,
         _Out_ sai_port_host_tx_ready_status_t& status)
@@ -4379,6 +4416,28 @@ void sai_deserialize_neighbor_entry(
     sai_deserialize_ip_address(j["ip"], ne.ip_address);
 }
 
+__attribute__((__noreturn__)) void sai_deserialize_meter_bucket_entry(
+        _In_ const std::string& s,
+        _Out_ sai_meter_bucket_entry_t& meter_bucket_entry)
+{
+    SWSS_LOG_ENTER();
+
+    json j = json::parse(s);
+
+    SWSS_LOG_THROW("not implemented, FIXME");
+}
+
+__attribute__((__noreturn__)) void sai_deserialize_flow_entry(
+        _In_ const std::string& s,
+        _Out_ sai_flow_entry_t &flow_entry)
+{
+    SWSS_LOG_ENTER();
+
+    json j = json::parse(s);
+
+    SWSS_LOG_THROW("not implemented, FIXME");
+}
+
 void sai_deserialize_twamp_session_stats_data(
         _In_ const std::string& s,
         _Out_ sai_twamp_session_stats_data_t &twamp_session_stats_data)
@@ -4990,6 +5049,7 @@ void sai_deserialize_port_oper_status_ntf(
     {
         sai_deserialize_object_id(j[i]["port_id"], data[i].port_id);
         sai_deserialize_port_oper_status(j[i]["port_state"], data[i].port_state);
+        sai_deserialize_port_error_status(j[i]["port_error_status"], data[i].port_error_status);
     }
 
     *port_oper_status = data;