Merge branch 'sonic-net:202505' into 202505

Author: ytzur1

.github/CODEOWNERS

@@ -4,49 +4,74 @@
 # rules are explained here
 # https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 
-# These owners will be the default owners for everything in the repo.
-# Unless a later match takes precedence, # @Azure/sonic-fundamentals
-# will be requested for review when someone opens a pull request.
-#       @Azure/sonic-fundamentals
+
+# Azure pipelines
+.azure-pipelines/baseline_test @xwjiang-ms
+.azure-pipelines/common2 @opcoder0 @wangxin
+.azure-pipelines/dependency_check @yutongzhang-microsoft @wangxin
+.azure-pipelines/impacted_area_testing @yutongzhang-microsoft @wangxin
+.azure-pipelines/markers_check @yutongzhang-microsoft @wangxin
+.azure-pipelines/recover_testbed @yutongzhang-microsoft @wangxin
+.azure-pipelines/testcases_collection @yutongzhang-microsoft @wangxin
+.azure-pipelines/testscripts_analysis @yutongzhang-microsoft @wangxin
+.azure-pipelines/*.yml @wangxin @lerry-lee
+.azure-pipelines/*.yaml @wangxin @lerry-lee
+.azure-pipelines/*.py @wangxin @lerry-lee
+
+# Github
+.github/codeql/* @liushilongbuaa
+.github/workflows/* @liushilongbuaa
+.github/CODEOWNER @sonic-net/sonic-mgmt-maintainer
+.github/* @sonic-net/sonic-mgmt-maintainer
+
+# Hooks
+.hooks/pre_commit_hooks @xwjiang-ms @wangxin
 
 # Ansible
+ansible   @wangxin @yxieca @opcoder0
 
 # Documents
 docs    @wangxin @yxieca
 
+# sdn_tests
+sdn_tests @ksravani-hcl @kishanps
+
 # spytest
 spytest @ramakristipati @lolyu @yxieca
 
 # test reporting
 test_reporting  @wangxin
 
 # tests
+tests/acl @bingwang-ms
+tests/acl/test_stress_acl.py @xwjiang-ms
+tests/arp
+tests/auditd @maipbui
+tests/autorestart @lerry-lee
+tests/bgp @StormLiangMS
+tests/cacl @ZhaohuiS
+tests/common/mellanox_data.py @keboliu @Junchao-Mellanox
+tests/common/* @wangxin @opcoder0
+tests/common2 @opcoder0 @wangxin
+tests/dualtor @lolyu @wsycqyz
+tests/dualtor_io @lolyu @wsycqyz
+tests/dualtor_mgmt @lolyu @wsycqyz
+tests/lldp @ZhaohuiS
+tests/pfcwd @lipxu
 tests/platform_tests    @prgeor
 tests/platform_tests/mellanox @keboliu @Junchao-Mellanox
 tests/platform_tests/fwutil @prgeor @alexrallen
 tests/platform_tests/files @prgeor @Junchao-Mellanox
 tests/platform_tests/test_auto_negotiation.py @prgeor @Junchao-Mellanox
 tests/platform_tests/thermal_control_test_helper.py @prgeor @Junchao-Mellanox
-tests/system_health @prgeor @Junchao-Mellanox
-tests/show_techsupport @yxieca @noaOrMlnx
 tests/qos @XuChen-MSFT @wsycqyz
-tests/qos/test_buffer.py @neethajohn @stephenxs
-tests/qos/test_buffer_traditional.py @neethajohn @stephenxs
-tests/qos/files/dynamic_buffer_param.json @neethajohn @stephenxs
+tests/qos/test_buffer.py @stephenxs
+tests/qos/test_buffer_traditional.py @stephenxs
+tests/qos/files/dynamic_buffer_param.json @stephenxs
 tests/qos/files/mellanox @stephenxs @keboliu
-tests/qos/args @neethajohn @stephenxs
-tests/common/mellanox_data.py @keboliu @Junchao-Mellanox
-tests/dhcp_relay @jcaiMR
-tests/bgp @jcaiMR @StormLiangMS
-tests/route @jcaiMR
-tests/fib @jcaiMR
-tests/ip @jcaiMR
-tests/ipfwd @jcaiMR
-tests/radv @jcaiMR
-tests/fdb @jcaiMR
-tests/pfcwd @lipxu @neethajohn
-tests/lldp @ZhaohuiS
-tests/cacl @ZhaohuiS
-tests/dualtor @lolyu @wsycqyz
-tests/dualtor_io @lolyu @wsycqyz
-tests/dualtor_mgmt @lolyu @wsycqyz
+tests/qos/args @stephenxs
+tests/show_techsupport @yxieca @noaOrMlnx
+tests/system_health @prgeor @Junchao-Mellanox
+
+tests/setup-container.sh @theasianpianist @wangxin
+tests/* @sonic-net/sonic-mgmt-maintainer @wangxin

ansible/config_sonic_basedon_testbed.yml

@@ -624,7 +624,7 @@
               dest=/tmp/smartswitch.json
         become: true
         # t1-28-lag is smartswitch topo only
-        when: topo in ["t1-smartswitch-ha","t1-28-lag","smartswitch-t1"]
+        when: topo in ["t1-smartswitch-ha","t1-28-lag","smartswitch-t1", "t1-48-lag"]
 
       - name: Create dns config
         template: src=templates/dns_config.j2
@@ -803,7 +803,7 @@
               dest=/tmp/dpu_extra.json
         become: true
         # t1-28-lag is smartswitch topo only
-        when: topo in ["t1-smartswitch-ha","t1-28-lag","smartswitch-t1"]
+        when: topo in ["t1-smartswitch-ha","t1-28-lag","smartswitch-t1", "t1-48-lag"]
 
       - name: Load DPU config in smartswitch
         load_extra_dpu_config:
@@ -812,7 +812,7 @@
           host_passwords: "{{ sonic_default_passwords }}"
         become: true
         # t1-28-lag is smartswitch topo only
-        when: topo in ["t1-smartswitch-ha","t1-28-lag","smartswitch-t1"]
+        when: topo in ["t1-smartswitch-ha","t1-28-lag","smartswitch-t1", "t1-48-lag"]
 
       - name: Configure TACACS
         become: true
@@ -950,4 +950,11 @@
         become: True
         shell: sed -i "s/^ClientAliveInterval [0-9].*/ClientAliveInterval 900/g" /etc/ssh/sshd_config && systemctl restart sshd
 
+      - name: enable IPv6 on device
+        become: true
+        ansible.builtin.sysctl:
+          name: net.ipv6.conf.all.disable_ipv6
+          value: 0
+          sysctl_set: true
+
     when: deploy is defined and deploy|bool == true

ansible/group_vars/snappi-sonic/snappi-sonic.yml

@@ -47,4 +47,4 @@ bgp_slb_passive_range: 10.255.0.0/25
 fanout_admin_user: "fanoutadminuser"
 fanout_admin_password: "fanoutadminpassword"
 
-secret_group_vars: {snappi_api_server: {user: admin, password: admin, rest_port: 443, session_id: "None"}}
+snappi_api_server: {user: admin, password: admin, rest_port: 443, session_id: "None"}

ansible/group_vars/sonic/variables

@@ -19,7 +19,7 @@ broadcom_th5_hwskus: ['Arista-7060X6-64DE', 'Arista-7060X6-64DE-64x400G', 'Arist
 broadcom_j2c+_hwskus: ['Nokia-IXR7250E-36x100G', 'Nokia-IXR7250E-36x400G', 'Arista-7800R3A-36DM2-C36', 'Arista-7800R3A-36DM2-D36', 'Arista-7800R3AK-36DM2-C36', 'Arista-7800R3AK-36DM2-D36', 'Nokia-IXR7250-X3B']
 broadcom_jr2_hwskus: ['Arista-7800R3-48CQ2-C48', 'Arista-7800R3-48CQM2-C48']
 
-mellanox_spc1_hwskus: [ 'ACS-MSN2700', 'ACS-MSN2740', 'ACS-MSN2100', 'ACS-MSN2410', 'ACS-MSN2010', 'Mellanox-SN2700', 'Mellanox-SN2700-A1', 'Mellanox-SN2700-D48C8','Mellanox-SN2700-D40C8S8', 'Mellanox-SN2700-A1-D48C8']
+mellanox_spc1_hwskus: [ 'ACS-MSN2700', 'ACS-MSN2740', 'ACS-MSN2100', 'ACS-MSN2410', 'ACS-MSN2010', 'Mellanox-SN2700', 'Mellanox-SN2700-A1', 'Mellanox-SN2700-D48C8','Mellanox-SN2700-D40C8S8', 'Mellanox-SN2700-A1-D48C8', 'Mellanox-SN2700-C28D8', 'Mellanox-SN2700-A1-C28D8']
 mellanox_spc2_hwskus: [ 'ACS-MSN3700', 'ACS-MSN3700C', 'ACS-MSN3800', 'Mellanox-SN3800-D112C8' , 'ACS-MSN3420']
 mellanox_spc3_hwskus: [ 'ACS-MSN4700', 'Mellanox-SN4700-O28', 'Mellanox-SN4700-O32', 'ACS-MSN4600', 'ACS-MSN4600C', 'ACS-MSN4410', 'Mellanox-SN4600C-D112C8', 'Mellanox-SN4600C-C64', 'Mellanox-SN4700-O8C48', 'Mellanox-SN4700-O8V48', 'ACS-SN4280', 'Mellanox-SN4280-O28', 'Mellanox-SN4700-V64', 'Mellanox-SN4700-O32']
 mellanox_spc4_hwskus: [ 'ACS-SN5600' , 'Mellanox-SN5600-V256', 'Mellanox-SN5600-C256S1', 'Mellanox-SN5600-C224O8',
@@ -71,3 +71,5 @@ orchagent_docker_volumes_dict:
   "/host/machine.conf:/host/machine.conf":
 
 orchagent_docker_volumes: "{{ orchagent_docker_volumes_dict.keys() }}"
+
+sonic_qos_profile: "BALANCED"    # Possible values: DEFAULT, RDMA-CENTRIC, TCP-CENTRIC, BALANCED

ansible/library/announce_routes.py

@@ -1571,7 +1571,7 @@ def main():
             dut_interfaces=dict(required=False, type='str', default=''),
             adhoc=dict(required=False, type='bool', default=False),
             peers_routes_to_change=dict(required=False, type='dict', default={}),
-            log_path=dict(required=False, type='str', default=''),
+            log_path=dict(required=False, type='str', default='/tmp'),
             upstream_neighbor_groups=dict(required=False, type='int', default=0),
             downstream_neighbor_groups=dict(required=False, type='int', default=0)
         ),

ansible/library/generate_golden_config_db.py

@@ -166,14 +166,17 @@ def get_multiasic_feature_config(self):
         rc, out, err = self.module.run_command("show runningconfiguration all")
         if rc != 0:
             self.module.fail_json(msg="Failed to get config from runningconfiguration: {}".format(err))
-
-        return out
+        config = json.loads(out)
+        # From the running configure, only keep the key "FEATURE"
+        for namespace, ns_data in config.items():
+            config[namespace] = {k: ns_data[k] for k in ns_data if k == "FEATURE"}
+        return config
 
     def overwrite_feature_golden_config_db_multiasic(self, config, feature_key):
         full_config = json.loads(config)
         if config == "{}" or "FEATURE" not in config["localhost"]:
             # need dump running config FEATURE + selected feature
-            gold_config_db = json.loads(self.get_multiasic_feature_config())
+            gold_config_db = self.get_multiasic_feature_config()
         else:
             # need existing config + selected feature
             gold_config_db = full_config
@@ -402,7 +405,7 @@ def generate(self):
             config = self.generate_mgfx_golden_config_db()
             module_msg = module_msg + " for mgfx"
             self.module.run_command("sudo rm -f {}".format(TEMP_DHCP_SERVER_CONFIG_PATH))
-        elif self.topo_name in ["t1-smartswitch-ha", "t1-28-lag", "smartswitch-t1"]:
+        elif self.topo_name in ["t1-smartswitch-ha", "t1-28-lag", "smartswitch-t1", "t1-48-lag"]:
             config = self.generate_smartswitch_golden_config_db()
             module_msg = module_msg + " for smartswitch"
             self.module.run_command("sudo rm -f {}".format(TEMP_SMARTSWITCH_CONFIG_PATH))

ansible/library/shell_cmds.py

@@ -95,11 +95,13 @@ def run_cmd(module, cmd, timeout):
         err_msg = "[WARNING] timeout is not supported for command contains single quote, ran without time limit"
         timeout = 0
 
+    start = datetime.datetime.now()
     if int(timeout) == 0:
         rc, out, err = module.run_command(cmd, use_unsafe_shell=True)
     else:
         cmd_with_timeout = "echo '{}' | timeout --preserve-status {} bash".format(cmd, timeout)
         rc, out, err = module.run_command(cmd_with_timeout, use_unsafe_shell=True)
+    end = datetime.datetime.now()
 
     result = dict(
         cmd=cmd,
@@ -110,7 +112,9 @@ def run_cmd(module, cmd, timeout):
         stderr=err,
         stdout_lines=out.splitlines(),
         stderr_lines=err.splitlines(),
-        timeout=timeout
+        timeout=timeout,
+        start=str(start),
+        end=str(end)
     )
     return result
 

ansible/module_utils/port_utils.py

@@ -178,6 +178,28 @@ def get_port_alias_to_name_map(hwsku, asic_name=None):
                         alias = "etp{}{}".format(i, split_alias)
                         eth_name = "Ethernet{}".format((i - 1) * 8 + idx)
                         port_alias_to_name_map[alias] = eth_name
+        elif hwsku in ["Arista-7060X6-16PE-384C-O128S2", "Arista-7060X6-16PE-384C-B-O128S2",
+                       "Arista-7060X6-16PE-384C-B-O128S2-COPPER-LAB", "Arista-7060X6-16PE-384C-B-O128S2-LAB",
+                       "Arista-7060X6-16PE-384C-O128S2-COPPER-LAB", "Arista-7060X6-16PE-384C-O128S2-LAB"]:
+            split_alias_list = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l"]
+            split_alias_list_1 = ["a", "b"]
+            split_2_port_indexs = list(range(1, 17))
+            cur_idx = 0
+            for i in range(1, 25):
+                if i in split_2_port_indexs:
+                    for idx, split_alias in enumerate(split_alias_list_1):
+                        alias = "etp{}{}".format(i, split_alias)
+                        eth_name = "Ethernet{}".format(cur_idx)
+                        port_alias_to_name_map[alias] = eth_name
+                        cur_idx += 4
+                else:
+                    for idx, split_alias in enumerate(split_alias_list):
+                        alias = "etp{}{}".format(i, split_alias)
+                        eth_name = "Ethernet{}".format(cur_idx)
+                        port_alias_to_name_map[alias] = eth_name
+                        cur_idx += 4
+            port_alias_to_name_map['etp25a'] = "Ethernet512"
+            port_alias_to_name_map['etp25b'] = "Ethernet513"
         elif hwsku == "Arista-7050QX32S-Q32":
             for i in range(5, 29):
                 port_alias_to_name_map["Ethernet%d/1" % i] = "Ethernet%d" % ((i - 5) * 4)
@@ -258,6 +280,19 @@ def get_port_alias_to_name_map(hwsku, asic_name=None):
                 alias = "etp%d" % (i / 4 + 1) + ("a" if i % 4 == 0 else "b")
                 # print alias, "Ethernet%d" % i
                 port_alias_to_name_map[alias] = "Ethernet%d" % i
+        elif hwsku in ["Mellanox-SN2700-C28D8", "Mellanox-SN2700-A1-C28D8"]:
+            # 50G ports
+            s50G_ports = [x for x in range(112, 127, 2)]
+
+            # 100G ports
+            s100G_ports = [x for x in range(0, 109, 4)]
+
+            for i in s50G_ports:
+                alias = "etp%d" % (i / 4 + 1) + ("a" if i % 4 == 0 else "b")
+                port_alias_to_name_map[alias] = "Ethernet%d" % i
+            for i in s100G_ports:
+                alias = "etp%d" % (i / 4 + 1)
+                port_alias_to_name_map[alias] = "Ethernet%d" % i
         elif hwsku in ["ACS-MSN3800", "ACS-MSN4600C", 'Mellanox-SN4700-V64']:
             for i in range(1, 65):
                 port_alias_to_name_map["etp%d" % i] = "Ethernet%d" % ((i - 1) * 4)
@@ -493,6 +528,24 @@ def get_port_alias_to_name_map(hwsku, asic_name=None):
             for i in range(1, 33):
                 port_alias_to_name_map["etp%d" % i] = "Ethernet%d" % idx
                 idx += 8
+        elif hwsku in ["Mellanox-SN4280-O8C40", "Mellanox-SN4280-O8V40", "Mellanox-SN4280-C48"]:
+            idx = 0
+            for i in range(1, 13):
+                port_alias_to_name_map["etp%da" % i] = "Ethernet%d" % idx
+                idx += 4
+                port_alias_to_name_map["etp%db" % i] = "Ethernet%d" % idx
+                idx += 4
+            for i in range(13, 21):
+                port_alias_to_name_map["etp%d" % i] = "Ethernet%d" % idx
+                idx += 8
+            for i in range(21, 29):
+                port_alias_to_name_map["etp%da" % i] = "Ethernet%d" % idx
+                idx += 4
+                port_alias_to_name_map["etp%db" % i] = "Ethernet%d" % idx
+                idx += 4
+            for i in range(29, 33):
+                port_alias_to_name_map["etp%d" % i] = "Ethernet%d" % idx
+                idx += 8
         elif hwsku == "Mellanox-SN5600-V256":
             split_alias_list = ["a", "b", "c", "d"]
             for i in range(1, 65):

ansible/module_utils/smartswitch_utils.py

@@ -11,5 +11,13 @@
         "base": 224,
         "step": 8,
         "dpu_key": "dpu{}"
+    },
+    "Mellanox-SN4280-O8C40": {
+        "dpu_num": 4,
+        "port_key": "Ethernet{}",
+        "interface_key": "Ethernet{}|18.{}.202.0/31",
+        "base": 224,
+        "step": 8,
+        "dpu_key": "dpu{}"
     }
 }

ansible/roles/eos/templates/t0-leaf.j2

@@ -109,6 +109,7 @@ router bgp {{ host['bgp']['asn'] }}
 {# set LT2/FT2 as reflector to advertise route to DUT #}
 {% if props.swrole is defined and props.swrole in ("lowerspine", "fabricspine") %}
  neighbor {{ remote_ip }} route-reflector-client
+ neighbor {{ remote_ip }} additional-paths send any
 {% endif %}
 {% if remote_ip | ipv6 %}
  address-family ipv6