Merge branch 'master' into pcied_transcation_check

.github/codeql/codeql-config.yml

@@ -0,0 +1,4 @@
+name: "CodeQL config"
+queries:
+  - uses: security-and-quality
+  - uses: security-extended

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,43 @@
+# For more infomation, please visit: https://github.com/github/codeql-action
+
+name: "CodeQL"
+
+on:
+  push:
+    branches:
+      - 'master'
+      - '202[0-9][0-9][0-9]'
+  pull_request_target:
+    branches:
+      - 'master'
+      - '202[0-9][0-9][0-9]'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'python' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        config-file: ./.github/codeql/codeql-config.yml
+        languages: ${{ matrix.language }}
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/semgrep.yml

@@ -0,0 +1,22 @@
+name: Semgrep
+
+on:
+  pull_request: {}
+  push:
+    branches:
+      - master
+      - '201[7-9][0-1][0-9]'
+      - '202[0-9][0-1][0-9]'
+
+jobs:
+  semgrep:
+    if: github.repository_owner == 'sonic-net'
+    name: Semgrep
+    runs-on: ubuntu-latest
+    container:
+      image: returntocorp/semgrep
+    steps:
+      - uses: actions/checkout@v3
+      - run: semgrep ci
+        env:
+           SEMGREP_RULES: p/default

azure-pipelines.yml

@@ -18,13 +18,12 @@ pr:
     include:
       - '*'
 
-pool:
-  vmImage: 'ubuntu-20.04'
+pool: sonic-common
 
 resources:
   containers:
-  - container: sonic-slave-buster
-    image: sonicdev-microsoft.azurecr.io:443/sonic-slave-buster:latest
+  - container: sonic-slave-bullseye
+    image: sonicdev-microsoft.azurecr.io:443/sonic-slave-bullseye:latest
 
 parameters:
 - name: project_list
@@ -60,7 +59,7 @@ parameters:
 
 jobs:
   - job: build_test
-    container: sonic-slave-buster
+    container: sonic-slave-bullseye
     variables:
       sourceBranch: "$(Build.SourceBranch)"
     steps:
@@ -86,16 +85,16 @@ jobs:
 
     - script: |
         set -xe
-        sudo apt-get -y purge libhiredis-dev libnl-3-dev libnl-route-3-dev
+        sudo apt-get -y purge libhiredis-dev libnl-3-dev libnl-route-3-dev || true
         sudo dpkg -i libnl-3-200_*.deb
         sudo dpkg -i libnl-genl-3-200_*.deb
         sudo dpkg -i libnl-route-3-200_*.deb
         sudo dpkg -i libnl-nf-3-200_*.deb
         sudo dpkg -i libhiredis0.14_*.deb
+        sudo dpkg -i libyang_1.0.73_amd64.deb
         sudo dpkg -i libswsscommon_1.0.0_amd64.deb
-        sudo dpkg -i python-swsscommon_1.0.0_amd64.deb
         sudo dpkg -i python3-swsscommon_1.0.0_amd64.deb
-      workingDirectory: $(Pipeline.Workspace)/target/debs/buster/
+      workingDirectory: $(Pipeline.Workspace)/target/debs/bullseye/
       displayName: 'Install Debian dependencies'
 
     - script: |
@@ -106,16 +105,16 @@ jobs:
         sudo pip3 install sonic_yang_models-1.0-py3-none-any.whl
         sudo pip3 install sonic_config_engine-1.0-py3-none-any.whl
         sudo pip3 install sonic_platform_common-1.0-py3-none-any.whl
-      workingDirectory: $(Pipeline.Workspace)/target/python-wheels/buster/
+      workingDirectory: $(Pipeline.Workspace)/target/python-wheels/bullseye/
       displayName: 'Install Python dependencies'
 
     - 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-add-repository https://packages.microsoft.com/debian/11/prod
         sudo apt-get update
-        sudo apt-get install -y dotnet-sdk-5.0
+        sudo apt-get install -y dotnet-sdk-7.0
       displayName: "Install .NET CORE"
 
     - ${{ each project in parameters.project_list }}:

sonic-chassisd/scripts/chassisd

@@ -49,8 +49,10 @@ CHASSIS_MODULE_INFO_SLOT_FIELD = 'slot'
 CHASSIS_MODULE_INFO_OPERSTATUS_FIELD = 'oper_status'
 CHASSIS_MODULE_INFO_NUM_ASICS_FIELD = 'num_asics'
 CHASSIS_MODULE_INFO_ASICS = 'asics'
+CHASSIS_MODULE_INFO_SERIAL_FIELD = 'serial'
 
 CHASSIS_ASIC_INFO_TABLE = 'CHASSIS_ASIC_TABLE'
+CHASSIS_FABRIC_ASIC_INFO_TABLE = 'CHASSIS_FABRIC_ASIC_TABLE'
 CHASSIS_ASIC = 'asic'
 CHASSIS_ASIC_PCI_ADDRESS_FIELD = 'asic_pci_address'
 CHASSIS_ASIC_ID_IN_MODULE_FIELD = 'asic_id_in_module'
@@ -158,14 +160,16 @@ class ModuleConfigUpdater(logger.Logger):
 
 class ModuleUpdater(logger.Logger):
 
-    def __init__(self, log_identifier, chassis):
+    def __init__(self, log_identifier, chassis, my_slot, supervisor_slot):
         """
         Constructor for ModuleUpdater
         :param chassis: Object representing a platform chassis
         """
         super(ModuleUpdater, self).__init__(log_identifier)
 
         self.chassis = chassis
+        self.my_slot = my_slot
+        self.supervisor_slot = supervisor_slot
         self.num_modules = chassis.get_num_modules()
         # Connect to STATE_DB and create chassis info tables
         state_db = daemon_base.db_connect("STATE_DB")
@@ -175,11 +179,17 @@ class ModuleUpdater(logger.Logger):
         self.info_dict_keys = [CHASSIS_MODULE_INFO_NAME_FIELD,
                                CHASSIS_MODULE_INFO_DESC_FIELD,
                                CHASSIS_MODULE_INFO_SLOT_FIELD,
+                               CHASSIS_MODULE_INFO_SERIAL_FIELD,
                                CHASSIS_MODULE_INFO_OPERSTATUS_FIELD]
 
-        chassis_state_db = daemon_base.db_connect("CHASSIS_STATE_DB")
-        self.asic_table = swsscommon.Table(chassis_state_db, CHASSIS_ASIC_INFO_TABLE)
-
+        self.chassis_state_db = daemon_base.db_connect("CHASSIS_STATE_DB")
+        if self._is_supervisor():
+            self.asic_table = swsscommon.Table(self.chassis_state_db, 
+                                            CHASSIS_FABRIC_ASIC_INFO_TABLE)
+        else:
+            self.asic_table = swsscommon.Table(self.chassis_state_db, 
+                                            CHASSIS_ASIC_INFO_TABLE)
+#
         self.midplane_initialized = try_get(chassis.init_midplane_switch, default=False)
         if not self.midplane_initialized:
             self.log_error("Chassisd midplane intialization failed")
@@ -200,9 +210,10 @@ class ModuleUpdater(logger.Logger):
             self.chassis_table._del(CHASSIS_INFO_KEY_TEMPLATE.format(1))
 
         if self.asic_table is not None:
-            asics = list(self.asic_table.getKeys())
-            for asic in asics:
-                self.asic_table._del(asic)
+            if not self._is_supervisor():
+                asics = list(self.asic_table.getKeys())
+                for asic in asics:
+                    self.asic_table._del(asic)
 
     def modules_num_update(self):
         # Check if module list is populated
@@ -236,29 +247,33 @@ class ModuleUpdater(logger.Logger):
                                                   (CHASSIS_MODULE_INFO_SLOT_FIELD,
                                                    module_info_dict[CHASSIS_MODULE_INFO_SLOT_FIELD]),
                                                   (CHASSIS_MODULE_INFO_OPERSTATUS_FIELD, module_info_dict[CHASSIS_MODULE_INFO_OPERSTATUS_FIELD]),
-                                                  (CHASSIS_MODULE_INFO_NUM_ASICS_FIELD, str(len(module_info_dict[CHASSIS_MODULE_INFO_ASICS])))])
+                                                  (CHASSIS_MODULE_INFO_NUM_ASICS_FIELD, str(len(module_info_dict[CHASSIS_MODULE_INFO_ASICS]))),
+                                                  (CHASSIS_MODULE_INFO_SERIAL_FIELD, module_info_dict[CHASSIS_MODULE_INFO_SERIAL_FIELD])])
                 self.module_table.set(key, fvs)
 
                 if module_info_dict[CHASSIS_MODULE_INFO_OPERSTATUS_FIELD] != str(ModuleBase.MODULE_STATUS_ONLINE):
-                   notOnlineModules.append(key)
-                   continue
+                    notOnlineModules.append(key)
+                    continue
 
                 for asic_id, asic in enumerate(module_info_dict[CHASSIS_MODULE_INFO_ASICS]):
-                   asic_global_id, asic_pci_addr = asic
-                   asic_key = "%s%s" % (CHASSIS_ASIC, asic_global_id)
-                   asic_fvs = swsscommon.FieldValuePairs([(CHASSIS_ASIC_PCI_ADDRESS_FIELD, asic_pci_addr),
-                                                          (CHASSIS_MODULE_INFO_NAME_FIELD, key),
-                                                          (CHASSIS_ASIC_ID_IN_MODULE_FIELD, str(asic_id))])
-                   self.asic_table.set(asic_key, asic_fvs)
+                    asic_global_id, asic_pci_addr = asic
+                    asic_key = "%s%s" % (CHASSIS_ASIC, asic_global_id)
+                    if not self._is_supervisor():
+                        asic_key = "%s|%s" % (key, asic_key)
+
+                    asic_fvs = swsscommon.FieldValuePairs([(CHASSIS_ASIC_PCI_ADDRESS_FIELD, asic_pci_addr),
+                                                            (CHASSIS_MODULE_INFO_NAME_FIELD, key),
+                                                            (CHASSIS_ASIC_ID_IN_MODULE_FIELD, str(asic_id))])
+                    self.asic_table.set(asic_key, asic_fvs)
 
         # Asics that are on the "not online" modules need to be cleaned up
         asics = list(self.asic_table.getKeys())
         for asic in asics:
-           fvs = self.asic_table.get(asic)
-           if isinstance(fvs, list):
-              fvs = dict(fvs[-1])
-           if fvs[CHASSIS_MODULE_INFO_NAME_FIELD] in notOnlineModules:
-              self.asic_table._del(asic)
+            fvs = self.asic_table.get(asic)
+            if isinstance(fvs, list):
+                fvs = dict(fvs[-1])
+            if fvs[CHASSIS_MODULE_INFO_NAME_FIELD] in notOnlineModules:
+                self.asic_table._del(asic)
 
     def _get_module_info(self, module_index):
         """
@@ -273,12 +288,14 @@ class ModuleUpdater(logger.Logger):
                          default=ModuleBase.MODULE_STATUS_OFFLINE)
         asics = try_get(self.chassis.get_module(module_index).get_all_asics,
                         default=[])
+        serial = try_get(self.chassis.get_module(module_index).get_serial)
 
         module_info_dict[CHASSIS_MODULE_INFO_NAME_FIELD] = name
         module_info_dict[CHASSIS_MODULE_INFO_DESC_FIELD] = str(desc)
         module_info_dict[CHASSIS_MODULE_INFO_SLOT_FIELD] = str(slot)
         module_info_dict[CHASSIS_MODULE_INFO_OPERSTATUS_FIELD] = str(status)
         module_info_dict[CHASSIS_MODULE_INFO_ASICS] = asics
+        module_info_dict[CHASSIS_MODULE_INFO_SERIAL_FIELD] = str(serial)
 
         return module_info_dict
 
@@ -403,15 +420,17 @@ class ChassisdDaemon(daemon_base.DaemonBase):
             self.log_error("Failed to load chassis due to {}".format(repr(e)))
             sys.exit(CHASSIS_LOAD_ERROR)
 
-        # Check if module list is populated
-        self.module_updater = ModuleUpdater(SYSLOG_IDENTIFIER, platform_chassis)
-        self.module_updater.modules_num_update()
-
         # Check for valid slot numbers
-        self.module_updater.my_slot = try_get(platform_chassis.get_my_slot,
+        my_slot = try_get(platform_chassis.get_my_slot,
                                               default=INVALID_SLOT)
-        self.module_updater.supervisor_slot = try_get(platform_chassis.get_supervisor_slot,
+        supervisor_slot = try_get(platform_chassis.get_supervisor_slot,
                                                       default=INVALID_SLOT)
+
+        # Check if module list is populated
+        self.module_updater = ModuleUpdater(SYSLOG_IDENTIFIER, platform_chassis, my_slot, supervisor_slot)
+        self.module_updater.modules_num_update()
+
+
         if ((self.module_updater.my_slot == INVALID_SLOT) or
                 (self.module_updater.supervisor_slot == INVALID_SLOT)):
             self.log_error("Chassisd not supported for this platform")
@@ -421,6 +440,8 @@ class ChassisdDaemon(daemon_base.DaemonBase):
         if self.module_updater.supervisor_slot == self.module_updater.my_slot:
             config_manager = ConfigManagerTask()
             config_manager.task_run()
+        else:
+            config_manager = None
 
         # Start main loop
         self.log_info("Start daemon main loop")
@@ -431,6 +452,9 @@ class ChassisdDaemon(daemon_base.DaemonBase):
 
         self.log_info("Stop daemon main loop")
 
+        if config_manager is not None:
+            config_manager.task_stop()
+
         # Delete all the information from DB and then exit
         self.module_updater.deinit()
 

sonic-chassisd/tests/mock_platform.py

@@ -20,7 +20,7 @@ def get_serial(self):
 
 class MockModule(MockDevice):
     def __init__(self, module_index, module_name, module_desc, module_type, module_slot,
-                 asic_list=[]):
+                 module_serial, asic_list=[]):
         self.module_index = module_index
         self.module_name = module_name
         self.module_desc = module_desc
@@ -31,6 +31,7 @@ def __init__(self, module_index, module_name, module_desc, module_type, module_s
         self.supervisor_slot = 16
         self.midplane_access = False
         self.asic_list = asic_list
+        self.module_serial = module_serial
 
     def get_name(self):
         return self.module_name
@@ -74,6 +75,9 @@ def set_midplane_reachable(self, up):
     def get_all_asics(self):
         return self.asic_list
 
+    def get_serial(self):
+        return self.module_serial
+
 class MockChassis:
     def __init__(self):
         self.module_list = []

sonic-chassisd/tests/mock_swsscommon.py

@@ -7,7 +7,8 @@ def __init__(self, db, table_name):
         self.mock_dict = {}
 
     def _del(self, key):
-        del self.mock_dict[key]
+        if key in self.mock_dict:
+            del self.mock_dict[key]
         pass
 
     def set(self, key, fvs):
@@ -29,3 +30,18 @@ class FieldValuePairs:
     def __init__(self, fvs):
         self.fv_dict = dict(fvs)
         pass
+
+class Select:
+    TIMEOUT = 1
+
+    def addSelectable(self, selectable):
+        pass
+
+    def removeSelectable(self, selectable):
+        pass
+
+    def select(self, timeout=-1, interrupt_on_signal=False):
+        return self.TIMEOUT, None
+
+class SubscriberStateTable(Table):
+    pass

sonic-chassisd/tests/mocked_libs/sonic_platform/__init__.py

@@ -0,0 +1,6 @@
+"""
+    Mock implementation of sonic_platform package for unit testing
+"""
+
+from . import chassis
+from . import platform

sonic-chassisd/tests/mocked_libs/sonic_platform/chassis.py

@@ -0,0 +1,26 @@
+"""
+    Mock implementation of sonic_platform package for unit testing
+"""
+
+import sys
+if sys.version_info.major == 3:
+    from unittest import mock
+else:
+    import mock
+
+from sonic_platform_base.chassis_base import ChassisBase
+
+
+class Chassis(ChassisBase):
+    def __init__(self):
+        ChassisBase.__init__(self)
+        self.eeprom = mock.MagicMock()
+
+    def get_eeprom(self):
+        return self.eeprom
+
+    def get_my_slot(self):
+        return 1
+
+    def get_supervisor_slot(self):
+        return 1