P4Runtime : Status Code additions

common/json.hpp

@@ -5394,7 +5394,7 @@ class basic_json
                 {
                     assert(lhs.m_value.array != nullptr);
                     assert(rhs.m_value.array != nullptr);
-                    return *lhs.m_value.array < *rhs.m_value.array;
+                    return (*lhs.m_value.array) < *rhs.m_value.array;
                 }
                 case value_t::object:
                 {

common/producerstatetable.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <memory>
+#include <vector>
 #include "table.h"
 #include "redispipeline.h"
 

common/status_code_util.h

@@ -0,0 +1,76 @@
+#pragma once
+
+#include <map>
+#include <string>
+
+namespace swss
+{
+
+enum class StatusCode
+{
+    SWSS_RC_SUCCESS,
+    SWSS_RC_INVALID_PARAM,
+    SWSS_RC_DEADLINE_EXCEEDED,
+    SWSS_RC_UNAVAIL,
+    SWSS_RC_NOT_FOUND,
+    SWSS_RC_NO_MEMORY,
+    SWSS_RC_EXISTS,
+    SWSS_RC_PERMISSION_DENIED,
+    SWSS_RC_FULL,
+    SWSS_RC_IN_USE,
+    SWSS_RC_INTERNAL,
+    SWSS_RC_UNIMPLEMENTED,
+    SWSS_RC_UNKNOWN,
+};
+
+static const std::map<StatusCode, std::string> statusCodeMapping = {
+    {StatusCode::SWSS_RC_SUCCESS, "SWSS_RC_SUCCESS"},
+    {StatusCode::SWSS_RC_INVALID_PARAM, "SWSS_RC_INVALID_PARAM"},
+    {StatusCode::SWSS_RC_DEADLINE_EXCEEDED, "SWSS_RC_DEADLINE_EXCEEDED"},
+    {StatusCode::SWSS_RC_UNAVAIL, "SWSS_RC_UNAVAIL"},
+    {StatusCode::SWSS_RC_NOT_FOUND, "SWSS_RC_NOT_FOUND"},
+    {StatusCode::SWSS_RC_NO_MEMORY, "SWSS_RC_NO_MEMORY"},
+    {StatusCode::SWSS_RC_EXISTS, "SWSS_RC_EXISTS"},
+    {StatusCode::SWSS_RC_PERMISSION_DENIED, "SWSS_RC_PERMISSION_DENIED"},
+    {StatusCode::SWSS_RC_FULL, "SWSS_RC_FULL"},
+    {StatusCode::SWSS_RC_IN_USE, "SWSS_RC_IN_USE"},
+    {StatusCode::SWSS_RC_INTERNAL, "SWSS_RC_INTERNAL"},
+    {StatusCode::SWSS_RC_UNIMPLEMENTED, "SWSS_RC_UNIMPLEMENTED"},
+    {StatusCode::SWSS_RC_UNKNOWN, "SWSS_RC_UNKNOWN"},
+};
+
+static const std::map<std::string, StatusCode> StatusCodeLookup = {
+    {"SWSS_RC_SUCCESS", StatusCode::SWSS_RC_SUCCESS},
+    {"SWSS_RC_INVALID_PARAM", StatusCode::SWSS_RC_INVALID_PARAM},
+    {"SWSS_RC_DEADLINE_EXCEEDED", StatusCode::SWSS_RC_DEADLINE_EXCEEDED},
+    {"SWSS_RC_UNAVAIL", StatusCode::SWSS_RC_UNAVAIL},
+    {"SWSS_RC_NOT_FOUND", StatusCode::SWSS_RC_NOT_FOUND},
+    {"SWSS_RC_NO_MEMORY", StatusCode::SWSS_RC_NO_MEMORY},
+    {"SWSS_RC_EXISTS", StatusCode::SWSS_RC_EXISTS},
+    {"SWSS_RC_PERMISSION_DENIED", StatusCode::SWSS_RC_PERMISSION_DENIED},
+    {"SWSS_RC_FULL", StatusCode::SWSS_RC_FULL},
+    {"SWSS_RC_IN_USE", StatusCode::SWSS_RC_IN_USE},
+    {"SWSS_RC_INTERNAL", StatusCode::SWSS_RC_INTERNAL},
+    {"SWSS_RC_UNIMPLEMENTED", StatusCode::SWSS_RC_UNIMPLEMENTED},
+    {"SWSS_RC_UNKNOWN", StatusCode::SWSS_RC_UNKNOWN},
+};
+
+static inline std::string statusCodeToStr(const StatusCode &status)
+{
+    if (statusCodeMapping.find(status) == statusCodeMapping.end())
+    {
+        return "SWSS_RC_UNKNOWN";
+    }
+    return statusCodeMapping.at(status);
+}
+
+static inline StatusCode strToStatusCode(const std::string &status)
+{
+    if (StatusCodeLookup.find(status) == StatusCodeLookup.end())
+    {
+        return StatusCode::SWSS_RC_UNKNOWN;
+    }
+    return StatusCodeLookup.at(status);
+}
+
+} // namespace swss

pyext/swsscommon.i

@@ -35,6 +35,7 @@
 #include "warm_restart.h"
 #include "logger.h"
 #include "configdb.h"
+#include "status_code_util.h"
 %}
 
 %include <std_string.i>
@@ -203,3 +204,4 @@ T castSelectableObj(swss::Selectable *temp)
 %include "warm_restart.h"
 %include "dbinterface.h"
 %include "logger.h"
+%include "status_code_util.h"

tests/Makefile.am

@@ -33,6 +33,7 @@ tests_SOURCES = redis_ut.cpp                \
                 stringutility_ut.cpp        \
                 redisutility_ut.cpp         \
                 boolean_ut.cpp              \
+                status_code_util_test.cpp   \
                 main.cpp
 
 tests_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(LIBNL_CFLAGS)

tests/status_code_util_test.cpp

@@ -0,0 +1,21 @@
+#include "common/status_code_util.h"
+
+#include <gtest/gtest.h>
+
+namespace
+{
+
+using swss::StatusCode;
+
+TEST(StatusCodeUtilTest, StatusCodeUtilTest)
+{
+    for (int i = static_cast<int>(StatusCode::SWSS_RC_SUCCESS); i <= static_cast<int>(StatusCode::SWSS_RC_UNKNOWN); ++i)
+    {
+        StatusCode original = static_cast<StatusCode>(i);
+        StatusCode final = swss::strToStatusCode(statusCodeToStr(original));
+        EXPECT_EQ(original, final);
+    }
+    EXPECT_EQ(StatusCode::SWSS_RC_UNKNOWN, swss::strToStatusCode("invalid"));
+}
+
+} // namespace