Fix the pipeline failures

Signed-off-by: saksarav <sakthivadivu.saravanaraj@nokia.com>

Author: saksarav-nokia

meta/SaiSerialize.cpp

@@ -863,7 +863,8 @@ static std::string sai_serialize_flags(
 
 std::string sai_serialize_enum(
         _In_ const int32_t value,
-        _In_ const sai_enum_metadata_t* meta)
+        _In_ const sai_enum_metadata_t* meta,
+        bool flagCheck)
 {
     SWSS_LOG_ENTER();
 
@@ -872,7 +873,7 @@ std::string sai_serialize_enum(
         return sai_serialize_number(value);
     }
 
-    if (meta->flagstype == SAI_ENUM_FLAGS_TYPE_STRICT)
+    if ((flagCheck) && (meta->flagstype == SAI_ENUM_FLAGS_TYPE_STRICT))
     {
         return sai_serialize_flags(value, meta);
     }
@@ -3413,7 +3414,7 @@ json sai_serialize_stat_capability(
 
     json j;
 
-    j["stat_enum"] = sai_serialize_enum(stat_capability.stat_enum, meta);
+    j["stat_enum"] = sai_serialize_enum(stat_capability.stat_enum, meta, false);
 
     json arr = json::array();
 

meta/sai_serialize.h

@@ -254,7 +254,8 @@ std::string sai_serialize_switch_shutdown_request(
 
 std::string sai_serialize_enum(
         _In_ const int32_t value,
-        _In_ const sai_enum_metadata_t* meta);
+        _In_ const sai_enum_metadata_t* meta,
+        _In_ bool flagCheck = true);
 
 std::string sai_serialize_enum_list(
         _In_ const sai_s32_list_t& list,

unittest/meta/TestSaiSerialize.cpp

@@ -2060,8 +2060,8 @@ TEST(SaiDeserialize, sai_deserialize_enum)
     sai_deserialize_enum("SAI_PORT_ERROR_STATUS_MAC_REMOTE_FAULT|SAI_PORT_ERROR_STATUS_DATA_UNIT_SIZE|0x80000", emd, value);
     EXPECT_EQ(value, SAI_PORT_ERROR_STATUS_MAC_REMOTE_FAULT| SAI_PORT_ERROR_STATUS_DATA_UNIT_SIZE|0x80000);
 
-    sai_deserialize_enum("SAI_PORT_ERROR_STATUS_LOCAL_REMOTE_FAULT|SAI_PORT_ERROR_STATUS_DATA_UNIT_SIZE|0xe0000", emd, value);
-    EXPECT_EQ(value, SAI_PORT_ERROR_STATUS_MAC_REMOTE_FAULT| SAI_PORT_ERROR_STATUS_DATA_UNIT_SIZE|0xe0000);
+    sai_deserialize_enum("SAI_PORT_ERROR_STATUS_MAC_LOCAL_FAULT|SAI_PORT_ERROR_STATUS_DATA_UNIT_SIZE|0xe0000", emd, value);
+    EXPECT_EQ(value, SAI_PORT_ERROR_STATUS_MAC_LOCAL_FAULT| SAI_PORT_ERROR_STATUS_DATA_UNIT_SIZE|0xe0000);
 
     sai_deserialize_enum("SAI_PORT_ERROR_STATUS_MAC_LOCAL_FAULT|SAI_PORT_ERROR_STATUS_DATA_UNIT_SIZE|"
             "SAI_PORT_ERROR_STATUS_NO_RX_REACHABILITY|SAI_PORT_ERROR_STATUS_LLR_TX_FLUSH|0xff064000", emd, value);
@@ -2094,7 +2094,7 @@ TEST(SaiDeserialize, sai_deserialize_enum)
     EXPECT_EQ(value, 0xf1230000);
 
     sai_deserialize_enum("SAI_STATS_MODE_READ|", emd, value);
-    EXPECT_EQ(value, 0xf1230000);
+    EXPECT_EQ(value, SAI_STATS_MODE_READ);
 
     // Not checking the syslog warning
     sai_deserialize_enum("SAI_STATS_MODE_READ|SAI_STATS_MODE_WRITE", emd, value);