Merge branch 'master' of https://github.com/divyagayathri-hcl/sonic-swss-common into one-to-one

Author: divyagayathri-hcl

common/schema.h

@@ -116,6 +116,9 @@ namespace swss {
 #define APP_ISOLATION_GROUP_TABLE_NAME      "ISOLATION_GROUP_TABLE"
 #define APP_BFD_SESSION_TABLE_NAME          "BFD_SESSION_TABLE"
 #define APP_ICMP_ECHO_SESSION_TABLE_NAME    "ICMP_ECHO_SESSION_TABLE"
+#define APP_STP_MST_INST_TABLE_NAME         "STP_MST_INST_TABLE"
+#define APP_STP_MST_PORT_TABLE_NAME         "STP_MST_PORT_TABLE"
+#define APP_STP_INST_PORT_FLUSH_TABLE_NAME  "STP_INST_PORT_FLUSH_TABLE"
 
 
 #define APP_SAG_TABLE_NAME                  "SAG_TABLE"
@@ -283,6 +286,7 @@ namespace swss {
 #define PG_ATTR_ID_LIST                 "PG_ATTR_ID_LIST"
 #define RIF_COUNTER_ID_LIST             "RIF_COUNTER_ID_LIST"
 #define TUNNEL_COUNTER_ID_LIST          "TUNNEL_COUNTER_ID_LIST"
+#define SWITCH_COUNTER_ID_LIST          "SWITCH_COUNTER_ID_LIST"
 #define SWITCH_DEBUG_COUNTER_ID_LIST    "SWITCH_DEBUG_COUNTER_ID_LIST"
 #define MACSEC_FLOW_COUNTER_ID_LIST     "MACSEC_FLOW_COUNTER_ID_LIST"
 #define MACSEC_SA_COUNTER_ID_LIST       "MACSEC_SA_COUNTER_ID_LIST"
@@ -440,6 +444,10 @@ namespace swss {
 #define CFG_STP_VLAN_PORT_TABLE_NAME                "STP_VLAN_PORT"
 #define CFG_STP_PORT_TABLE_NAME                     "STP_PORT"
 
+#define CFG_STP_MST_GLOBAL_TABLE_NAME               "STP_MST"
+#define CFG_STP_MST_INST_TABLE_NAME                 "STP_MST_INST"
+#define CFG_STP_MST_PORT_TABLE_NAME                 "STP_MST_PORT"
+
 #define CFG_MCLAG_TABLE_NAME                        "MCLAG_DOMAIN"
 #define CFG_MCLAG_INTF_TABLE_NAME                   "MCLAG_INTERFACE"
 #define CFG_MCLAG_UNIQUE_IP_TABLE_NAME              "MCLAG_UNIQUE_IP"

crates/swss-common/src/lib.rs

@@ -17,11 +17,3 @@ pub fn sonic_db_config_initialize_global(path: &str) -> Result<(), Exception> {
     let path = cstr(path);
     unsafe { swss_try!(bindings::SWSSSonicDBConfig_initializeGlobalConfig(path.as_ptr())) }
 }
-
-/// Trait for objects that can be stored in a Sonic DB table.
-pub trait SonicDbTable {
-    fn key_separator() -> char;
-    fn table_name() -> &'static str;
-    fn db_name() -> &'static str;
-    fn is_dpu() -> bool;
-}

pyext/swsscommon.i

@@ -73,6 +73,42 @@
 %include <stdint.i>
 %include <exception.i>
 
+#ifdef SWIGGO
+
+// Mapping c++ exception to go language panic
+%exception {
+    try {
+        $function
+    } catch(const std::system_error& e) {
+        if (e.code() == std::make_error_code(std::errc::connection_reset))
+        {
+            SWIG_exception(SWIG_SystemError, "connection_reset");
+        }
+        else
+        {
+            SWIG_exception(SWIG_SystemError, e.what());
+        }
+    } catch(std::exception &e) {
+        SWIG_exception(SWIG_RuntimeError,e.what());
+    } catch(...) {
+        SWIG_exception(SWIG_RuntimeError,"Unknown exception");
+    }
+}
+
+// This %typemap(directorin) is crucial for fixing the original 'cannot convert' error
+// in SwigDirector_ZmqProducerStateTable::wait.
+%typemap(directorin) std::string& {
+    $input = SWIG_cgo_go_string(std_string_data($1), std_string_length($1));
+}
+
+// This 'in' typemap is for when Go passes a string to a C++ function parameter.
+%typemap(in) std::string& (std::string temp) {
+    temp = std::string(GoString_to_std_string($input));
+    $1 = &temp;
+}
+
+#endif // SWIGGO
+
 %template(FieldValuePair) std::pair<std::string, std::string>;
 %template(FieldValuePairs) std::vector<std::pair<std::string, std::string>>;
 %template(FieldValuePairsList) std::vector<std::vector<std::pair<std::string, std::string>>>;

tests/performancetimer_ut.cpp

@@ -9,35 +9,46 @@ using namespace std;
 
 TEST(PerformancetimerTest, basic)
 {
-    std::string expected;
-
     static swss::PerformanceTimer timer("basic", PRINT_ALL);
+    
+    // First measurement
     timer.start();
     this_thread::sleep_for(chrono::milliseconds(100));
     timer.stop();
     std::string output = timer.inc(1000);
 
-    expected = R"({"API":"basic","RPS[k]":10.0,"Tasks":1000,"Total[ms]":100,"busy[ms]":100,"idle[ms]":0})";
-    EXPECT_EQ(output, expected);
+    auto actualJson = nlohmann::json::parse(output);
+    EXPECT_EQ(actualJson["API"], "basic");
+    EXPECT_EQ(actualJson["Tasks"], 1000);
+    EXPECT_NEAR(actualJson["RPS[k]"].get<double>(), 10.0, 0.1);
+    EXPECT_NEAR(static_cast<double>(actualJson["busy[ms]"].get<uint64_t>()), 100.0, 10.0);
+    EXPECT_LE(actualJson["idle[ms]"].get<uint64_t>(), 10u);
 
+    // Configuration changes
     timer.setTimerName("basic_set_name");
     timer.setTimerVerbose(true);
     timer.setTimerThreshold(3000);
 
+    // Second measurement
     timer.start();
     this_thread::sleep_for(chrono::milliseconds(100));
     timer.stop();
     output = timer.inc(1000);
     EXPECT_EQ(output, "");
 
+    // Third measurement
     this_thread::sleep_for(chrono::milliseconds(200));
-
     timer.start();
     this_thread::sleep_for(chrono::milliseconds(300));
     timer.stop();
     output = timer.inc(2000);
 
-    expected = R"({"API":"basic_set_name","RPS[k]":5.0,"Tasks":3000,"Total[ms]":600,"busy[ms]":400,"idle[ms]":200,"m_gaps":[0,200],"m_incs":[1000,2000],"m_intervals":[100,300]})";
-    
-    EXPECT_EQ(output, expected);
-}
+    actualJson = nlohmann::json::parse(output);
+    EXPECT_EQ(actualJson["API"], "basic_set_name");
+    EXPECT_EQ(actualJson["Tasks"], 3000);
+    EXPECT_NEAR(actualJson["RPS[k]"].get<double>(), 5.0, 0.1);
+    EXPECT_NEAR(static_cast<double>(actualJson["busy[ms]"].get<uint64_t>()), 400.0, 20.0);
+    EXPECT_NEAR(static_cast<double>(actualJson["idle[ms]"].get<uint64_t>()), 200.0, 20.0);
+    EXPECT_EQ(actualJson["m_incs"].get<std::vector<uint64_t>>(), std::vector<uint64_t>({1000, 2000}));
+    EXPECT_EQ(actualJson["m_intervals"].get<std::vector<uint64_t>>(), std::vector<uint64_t>({100, 300}));
+}