Saithriftv2 fixes for extensions (opencomputeproject#1533)

* [doc] Add SAI metadata introduction presentation (opencomputeproject#1487)

Small presentation about SAI metadata features added in last time.

Signed-off-by: Chris Sommers <[email protected]>

* Add GEN_SAIRPC_OPTS to pass flags to gensairpc.pl from top-level Makefile or meta/Makefile

Signed-off-by: Chris Sommers <[email protected]>

* Add static_cast<> to sairpcgen templates to avoid type mismatches for SAI extensions.

Signed-off-by: Chris Sommers <[email protected]>

* Add new env variable SAIRPC_EXTRA_LIBS which gets passed to final linkage of saiserver, so user can pass in additional libraries.

Signed-off-by: Chris Sommers <[email protected]>

* Add experimental to include path.

Signed-off-by: Chris Sommers <[email protected]>

* Add experimental headers to CPPFLAGS passed to ctypesgen.

Signed-off-by: Chris Sommers <[email protected]>

* Add VLAN and PortChannel test plan (opencomputeproject#1480)

* Add VLAN and PortChannel test plan

For vlan, it includes:
1. Vlan functionalities
   - Flooding
   - Forwarding
   - Trunk/Access
   - Tagging/Untagging(802.1Q)
   - VLAN interface (RIF/SVI)
2. SAI APIs operations
   - Vlan Counters
   - Vlan and member list operations

For PortChannel, it includes:
1. Lag functionalities
    - Loadbalance
2. Lag SAI APIs
    - create/check/remove lag and lag member

Signed-off-by: richardyu-ms <[email protected]>

* Update lag_test_plan.md

Signed-off-by: richardyu-ms <[email protected]>

* Update lag_test_plan.md

Signed-off-by: richardyu-ms <[email protected]>

* remove cases not related to T0

Signed-off-by: richardyu-ms <[email protected]>

* Update lag_test_plan.md

Signed-off-by: richardyu-ms <[email protected]>

* Add VLAN and Lag test plan and put topo config in seperated files

Signed-off-by: richardyu <[email protected]>

* fix typo and more description more clear

Signed-off-by: richardyu-ms <[email protected]>

* fix lag test typo (#29)

Signed-off-by: zhoudongxu <[email protected]>

* refactor vlan test plan and config

Signed-off-by: richardyu-ms <[email protected]>

* refactor lag test plan (#33)

Signed-off-by: zhoudongxu <[email protected]>

* refactor pc and vlan test

Signed-off-by: zhoudongxu <[email protected]>

* Improve pc and vlan test Doc (#35)

* fix typo

Signed-off-by: zhoudongxu <[email protected]>

* remove some unnecessary comments

Signed-off-by: zhoudongxu <[email protected]>

* reformat and adjust the description of the tests

Signed-off-by: richardyu-ms <[email protected]>

* set hash algorithm (#36)

Signed-off-by: zhoudongxu <[email protected]>

* refine lag test (#37)

Signed-off-by: zhoudongxu <[email protected]>

* correct vlan interface test (#38)

Signed-off-by: zhoudongxu <[email protected]>

* workaround for the sequence number issue in github and correct typo
standardise the ip and mac naming in config

add lag test for ingress port indifferenate in lag hash
redesign the mac and ip namin convention and reformat
Signed-off-by: richardyu-ms <[email protected]>

* adjust the case numbers and vlan id

Signed-off-by: richardyu-ms <[email protected]>

Co-authored-by: zhoudongxu <[email protected]>
Co-authored-by: richardyu <[email protected]>
Co-authored-by: zhoudongxu <[email protected]>
Signed-off-by: Chris Sommers <[email protected]>

* [SAI-PTF] SAI PTF test structure for T0 test and VLAN,FDB sample cases (opencomputeproject#1499)

* [SAI-PTF] Add SAI ptf test structure for T0 test

Create SAI PTF test structure for T0
1. Create configuration structure for different components configu
2. Add FDB, PORT, switch, vlan configurations
3. Create Test structure base on PTF
4. Add T0 test case samples for FDB

Test Done:
Checked the ports functionality with port flooding
Checked port forwarding base on FDB configurations

Signed-off-by: richardyu-ms <[email protected]>

* add vlan config and vlan test sample case

Signed-off-by: richardyu-ms <[email protected]>

* add dx010 config

Signed-off-by: richardyu-ms <[email protected]>
Signed-off-by: Chris Sommers <[email protected]>

* [meta] Add sai_status_t to ancestry check (opencomputeproject#1501)

Signed-off-by: Chris Sommers <[email protected]>

* reset sleep time during turning up ports (opencomputeproject#1502)

Signed-off-by: Yang Wang <[email protected]>
Signed-off-by: Chris Sommers <[email protected]>

* [saineighbor] Bulk API support for Neighbor entries (opencomputeproject#1504)

* Bulk support for Neighbor entries

Signed-off-by: Chris Sommers <[email protected]>

* add vlan testcases from Group6 to Group10 (opencomputeproject#1506)

Signed-off-by: Yang Wang <[email protected]>
Signed-off-by: Chris Sommers <[email protected]>

* Support counters on IP MC route entries. This is similar to the support added earlier for Route counters. (opencomputeproject#1497)

Support counters on IP MC route entries. This is similar to the support added earlier for Route counters.

API sequence:

sai_attribute_t counter_attr;
attr.id = SAI_COUNTER_ATTR_TYPE;
attr.value.s32 = SAI_COUNTER_TYPE_REGULAR;
sai_object_id_t counter_id;
sai_status_t rc = sai_counter_api->create_counter(&counter_id, g_switch_id, 1, &attr);
sai_attribute_t ipmc_attr;
attr.id = SAI_IPMC_ENTRY_ATTR_COUNTER_ID;
attr.value.oid = counter_id;
rc = sai_ipmc_api->set_ipmc_entry_attribute(route_entry, ipmc_attr);
sai_stat_id_t stat_ids[] = { SAI_COUNTER_STAT_PACKETS, SAI_COUNTER_STAT_BYTES };
uint64_t stats[2];
rc = sai_counter_api->sai_get_counter_stats_ext(counter_id, 2, stat_ids, stats);

Signed-off-by: rck-innovium <[email protected]>
Signed-off-by: Chris Sommers <[email protected]>

* Add thr missing API into saithriftv2 missing for syncd (opencomputeproject#1484)

saithriftv1 offers start_sai_thrift_rpc_server API to start the saithrift server and syncd is currently using that API https://github.com/Azure/sonic-sairedis/blob/master/syncd/syncd_main.cpp#L60

But this API is missing from the for saithriftv2.

Made the relevant changes to provide a similar API for saithriftv2 library

The start_sai_thrift_rpc_server API currently resides in saiserver.cpp which is not included in librpcserver.a and is not available for the users of the static library. Thus moved the function definition into sai_rpc_frontend.cpp for including it in the static library.

Signed-off-by: Vivek Reddy Karri <[email protected]>
Signed-off-by: Chris Sommers <[email protected]>

* add vlan test case (opencomputeproject#1510)

Signed-off-by: ms-junyi <[email protected]>

add vlan test case

edit FilteringTest

Signed-off-by: ms-junyi <[email protected]>

edit vlan test case

Signed-off-by: ms-junyi <[email protected]>
Signed-off-by: Chris Sommers <[email protected]>

* add more waiting time for test (opencomputeproject#1511)

* add more waiting time for test

Signed-off-by: richardyu-ms <[email protected]>

* Update fdb_configer.py

increase the waiting time for fdb entries update

Signed-off-by: richardyu-ms <[email protected]>

* remove useless change

Signed-off-by: richardyu-ms <[email protected]>
Signed-off-by: Chris Sommers <[email protected]>

* add read config_db.json (opencomputeproject#1519)

Signed-off-by: ms-junyi <[email protected]>

format

Signed-off-by: ms-junyi <[email protected]>

addomment for each function

Signed-off-by: ms-junyi <[email protected]>

add comment for each function

Signed-off-by: ms-junyi <[email protected]>
Signed-off-by: Chris Sommers <[email protected]>

* [Fix]Add necessary test data file for sai test (opencomputeproject#1520)

In order to set up the port on different platforms, need to read the data for port configuration when turning on the admin state

This PR is a bug fix for adding the config_db into test resources folder.

Test Done:
Test within SONiC mgmt container

Signed-off-by: richardyu-ms <[email protected]>
Signed-off-by: Chris Sommers <[email protected]>

* Zitingguo/add lag test (opencomputeproject#1522)

* add lag config

Signed-off-by: Ziting Guo <[email protected]>
Signed-off-by: zitingguo <[email protected]>

* enable lag config in test base

Signed-off-by: Ziting Guo <[email protected]>
Signed-off-by: zitingguo <[email protected]>

* fix lag config

Signed-off-by: Ziting Guo <[email protected]>
Signed-off-by: zitingguo <[email protected]>

* add remove_lag_member in lag_configer

Signed-off-by: Ziting Guo <[email protected]>
Signed-off-by: zitingguo <[email protected]>

* add sai_ipprefix() in utils

Signed-off-by: Ziting Guo <[email protected]>
Signed-off-by: zitingguo <[email protected]>

* fix typo

Signed-off-by: zitingguo <[email protected]>

* import LagConfiger in sai_test_base

Signed-off-by: Ziting Guo <[email protected]>
Signed-off-by: zitingguo <[email protected]>

* add a simple lag test

Signed-off-by: Ziting Guo <[email protected]>
Signed-off-by: zitingguo <[email protected]>

* fix typo

Signed-off-by: zitingguo <[email protected]>

* fix a config error in lag

Signed-off-by: Ziting Guo <[email protected]>
Signed-off-by: zitingguo <[email protected]>

* add lag lb test based on scr port

Signed-off-by: Ziting Guo <[email protected]>
Signed-off-by: zitingguo <[email protected]>

* fix

Signed-off-by: zitingguo <[email protected]>

* set lag v4 hash

Signed-off-by: Ziting Guo <[email protected]>
Signed-off-by: zitingguo <[email protected]>

* add lag disable egress test case

Signed-off-by: Ziting Guo <[email protected]>
Signed-off-by: zitingguo <[email protected]>

* add IndifferenceIngressPortTest

Signed-off-by: Ziting Guo <[email protected]>
Signed-off-by: zitingguo <[email protected]>

* fix set hash function

Signed-off-by: Ziting Guo <[email protected]>
Signed-off-by: zitingguo <[email protected]>

* separate route configuration from lag

Signed-off-by: Ziting Guo <[email protected]>
Signed-off-by: zitingguo <[email protected]>

* disable setting lag hash

Signed-off-by: Ziting Guo <[email protected]>
Signed-off-by: zitingguo <[email protected]>

* add virtual interface

Signed-off-by: Ziting Guo <[email protected]>
Signed-off-by: zitingguo <[email protected]>

* Config default v4&v6 route

Signed-off-by: zitingguo <[email protected]>
Signed-off-by: Chris Sommers <[email protected]>

* add teardown for testing multiple cases at a time (opencomputeproject#1521)

* add read config_db.json

Signed-off-by: ms-junyi <[email protected]>

format

Signed-off-by: ms-junyi <[email protected]>

addomment for each function

Signed-off-by: ms-junyi <[email protected]>

add comment for each function

Signed-off-by: ms-junyi <[email protected]>

* tear down

Signed-off-by: ms-junyi <[email protected]>
Signed-off-by: Chris Sommers <[email protected]>

* Added missing dependencies required to run gensairpc.pl (opencomputeproject#1492)

Fixes opencomputeproject#1490

Co-authored-by: Chris Sommers <[email protected]>
Signed-off-by: Chris Sommers <[email protected]>

* Update saitam.h (opencomputeproject#1496)

Attribute is introduced to configure IPFIX template reporting interval as per the RFC7011.

https://datatracker.ietf.org/doc/html/rfc7011#section-8.4

Signed-off-by: Jai Kumar <[email protected]>
Signed-off-by: Chris Sommers <[email protected]>

* Pass SAIRPC_EXTRA_LIBS flag in Makefile

Signed-off-by: Chris Sommers <[email protected]>

* Removed changes to include paths for SAI extension headers;
as it turns out these changes were not required as originally reported in opencomputeproject#1531.

Signed-off-by: Chris Sommers <[email protected]>

Co-authored-by: Kamil Cudnik <[email protected]>
Co-authored-by: Chris Sommers <[email protected]>
Co-authored-by: Richard.Yu <[email protected]>
Co-authored-by: zhoudongxu <[email protected]>
Co-authored-by: richardyu <[email protected]>
Co-authored-by: zhoudongxu <[email protected]>
Co-authored-by: Yang Wang <[email protected]>
Co-authored-by: Prince Sunny <[email protected]>
Co-authored-by: Ravindranath C K <[email protected]>
Co-authored-by: Vivek R <[email protected]>
Co-authored-by: ms-junyi <[email protected]>
Co-authored-by: zitingguo-ms <[email protected]>
Co-authored-by: Jai Kumar <[email protected]>
Signed-off-by: richardyu-ms <[email protected]>

Makefile

@@ -28,6 +28,12 @@ else
 SAITHRIFT_PATH=test/saithrift
 endif
 
+# Passed to genrpc.pl via "make saithrift-build":
+GEN_SAIRPC_OPTS?=
+
+# Passed to meta/Makefile via "make saithrift-build, can specify add'l libraries along with libsai
+SAIRPC_EXTRA_LIBS?=
+
 .PHONY: test doc clean
 
 doc:
@@ -37,7 +43,7 @@ test:
 	make -C test
 
 saithrift-build:
-	make -C $(SAITHRIFT_PATH)
+	SAIRPC_EXTRA_LIBS="$(SAIRPC_EXTRA_LIBS)" GEN_SAIRPC_OPTS=$(GEN_SAIRPC_OPTS) make -C $(SAITHRIFT_PATH)
 
 saithrift-install: saithrift-build
 	make -C $(SAITHRIFT_PATH) install

meta/templates/sai_rpc_server_functions.tt

@@ -110,7 +110,7 @@
 [%- ######################################################################## -%]
 
 [%- BLOCK sai_api_query -%]
-    status = sai_api_query(SAI_API_[% api.upper %], (void **)&[% api %]_api);
+    status = sai_api_query(static_cast<sai_api_t>(SAI_API_[% api.upper %]), (void **)&[% api %]_api);
     if (status != SAI_STATUS_SUCCESS) {
       [%- PROCESS return_error indentation = 3 status_variable = 'status' %]
     }

meta/templates/sai_rpc_server_helper_functions.tt

@@ -64,7 +64,7 @@ void sai_thrift_parse_[% object %]_attributes(const std::vector<sai_thrift_attri
   for (uint32_t i = 0; i < thrift_attr_list.size(); i++, it++) {
     attribute = (sai_thrift_attribute_t)*it;
     attr_list[i].id = attribute.id;
-    convert_attr_thrift_to_sai(SAI_OBJECT_TYPE_[% object.upper %], attribute, &attr_list[i]);
+    convert_attr_thrift_to_sai(static_cast<sai_object_type_t>(SAI_OBJECT_TYPE_[% object.upper %]), attribute, &attr_list[i]);
   }
 [% END -%]
 
@@ -85,7 +85,7 @@ void sai_thrift_deparse_[% object %]_attributes(sai_attribute_t *attr_list,
 
   for (uint32_t i = 0; i < attr_count; i++, it++) {
     sai_thrift_attribute_t attribute;
-    convert_attr_sai_to_thrift(SAI_OBJECT_TYPE_[% object.upper %], attr_list[i], attribute);
+    convert_attr_sai_to_thrift(static_cast<sai_object_type_t>(SAI_OBJECT_TYPE_[% object.upper %]), attr_list[i], attribute);
     thrift_attr_list.push_back(attribute);
   }
 [% END -%]

test/saithriftv2/Makefile

@@ -18,6 +18,9 @@ CPPFLAGS = -I$(SAI_HEADER_DIR) -I. -std=c++11
 CPPFLAGS += -O0 -ggdb
 
 
+# specify add'l libraries along with libsai
+SAIRPC_EXTRA_LIBS?=
+
 ifeq ($(platform),MLNX)
 CDEFS = -DMLNXSAI
 else
@@ -88,7 +91,7 @@ $(ODIR)/sai_rpc_server.o: ../../meta/sai_rpc_frontend.cpp
 	$(CXX) $(CPPFLAGS) -c $^ -o $@ $(CPPFLAGS) -I./gen-cpp -I../../meta -I../../inc -I../../experimental
 
 $(ODIR)/saiserver.o: src/saiserver.cpp $(CPP_SOURCES) directories
-	$(CXX) $(CPPFLAGS) -c src/saiserver.cpp  -o $@ $(CPPFLAGS) $(CDEFS) -I./gen-cpp -I../../inc
+	$(CXX) $(CPPFLAGS) -c src/saiserver.cpp  -o $@ $(CPPFLAGS) $(CDEFS) -I./gen-cpp -I../../inc -I../../experimental
 
 $(ODIR)/librpcserver.a: $(ODIR)/sai_rpc.o $(ODIR)/sai_types.o $(ODIR)/sai_rpc_server.o
 	ar rcs $(ODIR)/librpcserver.a $^
@@ -98,7 +101,7 @@ clientlib: $(PY_SOURCES) $(SAI_PY_HEADERS)
 
 saiserver: $(ODIR)/saiserver.o $(ODIR)/librpcserver.a
 	$(CXX) $(LDFLAGS) $(ODIR)/sai_rpc_server.o $(ODIR)/saiserver.o -o $@ \
-		   $(ODIR)/librpcserver.a $(LIBS)
+		   $(ODIR)/librpcserver.a $(LIBS) $(SAIRPC_EXTRA_LIBS)
 
 install-lib: $(ODIR)/librpcserver.a
 	$(INSTALL) -D $(ODIR)/librpcserver.a $(DESTDIR)/usr/lib/librpcserver.a