updating sonic-sairedis submodule to include SAI 1.6 headers

smaheshm · lguohan · commit e50cf663161b · 2020-05-09T21:12:30.000Z
diff --git a/SAI b/SAI
@@ -1 +1 @@
-Subproject commit 22979659d2ec965eb250424833747510f40cee7e
+Subproject commit 013765bc9e815dc70e6cc87fd6503eda1b245a98
diff --git a/lib/inc/sai_redis.h b/lib/inc/sai_redis.h
@@ -28,6 +28,7 @@ PRIVATE extern const sai_isolation_group_api_t  redis_isolation_group_api;
 PRIVATE extern const sai_l2mc_api_t             redis_l2mc_api;
 PRIVATE extern const sai_l2mc_group_api_t       redis_l2mc_group_api;
 PRIVATE extern const sai_lag_api_t              redis_lag_api;
+PRIVATE extern const sai_macsec_api_t           redis_macsec_api;
 PRIVATE extern const sai_mcast_fdb_api_t        redis_mcast_fdb_api;
 PRIVATE extern const sai_mirror_api_t           redis_mirror_api;
 PRIVATE extern const sai_mpls_api_t             redis_mpls_api;
diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am
@@ -53,6 +53,7 @@ libsairedis_la_SOURCES = \
 						 sai_redis_l2mc.cpp \
 						 sai_redis_l2mcgroup.cpp \
 						 sai_redis_lag.cpp \
+						 sai_redis_macsec.cpp \
 						 sai_redis_mcastfdb.cpp \
 						 sai_redis_mirror.cpp \
 						 sai_redis_mpls.cpp \
diff --git a/lib/src/sai_redis_fdb.cpp b/lib/src/sai_redis_fdb.cpp
@@ -14,9 +14,7 @@ static sai_status_t redis_flush_fdb_entries(
 }
 
 REDIS_GENERIC_QUAD_ENTRY(FDB_ENTRY,fdb_entry);
-
-REDIS_BULK_CREATE_ENTRY(FDB_ENTRY,fdb_entry);
-REDIS_BULK_REMOVE_ENTRY(FDB_ENTRY,fdb_entry);
+REDIS_BULK_QUAD_ENTRY(FDB_ENTRY,fdb_entry);
 
 // TODO remove when test corrected (SAI pointer must be advanced for this)
 
@@ -59,4 +57,6 @@ const sai_fdb_api_t redis_fdb_api = {
     REDIS_GENERIC_QUAD_API(fdb_entry)
 
     redis_flush_fdb_entries,
+
+    REDIS_BULK_QUAD_API(fdb_entry)
 };
diff --git a/lib/src/sai_redis_interfacequery.cpp b/lib/src/sai_redis_interfacequery.cpp
@@ -74,6 +74,7 @@ static sai_apis_t redis_apis = {
     API(nat),
     API(counter),
     API(debug_counter),
+    API(macsec),
     API(bmtor),
 };
 
diff --git a/lib/src/sai_redis_macsec.cpp b/lib/src/sai_redis_macsec.cpp
@@ -0,0 +1,32 @@
+#include "sai_redis.h"
+
+REDIS_GENERIC_QUAD(MACSEC,macsec);
+
+REDIS_GENERIC_QUAD(MACSEC_PORT,macsec_port);
+REDIS_GENERIC_STATS(MACSEC_PORT,macsec_port);
+
+REDIS_GENERIC_QUAD(MACSEC_FLOW,macsec_flow);
+REDIS_GENERIC_STATS(MACSEC_FLOW,macsec_flow);
+
+REDIS_GENERIC_QUAD(MACSEC_SC,macsec_sc);
+REDIS_GENERIC_STATS(MACSEC_SC,macsec_sc);
+
+REDIS_GENERIC_QUAD(MACSEC_SA,macsec_sa);
+REDIS_GENERIC_STATS(MACSEC_SA,macsec_sa);
+
+const sai_macsec_api_t redis_macsec_api = {
+
+    REDIS_GENERIC_QUAD_API(macsec)
+
+    REDIS_GENERIC_QUAD_API(macsec_port)
+    REDIS_GENERIC_STATS_API(macsec_port)
+
+    REDIS_GENERIC_QUAD_API(macsec_flow)
+    REDIS_GENERIC_STATS_API(macsec_flow)
+
+    REDIS_GENERIC_QUAD_API(macsec_sc)
+    REDIS_GENERIC_STATS_API(macsec_sc)
+
+    REDIS_GENERIC_QUAD_API(macsec_sa)
+    REDIS_GENERIC_STATS_API(macsec_sa)
+};
diff --git a/lib/src/sai_redis_port.cpp b/lib/src/sai_redis_port.cpp
@@ -11,6 +11,7 @@ static sai_status_t redis_clear_port_all_stats(
 REDIS_GENERIC_QUAD(PORT,port);
 REDIS_GENERIC_QUAD(PORT_POOL,port_pool);
 REDIS_GENERIC_QUAD(PORT_SERDES,port_serdes);
+REDIS_GENERIC_QUAD(PORT_CONNECTOR,port_connector);
 REDIS_GENERIC_STATS(PORT,port);
 REDIS_GENERIC_STATS(PORT_POOL,port_pool);
 
@@ -23,6 +24,6 @@ const sai_port_api_t redis_port_api = {
 
     REDIS_GENERIC_QUAD_API(port_pool)
     REDIS_GENERIC_STATS_API(port_pool)
-
+    REDIS_GENERIC_QUAD_API(port_connector)
     REDIS_GENERIC_QUAD_API(port_serdes)
 };
diff --git a/lib/src/sai_redis_switch.cpp b/lib/src/sai_redis_switch.cpp
@@ -17,6 +17,30 @@ static sai_status_t redis_create_switch_uniq(
             attr_list);
 }
 
+static sai_status_t redis_mdio_read(
+        _In_ sai_object_id_t switch_id,
+        _In_ uint32_t device_addr,
+        _In_ uint32_t start_reg_addr,
+        _In_ uint32_t number_of_registers,
+        _Out_ uint32_t *reg_val) 
+{
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
+static sai_status_t redis_mdio_write(
+        _In_ sai_object_id_t switch_id,
+        _In_ uint32_t device_addr,
+        _In_ uint32_t start_reg_addr,
+        _In_ uint32_t number_of_registers,
+        _In_ const uint32_t *reg_val)
+{
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 const sai_switch_api_t redis_switch_api = {
 
     redis_create_switch_uniq,
@@ -25,4 +49,7 @@ const sai_switch_api_t redis_switch_api = {
     redis_get_switch_attribute,
 
     REDIS_GENERIC_STATS_API(switch)
+
+    redis_mdio_read,
+    redis_mdio_write,
 };
diff --git a/meta/saiserialize.cpp b/meta/saiserialize.cpp
@@ -1110,13 +1110,14 @@ json sai_serialize_qos_map_params(
 
     json j;
 
-    j["tc"]     = params.tc;
-    j["dscp"]   = params.dscp;
-    j["dot1p"]  = params.dot1p;
-    j["prio"]   = params.prio;
-    j["pg"]     = params.pg;
-    j["qidx"]   = params.queue_index;
-    j["color"]  = sai_serialize_packet_color(params.color);
+    j["tc"]       = params.tc;
+    j["dscp"]     = params.dscp;
+    j["dot1p"]    = params.dot1p;
+    j["prio"]     = params.prio;
+    j["pg"]       = params.pg;
+    j["qidx"]     = params.queue_index;
+    j["mpls_exp"] = params.mpls_exp;
+    j["color"]    = sai_serialize_packet_color(params.color);
 
     return j;
 }
@@ -2089,6 +2090,7 @@ void sai_deserialize_qos_map_params(
     params.prio           = j["prio"];
     params.pg             = j["pg"];
     params.queue_index    = j["qidx"];
+    params.mpls_exp       = j["mpls_exp"];
 
     sai_deserialize_packet_color(j["color"], params.color);
 }
diff --git a/meta/tests.cpp b/meta/tests.cpp
@@ -3779,8 +3779,8 @@ void test_serialize_qos_map()
     attr.id = SAI_QOS_MAP_ATTR_MAP_TO_VALUE_LIST;
 
     sai_qos_map_t qm = {
-        .key   = { .tc = 1, .dscp = 2, .dot1p = 3, .prio = 4, .pg = 5, .queue_index = 6, .color = SAI_PACKET_COLOR_RED },
-        .value = { .tc = 11, .dscp = 22, .dot1p = 33, .prio = 44, .pg = 55, .queue_index = 66, .color = SAI_PACKET_COLOR_GREEN } };
+        .key   = { .tc = 1, .dscp = 2, .dot1p = 3, .prio = 4, .pg = 5, .queue_index = 6, .color = SAI_PACKET_COLOR_RED, .mpls_exp = 0 },
+        .value = { .tc = 11, .dscp = 22, .dot1p = 33, .prio = 44, .pg = 55, .queue_index = 66, .color = SAI_PACKET_COLOR_GREEN, .mpls_exp = 0 } };
 
     attr.value.qosmap.count = 1;
     attr.value.qosmap.list = &qm;
@@ -3789,7 +3789,7 @@ void test_serialize_qos_map()
 
     s = sai_serialize_attr_value(*meta, attr);
 
-    std::string ret = "{\"count\":1,\"list\":[{\"key\":{\"color\":\"SAI_PACKET_COLOR_RED\",\"dot1p\":3,\"dscp\":2,\"pg\":5,\"prio\":4,\"qidx\":6,\"tc\":1},\"value\":{\"color\":\"SAI_PACKET_COLOR_GREEN\",\"dot1p\":33,\"dscp\":22,\"pg\":55,\"prio\":44,\"qidx\":66,\"tc\":11}}]}";
+    std::string ret = "{\"count\":1,\"list\":[{\"key\":{\"color\":\"SAI_PACKET_COLOR_RED\",\"dot1p\":3,\"dscp\":2,\"mpls_exp\":0,\"pg\":5,\"prio\":4,\"qidx\":6,\"tc\":1},\"value\":{\"color\":\"SAI_PACKET_COLOR_GREEN\",\"dot1p\":33,\"dscp\":22,\"mpls_exp\":0,\"pg\":55,\"prio\":44,\"qidx\":66,\"tc\":11}}]}";
 
     ASSERT_TRUE(s, ret);
 
@@ -3814,6 +3814,7 @@ void test_serialize_qos_map()
     ASSERT_TRUE(l.key.pg, 5);
     ASSERT_TRUE(l.key.queue_index, 6);
     ASSERT_TRUE(l.key.color, SAI_PACKET_COLOR_RED);
+    ASSERT_TRUE(l.key.mpls_exp, 0);
 
     ASSERT_TRUE(l.value.tc, 11);
     ASSERT_TRUE(l.value.dscp, 22);
@@ -3822,6 +3823,7 @@ void test_serialize_qos_map()
     ASSERT_TRUE(l.value.pg, 55);
     ASSERT_TRUE(l.value.queue_index, 66);
     ASSERT_TRUE(l.value.color, SAI_PACKET_COLOR_GREEN);
+    ASSERT_TRUE(l.value.mpls_exp, 0);
 }
 
 template<typename T>
diff --git a/vslib/inc/sai_vs.h b/vslib/inc/sai_vs.h
@@ -28,6 +28,7 @@ PRIVATE extern const sai_isolation_group_api_t  vs_isolation_group_api;
 PRIVATE extern const sai_l2mc_api_t             vs_l2mc_api;
 PRIVATE extern const sai_l2mc_group_api_t       vs_l2mc_group_api;
 PRIVATE extern const sai_lag_api_t              vs_lag_api;
+PRIVATE extern const sai_macsec_api_t           vs_macsec_api;
 PRIVATE extern const sai_mcast_fdb_api_t        vs_mcast_fdb_api;
 PRIVATE extern const sai_mirror_api_t           vs_mirror_api;
 PRIVATE extern const sai_mpls_api_t             vs_mpls_api;
diff --git a/vslib/src/Makefile.am b/vslib/src/Makefile.am
@@ -69,6 +69,7 @@ libsaivs_la_SOURCES = \
 					  sai_vs_l2mc.cpp \
 					  sai_vs_l2mcgroup.cpp \
 					  sai_vs_lag.cpp \
+					  sai_vs_macsec.cpp \
 					  sai_vs_mcastfdb.cpp \
 					  sai_vs_mirror.cpp \
 					  sai_vs_mpls.cpp \
diff --git a/vslib/src/sai_vs_fdb.cpp b/vslib/src/sai_vs_fdb.cpp
@@ -16,10 +16,13 @@ static sai_status_t vs_flush_fdb_entries(
 }
 
 VS_GENERIC_QUAD_ENTRY(FDB_ENTRY,fdb_entry);
+VS_BULK_QUAD_ENTRY(FDB_ENTRY, fdb_entry);
 
 const sai_fdb_api_t vs_fdb_api = {
 
     VS_GENERIC_QUAD_API(fdb_entry)
 
     vs_flush_fdb_entries,
+
+    VS_BULK_QUAD_API(fdb_entry)
 };
diff --git a/vslib/src/sai_vs_interfacequery.cpp b/vslib/src/sai_vs_interfacequery.cpp
@@ -74,6 +74,7 @@ static sai_apis_t vs_apis = {
     API(nat),
     API(counter),
     API(debug_counter),
+    API(macsec),
     API(bmtor),
 };
 
diff --git a/vslib/src/sai_vs_macsec.cpp b/vslib/src/sai_vs_macsec.cpp
@@ -0,0 +1,32 @@
+#include "sai_vs.h"
+
+VS_GENERIC_QUAD(MACSEC,macsec);
+
+VS_GENERIC_QUAD(MACSEC_PORT,macsec_port);
+VS_GENERIC_STATS(MACSEC_PORT,macsec_port);
+
+VS_GENERIC_QUAD(MACSEC_FLOW,macsec_flow);
+VS_GENERIC_STATS(MACSEC_FLOW,macsec_flow);
+
+VS_GENERIC_QUAD(MACSEC_SC,macsec_sc);
+VS_GENERIC_STATS(MACSEC_SC,macsec_sc);
+
+VS_GENERIC_QUAD(MACSEC_SA,macsec_sa);
+VS_GENERIC_STATS(MACSEC_SA,macsec_sa);
+
+const sai_macsec_api_t vs_macsec_api = {
+
+    VS_GENERIC_QUAD_API(macsec)
+
+    VS_GENERIC_QUAD_API(macsec_port)
+    VS_GENERIC_STATS_API(macsec_port)
+
+    VS_GENERIC_QUAD_API(macsec_flow)
+    VS_GENERIC_STATS_API(macsec_flow)
+
+    VS_GENERIC_QUAD_API(macsec_sc)
+    VS_GENERIC_STATS_API(macsec_sc)
+
+    VS_GENERIC_QUAD_API(macsec_sa)
+    VS_GENERIC_STATS_API(macsec_sa)
+};
diff --git a/vslib/src/sai_vs_port.cpp b/vslib/src/sai_vs_port.cpp
@@ -10,6 +10,7 @@ sai_status_t vs_clear_port_all_stats(
 
 VS_GENERIC_QUAD(PORT,port);
 VS_GENERIC_QUAD(PORT_POOL,port_pool);
+VS_GENERIC_QUAD(PORT_CONNECTOR,port_connector);
 VS_GENERIC_QUAD(PORT_SERDES,port_serdes);
 VS_GENERIC_STATS(PORT,port);
 VS_GENERIC_STATS(PORT_POOL,port_pool);
@@ -24,5 +25,7 @@ const sai_port_api_t vs_port_api = {
     VS_GENERIC_QUAD_API(port_pool)
     VS_GENERIC_STATS_API(port_pool)
 
+    VS_GENERIC_QUAD_API(port_connector)
+
     VS_GENERIC_QUAD_API(port_serdes)
 };
diff --git a/vslib/src/sai_vs_switch.cpp b/vslib/src/sai_vs_switch.cpp
@@ -17,6 +17,30 @@ static sai_status_t vs_create_switch_uniq(
             attr_list);
 }
 
+static sai_status_t vs_mdio_read(
+        _In_ sai_object_id_t switch_id,
+        _In_ uint32_t device_addr,
+        _In_ uint32_t start_reg_addr,
+        _In_ uint32_t number_of_registers,
+        _Out_ uint32_t *reg_val) 
+{
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
+static sai_status_t vs_mdio_write(
+        _In_ sai_object_id_t switch_id,
+        _In_ uint32_t device_addr,
+        _In_ uint32_t start_reg_addr,
+        _In_ uint32_t number_of_registers,
+        _In_ const uint32_t *reg_val)
+{
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 const sai_switch_api_t vs_switch_api = {
 
     vs_create_switch_uniq,
@@ -25,4 +49,7 @@ const sai_switch_api_t vs_switch_api = {
     vs_get_switch_attribute,
 
     VS_GENERIC_STATS_API(switch)
+
+    vs_mdio_read,
+    vs_mdio_write,
 };
