Merge branch 'master' into loopback_mode

sonic-net · Jun 3, 2024 · 2430b1d · 2430b1d
2 parents 59e5bdc + 98012ed
commit 2430b1d
Show file tree

Hide file tree

Showing 35 changed files with 943 additions and 1,197 deletions.
diff --git a/.azure-pipelines/build-docker-sonic-vs-template.yml b/.azure-pipelines/build-docker-sonic-vs-template.yml
@@ -90,6 +90,7 @@ jobs:
       artifact: ${{ parameters.sairedis_artifact_name }}
       runVersion: 'latestFromBranch'
       runBranch: 'refs/heads/${{ parameters.sairedis_artifact_branch }}'
+      allowPartiallySucceededBuilds: true
       path: $(Build.ArtifactStagingDirectory)/download/sairedis
       patterns: |
         ${{ parameters.sairedis_artifact_pattern }}/libsaivs_*.deb

diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
@@ -10,7 +10,7 @@ parameters:
 - name: pool
   type: string
   values:
-  - sonicbld
+  - sonicbld-1es
   - sonicbld-armhf
   - sonicbld-arm64
   - default

diff --git a/.azure-pipelines/gcov.yml b/.azure-pipelines/gcov.yml
@@ -8,7 +8,7 @@ parameters:
 - name: pool
   type: string
   values:
-  - sonicbld
+  - sonicbld-1es
   - default
   default: default
 

diff --git a/.azure-pipelines/test-docker-sonic-vs-template.yml b/.azure-pipelines/test-docker-sonic-vs-template.yml
@@ -91,7 +91,8 @@ jobs:
         sudo apt-add-repository https://packages.microsoft.com/ubuntu/20.04/prod
         sudo apt-get update
         sudo apt-get install -y dotnet-sdk-7.0
-        sudo dotnet tool install dotnet-reportgenerator-globaltool  --tool-path /usr/bin
+        sudo dotnet tool install dotnet-reportgenerator-globaltool --tool-path /usr/bin 2>&1 | tee log.log || grep 'already installed' log.log
+        rm log.log
     displayName: "Install .NET CORE"
 
   - script: |

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -41,7 +41,7 @@ stages:
   - template: .azure-pipelines/build-template.yml
     parameters:
       arch: amd64
-      pool: sonicbld
+      pool: sonicbld-1es
       sonic_slave: sonic-slave-bullseye
       common_lib_artifact_name: common-lib
       swss_common_artifact_name: sonic-swss-common
@@ -56,7 +56,7 @@ stages:
   - template: .azure-pipelines/build-template.yml
     parameters:
       arch: amd64
-      pool: sonicbld
+      pool: sonicbld-1es
       sonic_slave: sonic-slave-bullseye
       common_lib_artifact_name: common-lib
       swss_common_artifact_name: sonic-swss-common
@@ -99,7 +99,7 @@ stages:
   - template: .azure-pipelines/build-template.yml
     parameters:
       arch: amd64
-      pool: sonicbld
+      pool: sonicbld-1es
       sonic_slave: sonic-slave-bookworm
       common_lib_artifact_name: common-lib
       swss_common_artifact_name: sonic-swss-common-bookworm

diff --git a/cfgmgr/fabricmgr.cpp b/cfgmgr/fabricmgr.cpp
@@ -41,6 +41,7 @@ void FabricMgr::doTask(Consumer &consumer)
             string monPollThreshRecovery, monPollThreshIsolation;
             string isolateStatus;
             string alias, lanes;
+            string enable;
             std::vector<FieldValueTuple> field_values;
             string value;
 
@@ -66,6 +67,12 @@ void FabricMgr::doTask(Consumer &consumer)
                     monPollThreshIsolation = fvValue(i);
                     writeConfigToAppDb(key, "monPollThreshIsolation", monPollThreshIsolation);
                 }
+                else if (fvField(i) == "monState")
+                {
+                    SWSS_LOG_INFO("Enable fabric monitoring setting in appl_db.");
+                    enable = fvValue(i);
+                    writeConfigToAppDb(key, "monState", enable);
+                }
                 else if (fvField(i) == "alias")
                 {
                     alias = fvValue(i);

diff --git a/cfgmgr/fabricmgr.h b/cfgmgr/fabricmgr.h
@@ -20,7 +20,7 @@ class FabricMgr : public Orch
 private:
     Table m_cfgFabricMonitorTable;
     Table m_cfgFabricPortTable;
-    Table m_appFabricMonitorTable;
+    ProducerStateTable m_appFabricMonitorTable;
     ProducerStateTable m_appFabricPortTable;
 
     void doTask(Consumer &consumer);