Merge branch 'master' into SAI_DBG_GEN_DUMP_support

.azure-pipelines/test-docker-sonic-vs-template.yml

@@ -76,7 +76,7 @@ jobs:
 
  # run pytests in sets of 20 
  all_tests=$(ls test_*.py)
- all_tests="${all_tests} p4rt"
+ all_tests="${all_tests} p4rt dash"
  test_set=()
  for test in ${all_tests}; do
  test_set+=("${test}")

common/events_common.h

@@ -310,16 +310,23 @@ struct serialization
  more = 0;
  zmq_msg_init(&msg);
  int rc = zmq_msg_recv(&msg, sock, flag);
- if (rc != -1) {
+ if (rc == 1) {
+ char control_character = *(char*)zmq_msg_data(&msg);
+ if (control_character == 0x01 || control_character == 0x00) {
+ SWSS_LOG_INFO("Received subscription/unsubscription message when XSUB connect to XPUB: %c", control_character);
+ } else {
+ SWSS_LOG_DEBUG("Received non subscription based control character: %c", control_character);
+ }
+ rc = 0;
+ } else if (rc != -1) {
  size_t more_size = sizeof (more);
 
  zmq_getsockopt (sock, ZMQ_RCVMORE, &more, &more_size);
 
  rc = zmsg_to_map(msg, data);
  RET_ON_ERR(rc == 0, "Failed to deserialize part rc=%d", rc);
  /* read more flag if message read fails to de-serialize */
- }
- else {
+ } else {
  /* override with zmq err */
  rc = zmq_errno();
  if (rc != 11) {
@@ -332,7 +339,7 @@ struct serialization
  return rc;
  }
 
- 
+
  template<typename DT>
  int
  zmq_send_part(void *sock, int flag, const DT &data)

common/schema.h

@@ -23,6 +23,10 @@ namespace swss {
 #define CHASSIS_APP_DB 12
 #define CHASSIS_STATE_DB 13
 #define APPL_STATE_DB 14
+#define DPU_APPL_DB 15
+#define DPU_APPL_STATE_DB 16
+#define DPU_STATE_DB 17
+#define DPU_COUNTERS_DB 18
 #define EVENT_DB 19
 #define BMP_STATE_DB 20
 
@@ -213,6 +217,7 @@ namespace swss {
 #define COUNTERS_DEBUG_NAME_SWITCH_STAT_MAP "COUNTERS_DEBUG_NAME_SWITCH_STAT_MAP"
 #define COUNTERS_TUNNEL_TYPE_MAP "COUNTERS_TUNNEL_TYPE_MAP"
 #define COUNTERS_TUNNEL_NAME_MAP "COUNTERS_TUNNEL_NAME_MAP"
+#define COUNTERS_ENI_NAME_MAP "COUNTERS_ENI_NAME_MAP"
 #define COUNTERS_ROUTE_NAME_MAP "COUNTERS_ROUTE_NAME_MAP"
 #define COUNTERS_ROUTE_TO_PATTERN_MAP "COUNTERS_ROUTE_TO_PATTERN_MAP"
 #define COUNTERS_FABRIC_QUEUE_NAME_MAP "COUNTERS_FABRIC_QUEUE_NAME_MAP"
@@ -250,6 +255,7 @@ namespace swss {
 #define QUEUE_COUNTER_ID_LIST "QUEUE_COUNTER_ID_LIST"
 #define QUEUE_ATTR_ID_LIST "QUEUE_ATTR_ID_LIST"
 #define BUFFER_POOL_COUNTER_ID_LIST "BUFFER_POOL_COUNTER_ID_LIST"
+#define ENI_COUNTER_ID_LIST "ENI_COUNTER_ID_LIST"
 #define PFC_WD_STATE_TABLE "PFC_WD_STATE_TABLE"
 #define PFC_WD_PORT_COUNTER_ID_LIST "PORT_COUNTER_ID_LIST"
 #define PFC_WD_QUEUE_COUNTER_ID_LIST "QUEUE_COUNTER_ID_LIST"

tests/events_common_ut.cpp

@@ -97,9 +97,51 @@ TEST(events_common, send_recv)
  zmq_ctx_term(zmq_ctx);
 }
 
+TEST(events_common, send_recv_control_character)
+{
+#if 0
+ {
+ /* Direct log messages to stdout */
+ string dummy, op("STDOUT");
+ swss::Logger::swssOutputNotify(dummy, op);
+ swss::Logger::setMinPrio(swss::Logger::SWSS_DEBUG);
+ }
+#endif
 
+ char *path = "tcp://127.0.0.1:5570";
+ void *zmq_ctx = zmq_ctx_new();
+ void *sock_p0 = zmq_socket (zmq_ctx, ZMQ_PAIR);
+ EXPECT_EQ(0, zmq_connect (sock_p0, path));
 
+ void *sock_p1 = zmq_socket (zmq_ctx, ZMQ_PAIR);
+ EXPECT_EQ(0, zmq_bind (sock_p1, path));
 
+ string source;
+ map<string, string> m;
+
+ // Subscription based control character test
+ zmq_msg_t sub_msg;
+ zmq_msg_init_size(&sub_msg, 1);
+ *(char*)zmq_msg_data(&sub_msg) = 0x01;
+ EXPECT_EQ(1, zmq_msg_send(&sub_msg, sock_p0, 0));
+ zmq_msg_close(&sub_msg);
+ // First part will be read only and will return as 0, but will not be deserialized event
+ EXPECT_EQ(0, zmq_message_read(sock_p1, 0, source, m));
+ EXPECT_EQ("", source);
+ EXPECT_EQ(0, m.size());
+
+ // Non-subscription based control character test
+ zmq_msg_t ctrl_msg;
+ zmq_msg_init_size(&ctrl_msg, 1);
+ *(char*)zmq_msg_data(&ctrl_msg) = 0x07;
+ EXPECT_EQ(1, zmq_msg_send(&ctrl_msg, sock_p0, 0));
+ zmq_msg_close(&ctrl_msg);
+ // First part will be read only and will return as 0, but will not be deserialized event
+ EXPECT_EQ(0, zmq_message_read(sock_p1, 0, source, m));
+ EXPECT_EQ("", source);
+ EXPECT_EQ(0, m.size());
 
-
-
+ zmq_close(sock_p0);
+ zmq_close(sock_p1);
+ zmq_ctx_term(zmq_ctx);
+}