Merge branch 'master' into fc-acl-counter

.azure-pipelines/build-swss-template.yml

@@ -50,10 +50,6 @@ jobs:
       sudo apt-get install -y libzmq5 libzmq3-dev
       sudo apt-get install -qq -y \
           libhiredis-dev \
-          libnl-3-dev \
-          libnl-genl-3-dev \
-          libnl-route-3-dev \
-          libnl-nf-3-dev \
           swig3.0
       sudo apt-get install -y libdbus-1-3
       sudo apt-get install -y libteam-dev \
@@ -73,7 +69,24 @@ jobs:
     inputs:
       artifact: ${{ parameters.sairedis_artifact_name }}
     displayName: "Download sonic sairedis deb packages"
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      source: specific
+      project: build
+      pipeline: 1
+      artifact: sonic-buildimage.vs
+      runVersion: 'latestFromBranch'
+      runBranch: 'refs/heads/master'
+    displayName: "Download sonic buildimage"
   - script: |
+      sudo dpkg -i target/debs/buster/libnl-3-200_*.deb
+      sudo dpkg -i target/debs/buster/libnl-3-dev_*.deb
+      sudo dpkg -i target/debs/buster/libnl-genl-3-200_*.deb
+      sudo dpkg -i target/debs/buster/libnl-genl-3-dev_*.deb
+      sudo dpkg -i target/debs/buster/libnl-route-3-200_*.deb
+      sudo dpkg -i target/debs/buster/libnl-route-3-dev_*.deb
+      sudo dpkg -i target/debs/buster/libnl-nf-3-200_*.deb
+      sudo dpkg -i target/debs/buster/libnl-nf-3-dev_*.deb
       sudo dpkg -i libswsscommon_1.0.0_${{ parameters.arch }}.deb
       sudo dpkg -i libswsscommon-dev_1.0.0_${{ parameters.arch }}.deb
       sudo dpkg -i libsaivs_*.deb
@@ -84,7 +97,7 @@ jobs:
       sudo dpkg -i libsaimetadata-dev_*.deb
       sudo dpkg -i syncd-vs_*.deb
     workingDirectory: $(Pipeline.Workspace)
-    displayName: "Install sonic swss common and sairedis"
+    displayName: "Install libnl3, sonic swss common, and sairedis"
   - checkout: sonic-swss
     path: s
     submodules: true

.azure-pipelines/build-template.yml

@@ -10,6 +10,8 @@ parameters:
   type: string
   values:
   - sonicbld
+  - sonicbld-arm64
+  - sonicbld-armhf
   - default
   default: default
 
@@ -33,10 +35,18 @@ parameters:
   type: boolean
   default: false
 
+- name: archive_gcov
+  type: boolean
+  default: false
+
 jobs:
 - job:
   displayName: ${{ parameters.arch }}
   timeoutInMinutes: ${{ parameters.timeout }}
+  variables:
+    DIFF_COVER_CHECK_THRESHOLD: 50
+    ${{ if eq(parameters.run_unit_test, true) }}:
+      DIFF_COVER_ENABLE: 'true'
 
   pool:
     ${{ if ne(parameters.pool, 'default') }}:
@@ -97,20 +107,49 @@ jobs:
   - checkout: self
     submodules: true
   - script: |
+      set -ex
       ./autogen.sh
-      fakeroot dpkg-buildpackage -b -us -uc -Tbinary-syncd-vs -j$(nproc) && cp ../*.deb .
-    displayName: "Compile sonic sairedis"
+      fakeroot debian/rules DEB_CONFIGURE_EXTRA_FLAGS='--enable-code-coverage' CFLAGS="" CXXFLAGS="" binary-syncd-vs && cp ../*.deb .
+    displayName: "Compile sonic sairedis with coverage enabled"
   - script: |
       sudo cp azsyslog.conf /etc/rsyslog.conf
       sudo service rsyslog restart
     displayName: "Update rsyslog.conf"
   - ${{ if eq(parameters.run_unit_test, true) }}:
     - script: |
+        set -ex
+        git clone https://github.com/Spacetown/gcovr.git
+        cd gcovr/
+        git checkout origin/recursive_search_file
+        sudo pip3 install setuptools
+        sudo python3 setup.py install
+        cd ..
+        sudo rm -rf gcovr
+      displayName: "Install gcovr 5.0 with recursive fix"
+    - script: |
+        set -ex
         make check
+        gcovr --version
+        find SAI/meta -name "*.gc*" | xargs rm -vf
+        gcovr -r ./ -e ".*/SAI/.*" -e ".+/json.hpp" -e "swss/.+" -e ".*/.libs/.*" -e ".*/debian/.*" --exclude-unreachable-branches --exclude-throw-branches -x --xml-pretty -o coverage.xml
       displayName: "Run sonic sairedis unit tests"
   - publish: $(System.DefaultWorkingDirectory)/
     artifact: ${{ parameters.artifact_name }}
     displayName: "Archive sonic sairedis debian packages"
+  - ${{ if eq(parameters.archive_gcov, true) }}:
+      - script: |
+          set -ex
+          # Install .NET CORE
+          curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
+          sudo apt-add-repository https://packages.microsoft.com/debian/10/prod
+          sudo apt-get update
+          sudo apt-get install -y dotnet-sdk-5.0
+        displayName: "Install .NET CORE"
+      - task: PublishCodeCoverageResults@1
+        inputs:
+            codeCoverageTool: Cobertura
+            summaryFileLocation: '$(System.DefaultWorkingDirectory)/coverage.xml'
+        displayName: 'Publish test coverage'
   - script: |
       pwd
       sudo chmod a+r /var/log/syslog*

.azure-pipelines/build_and_install_module.sh

@@ -48,6 +48,7 @@ function build_and_install_kmodule()
     grep NET_TEAM .config.bk >> .config
     echo CONFIG_NET_VRF=m >> .config
     echo CONFIG_MACSEC=m >> .config
+    echo CONFIG_SYSTEM_REVOCATION_LIST=n >> .config
     make VERSION=$VERSION PATCHLEVEL=$PATCHLEVEL SUBLEVEL=$SUBLEVEL EXTRAVERSION=-${EXTRAVERSION} LOCALVERSION=-${LOCALVERSION} modules_prepare
     make M=drivers/net/team
     mv drivers/net/Makefile drivers/net/Makefile.bak

.gitignore

@@ -88,19 +88,25 @@ deps/
 # Executables #
 ###############
 lib/tests
-vslib/tests
 meta/tests
+saiasiccmp/saiasiccmp
 saidiscovery/saidiscovery
 saidump/saidump
 saiplayer/saiplayer
 saisdkdump/saisdkdump
 syncd/syncd
 syncd/syncd_request_shutdown
 tests/syncd
-tests/vssyncd
-saiasiccmp/saiasiccmp
-tests/tests
 tests/testclient
+tests/tests
+tests/vssyncd
+unittest/lib/tests
+unittest/lib/testslibsairedis
+unittest/meta/tests
+unittest/syncd/tests
+unittest/vslib/tests
+unittest/vslib/testslibsaivs
+vslib/tests
 
 # Temporary files #
 ###################

azure-pipelines.yml

@@ -27,6 +27,7 @@ stages:
       artifact_name: sonic-sairedis
       syslog_artifact_name: sonic-sairedis.syslog
       run_unit_test: true
+      archive_gcov: true
 
 - stage: BuildArm
   dependsOn: Build
@@ -35,8 +36,8 @@ stages:
   - template: .azure-pipelines/build-template.yml
     parameters:
       arch: armhf
-      timeout: 180
-      pool: sonicbld
+      timeout: 240
+      pool: sonicbld-armhf
       sonic_slave: sonic-slave-buster-armhf
       swss_common_artifact_name: sonic-swss-common.armhf
       artifact_name: sonic-sairedis.armhf
@@ -45,8 +46,8 @@ stages:
   - template: .azure-pipelines/build-template.yml
     parameters:
       arch: arm64
-      timeout: 180
-      pool: sonicbld
+      timeout: 240
+      pool: sonicbld-arm64
       sonic_slave: sonic-slave-buster-arm64
       swss_common_artifact_name: sonic-swss-common.arm64
       artifact_name: sonic-sairedis.arm64

debian/rules

@@ -69,7 +69,7 @@ binary-syncd-vs:
 
 override_dh_auto_configure:
 	./autogen.sh
-	dh_auto_configure -- $(shell cat /tmp/syncd-build) ${SWSS_COMMON_CONFIG}
+	dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS) $(shell cat /tmp/syncd-build) ${SWSS_COMMON_CONFIG}
 
 override_dh_install:
 	dh_install

lib/ClientConfig.cpp

@@ -55,7 +55,7 @@ std::shared_ptr<ClientConfig> ClientConfig::loadFromFile(
         auto cc = std::make_shared<ClientConfig>();
 
         cc->m_zmqEndpoint = j["zmq_endpoint"];
-        cc->m_zmqNtfEndpoint = j["zmq_endpoint_ntf"];
+        cc->m_zmqNtfEndpoint = j["zmq_ntf_endpoint"];
 
         SWSS_LOG_NOTICE("client config: %s, %s",
                 cc->m_zmqEndpoint.c_str(),

lib/ClientSai.cpp

@@ -886,6 +886,16 @@ sai_status_t ClientSai::getStats(
     return waitForGetStatsResponse(number_of_counters, counters);
 }
 
+sai_status_t ClientSai::queryStatsCapability(
+        _In_ sai_object_id_t switchId,
+        _In_ sai_object_type_t objectType,
+        _Inout_ sai_stat_capability_list_t *stats_capability)
+{
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 sai_status_t ClientSai::waitForGetStatsResponse(
         _In_ uint32_t number_of_counters,
         _Out_ uint64_t *counters)
@@ -1179,6 +1189,38 @@ sai_status_t ClientSai::bulkCreate(
             object_statuses);
 }
 
+sai_status_t ClientSai::bulkCreate(
+        _In_ uint32_t object_count,
+        _In_ const sai_my_sid_entry_t* my_sid_entry,
+        _In_ const uint32_t *attr_count,
+        _In_ const sai_attribute_t **attr_list,
+        _In_ sai_bulk_op_error_mode_t mode,
+        _Out_ sai_status_t *object_statuses)
+{
+    MUTEX();
+    SWSS_LOG_ENTER();
+    REDIS_CHECK_API_INITIALIZED();
+
+    // TODO support mode
+
+    std::vector<std::string> serialized_object_ids;
+
+    // on create vid is put in db by syncd
+    for (uint32_t idx = 0; idx < object_count; idx++)
+    {
+        std::string str_object_id = sai_serialize_my_sid_entry(my_sid_entry[idx]);
+        serialized_object_ids.push_back(str_object_id);
+    }
+
+    return bulkCreate(
+            SAI_OBJECT_TYPE_MY_SID_ENTRY,
+            serialized_object_ids,
+            attr_count,
+            attr_list,
+            mode,
+            object_statuses);
+}
+
 // BULK CREATE HELPERS
 
 sai_status_t ClientSai::bulkCreate(
@@ -1335,6 +1377,26 @@ sai_status_t ClientSai::bulkRemove(
     return bulkRemove(SAI_OBJECT_TYPE_FDB_ENTRY, serializedObjectIds, mode, object_statuses);
 }
 
+sai_status_t ClientSai::bulkRemove(
+        _In_ uint32_t object_count,
+        _In_ const sai_my_sid_entry_t *my_sid_entry,
+        _In_ sai_bulk_op_error_mode_t mode,
+        _Out_ sai_status_t *object_statuses)
+{
+    MUTEX();
+    SWSS_LOG_ENTER();
+    REDIS_CHECK_API_INITIALIZED();
+
+    std::vector<std::string> serializedObjectIds;
+
+    for (uint32_t idx = 0; idx < object_count; idx++)
+    {
+        serializedObjectIds.emplace_back(sai_serialize_my_sid_entry(my_sid_entry[idx]));
+    }
+
+    return bulkRemove(SAI_OBJECT_TYPE_MY_SID_ENTRY, serializedObjectIds, mode, object_statuses);
+}
+
 // BULK REMOVE HELPERS
 
 sai_status_t ClientSai::bulkRemove(
@@ -1485,6 +1547,27 @@ sai_status_t ClientSai::bulkSet(
     return bulkSet(SAI_OBJECT_TYPE_FDB_ENTRY, serializedObjectIds, attr_list, mode, object_statuses);
 }
 
+sai_status_t ClientSai::bulkSet(
+        _In_ uint32_t object_count,
+        _In_ const sai_my_sid_entry_t *my_sid_entry,
+        _In_ const sai_attribute_t *attr_list,
+        _In_ sai_bulk_op_error_mode_t mode,
+        _Out_ sai_status_t *object_statuses)
+{
+    MUTEX();
+    SWSS_LOG_ENTER();
+    REDIS_CHECK_API_INITIALIZED();
+
+    std::vector<std::string> serializedObjectIds;
+
+    for (uint32_t idx = 0; idx < object_count; idx++)
+    {
+        serializedObjectIds.emplace_back(sai_serialize_my_sid_entry(my_sid_entry[idx]));
+    }
+
+    return bulkSet(SAI_OBJECT_TYPE_MY_SID_ENTRY, serializedObjectIds, attr_list, mode, object_statuses);
+}
+
 // BULK SET HELPERS
 
 sai_status_t ClientSai::bulkSet(

lib/ClientSai.h

@@ -97,6 +97,11 @@ namespace sairedis
                     _In_ const sai_stat_id_t *counter_ids,
                     _Out_ uint64_t *counters) override;
 
+            virtual sai_status_t queryStatsCapability(
+                    _In_ sai_object_id_t switch_id,
+                    _In_ sai_object_type_t object_type,
+                    _Inout_ sai_stat_capability_list_t *stats_capability) override;
+
             virtual sai_status_t getStatsExt(
                     _In_ sai_object_type_t object_type,
                     _In_ sai_object_id_t object_id,

lib/ClientServerSai.cpp

@@ -247,6 +247,18 @@ sai_status_t ClientServerSai::getStats(
             counters);
 }
 
+sai_status_t ClientServerSai::queryStatsCapability(
+        _In_ sai_object_id_t switchId,
+        _In_ sai_object_type_t objectType,
+        _Inout_ sai_stat_capability_list_t *stats_capability)
+{
+    MUTEX();
+    SWSS_LOG_ENTER();
+    REDIS_CHECK_API_INITIALIZED();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 sai_status_t ClientServerSai::getStatsExt(
         _In_ sai_object_type_t object_type,
         _In_ sai_object_id_t object_id,

lib/ClientServerSai.h

@@ -89,6 +89,11 @@ namespace sairedis
                     _In_ const sai_stat_id_t *counter_ids,
                     _Out_ uint64_t *counters) override;
 
+            virtual sai_status_t queryStatsCapability(
+                    _In_ sai_object_id_t switch_id,
+                    _In_ sai_object_type_t object_type,
+                    _Inout_ sai_stat_capability_list_t *stats_capability) override;
+
             virtual sai_status_t getStatsExt(
                     _In_ sai_object_type_t object_type,
                     _In_ sai_object_id_t object_id,

lib/Makefile.am

@@ -65,7 +65,7 @@ libsairedis_la_SOURCES = \
 						 sai_redis_samplepacket.cpp \
 						 sai_redis_scheduler.cpp \
 						 sai_redis_schedulergroup.cpp \
-						 sai_redis_segmentroute.cpp \
+						 sai_redis_srv6.cpp \
 						 sai_redis_stp.cpp \
 						 sai_redis_switch.cpp \
 						 sai_redis_system_port.cpp \
@@ -74,7 +74,9 @@ libsairedis_la_SOURCES = \
 						 sai_redis_udf.cpp \
 						 sai_redis_virtual_router.cpp \
 						 sai_redis_vlan.cpp \
-						 sai_redis_wred.cpp
+						 sai_redis_wred.cpp \
+						 sai_redis_ipsec.cpp \
+						 sai_redis_my_mac.cpp
 
 libSaiRedis_a_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 libSaiRedis_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)