Merge branch 'master' into bgp_dev

Author: maipbui

.azure-pipelines/pr_test_scripts.yaml

@@ -38,7 +38,7 @@ t0:
   - override_config_table/test_override_config_table.py
   - pc/test_po_cleanup.py
   - pc/test_po_update.py
-#  - platform_tests/test_advanced_reboot.py::test_warm_reboot
+  - platform_tests/test_advanced_reboot.py::test_warm_reboot
   - platform_tests/test_cpu_memory_usage.py
   - process_monitoring/test_critical_process_monitoring.py
   - radv/test_radv_ipv6_ra.py
@@ -99,6 +99,7 @@ t1-lag:
   - container_checker/test_container_checker.py
   - generic_config_updater/test_mmu_dynamic_threshold_config_update.py
   - http/test_http_copy.py
+  - iface_namingmode/test_iface_namingmode.py
   - ipfwd/test_mtu.py
   - lldp/test_lldp.py
   - monit/test_monit_status.py

.azure-pipelines/run-test-scheduler-template.yml

@@ -105,9 +105,6 @@ parameters:
   type: number
   default: 480
 
-- name: SPECIFIED_PARAMS
-  type: string
-  default: "{}"
 
 steps:
   - script: |
@@ -121,7 +118,6 @@ steps:
       --test-set ${{ parameters.TEST_SET }} --kvm-build-id $(KVM_BUILD_ID) \
       --deploy-mg-extra-params "${{ parameters.DEPLOY_MG_EXTRA_PARAMS }}" \
       --common-extra-params "${{ parameters.COMMON_EXTRA_PARAMS }}" \
-      --specified-params "${{ parameters.SPECIFIED_PARAMS }}" \
       --vm-type ${{ parameters.VM_TYPE }} --num-asic ${{ parameters.NUM_ASIC }} \
       --image_url ${{ parameters.IMAGE_URL }} \
       --hwsku ${{ parameters.HWSKU }} \

.azure-pipelines/test_plan.py

@@ -13,7 +13,13 @@
 from enum import Enum
 
 __metaclass__ = type
+BUILDIMAGE_REPO_FLAG = "buildimage"
+MGMT_REPO_FLAG = "sonic-mgmt"
+INTERNAL_REPO_LIST = ["Networking-acs-buildimage", "sonic-mgmt-int"]
+GITHUB_SONIC_MGMT_REPO = "https://github.com/sonic-net/sonic-mgmt"
+INTERNAL_SONIC_MGMT_REPO = "https://dev.azure.com/mssonic/internal/_git/sonic-mgmt-int"
 PR_TEST_SCRIPTS_FILE = "pr_test_scripts.yaml"
+SPECIFIC_PARAM_KEYWORD = "specific_param"
 TOLERATE_HTTP_EXCEPTION_TIMES = 20
 TOKEN_EXPIRE_HOURS = 6
 
@@ -34,7 +40,10 @@ def get_test_scripts(test_set):
     pr_test_scripts_file = os.path.join(os.path.dirname(_self_path), PR_TEST_SCRIPTS_FILE)
     with open(pr_test_scripts_file) as f:
         pr_test_scripts = yaml.safe_load(f)
-        return pr_test_scripts.get(test_set, [])
+
+        test_script_list = pr_test_scripts.get(test_set, [])
+        specific_param_list = pr_test_scripts.get(SPECIFIC_PARAM_KEYWORD, {}).get(test_set, [])
+        return test_script_list, specific_param_list
 
 
 def test_plan_status_factory(status):
@@ -69,7 +78,7 @@ def print_logs(self, test_plan_id, resp_data, start_time):
         status = resp_data.get("status", None)
         current_status = test_plan_status_factory(status).get_status()
 
-        if(current_status == self.get_status()):
+        if current_status == self.get_status():
             print("Test plan id: {}, status: {},  elapsed: {:.0f} seconds"
                   .format(test_plan_id, resp_data.get("status", None), time.time() - start_time))
 
@@ -203,20 +212,34 @@ def create(self, topology, test_plan_name="my_test_plan", deploy_mg_extra_params
         print("Test scripts to be covered in this test plan:")
         print(json.dumps(scripts, indent=4))
 
-        common_params = ["--completeness_level=confident", "--allow_recover"]
-        for param in common_extra_params:
-            common_params.append(param)
+        common_extra_params = common_extra_params + " --completeness_level=confident --allow_recover"
+
+        # If triggered by the internal repos, use internal sonic-mgmt repo as the code base
+        sonic_mgmt_repo_url = GITHUB_SONIC_MGMT_REPO
+        if kwargs.get("source_repo") in INTERNAL_REPO_LIST:
+            sonic_mgmt_repo_url = INTERNAL_SONIC_MGMT_REPO
+
+        # If triggered by mgmt repo, use pull request id as the code base
+        sonic_mgmt_pull_request_id = ""
+        if MGMT_REPO_FLAG in kwargs.get("source_repo"):
+            sonic_mgmt_pull_request_id = pr_id
+
+        # If triggered by buildimage repo, use image built from the buildId
+        kvm_image_build_id = kvm_build_id
+        if BUILDIMAGE_REPO_FLAG in kwargs.get("source_repo"):
+            kvm_image_build_id = build_id
 
         payload = json.dumps({
             "name": test_plan_name,
             "testbed": {
                 "platform": platform,
                 "name": testbed_name,
                 "topology": topology,
-                "image_url": image_url,
                 "hwsku": hwsku,
                 "min": min_worker,
-                "max": max_worker
+                "max": max_worker,
+                "nbr_type": kwargs["vm_type"],
+                "asic_num": kwargs["num_asic"]
             },
             "test_option": {
                 "stop_on_failure": kwargs.get("stop_on_failure", True),
@@ -227,30 +250,36 @@ def create(self, topology, test_plan_name="my_test_plan", deploy_mg_extra_params
                     "features_exclude": features_exclude,
                     "scripts_exclude": scripts_exclude
                 },
-                "common_params": common_params,
-                "specified_params": json.loads(kwargs['specified_params']),
-                "deploy_mg_params": deploy_mg_extra_params
+                "image": {
+                    "url": image_url,
+                    "release": "",
+                    "kvm_image_build_id": kvm_image_build_id
+                },
+                "sonic_mgmt": {
+                    "repo_url": sonic_mgmt_repo_url,
+                    "branch": kwargs["mgmt_branch"],
+                    "pull_request_id": sonic_mgmt_pull_request_id
+                },
+                "common_param": common_extra_params,
+                "specific_param": kwargs.get("specific_param", []),
+                "deploy_mg_param": deploy_mg_extra_params,
+                "max_execute_seconds": kwargs.get("max_execute_seconds", None),
+                "dump_kvm_if_fail": kwargs.get("dump_kvm_if_fail", False),
             },
             "type": test_plan_type,
-            "extra_params": {
-                "pull_request_id": pr_id,
-                "build_id": build_id,
+            "trigger": {
+                "requester": kwargs.get("requester", "Pull Request"),
                 "source_repo": kwargs.get("source_repo"),
-                "kvm_build_id": kvm_build_id,
-                "max_execute_seconds": kwargs.get("max_execute_seconds", None),
-                "dump_kvm_if_fail": kwargs.get("dump_kvm_if_fail", 2),
-                "mgmt_branch": kwargs["mgmt_branch"],
-                "testbed": {
-                    "num_asic": kwargs["num_asic"],
-                    "vm_type": kwargs["vm_type"]
-                },
+                "pull_request_id": pr_id,
+                "build_id": build_id
+            },
+            "extra_params": {
                 "secrets": {
                     "azp_access_token": kwargs["azp_access_token"],
                     "azp_repo_access_token": kwargs["azp_repo_access_token"],
                 }
             },
-            "priority": 10,
-            "requester": kwargs.get("requester", "Pull Request")
+            "priority": 10
         })
         print('Creating test plan with payload: {}'.format(payload))
         headers = {
@@ -351,11 +380,8 @@ def poll(self, test_plan_id, interval=60, timeout=-1, expected_state=""):
                 elif expected_status.get_status() < current_status.get_status():
                     steps = None
                     step_status = None
-                    extra_params = resp_data.get("extra_params", None)
                     runtime = resp_data.get("runtime", None)
-                    if extra_params and "steps" in extra_params:
-                        steps = extra_params.get("steps", None)
-                    else:
+                    if runtime:
                         steps = runtime.get("steps", None)
                     if steps:
                         for step in steps:
@@ -485,8 +511,9 @@ def poll(self, test_plan_id, interval=60, timeout=-1, expected_state=""):
         "--common-extra-params",
         type=str,
         dest="common_extra_params",
+        nargs='?',
+        const="",
         default="",
-        nargs='*',
         required=False,
         help="Run test common extra params"
     )
@@ -769,10 +796,12 @@ def poll(self, test_plan_id, interval=60, timeout=-1, expected_state=""):
                 ).replace(' ', '_')
 
             scripts = args.scripts
+            specific_param = []
             # For KVM PR test, get test modules from pr_test_scripts.yaml, otherwise use args.scripts
             if args.platform == "kvm":
                 args.test_set = args.test_set if args.test_set else args.topology
-                scripts = ",".join(get_test_scripts(args.test_set))
+                scripts, specific_param = get_test_scripts(args.test_set)
+                scripts = ",".join(scripts)
 
             tp.create(
                 args.topology,
@@ -792,6 +821,7 @@ def poll(self, test_plan_id, interval=60, timeout=-1, expected_state=""):
                 common_extra_params=args.common_extra_params,
                 num_asic=args.num_asic,
                 specified_params=args.specified_params,
+                specific_param=specific_param,
                 vm_type=args.vm_type,
                 azp_access_token=args.azp_access_token,
                 azp_repo_access_token=args.azp_repo_access_token,

ansible/ansible.cfg

@@ -14,7 +14,7 @@
 inventory      = /etc/ansible/hosts
 library        = library:library/ixia
 module_utils   = module_utils
-remote_tmp     = $HOME/.ansible/tmp
+remote_tmp     = /tmp/.ansible-$USER
 pattern        = *
 forks          = 5
 poll_interval  = 15

ansible/config_sonic_basedon_testbed.yml

@@ -65,6 +65,10 @@
       set_fact:
         ptf_image: "{{ testbed_facts['ptf_image_name'] }}"
 
+    - name: check if testbed is an ixia testbed
+      set_fact:
+        is_ixia_testbed: "{{ true if ptf_image == 'docker-keysight-api-server' else false }}"
+
     - name: set vm
       set_fact:
         vm_base: "{% if testbed_facts['vm_base'] != '' %}{{ testbed_facts['vm_base'] }}{% else %}''{% endif %}"
@@ -197,7 +201,7 @@
   - name: enable tunnel_qos_remap for T1 in dualtor deployment
     set_fact:
       enable_tunnel_qos_remap: true
-    when: "('leafrouter' == (vm_topo_config['dut_type'] | lower)) and (hwsku in hwsku_list_dualtor_t1)"
+    when: "('leafrouter' == (vm_topo_config['dut_type'] | lower)) and (hwsku in hwsku_list_dualtor_t1) and not (is_ixia_testbed)"
 
   - name: set default vm file path
     set_fact:

ansible/dualtor/nic_simulator/nic_simulator_grpc_mgmt_service.proto

@@ -1,5 +1,5 @@
-import "nic_simulator_grpc_service.proto"
-syntax = "proto3"
+syntax = "proto3";
+import "nic_simulator_grpc_service.proto";
 
 
 service DualTorMgmtService {
@@ -15,42 +15,42 @@ service DualTorMgmtService {
 }
 
 message ListOfAdminRequest {
-    repeated string nic_addresses = 1
-    repeated AdminRequest admin_requests = 2
+    repeated string nic_addresses = 1;
+    repeated AdminRequest admin_requests = 2;
 }
 
 message ListOfAdminReply {
-    repeated string nic_addresses = 1
-    repeated AdminReply admin_replies = 2
+    repeated string nic_addresses = 1;
+    repeated AdminReply admin_replies = 2;
 }
 
 message ListOfOperationRequest {
-    repeated string nic_addresses = 1
-    repeated OperationRequest operation_requests = 2
+    repeated string nic_addresses = 1;
+    repeated OperationRequest operation_requests = 2;
 }
 
 message ListOfOperationReply {
-    repeated string nic_addresses = 1
-    repeated OperationReply operation_replies = 2
+    repeated string nic_addresses = 1;
+    repeated OperationReply operation_replies = 2;
 }
 
 message ListOfDropRequest {
-    repeated string nic_addresses = 1
-    repeated DropRequest drop_requests = 2
+    repeated string nic_addresses = 1;
+    repeated DropRequest drop_requests = 2;
 }
 
 message ListOfDropReply {
-    repeated string nic_addresses = 1
-    repeated DropReply drop_replies = 2
+    repeated string nic_addresses = 1;
+    repeated DropReply drop_replies = 2;
 }
 
 message ListOfNiCServerAdminStateRequest {
-    repeated string nic_addresses = 1
-    repeated bool admin_states = 2
+    repeated string nic_addresses = 1;
+    repeated bool admin_states = 2;
 }
 
 message ListOfNiCServerAdminStateReply {
-    repeated string nic_addresses = 1
-    repeated bool admin_states = 2
-    repeated bool successes = 3
+    repeated string nic_addresses = 1;
+    repeated bool admin_states = 2;
+    repeated bool successes = 3;
 }

ansible/dualtor/nic_simulator/nic_simulator_grpc_service.proto

@@ -1,4 +1,4 @@
-syntax = "proto3"
+syntax = "proto3";
 
 service DualToRActive {
     rpc QueryAdminForwardingPortState(AdminRequest) returns(AdminReply) {}
@@ -15,48 +15,48 @@ service DualToRActive {
 }
 
 message AdminRequest {
-    repeated int32 portid = 1
-    repeated bool state = 2
+    repeated int32 portid = 1;
+    repeated bool state = 2;
 }
 
 message AdminReply {
-    repeated int32 portid = 1
-    repeated bool state = 2
+    repeated int32 portid = 1;
+    repeated bool state = 2;
 }
 
 message OperationRequest {
-    repeated int32 portid = 1
+    repeated int32 portid = 1;
 }
 
 message OperationReply {
-    repeated int32 portid = 1
-    repeated bool state = 2
+    repeated int32 portid = 1;
+    repeated bool state = 2;
 }
 
 message LinkStateRequest {
-    repeated int32 portid = 1
+    repeated int32 portid = 1;
 }
 
 message LinkStateReply {
-    repeated int32 portid = 1
-    repeated bool state = 2
+    repeated int32 portid = 1;
+    repeated bool state = 2;
 }
 
 message ServerVersionRequest {
-    string version = 1
+    string version = 1;
 }
 
 message ServerVersionReply {
-    string version = 1
+    string version = 1;
 }
 
 message DropRequest {
-    repeated int32 portid = 1
-    repeated int32 direction = 2
-    bool recover = 3
+    repeated int32 portid = 1;
+    repeated int32 direction = 2;
+    bool recover = 3;
 }
 
 message DropReply {
-    repeated int32 portid = 1
-    repeated bool success = 2
+    repeated int32 portid = 1;
+    repeated bool success = 2;
 }