Merge branch 'sonic-net:master' into Silverstone-X-commit-master

sonic-net · Sep 9, 2022 · 464228e · 464228e
2 parents 5d48ff6 + 549bb3d
commit 464228e
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 17 deletions.
diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
@@ -22,15 +22,6 @@ jobs:
   label:
     runs-on: ubuntu-latest
     steps:
-    - name: approve
-      env:
-        GITHUB_CONTEXT: ${{ toJson(github) }}
-      run: |
-        set -e
-        echo ${{ secrets.GITHUB_TOKEN }} | gh auth login --with-token
-        url=$(echo $GITHUB_CONTEXT | jq -r '.event.pull_request._links.html.href')
-        echo PR: $url
-        gh pr review $url --approve
     - uses: actions/labeler@main
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
@@ -170,7 +170,7 @@
             "3": "3",
             "4": "4",
             "5": "5",
-            "6": "6",
+            "6": "1",
             "7": "7",
             "8": "1"
         },

diff --git a/device/common/profiles/th2/7260/BALANCED/qos.json.j2 b/device/common/profiles/th2/7260/BALANCED/qos.json.j2
@@ -322,7 +322,7 @@
             "3": "3",
             "4": "4",
             "5": "5",
-            "6": "6",
+            "6": "1",
             "7": "7",
             "8": "1"
         },

diff --git a/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2 b/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
@@ -321,7 +321,7 @@
             "3": "3",
             "4": "4",
             "5": "5",
-            "6": "6",
+            "6": "1",
             "7": "7",
             "8": "1"
         },

diff --git a/files/build_templates/tacacs-config.timer b/files/build_templates/tacacs-config.timer
@@ -9,4 +9,4 @@ OnBootSec=5min 30 sec
 Unit=tacacs-config.service
 
 [Install]
-WantedBy=timers.target updategraph.service
+WantedBy=timers.target sonic.target sonic-delayed.target
diff --git a/files/scripts/swss.sh b/files/scripts/swss.sh
@@ -30,7 +30,7 @@ function read_dependent_services()
     fi
 
     if [[ -f ${ETC_SONIC_PATH}/${SERVICE}_multi_inst_dependent ]]; then
-        MULTI_INST_DEPENDENT="${MULTI_INST_DEPENDENT} cat ${ETC_SONIC_PATH}/${SERVICE}_multi_inst_dependent"
+        MULTI_INST_DEPENDENT="${MULTI_INST_DEPENDENT} $(cat ${ETC_SONIC_PATH}/${SERVICE}_multi_inst_dependent)"
     fi
 }
 
@@ -308,6 +308,19 @@ function check_peer_gbsyncd()
     fi
 }
 
+function check_macsec()
+{
+    MACSEC_STATE=`show feature status | grep macsec | awk '{print $2}'`
+
+    if [[ ${MACSEC_STATE} == 'enabled' ]]; then
+        if [ "$DEV" ]; then
+            DEPENDENT="${DEPENDENT} macsec@${DEV}"
+        else
+            DEPENDENT="${DEPENDENT} macsec"
+        fi
+    fi
+}
+
 if [ "$DEV" ]; then
     NET_NS="$NAMESPACE_PREFIX$DEV" #name of the network namespace
     SONIC_DB_CLI="sonic-db-cli -n $NET_NS"
@@ -319,6 +332,7 @@ else
 fi
 
 check_peer_gbsyncd
+check_macsec
 read_dependent_services
 
 case "$1" in

diff --git a/platform/vs/docker-sonic-vs/Dockerfile.j2 b/platform/vs/docker-sonic-vs/Dockerfile.j2
@@ -72,7 +72,8 @@ RUN apt-get install -y net-tools \
                        {%- if ENABLE_ASAN == "y" %}
                        libasan5 \
                        {%- endif %}
-                       libsystemd0
+                       libsystemd0 \
+                       dbus
 
 # Install redis-server
 {% if CONFIGURED_ARCH == "armhf" %}

diff --git a/rules/docker-macsec.mk b/rules/docker-macsec.mk
@@ -42,6 +42,9 @@ $(DOCKER_MACSEC)_RUN_OPT += --privileged -t
 $(DOCKER_MACSEC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_MACSEC)_RUN_OPT += -v /host/warmboot:/var/warmboot
 
+$(DOCKER_MACSEC)_SERVICE_REQUIRES = updategraph
+$(DOCKER_MACSEC)_SERVICE_AFTER = swss syncd
+
 $(DOCKER_MACSEC)_CLI_CONFIG_PLUGIN = /cli/config/plugins/macsec.py
 $(DOCKER_MACSEC)_CLI_SHOW_PLUGIN = /cli/show/plugins/show_macsec.py
 $(DOCKER_MACSEC)_CLI_CLEAR_PLUGIN = /cli/clear/plugins/clear_macsec_counter.py

diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json
@@ -19,7 +19,7 @@
             "3": "3",
             "4": "4",
             "5": "5",
-            "6": "6",
+            "6": "1",
             "7": "7",
             "8": "1"
         },

diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
@@ -19,7 +19,7 @@
             "3": "3",
             "4": "4",
             "5": "5",
-            "6": "6",
+            "6": "1",
             "7": "7",
             "8": "1"
         },