Fix pfcwd/test_pfcwd_cli.py for cEOS neighbors.

.azure-pipelines/baseline_test/baseline.test.mgmt.public.yml

@@ -8,7 +8,7 @@ schedules:
     displayName: Baseline test Scheduler
     branches:
       include:
-        - master
+        - 202505
     always: true
 
 stages:

.azure-pipelines/impacted_area_testing/calculate_instance_number.py

@@ -25,7 +25,7 @@ def get_access_token():
     managed_identity_id = os.environ.get("SONIC_AUTOMATION_UMI")
 
     # 1. Run az login with re-try
-    az_login_cmd = f"az login --identity --username {managed_identity_id}"
+    az_login_cmd = f"az login --identity --client-id {managed_identity_id}"
     az_login_attempts = 0
     while az_login_attempts < MAX_GET_TOKEN_RETRY_TIMES:
         try:

.azure-pipelines/impacted_area_testing/get-impacted-area.yml

@@ -3,7 +3,7 @@ steps:
     set -x
 
     git fetch --all
-    DIFF_FOLDERS=$(git diff $(git merge-base origin/master HEAD)..HEAD  --name-only | xargs -n1 dirname | sort -u | tr '\n' ' ')
+    DIFF_FOLDERS=$(git diff $(git merge-base origin/${{ parameters.BUILD_BRANCH }} HEAD)..HEAD  --name-only | xargs -n1 dirname | sort -u | tr '\n' ' ')
 
     if [[ $? -ne 0 ]]; then
       echo "##vso[task.complete result=Failed;]Get diff folders fails."

.azure-pipelines/pytest-collect-only.yml

@@ -1,7 +1,7 @@
 steps:
 
 - script: |
-    sudo apt-get update
+    sudo apt-get -o DPkg::Lock::Timeout=180 update
     sudo apt-get install \
       ca-certificates \
       curl \

.azure-pipelines/test_plan.py

@@ -207,7 +207,8 @@ def __init__(self, scheduler_url, frontend_url, client_id, managed_identity_id):
     def get_token(self):
 
         # 1. Run az login with re-try
-        az_login_cmd = f"az login --identity --username {self.managed_identity_id}"
+        print("az login --identity --client-id")
+        az_login_cmd = f"az login --identity --client-id {self.managed_identity_id}"
         az_login_attempts = 0
         while az_login_attempts < MAX_GET_TOKEN_RETRY_TIMES:
             try:
@@ -378,7 +379,7 @@ def create(self, topology, test_plan_name="my_test_plan", deploy_mg_extra_params
         }
         raw_resp = {}
         try:
-            raw_resp = requests.post(tp_url, headers=headers, data=json.dumps(payload), timeout=10)
+            raw_resp = requests.post(tp_url, headers=headers, data=json.dumps(payload), timeout=20)
             resp = raw_resp.json()
         except Exception as exception:
             raise Exception(f"HTTP execute failure, url: {tp_url}, raw_resp: {raw_resp}, exception: {str(exception)}")

.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/TestbedProcessing.py

@@ -5,6 +5,8 @@
 import datetime
 import os
 import argparse
+from collections import OrderedDict
+import copy
 
 """"
 Testbed Processing
@@ -54,6 +56,7 @@
 labLinks_file = "files/sonic_lab_links.csv"
 testbed_file = "testbed.yaml"
 devices_file = "files/sonic_lab_devices.csv"
+console_links_file = "files/sonic_lab_console_links.csv"
 eosCred_file = "group_vars/eos/creds.yml"
 fanoutSecrets_file = "group_vars/fanout/secrets.yml"
 labSecrets_file = "group_vars/lab/secrets.yml"
@@ -74,6 +77,7 @@
 backupList.append(labLinks_file)
 backupList.append(testbed_file)
 backupList.append(devices_file)
+backupList.append(console_links_file)
 backupList.append(eosCred_file)
 backupList.append(fanoutSecrets_file)
 backupList.append(labSecrets_file)
@@ -235,6 +239,53 @@ def makeSonicLabDevices(data, outfile):
         print("I/O error: makeSonicLabDevices")
 
 
+"""
+makeSonicLabConsoleLinks(data, outfile)
+@:parameter data - the dictionary to look through (devices dictionary)
+@:parameter outfile - the file to write to
+generates files/sonic_lab_console_links.csv
+"""
+
+
+def makeSonicLabConsoleLinks(data, outfile):
+    def fill_missing_fields(data, template):
+        """Returns a copy of `data` with missing fields from `template` \
+                filled with empty strings."""
+        filled_data = copy.deepcopy(OrderedDict(template))  # Preserve the order
+
+        for key in template:
+            filled_data[key] = str(data.get(key)) if data.get(key) is not None else ''
+
+        return filled_data
+
+    devices = data
+    csv_file = outfile
+    # folding this line inserts unwanted spaces
+    csv_columns = "StartDevice,StartPort,EndDevice,Console_type,Console_menu_type,Proxy,BaudRate"
+    console_info_template = OrderedDict({
+        "start_device": "",
+        "start_port": "",
+        "end_device": "",
+        "console_type": "",
+        "console_menu_type": "",
+        "proxy": "",
+        "baud_rate": ""})
+    try:
+        with open(csv_file, "w") as f:
+            f.write(csv_columns + "\n")
+            for device, deviceDetails in devices.items():
+                console_info = deviceDetails.get("console_info")
+                if not console_info:
+                    continue
+
+                result = fill_missing_fields(console_info, console_info_template)
+
+                row = ','.join(list(result.values()))
+                f.write(row + "\n")
+    except IOError:
+        print("I/O error: makeSonicLabConsoleLinks")
+
+
 """
 makeTestbed(data, outfile)
 @:parameter data - the dictionary to look through (devices dictionary)
@@ -434,6 +485,9 @@ def makeLabSecrets(data, outfile):
             result.update({"sonicadmin_initial_password": value.get(
                 "ansible").get("sonicadmin_initial_password")})
 
+        if "serialconsole" in str(value.get("device_type")).lower():
+            result["console_login"] = value.get("console_login")
+
     with open(outfile, "w") as toWrite:
         yaml.dump(result, stream=toWrite, default_flow_style=False)
 
@@ -1043,6 +1097,9 @@ def main():
     print("\tCREATING SONIC LAB DEVICES: " + args.basedir + devices_file)
     # Generate sonic_lab_devices.csv (DEVICES)
     makeSonicLabDevices(devices, args.basedir + devices_file)
+    print("\tCREATING SONIC LAB CONSOLE LINKS: " + args.basedir + console_links_file)
+    # Generate sonic_lab_console_links.csv (DEVICES)
+    makeSonicLabConsoleLinks(devices, args.basedir + console_links_file)
     print("\tCREATING TEST BED: " + args.basedir + testbed_file)
     # Generate testbed.yaml (TESTBED)
     makeTestbed(testbed, args.basedir + testbed_file)

ansible/config_sonic_basedon_testbed.yml

@@ -291,7 +291,7 @@
 
   - name: find all interface indexes connecting to VM
     set_fact:
-      ifindex_to_vms: "{{ ifindex_to_vms|default([]) }} + {{ item.value['interface_indexes'][dut_index|int] }}"
+      ifindex_to_vms: "{{ ifindex_to_vms|default([]) + item.value['interface_indexes'][dut_index|int] }}"
     with_dict: "{{ vm_topo_config['vm'] }}"
     when: "'cable' not in topo"
 
@@ -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