Merge branch 'master' into master

JunhongMao · Sep 12, 2023 · ce5a837 · ce5a837
2 parents 363589a + 9547060
commit ce5a837
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 12 deletions.
diff --git a/.azure-pipelines/build-swss-template.yml b/.azure-pipelines/build-swss-template.yml
@@ -33,6 +33,9 @@ parameters:
 - name: artifact_name
   type: string
 
+- name: syslog_artifact_name
+  type: string
+
 jobs:
 - job:
   displayName: ${{ parameters.arch }}
@@ -65,7 +68,14 @@ jobs:
         libzmq3-dev \
         swig4.0 \
         libdbus-1-dev \
-        libteam-dev
+        libteam-dev \
+        rsyslog
+
+      sudo perl -i.bk -ne 'print if not /SONiCFileFormat|ActionFileDefaultTemplate/' /etc/rsyslog.conf
+      sudo sed -ie '/GLOBAL DIRECTIVES/{s/$/\n\$template SONiCFileFormat,"%TIMESTAMP%.%timestamp:::date-subseconds% %HOSTNAME% %syslogseverity-text:::uppercase% %syslogtag%%msg:::sp-if-no-1st-sp%%msg:::drop-lst-lf%\\n"\n\$ActionFileDefaultTemplate SONiCFileFormat/}' /etc/rsyslog.conf
+
+      sudo service rsyslog start
+
     displayName: "Install dependencies"
   - task: DownloadPipelineArtifact@2
     inputs:
@@ -121,6 +131,8 @@ jobs:
       sudo dpkg -i $(find ./download -name libyang_*.deb)
       sudo dpkg -i $(find ./download -name *.deb)
       rm -rf download || true
+      cat /etc/apt/sources.list
+      dpkg --list |grep libnl
     workingDirectory: $(Build.ArtifactStagingDirectory)
     displayName: "Install libnl3, sonic swss common, and sairedis"
   - script: |
@@ -133,3 +145,21 @@ jobs:
   - publish: $(Build.ArtifactStagingDirectory)
     artifact: ${{ parameters.artifact_name }}
     displayName: "Archive swss debian packages"
+  - script: |
+      pwd
+      sudo chmod a+r /var/log/syslog*
+      tar -czf syslog-swss.tgz /var/log/syslog*
+      ls -al .
+      ls -al /var/log/
+    displayName: "Env info"
+    condition: always()
+  - task: CopyFiles@2
+    displayName: "Copy syslog to staging directory"
+    condition: always()
+    inputs:
+        contents: 'syslog-swss.tgz'
+        targetFolder: $(Build.ArtifactStagingDirectory)
+  - publish: $(Build.ArtifactStagingDirectory)/
+    artifact: ${{ parameters.syslog_artifact_name }}@$(System.JobAttempt)
+    displayName: "Publish syslog artifacts"
+    condition: always()
diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
@@ -100,6 +100,9 @@ jobs:
       sudo apt-get install -y rsyslog
       sudo service rsyslog start
 
+      cat /etc/apt/sources.list
+      dpkg --list | grep libnl
+
     displayName: "Install dependencies"
   - task: DownloadPipelineArtifact@2
     # amd64 artifact name does not has arch suffix

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -69,6 +69,7 @@ jobs:
             autoconf-archive \
             uuid-dev \
             libjansson-dev \
+            nlohmann-json3-dev \
             python
 
     - if: matrix.language == 'cpp'

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -111,6 +111,7 @@ stages:
       sonic_slave: sonic-slave-${{ parameters.debian_version }}
       swss_common_artifact_name: sonic-swss-common
       sairedis_artifact_name: sonic-sairedis
+      syslog_artifact_name: sonic-swss.syslog
       artifact_name: sonic-swss
       debian_version: ${{ parameters.debian_version }}
 

diff --git a/lib/ClientConfig.cpp b/lib/ClientConfig.cpp
@@ -1,7 +1,7 @@
 #include "ClientConfig.h"
 
 #include "swss/logger.h"
-#include "swss/json.hpp"
+#include <nlohmann/json.hpp>
 
 #include <cstring>
 #include <fstream>

diff --git a/lib/ContextConfigContainer.cpp b/lib/ContextConfigContainer.cpp
@@ -1,7 +1,7 @@
 #include "ContextConfigContainer.h"
 
 #include "swss/logger.h"
-#include "swss/json.hpp"
+#include <nlohmann/json.hpp>
 
 #include <cstring>
 #include <fstream>

diff --git a/lib/ServerConfig.cpp b/lib/ServerConfig.cpp
@@ -1,7 +1,7 @@
 #include "ServerConfig.h"
 
 #include "swss/logger.h"
-#include "swss/json.hpp"
+#include <nlohmann/json.hpp>
 
 #include <cstring>
 #include <fstream>

diff --git a/meta/SaiSerialize.cpp b/meta/SaiSerialize.cpp
@@ -3,10 +3,7 @@
 
 #include "swss/tokenize.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow"
-#include "swss/json.hpp"
-#pragma GCC diagnostic pop
+#include <nlohmann/json.hpp>
 
 #include <inttypes.h>
 #include <vector>

diff --git a/saiasiccmp/View.h b/saiasiccmp/View.h
@@ -5,7 +5,7 @@ extern "C" {
 #include "saimetadata.h"
 }
 
-#include "swss/json.hpp"
+#include <nlohmann/json.hpp>
 #include "swss/table.h"
 
 #include "syncd/AsicView.h"

diff --git a/unittest/meta/TestNotificationFactory.cpp b/unittest/meta/TestNotificationFactory.cpp
@@ -4,6 +4,7 @@
 #include "sai_serialize.h"
 
 #include <gtest/gtest.h>
+#include <nlohmann/json.hpp>
 
 #include <memory>
 
@@ -13,7 +14,7 @@ TEST(NotificationFactory, deserialize)
 {
     EXPECT_THROW(NotificationFactory::deserialize("foo", "bar"), std::runtime_error);
 
-    EXPECT_THROW(NotificationFactory::deserialize(SAI_SWITCH_NOTIFICATION_NAME_FDB_EVENT, "bar"), std::invalid_argument);
+    EXPECT_THROW(NotificationFactory::deserialize(SAI_SWITCH_NOTIFICATION_NAME_FDB_EVENT, "bar"), nlohmann::detail::parse_error);
 }
 
 TEST(NotificationFactory, deserialize_fdb_event)

diff --git a/vslib/ContextConfigContainer.cpp b/vslib/ContextConfigContainer.cpp
@@ -1,7 +1,7 @@
 #include "ContextConfigContainer.h"
 
 #include "swss/logger.h"
-#include "swss/json.hpp"
+#include <nlohmann/json.hpp>
 
 #include <cstring>
 #include <fstream>

diff --git a/vslib/FdbInfo.cpp b/vslib/FdbInfo.cpp
@@ -6,7 +6,7 @@
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
-#include "swss/json.hpp"
+#include <nlohmann/json.hpp>
 #pragma GCC diagnostic pop
 
 using namespace saivs;