Merge branch 'master' into saksarav-nokia-fec-counters

Author: saksarav-nokia

.azure-pipelines/docker-sonic-vs/start.sh

@@ -61,10 +61,15 @@ else
         qos_cmd="-j /tmp/qos.json"
     fi
 
+    if [ -f /usr/share/sonic/single_asic_voq_fs/default_config.json ]; then
+        sonic-cfggen -j /usr/share/sonic/single_asic_voq_fs/default_config.json --print-data > /tmp/voq.json
+        voq_cmd="-j /tmp/voq.json"
+    fi
+
     sonic-cfggen -p /usr/share/sonic/device/$PLATFORM/$PLATFORM_CONF -k $HWSKU --print-data > /tmp/ports.json
     # change admin_status from up to down; Test cases dependent
     sed -i "s/up/down/g" /tmp/ports.json
-    sonic-cfggen -j /etc/sonic/init_cfg.json $buffers_cmd $qos_cmd -j /tmp/ports.json --print-data > /etc/sonic/config_db.json
+    sonic-cfggen -j /etc/sonic/init_cfg.json $buffers_cmd $qos_cmd $voq_cmd -j /tmp/ports.json --print-data > /etc/sonic/config_db.json
 fi
 
 sonic-cfggen -t /usr/share/sonic/templates/copp_cfg.j2 > /etc/sonic/copp_cfg.json

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

@@ -180,6 +180,8 @@ jobs:
       retry=3
       IMAGE_NAME=docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber).asan-${{ parameters.asan }}
       echo $all_tests | xargs -n 1 | xargs -P 8 -I TEST_MODULE sudo DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io/ ./run-tests.sh "$IMAGE_NAME" "$params" "TEST_MODULE" 3
+      single_asic_voq_tests="test_portchannel.py test_neighbor.py test_route.py"
+      echo $single_asic_voq_tests | xargs -n 1 | xargs -P 3 -I TEST_MODULE sudo ./run-tests.sh "$IMAGE_NAME" "--force-recreate-dvs --switch-mode=single_asic_voq_fs" "TEST_MODULE" 3
 
       rm -rf $(Build.ArtifactStagingDirectory)/download
     displayName: "Run vs tests"

fpmsyncd/fpmlink.cpp

@@ -281,11 +281,21 @@ void FpmLink::processFpmMessage(fpm_msg_hdr_t* hdr)
             /* EVPN Type5 Add route processing */
             processRawMsg(nl_hdr);
         }
-	else if(nl_hdr->nlmsg_type == RTM_NEWNEXTHOP || nl_hdr->nlmsg_type == RTM_DELNEXTHOP)
+        else if(nl_hdr->nlmsg_type == RTM_NEWSRV6VPNROUTE || nl_hdr->nlmsg_type == RTM_DELSRV6VPNROUTE)
+        {
+            /* rtnl api dont support RTM_NEWSRV6VPNROUTE/RTM_DELSRV6VPNROUTE yet. Processing as raw message*/
+            processRawMsg(nl_hdr);
+        }
+        else if(nl_hdr->nlmsg_type == RTM_NEWNEXTHOP || nl_hdr->nlmsg_type == RTM_DELNEXTHOP)
         {
             /* rtnl api dont support RTM_NEWNEXTHOP/RTM_DELNEXTHOP yet. Processing as raw message*/
             processRawMsg(nl_hdr);
         }
+        else if(nl_hdr->nlmsg_type == RTM_NEWPICCONTEXT || nl_hdr->nlmsg_type == RTM_DELPICCONTEXT)
+        {
+            /* rtnl api dont support RTM_NEWPICCONTEXT/RTM_DELPICCONTEXT yet. Processing as raw message*/
+            processRawMsg(nl_hdr);
+        }
         else
         {
             NetDispatcher::getInstance().onNetlinkMessage(msg);

fpmsyncd/fpmlink.h

@@ -17,6 +17,10 @@
 
 #define RTM_NEWSRV6LOCALSID		1000
 #define RTM_DELSRV6LOCALSID		1001
+#define RTM_NEWPICCONTEXT		2000
+#define RTM_DELPICCONTEXT		2001
+#define RTM_NEWSRV6VPNROUTE		3000
+#define RTM_DELSRV6VPNROUTE		3001
 
 namespace swss {