From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 81CBDA0C4D; Wed, 13 Oct 2021 11:11:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 76F6141162; Wed, 13 Oct 2021 11:11:26 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id E4C8E40150 for ; Wed, 13 Oct 2021 11:11:23 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10135"; a="226159636" X-IronPort-AV: E=Sophos;i="5.85,370,1624345200"; d="scan'208";a="226159636" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2021 02:11:22 -0700 X-IronPort-AV: E=Sophos;i="5.85,370,1624345200"; d="scan'208";a="441576487" Received: from unknown (HELO dpdk-zhaohy-t.sh.intel.com) ([10.240.183.68]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2021 02:11:20 -0700 From: Jun Dong To: dts@dpdk.org Cc: PingX.Yu@intel.com, weix.ling@intel.com, junx.dong@intel.com Date: Wed, 13 Oct 2021 17:24:47 +0800 Message-Id: <1634117089-150476-1-git-send-email-junx.dong@intel.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dts] [PATCH V1 1/3] tests/*: changed eal -w parameter to -a X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" - changed eal parameter -w to -a for all test suite Signed-off-by: Jun Dong --- tests/TestSuite_cloud_filter_with_l4_port.py | 2 +- tests/TestSuite_cvl_advanced_iavf_rss_gtpu.py | 2 +- tests/TestSuite_cvl_advanced_rss.py | 2 +- tests/TestSuite_cvl_advanced_rss_gtpogre.py | 2 +- tests/TestSuite_cvl_advanced_rss_gtpu.py | 2 +- tests/TestSuite_cvl_advanced_rss_pppoe.py | 2 +- ...Suite_cvl_advanced_rss_vlan_esp_ah_l2tp_pfcp.py | 2 +- tests/TestSuite_cvl_fdir.py | 4 +- tests/TestSuite_cvl_iavf_rss_configure.py | 2 +- tests/TestSuite_dpdk_hugetlbfs_mount_size.py | 18 ++++---- tests/TestSuite_dynamic_queue.py | 2 +- ...tSuite_enable_package_download_in_ice_driver.py | 4 +- tests/TestSuite_eventdev_perf.py | 4 +- tests/TestSuite_eventdev_pipeline.py | 2 +- tests/TestSuite_eventdev_pipeline_perf.py | 6 +-- tests/TestSuite_floating_veb.py | 4 +- tests/TestSuite_generic_flow_api.py | 54 +++++++++++----------- tests/TestSuite_iavf.py | 2 +- .../TestSuite_iavf_package_driver_error_handle.py | 2 +- ...stSuite_ixgbe_vf_get_extra_queue_information.py | 4 +- tests/TestSuite_l2fwd.py | 2 +- tests/TestSuite_l2tp_esp_coverage.py | 2 +- .../TestSuite_malicious_driver_event_indication.py | 4 +- tests/TestSuite_multiprocess.py | 6 +-- tests/TestSuite_nic_single_core_perf.py | 2 +- tests/TestSuite_performance_thread.py | 2 +- tests/TestSuite_pmd.py | 2 +- tests/TestSuite_port_representor.py | 6 +-- ...te_pvp_virtio_user_multi_queues_port_restart.py | 2 +- tests/TestSuite_qinq_filter.py | 8 ++-- tests/TestSuite_qos_api.py | 2 +- tests/TestSuite_runtime_vf_queue_number.py | 24 +++++----- tests/TestSuite_runtime_vf_queue_number_maxinum.py | 10 ++-- tests/TestSuite_softnic.py | 2 +- tests/TestSuite_sriov_kvm.py | 2 +- tests/TestSuite_stats_checks.py | 2 +- tests/TestSuite_telemetry.py | 2 +- tests/TestSuite_unit_tests_event_timer.py | 4 +- tests/TestSuite_vf_l3fwd.py | 4 +- tests/TestSuite_vf_single_core_perf.py | 2 +- tests/TestSuite_vm2vm_virtio_pmd.py | 2 +- tests/TestSuite_vmdq.py | 2 +- tests/TestSuite_vmdq_dcb.py | 2 +- tests/flexible_common.py | 6 +-- tests/perf_test_base.py | 8 ++-- 45 files changed, 116 insertions(+), 116 deletions(-) diff --git a/tests/TestSuite_cloud_filter_with_l4_port.py b/tests/TestSuite_cloud_filter_with_l4_port.py index 272b86c..0e2e548 100644 --- a/tests/TestSuite_cloud_filter_with_l4_port.py +++ b/tests/TestSuite_cloud_filter_with_l4_port.py @@ -84,7 +84,7 @@ class TestCloudFilterWithL4Port(TestCase): """ self.dut.kill_all() - self.pmdout.start_testpmd("%s" % self.cores, "--rxq=%d --txq=%d --disable-rss" % (MAX_QUEUE, MAX_QUEUE), "-w %s --file-prefix=test1" % self.pf_pci) + self.pmdout.start_testpmd("%s" % self.cores, "--rxq=%d --txq=%d --disable-rss" % (MAX_QUEUE, MAX_QUEUE), "-a %s --file-prefix=test1" % self.pf_pci) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) self.dut.send_expect("set promisc all off", "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) diff --git a/tests/TestSuite_cvl_advanced_iavf_rss_gtpu.py b/tests/TestSuite_cvl_advanced_iavf_rss_gtpu.py index d19ddbf..0ce0e7e 100644 --- a/tests/TestSuite_cvl_advanced_iavf_rss_gtpu.py +++ b/tests/TestSuite_cvl_advanced_iavf_rss_gtpu.py @@ -6971,7 +6971,7 @@ class TestCVLAdvancedIAVFRSSGTPU(TestCase): # if support add --disable-rss param = "--rxq=16 --txq=16" self.pmd_output.start_testpmd(cores="1S/4C/1T", param=param, - eal_param=f"-w {self.vf0_pci}", socket=self.ports_socket) + eal_param=f"-a {self.vf0_pci}", socket=self.ports_socket) ''' self.symmetric = symmetric if symmetric: diff --git a/tests/TestSuite_cvl_advanced_rss.py b/tests/TestSuite_cvl_advanced_rss.py index 8ed6d1a..7c8a317 100644 --- a/tests/TestSuite_cvl_advanced_rss.py +++ b/tests/TestSuite_cvl_advanced_rss.py @@ -4920,7 +4920,7 @@ class AdvancedRSSTest(TestCase): else: param = "--rxq=64 --txq=64 --disable-rss --rxd=384 --txd=384" out = self.pmd_output.start_testpmd(cores="1S/4C/1T", param=param, - eal_param=f"-w {self.pci0}", socket=self.ports_socket) + eal_param=f"-a {self.pci0}", socket=self.ports_socket) self.symmetric = symmetric if symmetric is True: ''' diff --git a/tests/TestSuite_cvl_advanced_rss_gtpogre.py b/tests/TestSuite_cvl_advanced_rss_gtpogre.py index 4a889ea..3033561 100755 --- a/tests/TestSuite_cvl_advanced_rss_gtpogre.py +++ b/tests/TestSuite_cvl_advanced_rss_gtpogre.py @@ -3158,7 +3158,7 @@ class TestCVLAdvancedRSSGTPoGRE(TestCase): else: param = "--rxq=64 --txq=64 --disable-rss --rxd=384 --txd=384" self.pmd_output.start_testpmd(cores="1S/4C/1T", param=param, - eal_param=f"-w {self.pci0}", socket=self.ports_socket) + eal_param=f"-a {self.pci0}", socket=self.ports_socket) self.enable_rss = enable_rss if set_rss: self.pmd_output.execute_cmd('port config all rss all') diff --git a/tests/TestSuite_cvl_advanced_rss_gtpu.py b/tests/TestSuite_cvl_advanced_rss_gtpu.py index 37be57f..e09b787 100755 --- a/tests/TestSuite_cvl_advanced_rss_gtpu.py +++ b/tests/TestSuite_cvl_advanced_rss_gtpu.py @@ -4256,7 +4256,7 @@ class TestCVLAdvancedRSSGTPU(TestCase): else: param = "--rxq=64 --txq=64 --disable-rss --rxd=384 --txd=384" self.pmd_output.start_testpmd(cores="1S/4C/1T", param=param, - eal_param=f"-w {self.pci0}", socket=self.ports_socket) + eal_param=f"-a {self.pci0}", socket=self.ports_socket) self.enable_rss = enable_rss if set_rss: self.pmd_output.execute_cmd('port config all rss all') diff --git a/tests/TestSuite_cvl_advanced_rss_pppoe.py b/tests/TestSuite_cvl_advanced_rss_pppoe.py index 3952bbf..6bd21af 100644 --- a/tests/TestSuite_cvl_advanced_rss_pppoe.py +++ b/tests/TestSuite_cvl_advanced_rss_pppoe.py @@ -4526,7 +4526,7 @@ class Advanced_rss_pppoe(TestCase): else: param = "--rxq=64 --txq=64 --disable-rss --rxd=384 --txd=384" out = self.pmd_output.start_testpmd(cores="1S/4C/1T", param=param, - eal_param=f"-w {self.pci_list[0]}", socket=self.ports_socket) + eal_param=f"-a {self.pci_list[0]}", socket=self.ports_socket) self.symmetric = symmetric if symmetric: # Need config rss in setup diff --git a/tests/TestSuite_cvl_advanced_rss_vlan_esp_ah_l2tp_pfcp.py b/tests/TestSuite_cvl_advanced_rss_vlan_esp_ah_l2tp_pfcp.py index df071e9..e3f0808 100644 --- a/tests/TestSuite_cvl_advanced_rss_vlan_esp_ah_l2tp_pfcp.py +++ b/tests/TestSuite_cvl_advanced_rss_vlan_esp_ah_l2tp_pfcp.py @@ -857,7 +857,7 @@ class Advanced_rss_vlan_ah_l2tp_pfcp(TestCase): else: param = "--rxq=64 --txq=64 --disable-rss --rxd=384 --txd=384" out = self.pmd_output.start_testpmd(cores="1S/4C/1T", param=param, - eal_param=f"-w {self.pci_list[0]}", socket=self.ports_socket) + eal_param=f"-a {self.pci_list[0]}", socket=self.ports_socket) self.symmetric = symmetric if symmetric: # Need config rss in setup diff --git a/tests/TestSuite_cvl_fdir.py b/tests/TestSuite_cvl_fdir.py index 1883675..541599f 100644 --- a/tests/TestSuite_cvl_fdir.py +++ b/tests/TestSuite_cvl_fdir.py @@ -2585,7 +2585,7 @@ class TestCVLFdir(TestCase): self.pmd_output.start_testpmd(cores="1S/4C/1T", param="--portmask=%s --rxq=%d --txq=%d --port-topology=loop" % ( self.portMask, rxq, txq), - eal_param="-w %s -w %s --log-level=ice,7" % ( + eal_param="-a %s -a %s --log-level=ice,7" % ( self.pci0, self.pci1), socket=self.ports_socket) self.config_testpmd() @@ -3387,7 +3387,7 @@ class TestCVLFdir(TestCase): out = self.pmd_output.start_testpmd(cores="1S/4C/1T", param="--portmask=%s --rxq=%d --txq=%d --port-topology=loop --cmdline-file=%s" % ( self.portMask, 64, 64, cmd_path), - eal_param="-w %s -w %s --log-level='ice,7'" % ( + eal_param="-a %s -a %s --log-level='ice,7'" % ( self.pci0, self.pci1), socket=self.ports_socket) self.verify('Failed to create flow' not in out, "create some rule failed") self.config_testpmd() diff --git a/tests/TestSuite_cvl_iavf_rss_configure.py b/tests/TestSuite_cvl_iavf_rss_configure.py index 86b2819..baf33c5 100755 --- a/tests/TestSuite_cvl_iavf_rss_configure.py +++ b/tests/TestSuite_cvl_iavf_rss_configure.py @@ -311,7 +311,7 @@ class IAVFRSSConfigureTest(TestCase): """ #Prepare testpmd EAL and parameters self.pmdout.start_testpmd(cores=self.cores, param=param, - eal_param=f"-w {self.vf0_pci}", socket=self.ports_socket) + eal_param=f"-a {self.vf0_pci}", socket=self.ports_socket) # test link status res = self.pmdout.wait_link_status_up('all', timeout=15) self.verify(res is True, 'there have port link is down') diff --git a/tests/TestSuite_dpdk_hugetlbfs_mount_size.py b/tests/TestSuite_dpdk_hugetlbfs_mount_size.py index 48fdc8e..c170de8 100644 --- a/tests/TestSuite_dpdk_hugetlbfs_mount_size.py +++ b/tests/TestSuite_dpdk_hugetlbfs_mount_size.py @@ -116,7 +116,7 @@ class DpdkHugetlbfsMountSize(TestCase): # Bind one nic port to igb_uio driver, launch testpmd self.dut.send_expect("mount -t hugetlbfs hugetlbfs %s" % MNT_PATH[0], "#", 15) self.logger.info("test default hugepage size start testpmd without numa") - ttd = '%s -l %s -n %d --huge-dir %s --file-prefix=%s -w %s -- -i' + ttd = '%s -l %s -n %d --huge-dir %s --file-prefix=%s -a %s -- -i' launch_ttd = ttd % (self.app_path, self.core_list1, self.mem_channels, MNT_PATH[0], vhost_name[0], self.pci_info_0) self.dut.send_expect(launch_ttd, "testpmd> ", 120) self.dut.send_expect("set promisc all off", "testpmd> ", 120) @@ -128,7 +128,7 @@ class DpdkHugetlbfsMountSize(TestCase): # resart testpmd with numa support self.logger.info("test default hugepage size start testpmd with numa") - ttd_secondary = '%s -l %s -n %d --huge-dir %s --file-prefix=%s -w %s -- -i --numa' + ttd_secondary = '%s -l %s -n %d --huge-dir %s --file-prefix=%s -a %s -- -i --numa' launch_ttd_secondary = ttd_secondary % (self.app_path, self.core_list1, self.mem_channels, MNT_PATH[0], vhost_name[0], self.pci_info_0) self.dut.send_expect(launch_ttd_secondary, "testpmd> ", 120) self.dut.send_expect("set promisc all off", "testpmd> ", 120) @@ -148,7 +148,7 @@ class DpdkHugetlbfsMountSize(TestCase): self.logger.info("start first testpmd") ttd = 'numactl --membind=%d %s -l %s -n %d --legacy-mem --socket-mem %s' \ - ' --huge-dir %s --file-prefix=%s -w %s -- -i --socket-num=%d --no-numa' + ' --huge-dir %s --file-prefix=%s -a %s -- -i --socket-num=%d --no-numa' launch_ttd = ttd % (self.numa_id, self.app_path, self.core_list1, self.mem_channels, self.socket_mem2, MNT_PATH[0], vhost_name[0], self.pci_info_0, self.numa_id) self.session_first.send_expect(launch_ttd, "testpmd> ", 120) self.session_first.send_expect("set promisc all off", "testpmd> ", 120) @@ -157,7 +157,7 @@ class DpdkHugetlbfsMountSize(TestCase): self.logger.info("start secondary testpmd") ttd_secondary = 'numactl --membind=%d %s -l %s -n %d --legacy-mem --socket-mem %s' \ - ' --huge-dir %s --file-prefix=%s -w %s -- -i --socket-num=%d --no-numa' + ' --huge-dir %s --file-prefix=%s -a %s -- -i --socket-num=%d --no-numa' launch_ttd_secondary = ttd_secondary % (self.numa_id, self.app_path, self.core_list2, self.mem_channels, self.socket_mem2, MNT_PATH[1], vhost_name[1], self.pci_info_1, self.numa_id) self.session_secondary.send_expect(launch_ttd_secondary, "testpmd> ", 120) self.session_secondary.send_expect("set promisc all off", "testpmd> ", 120) @@ -175,7 +175,7 @@ class DpdkHugetlbfsMountSize(TestCase): def test_mount_size_greater_than_hugepage_size_single_mount_point(self): # Bind one nic port to igb_uio driver self.dut.send_expect("mount -t hugetlbfs -o size=9G hugetlbfs %s" % MNT_PATH[0], "#", 15) - ttd = '%s -l %s -n %d --legacy-mem --huge-dir %s --file-prefix=%s -w %s -- -i' + ttd = '%s -l %s -n %d --legacy-mem --huge-dir %s --file-prefix=%s -a %s -- -i' launch_ttd = ttd % (self.app_path, self.core_list1, self.mem_channels, MNT_PATH[0], vhost_name[0], self.pci_info_0) self.dut.send_expect(launch_ttd, "testpmd> ", 120) self.dut.send_expect("set promisc all off", "testpmd> ", 120) @@ -196,7 +196,7 @@ class DpdkHugetlbfsMountSize(TestCase): # launch first testpmd self.logger.info("launch first testpmd") ttd = 'numactl --membind=%d %s -l %s -n %d --legacy-mem --socket-mem %s --huge-dir %s' \ - ' --file-prefix=%s -w %s -- -i --socket-num=%d --no-numa' + ' --file-prefix=%s -a %s -- -i --socket-num=%d --no-numa' launch_ttd = ttd % (self.numa_id, self.app_path, self.core_list1, self.mem_channels, self.socket_mem2, MNT_PATH[0], vhost_name[0], self.pci_info_0, self.numa_id) self.session_first.send_expect(launch_ttd, "testpmd> ", 120) self.session_first.send_expect("set promisc all off", "testpmd> ", 120) @@ -206,7 +206,7 @@ class DpdkHugetlbfsMountSize(TestCase): # launch secondary testpmd self.logger.info("launch secondary testpmd") ttd_secondary = 'numactl --membind=%d %s -l %s -n %d --legacy-mem --socket-mem %s --huge-dir' \ - ' %s --file-prefix=%s -w %s -- -i --socket-num=%d --no-numa' + ' %s --file-prefix=%s -a %s -- -i --socket-num=%d --no-numa' launch_ttd_secondary = ttd_secondary % (self.numa_id, self.app_path, self.core_list2, self.mem_channels, self.socket_mem2, MNT_PATH[1], vhost_name[1], self.pci_info_1, self.numa_id) self.session_secondary.send_expect(launch_ttd_secondary, "testpmd> ", 120) self.session_secondary.send_expect("set promisc all off", "testpmd> ", 120) @@ -216,7 +216,7 @@ class DpdkHugetlbfsMountSize(TestCase): # launch third testpmd self.logger.info("launch third testpmd") ttd_third = 'numactl --membind=%d %s -l %s -n %d --legacy-mem --socket-mem %s --huge-dir' \ - ' %s --file-prefix=%s -w %s -- -i --socket-num=%d --no-numa' + ' %s --file-prefix=%s -a %s -- -i --socket-num=%d --no-numa' launch_ttd_third = ttd_third % (self.numa_id, self.app_path, self.core_list3, self.mem_channels, self.socket_mem, MNT_PATH[2], vhost_name[2], self.pci_info_0, self.numa_id) expect_str = 'Not enough memory available on socket' self.dut.get_session_output(timeout=2) @@ -248,7 +248,7 @@ class DpdkHugetlbfsMountSize(TestCase): self.dut.send_expect("mount -t hugetlbfs nodev %s" % MNT_PATH[0], "#", 15) self.dut.send_expect("cgcreate -g hugetlb:/test-subgroup", "# ", 15) self.dut.send_expect("cgset -r hugetlb.1GB.limit_in_bytes=2147483648 test-subgroup", "#", 15) - ttd = 'cgexec -g hugetlb:test-subgroup numactl -m %d %s -l %s -n %d -w %s -- -i --socket-num=%d --no-numa' + ttd = 'cgexec -g hugetlb:test-subgroup numactl -m %d %s -l %s -n %d -a %s -- -i --socket-num=%d --no-numa' launch_ttd = ttd % (self.numa_id, self.app_path, self.core_list1, self.mem_channels, self.pci_info_0, self.numa_id) self.dut.send_expect(launch_ttd, "testpmd> ", 120) self.dut.send_expect("set promisc all off", "testpmd> ", 120) diff --git a/tests/TestSuite_dynamic_queue.py b/tests/TestSuite_dynamic_queue.py index 9314ff7..be8a45b 100644 --- a/tests/TestSuite_dynamic_queue.py +++ b/tests/TestSuite_dynamic_queue.py @@ -65,7 +65,7 @@ class TestDynamicQueue(TestCase): elif (self.nic in ["cavium_a063", "cavium_a064"]): eal_opts = "" for port in self.dut_ports: - eal_opts += "-w %s,max_pools=256 "%(self.dut.get_port_pci(self.dut_ports[port])) + eal_opts += "-a %s,max_pools=256 "%(self.dut.get_port_pci(self.dut_ports[port])) self.dut_testpmd.start_testpmd( "Default", "--port-topology=chained --txq=%s --rxq=%s" % (self.PF_QUEUE, self.PF_QUEUE), eal_param = eal_opts) diff --git a/tests/TestSuite_enable_package_download_in_ice_driver.py b/tests/TestSuite_enable_package_download_in_ice_driver.py index 8bf21d1..0c85f31 100644 --- a/tests/TestSuite_enable_package_download_in_ice_driver.py +++ b/tests/TestSuite_enable_package_download_in_ice_driver.py @@ -95,7 +95,7 @@ class TestEnable_Package_Download_In_Ice_Driver(TestCase): self.eal_param = "" if safe_mode_support == "true": for i in range(len(self.dut_ports)): - self.eal_param = self.eal_param + "-w %s,safe-mode-support=1 " % self.dut.ports_info[i]['pci'] + self.eal_param = self.eal_param + "-a %s,safe-mode-support=1 " % self.dut.ports_info[i]['pci'] out = self.dut_testpmd.start_testpmd("all", "--nb-cores=8 --rxq=%s --txq=%s --port-topology=chained" % (self.PF_QUEUE, self.PF_QUEUE), eal_param=self.eal_param) if ice_pkg == "false": if safe_mode_support == "true": @@ -340,7 +340,7 @@ class TestEnable_Package_Download_In_Ice_Driver(TestCase): self.copy_specify_ice_pkg(self.new_pkgs[i]) self.generate_delete_specify_pkg(pkg_ver=self.new_pkgs[i], sn=self.nic_sn[i], key="true") - eal_param = "-w %s " % self.nic_pci[0] + "-w %s " % self.nic_pci[1] + "--log-level=8" + eal_param = "-a %s " % self.nic_pci[0] + "-a %s " % self.nic_pci[1] + "--log-level=8" out = self.dut_testpmd.execute_cmd(self.path + eal_param + " -- -i ") self.dut_testpmd.quit() diff --git a/tests/TestSuite_eventdev_perf.py b/tests/TestSuite_eventdev_perf.py index 7730cd1..e20c988 100644 --- a/tests/TestSuite_eventdev_perf.py +++ b/tests/TestSuite_eventdev_perf.py @@ -143,11 +143,11 @@ class TestEventdevPerf(TestCase): def eventdev_cmd(self, test_type, stlist, nports, worker_cores): self.Port_pci_ids = [] - command_line1 = self.app_command + " -l %s -w %s" + command_line1 = self.app_command + " -l %s -a %s" for i in range(0, nports): self.Port_pci_ids.append(self.dut.ports_info[i]['pci']) ## Adding core-list and pci-ids - command_line1 = command_line1 + " -w %s " + command_line1 = command_line1 + " -a %s " ## Adding test and stage types command_line2 = "-- --prod_type_ethdev --nb_pkts=0 --verbose 2 --test=%s --stlist=%s --wlcores=%s" %(test_type, stlist, worker_cores) return command_line1 + command_line2 diff --git a/tests/TestSuite_eventdev_pipeline.py b/tests/TestSuite_eventdev_pipeline.py index 33091b6..3295950 100644 --- a/tests/TestSuite_eventdev_pipeline.py +++ b/tests/TestSuite_eventdev_pipeline.py @@ -99,7 +99,7 @@ class TestEventdevPipeline(TestCase): ports=[self.dut.ports_info[0]['pci']]) command_line = "taskset -c %s " + self.app_command + \ "/build/eventdev_pipeline %s " + \ - "--vdev event_sw0 -- -r%s -t%s -e%s -w %s -s1 -n0 -c32 -W1000 %s -D" + "--vdev event_sw0 -- -r%s -t%s -e%s -a %s -s1 -n0 -c32 -W1000 %s -D" command_line = command_line % ( self.taskset_core_list, eal_params, self.core_mask_rx, self.core_mask_tx, self.core_mask_sd, self.core_mask_wk, cmd_type) diff --git a/tests/TestSuite_eventdev_pipeline_perf.py b/tests/TestSuite_eventdev_pipeline_perf.py index 69cb4aa..830c91a 100644 --- a/tests/TestSuite_eventdev_pipeline_perf.py +++ b/tests/TestSuite_eventdev_pipeline_perf.py @@ -143,13 +143,13 @@ class TestEventdevPipelinePerf(TestCase): def eventdev_cmd(self, stlist, nports, wmask): self.Port_pci_ids = [] - command_line1 = self.app_command + " -c %s -w %s" + command_line1 = self.app_command + " -c %s -a %s" for i in range(0, nports): self.Port_pci_ids.append(self.dut.ports_info[i]['pci']) ## Adding core-list and pci-ids - command_line1 = command_line1 + " -w %s " + command_line1 = command_line1 + " -a %s " ## Adding test and stage types - command_line2 = "-- -w %s -n=0 --dump %s -m 16384" % (wmask , stlist ) + command_line2 = "-- -a %s -n=0 --dump %s -m 16384" % (wmask , stlist ) return command_line1 + command_line2 def test_perf_eventdev_pipeline_1ports_atomic_performance(self): diff --git a/tests/TestSuite_floating_veb.py b/tests/TestSuite_floating_veb.py index 8bfc4c4..c012abd 100644 --- a/tests/TestSuite_floating_veb.py +++ b/tests/TestSuite_floating_veb.py @@ -367,7 +367,7 @@ class TestFloatingVEBSwitching(TestCase): """ self.setup_env(driver=self.drivername, vf_num=4) # start PF - cmd = self.path + "-c 0xf -n 4 --socket-mem 1024,1024 -w \"%s,enable_floating_veb=1,floating_veb_list=0;2-3\" --file-prefix=test1 -- -i" % self.pf_pci + cmd = self.path + "-c 0xf -n 4 --socket-mem 1024,1024 -a \"%s,enable_floating_veb=1,floating_veb_list=0;2-3\" --file-prefix=test1 -- -i" % self.pf_pci self.dut.send_expect(cmd, "testpmd> ", 120) self.dut.send_expect("port start all", "testpmd>") time.sleep(2) @@ -497,7 +497,7 @@ class TestFloatingVEBSwitching(TestCase): """ self.setup_env(driver=self.drivername, vf_num=4) # VF0->PF - cmd = self.path + "-c 0xf -n 4 --socket-mem 1024,1024 -w \"%s,enable_floating_veb=1,floating_veb_list=0;3\" --file-prefix=test1 -- -i" % self.pf_pci + cmd = self.path + "-c 0xf -n 4 --socket-mem 1024,1024 -a \"%s,enable_floating_veb=1,floating_veb_list=0;3\" --file-prefix=test1 -- -i" % self.pf_pci self.dut.send_expect(cmd, "testpmd> ", 120) self.dut.send_expect("set fwd rxonly", "testpmd>") self.dut.send_expect("set promisc all off", "testpmd>") diff --git a/tests/TestSuite_generic_flow_api.py b/tests/TestSuite_generic_flow_api.py index 32805e4..2c17e4f 100644 --- a/tests/TestSuite_generic_flow_api.py +++ b/tests/TestSuite_generic_flow_api.py @@ -863,7 +863,7 @@ class TestGeneric_flow_api(TestCase): "powerville", "fortville_eagle", "fortville_25g", "fortville_spirit", "carlsville", "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "foxville","columbiaville_25g","columbiaville_100g"], "%s nic not support ethertype filter" % self.nic) - self.pmdout.start_testpmd("%s" % self.cores, "--disable-rss --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=test1" % self.pf_pci) + self.pmdout.start_testpmd("%s" % self.cores, "--disable-rss --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-a %s --file-prefix=test1" % self.pf_pci) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) self.dut.send_expect("start", "testpmd> ", 120) @@ -916,19 +916,19 @@ class TestGeneric_flow_api(TestCase): self.setup_env() # start testpmd on pf - self.pmdout.start_testpmd("1S/4C/1T", "--rxq=4 --txq=4", "-w %s --file-prefix=pf -m 1024" % self.pf_pci) + self.pmdout.start_testpmd("1S/4C/1T", "--rxq=4 --txq=4", "-a %s --file-prefix=pf -m 1024" % self.pf_pci) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) self.dut.send_expect("start", "testpmd> ", 120) time.sleep(2) # start testpmd on vf0 - self.session_secondary.send_expect("%s -c 0x1e0 -n 4 -m 1024 -w %s --file-prefix=vf1 -- -i --rxq=4 --txq=4" % (self.app_path, self.sriov_vfs_port[0].pci), "testpmd>", 120) + self.session_secondary.send_expect("%s -c 0x1e0 -n 4 -m 1024 -a %s --file-prefix=vf1 -- -i --rxq=4 --txq=4" % (self.app_path, self.sriov_vfs_port[0].pci), "testpmd>", 120) self.session_secondary.send_expect("set fwd rxonly", "testpmd> ") self.session_secondary.send_expect("set verbose 1", "testpmd> ") self.session_secondary.send_expect("start", "testpmd> ") time.sleep(2) # start testpmd on vf1 - self.session_third.send_expect("%s -c 0x1e00 -n 4 -m 1024 -w %s --file-prefix=vf2 -- -i --rxq=4 --txq=4" % (self.app_path, self.sriov_vfs_port[1].pci), "testpmd>", 120) + self.session_third.send_expect("%s -c 0x1e00 -n 4 -m 1024 -a %s --file-prefix=vf2 -- -i --rxq=4 --txq=4" % (self.app_path, self.sriov_vfs_port[1].pci), "testpmd>", 120) self.session_third.send_expect("set fwd rxonly", "testpmd> ") self.session_third.send_expect("set verbose 1", "testpmd> ") self.session_third.send_expect("start", "testpmd> ") @@ -962,7 +962,7 @@ class TestGeneric_flow_api(TestCase): self.verify(self.nic in ["fortville_eagle", "fortville_25g", "fortville_spirit", "carlsville", "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "foxville","columbiaville_25g","columbiaville_100g"], "%s nic not support fdir L2 payload filter" % self.nic) - self.pmdout.start_testpmd("%s" % self.pf_cores, "--rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=test1" % self.pf_pci) + self.pmdout.start_testpmd("%s" % self.pf_cores, "--rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-a %s --file-prefix=test1" % self.pf_pci) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) self.dut.send_expect("start", "testpmd> ", 120) @@ -1009,7 +1009,7 @@ class TestGeneric_flow_api(TestCase): "fortville_spirit_single", "fortpark_TLV", "fortpark_BASE-T","fortville_25g","carlsville","columbiaville_25g","columbiaville_100g"], "%s nic not support fdir vlan filter" % self.nic) - self.pmdout.start_testpmd("%s" % self.cores, "--rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=test1" % self.pf_pci) + self.pmdout.start_testpmd("%s" % self.cores, "--rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-a %s --file-prefix=test1" % self.pf_pci) self.dut.send_expect("port config all rss all", "testpmd> ", 120) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) @@ -1098,7 +1098,7 @@ class TestGeneric_flow_api(TestCase): "fortville_spirit_single", "fortpark_TLV", "fortpark_BASE-T","fortville_25g","carlsville","columbiaville_25g","columbiaville_100g"], "%s nic not support fdir vlan filter" % self.nic) - self.pmdout.start_testpmd("%s" % self.cores, "--rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=test1" % self.pf_pci) + self.pmdout.start_testpmd("%s" % self.cores, "--rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-a %s --file-prefix=test1" % self.pf_pci) self.dut.send_expect("port config all rss all", "testpmd> ", 120) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) @@ -1187,7 +1187,7 @@ class TestGeneric_flow_api(TestCase): "fortville_spirit_single", "fortpark_TLV", "fortpark_BASE-T","fortville_25g","carlsville","columbiaville_25g","columbiaville_100g"], "%s nic not support fdir vlan filter" % self.nic) - self.pmdout.start_testpmd("%s" % self.cores, "--rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=test1" % self.pf_pci) + self.pmdout.start_testpmd("%s" % self.cores, "--rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-a %s --file-prefix=test1" % self.pf_pci) self.dut.send_expect("port config all rss all", "testpmd> ", 120) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) @@ -1276,7 +1276,7 @@ class TestGeneric_flow_api(TestCase): "fortville_spirit_single", "fortpark_TLV", "fortpark_BASE-T","fortville_25g","carlsville","columbiaville_25g","columbiaville_100g"], "%s nic not support fdir vlan filter" % self.nic) - self.pmdout.start_testpmd("%s" % self.cores, "--rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=test1" % self.pf_pci) + self.pmdout.start_testpmd("%s" % self.cores, "--rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-a %s --file-prefix=test1" % self.pf_pci) self.dut.send_expect("port config all rss all", "testpmd> ", 120) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) @@ -1364,7 +1364,7 @@ class TestGeneric_flow_api(TestCase): "fortville_spirit_single", "fortpark_TLV", "fortpark_BASE-T","fortville_25g","carlsville","columbiaville_25g","columbiaville_100g"], "%s nic not support fdir vlan filter" % self.nic) - self.pmdout.start_testpmd("%s" % self.cores, "--rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=test1" % self.pf_pci) + self.pmdout.start_testpmd("%s" % self.cores, "--rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-a %s --file-prefix=test1" % self.pf_pci) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) self.dut.send_expect("start", "testpmd> ", 120) @@ -1427,19 +1427,19 @@ class TestGeneric_flow_api(TestCase): "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "foxville","columbiaville_25g","columbiaville_100g"], "%s nic not support fdir vlan filter" % self.nic) self.setup_env() # start testpmd on pf - self.pmdout.start_testpmd("%s" % self.pf_cores, "--disable-rss --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=pf --socket-mem 1024,1024 --legacy-mem" % self.pf_pci) + self.pmdout.start_testpmd("%s" % self.pf_cores, "--disable-rss --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-a %s --file-prefix=pf --socket-mem 1024,1024 --legacy-mem" % self.pf_pci) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) self.dut.send_expect("start", "testpmd> ", 120) time.sleep(2) # start testpmd on vf0 - self.session_secondary.send_expect("%s -c 0x1e0000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf1 -- -i --rxq=4 --txq=4 --disable-rss --pkt-filter-mode=perfect" % (self.app_path, self.sriov_vfs_port[0].pci), "testpmd>", 120) + self.session_secondary.send_expect("%s -c 0x1e0000 -n 4 --socket-mem 1024,1024 --legacy-mem -a %s --file-prefix=vf1 -- -i --rxq=4 --txq=4 --disable-rss --pkt-filter-mode=perfect" % (self.app_path, self.sriov_vfs_port[0].pci), "testpmd>", 120) self.session_secondary.send_expect("set fwd rxonly", "testpmd>") self.session_secondary.send_expect("set verbose 1", "testpmd>") self.session_secondary.send_expect("start", "testpmd>") time.sleep(2) # start testpmd on vf1 - self.session_third.send_expect("%s -c 0x1e000000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf2 -- -i --rxq=4 --txq=4 --disable-rss --pkt-filter-mode=perfect" % (self.app_path, self.sriov_vfs_port[1].pci), "testpmd>", 120) + self.session_third.send_expect("%s -c 0x1e000000 -n 4 --socket-mem 1024,1024 --legacy-mem -a %s --file-prefix=vf2 -- -i --rxq=4 --txq=4 --disable-rss --pkt-filter-mode=perfect" % (self.app_path, self.sriov_vfs_port[1].pci), "testpmd>", 120) self.session_third.send_expect("set fwd rxonly", "testpmd>") self.session_third.send_expect("set verbose 1", "testpmd>") self.session_third.send_expect("start", "testpmd>") @@ -1539,19 +1539,19 @@ class TestGeneric_flow_api(TestCase): "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "foxville", "carlsville"]): self.setup_env() # start testpmd on pf - self.pmdout.start_testpmd("%s" % self.pf_cores, "--disable-rss --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=pf --socket-mem 1024,1024 --legacy-mem" % self.pf_pci) + self.pmdout.start_testpmd("%s" % self.pf_cores, "--disable-rss --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-a %s --file-prefix=pf --socket-mem 1024,1024 --legacy-mem" % self.pf_pci) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) self.dut.send_expect("start", "testpmd> ", 120) time.sleep(2) # start testpmd on vf0 - self.session_secondary.send_expect("%s -c 0x1e0000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf1 -- -i --rxq=4 --txq=4 --disable-rss" % (self.app_path, self.sriov_vfs_port[0].pci), "testpmd>", 120) + self.session_secondary.send_expect("%s -c 0x1e0000 -n 4 --socket-mem 1024,1024 --legacy-mem -a %s --file-prefix=vf1 -- -i --rxq=4 --txq=4 --disable-rss" % (self.app_path, self.sriov_vfs_port[0].pci), "testpmd>", 120) self.session_secondary.send_expect("set fwd rxonly", "testpmd>") self.session_secondary.send_expect("set verbose 1", "testpmd>") self.session_secondary.send_expect("start", "testpmd>") time.sleep(2) # start testpmd on vf1 - self.session_third.send_expect("%s -c 0x1e000000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf2 -- -i --rxq=4 --txq=4 --disable-rss" % (self.app_path, self.sriov_vfs_port[1].pci), "testpmd>", 120) + self.session_third.send_expect("%s -c 0x1e000000 -n 4 --socket-mem 1024,1024 --legacy-mem -a %s --file-prefix=vf2 -- -i --rxq=4 --txq=4 --disable-rss" % (self.app_path, self.sriov_vfs_port[1].pci), "testpmd>", 120) self.session_third.send_expect("set fwd rxonly", "testpmd>") self.session_third.send_expect("set verbose 1", "testpmd>") self.session_third.send_expect("start", "testpmd>") @@ -1685,17 +1685,17 @@ class TestGeneric_flow_api(TestCase): if (self.nic in ["fortville_eagle", "fortville_25g", "fortville_spirit","columbiaville_25g","columbiaville_100g", "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "carlsville"]): self.setup_env() - self.pmdout.start_testpmd("%s" % self.pf_cores, "--disable-rss --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=pf --socket-mem 1024,1024 --legacy-mem" % self.pf_pci) + self.pmdout.start_testpmd("%s" % self.pf_cores, "--disable-rss --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-a %s --file-prefix=pf --socket-mem 1024,1024 --legacy-mem" % self.pf_pci) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) self.dut.send_expect("start", "testpmd> ", 120) time.sleep(2) - self.session_secondary.send_expect("%s -c 0x1e0000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf1 -- -i --rxq=4 --txq=4 --disable-rss" % (self.app_path, self.sriov_vfs_port[0].pci), "testpmd>", 120) + self.session_secondary.send_expect("%s -c 0x1e0000 -n 4 --socket-mem 1024,1024 --legacy-mem -a %s --file-prefix=vf1 -- -i --rxq=4 --txq=4 --disable-rss" % (self.app_path, self.sriov_vfs_port[0].pci), "testpmd>", 120) self.session_secondary.send_expect("set fwd rxonly", "testpmd>") self.session_secondary.send_expect("set verbose 1", "testpmd>") self.session_secondary.send_expect("start", "testpmd>") time.sleep(2) - self.session_third.send_expect("%s -c 0x1e000000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf2 -- -i --rxq=4 --txq=4 --disable-rss" % (self.app_path, self.sriov_vfs_port[1].pci), "testpmd>", 120) + self.session_third.send_expect("%s -c 0x1e000000 -n 4 --socket-mem 1024,1024 --legacy-mem -a %s --file-prefix=vf2 -- -i --rxq=4 --txq=4 --disable-rss" % (self.app_path, self.sriov_vfs_port[1].pci), "testpmd>", 120) self.session_third.send_expect("set fwd rxonly", "testpmd>") self.session_third.send_expect("set verbose 1", "testpmd>") self.session_third.send_expect("start", "testpmd>") @@ -1850,7 +1850,7 @@ class TestGeneric_flow_api(TestCase): # i40e if (self.nic in ["fortville_eagle", "fortville_25g", "fortville_spirit", "carlsville", "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T","columbiaville_25g","columbiaville_100g"]): - self.pmdout.start_testpmd("%s" % self.pf_cores, "--disable-rss --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=pf" % self.pf_pci) + self.pmdout.start_testpmd("%s" % self.pf_cores, "--disable-rss --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-a %s --file-prefix=pf" % self.pf_pci) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) self.dut.send_expect("start", "testpmd> ", 120) @@ -1954,7 +1954,7 @@ class TestGeneric_flow_api(TestCase): self.dut.send_expect("quit", "# ") time.sleep(2) - self.pmdout.start_testpmd("%s" % self.pf_cores, "--disable-rss --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=pf --socket-mem 1024,1024" % self.pf_pci) + self.pmdout.start_testpmd("%s" % self.pf_cores, "--disable-rss --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-a %s --file-prefix=pf --socket-mem 1024,1024" % self.pf_pci) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) self.dut.send_expect("start", "testpmd> ", 120) @@ -2306,18 +2306,18 @@ class TestGeneric_flow_api(TestCase): "%s nic not support tunnel vxlan filter" % self.nic) self.setup_env() - self.pmdout.start_testpmd("%s" % self.pf_cores, "--disable-rss --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=pf --socket-mem 1024,1024 --legacy-mem" % self.pf_pci) + self.pmdout.start_testpmd("%s" % self.pf_cores, "--disable-rss --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-a %s --file-prefix=pf --socket-mem 1024,1024 --legacy-mem" % self.pf_pci) self.dut.send_expect("rx_vxlan_port add 4789 0", "testpmd> ", 120) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) self.dut.send_expect("start", "testpmd> ", 120) time.sleep(2) - self.session_secondary.send_expect("%s -c 0x1e0000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf1 -- -i --rxq=4 --txq=4 --disable-rss" % (self.app_path, self.sriov_vfs_port[0].pci), "testpmd>", 120) + self.session_secondary.send_expect("%s -c 0x1e0000 -n 4 --socket-mem 1024,1024 --legacy-mem -a %s --file-prefix=vf1 -- -i --rxq=4 --txq=4 --disable-rss" % (self.app_path, self.sriov_vfs_port[0].pci), "testpmd>", 120) self.session_secondary.send_expect("set fwd rxonly", "testpmd>") self.session_secondary.send_expect("set verbose 1", "testpmd>") self.session_secondary.send_expect("start", "testpmd>") time.sleep(2) - self.session_third.send_expect("%s -c 0x1e000000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf2 -- -i --rxq=4 --txq=4 --disable-rss" % (self.app_path, self.sriov_vfs_port[1].pci), "testpmd>", 120) + self.session_third.send_expect("%s -c 0x1e000000 -n 4 --socket-mem 1024,1024 --legacy-mem -a %s --file-prefix=vf2 -- -i --rxq=4 --txq=4 --disable-rss" % (self.app_path, self.sriov_vfs_port[1].pci), "testpmd>", 120) self.session_third.send_expect("set fwd rxonly", "testpmd>") self.session_third.send_expect("set verbose 1", "testpmd>") self.session_third.send_expect("start", "testpmd>") @@ -2377,17 +2377,17 @@ class TestGeneric_flow_api(TestCase): "%s nic not support tunnel nvgre filter" % self.nic) self.setup_env() - self.pmdout.start_testpmd("%s" % self.pf_cores, "--disable-rss --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=pf --socket-mem 1024,1024 --legacy-mem" % self.pf_pci) + self.pmdout.start_testpmd("%s" % self.pf_cores, "--disable-rss --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-a %s --file-prefix=pf --socket-mem 1024,1024 --legacy-mem" % self.pf_pci) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) self.dut.send_expect("start", "testpmd> ", 120) time.sleep(2) - self.session_secondary.send_expect("%s -c 0x1e0000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf1 -- -i --rxq=4 --txq=4 --disable-rss" % (self.app_path, self.sriov_vfs_port[0].pci), "testpmd>", 120) + self.session_secondary.send_expect("%s -c 0x1e0000 -n 4 --socket-mem 1024,1024 --legacy-mem -a %s --file-prefix=vf1 -- -i --rxq=4 --txq=4 --disable-rss" % (self.app_path, self.sriov_vfs_port[0].pci), "testpmd>", 120) self.session_secondary.send_expect("set fwd rxonly", "testpmd>") self.session_secondary.send_expect("set verbose 1", "testpmd>") self.session_secondary.send_expect("start", "testpmd>") time.sleep(2) - self.session_third.send_expect("%s -c 0x1e000000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf2 -- -i --rxq=4 --txq=4 --disable-rss" % (self.app_path, self.sriov_vfs_port[1].pci), "testpmd>", 120) + self.session_third.send_expect("%s -c 0x1e000000 -n 4 --socket-mem 1024,1024 --legacy-mem -a %s --file-prefix=vf2 -- -i --rxq=4 --txq=4 --disable-rss" % (self.app_path, self.sriov_vfs_port[1].pci), "testpmd>", 120) self.session_third.send_expect("set fwd rxonly", "testpmd>") self.session_third.send_expect("set verbose 1", "testpmd>") self.session_third.send_expect("start", "testpmd>") diff --git a/tests/TestSuite_iavf.py b/tests/TestSuite_iavf.py index adaa130..7c5ace3 100644 --- a/tests/TestSuite_iavf.py +++ b/tests/TestSuite_iavf.py @@ -114,7 +114,7 @@ class TestIavf(TestCase): # start testpmd for pf self.dut_testpmd = PmdOutput(self.dut) - host_eal_param = '-w %s -w %s' % (self.pf_pci0, self.pf_pci1) + host_eal_param = '-a %s -a %s' % (self.pf_pci0, self.pf_pci1) self.dut_testpmd.start_testpmd( "Default", "--rxq=4 --txq=4 --port-topology=chained", eal_param=host_eal_param) diff --git a/tests/TestSuite_iavf_package_driver_error_handle.py b/tests/TestSuite_iavf_package_driver_error_handle.py index d155afc..c180c5a 100644 --- a/tests/TestSuite_iavf_package_driver_error_handle.py +++ b/tests/TestSuite_iavf_package_driver_error_handle.py @@ -98,7 +98,7 @@ class Testiavf_package_and_driver_check(TestCase): self.eal_param = "" if safe_mode_support == "true": for i in range(len(self.dut_ports)): - self.eal_param = self.eal_param + "-w %s,safe-mode-support=1 " % self.dut.ports_info[i]['pci'] + self.eal_param = self.eal_param + "-a %s,safe-mode-support=1 " % self.dut.ports_info[i]['pci'] out = self.dut_testpmd.start_testpmd("all", "--nb-cores=8 --rxq=%s --txq=%s --port-topology=chained" % (self.PF_QUEUE, self.PF_QUEUE), eal_param=self.eal_param) if ice_pkg == "false": if safe_mode_support == "true": diff --git a/tests/TestSuite_ixgbe_vf_get_extra_queue_information.py b/tests/TestSuite_ixgbe_vf_get_extra_queue_information.py index eeef6c7..4f92888 100644 --- a/tests/TestSuite_ixgbe_vf_get_extra_queue_information.py +++ b/tests/TestSuite_ixgbe_vf_get_extra_queue_information.py @@ -231,7 +231,7 @@ class TestIxgbeVfGetExtraInfo(TestCase): # start testpmd with PF on the host self.dut_testpmd = PmdOutput(self.dut) self.dut_testpmd.start_testpmd( - "%s" % self.cores, "--rxq=4 --txq=4 --nb-cores=4", "-w %s" % self.pf_pci) + "%s" % self.cores, "--rxq=4 --txq=4 --nb-cores=4", "-a %s" % self.pf_pci) self.dut_testpmd.execute_cmd("port stop 0") self.dut_testpmd.execute_cmd("port config 0 dcb vt on 4 pfc off") self.dut_testpmd.execute_cmd("port start 0") @@ -257,7 +257,7 @@ class TestIxgbeVfGetExtraInfo(TestCase): # start testpmd with PF on the host self.dut_testpmd = PmdOutput(self.dut) self.dut_testpmd.start_testpmd( - "%s" % self.cores, "--rxq=2 --txq=2 --nb-cores=2", "-w %s" % self.pf_pci) + "%s" % self.cores, "--rxq=2 --txq=2 --nb-cores=2", "-a %s" % self.pf_pci) self.dut_testpmd.execute_cmd("start") time.sleep(5) self.setup_vm_env() diff --git a/tests/TestSuite_l2fwd.py b/tests/TestSuite_l2fwd.py index 091ac09..2c44858 100644 --- a/tests/TestSuite_l2fwd.py +++ b/tests/TestSuite_l2fwd.py @@ -175,7 +175,7 @@ class TestL2fwd(TestCase): eal_params = self.dut.create_eal_parameters(cores=cores) eal_param = "" for i in ports: - eal_param += " -w %s" % self.dut.ports_info[i]['pci'] + eal_param += " -a %s" % self.dut.ports_info[i]['pci'] for frame_size in self.frame_sizes: diff --git a/tests/TestSuite_l2tp_esp_coverage.py b/tests/TestSuite_l2tp_esp_coverage.py index 10520c8..96378db 100644 --- a/tests/TestSuite_l2tp_esp_coverage.py +++ b/tests/TestSuite_l2tp_esp_coverage.py @@ -153,7 +153,7 @@ class L2tpEspCoverage(TestCase): param_str = " --rxq=16 --txq=16 --port-topology=loop --enable-rx-cksum " else: param_str = " --rxq=16 --txq=16 --port-topology=loop " - self.pmd_output.start_testpmd(cores="1S/8C/1T", param=param_str, eal_param="-w %s" % port_pci) + self.pmd_output.start_testpmd(cores="1S/8C/1T", param=param_str, eal_param="-a %s" % port_pci) self.dut.send_expect("set fwd rxonly", "testpmd> ", 15) self.dut.send_expect("set verbose 1", "testpmd> ", 15) diff --git a/tests/TestSuite_malicious_driver_event_indication.py b/tests/TestSuite_malicious_driver_event_indication.py index 8b446cf..c163c47 100644 --- a/tests/TestSuite_malicious_driver_event_indication.py +++ b/tests/TestSuite_malicious_driver_event_indication.py @@ -252,9 +252,9 @@ class TestSuiteMaliciousDrvEventIndication(TestCase): # get whitelist and cores socket = self.dut.get_numa_id(self.dut_ports[0]) corelist = self.dut.get_core_list("1S/6C/1T", socket=socket)[2:] - self.pf_pmd_whitelist = '-w ' + self.vf_ports_info[0].get('pf_pci') + self.pf_pmd_whitelist = '-a ' + self.vf_ports_info[0].get('pf_pci') self.pf_pmd_cores = corelist[:2] - self.vf_pmd_allowlst = '-w ' + self.vf_ports_info[0].get('vfs_pci')[0] + self.vf_pmd_allowlst = '-a ' + self.vf_ports_info[0].get('vfs_pci')[0] self.vf_pmd_cores = corelist[2:] def init_params(self): diff --git a/tests/TestSuite_multiprocess.py b/tests/TestSuite_multiprocess.py index 8752a72..c6f5957 100644 --- a/tests/TestSuite_multiprocess.py +++ b/tests/TestSuite_multiprocess.py @@ -84,7 +84,7 @@ class TestMultiprocess(TestCase): self.eal_param = "" for i in self.dut_ports: - self.eal_param += " -w %s" % self.dut.ports_info[i]['pci'] + self.eal_param += " -a %s" % self.dut.ports_info[i]['pci'] self.eal_para = self.dut.create_eal_parameters(cores='1S/2C/1T') # start new session to run secondary @@ -266,7 +266,7 @@ class TestMultiprocess(TestCase): for index in range(len(coreList)): dut_new_session = self.dut.new_session() dutSessionList.append(dut_new_session) - # add -w option when tester and dut in same server + # add -a option when tester and dut in same server dut_new_session.send_expect( self.app_symmetric_mp + " -c %s --proc-type=auto %s -- -p %s --num-procs=%d --proc-id=%d" % ( utils.create_mask([coreList[index]]), self.eal_param, portMask, execution['nprocs'], index), "Finished Process Init") @@ -324,7 +324,7 @@ class TestMultiprocess(TestCase): # get core with socket parameter to specified which core dut used when tester and dut in same server coreMask = utils.create_mask(self.dut.get_core_list('1S/1C/1T', socket=self.socket)) portMask = utils.create_mask(self.dut_ports) - # specified mp_server core and add -w option when tester and dut in same server + # specified mp_server core and add -a option when tester and dut in same server self.dut.send_expect(self.app_mp_server + " -n %d -c %s %s -- -p %s -n %d" % ( self.dut.get_memory_channels(), coreMask, self.eal_param, portMask, execution['nprocs']), "Finished Process Init", 20) self.dut.send_expect("^Z", "\r\n") diff --git a/tests/TestSuite_nic_single_core_perf.py b/tests/TestSuite_nic_single_core_perf.py index 4ccc04a..c247ae7 100644 --- a/tests/TestSuite_nic_single_core_perf.py +++ b/tests/TestSuite_nic_single_core_perf.py @@ -220,7 +220,7 @@ class TestNicSingleCorePerf(TestCase): # ports allowlist eal_para = "" for i in range(port_num): - eal_para += " -w " + self.dut.ports_info[i]['pci'] + eal_para += " -a " + self.dut.ports_info[i]['pci'] port_mask = utils.create_mask(self.dut_ports) diff --git a/tests/TestSuite_performance_thread.py b/tests/TestSuite_performance_thread.py index 459d9a1..0928df8 100644 --- a/tests/TestSuite_performance_thread.py +++ b/tests/TestSuite_performance_thread.py @@ -189,7 +189,7 @@ class TestPerformanceThread(TestCase): self.test_results["data"] = [] eal_param = "" for i in valports: - eal_param += " -w %s" % self.dut.ports_info[i]['pci'] + eal_param += " -a %s" % self.dut.ports_info[i]['pci'] for cores in self.nb_cores: core_list, core_mask = self.create_cores(cores) diff --git a/tests/TestSuite_pmd.py b/tests/TestSuite_pmd.py index afc36d9..8253c43 100644 --- a/tests/TestSuite_pmd.py +++ b/tests/TestSuite_pmd.py @@ -397,7 +397,7 @@ class TestPmd(TestCase): eal_opts = "" for port in self.dut_ports: - eal_opts += "-w %s,scalar_enable=1 "%(self.dut.get_port_pci(self.dut_ports[port])) + eal_opts += "-a %s,scalar_enable=1 "%(self.dut.get_port_pci(self.dut_ports[port])) self.pmdout.start_testpmd("1S/2C/1T", "--portmask=%s" % port_mask, eal_param = eal_opts, socket=self.ports_socket) diff --git a/tests/TestSuite_port_representor.py b/tests/TestSuite_port_representor.py index e2fe0dc..f169473 100644 --- a/tests/TestSuite_port_representor.py +++ b/tests/TestSuite_port_representor.py @@ -104,14 +104,14 @@ class TestPortRepresentor(TestCase): self.vf_flag = 0 def testpmd_pf(self): - self.pmdout_pf.start_testpmd("Default", eal_param="-w %s,representor=0-1" % self.pf_pci, param="--port-topology=chained --total-num-mbufs=120000") + self.pmdout_pf.start_testpmd("Default", eal_param="-a %s,representor=0-1" % self.pf_pci, param="--port-topology=chained --total-num-mbufs=120000") def testpmd_vf0(self): - self.out_vf0 = self.pmdout_vf0.start_testpmd("Default", eal_param="-w %s --file-prefix testpmd-vf0" % self.vfs_pci[0], param="--total-num-mbufs=120000") + self.out_vf0 = self.pmdout_vf0.start_testpmd("Default", eal_param="-a %s --file-prefix testpmd-vf0" % self.vfs_pci[0], param="--total-num-mbufs=120000") self.vf0_mac = self.pmdout_vf0.get_port_mac(0) def testpmd_vf1(self): - self.out_vf1 = self.pmdout_vf1.start_testpmd("Default", eal_param="-w %s --file-prefix testpmd-vf1" % self.vfs_pci[1], param="--total-num-mbufs=120000") + self.out_vf1 = self.pmdout_vf1.start_testpmd("Default", eal_param="-a %s --file-prefix testpmd-vf1" % self.vfs_pci[1], param="--total-num-mbufs=120000") self.vf1_mac = self.pmdout_vf1.get_port_mac(0) def check_port_stats(self): diff --git a/tests/TestSuite_pvp_virtio_user_multi_queues_port_restart.py b/tests/TestSuite_pvp_virtio_user_multi_queues_port_restart.py index eefc5bb..841d4ca 100644 --- a/tests/TestSuite_pvp_virtio_user_multi_queues_port_restart.py +++ b/tests/TestSuite_pvp_virtio_user_multi_queues_port_restart.py @@ -96,7 +96,7 @@ class TestPVPVirtioUserMultiQueuesPortRestart(TestCase): vdev = "'net_vhost0,iface=vhost-net,queues=2,client=0'" param = "--nb-cores=2 --rxq={} --txq={} --rss-ip".format(self.queue_number, self.queue_number) self.vhost_pmd.start_testpmd(cores=self.core_list[2:5], param=param, \ - eal_param="-w {} --file-prefix=vhost --vdev {}".format(self.pci_info, vdev)) + eal_param="-a {} --file-prefix=vhost --vdev {}".format(self.pci_info, vdev)) self.vhost_pmd.execute_cmd("set fwd mac", "testpmd> ", 120) self.vhost_pmd.execute_cmd("start", "testpmd> ", 120) diff --git a/tests/TestSuite_qinq_filter.py b/tests/TestSuite_qinq_filter.py index e19fe0f..9e1671c 100644 --- a/tests/TestSuite_qinq_filter.py +++ b/tests/TestSuite_qinq_filter.py @@ -217,13 +217,13 @@ class TestQinqFilter(TestCase): self.dut.send_expect(r'flow create 0 ingress pattern eth / vlan tci is 3 / vlan tci is 4094 / end actions pf / queue index 1 / end', "testpmd> ") vf0_session.send_expect(r'%s -c %s -n 4 \ - --socket-mem=1024,1024 --file-prefix=vf0 -w %s -- -i --port-topology=loop \ + --socket-mem=1024,1024 --file-prefix=vf0 -a %s -- -i --port-topology=loop \ --rxq=4 --txq=4 --disable-rss' % (self.path, self.coreMask, vf_list[0]), "testpmd> ", 30) vf1_session.send_expect(r'%s -c %s -n 4 \ - --socket-mem=1024,1024 --file-prefix=vf1 -w %s -- -i --port-topology=loop \ + --socket-mem=1024,1024 --file-prefix=vf1 -a %s -- -i --port-topology=loop \ --rxq=4 --txq=4 --disable-rss' % (self.path, self.coreMask, vf_list[1]), "testpmd>", 30) @@ -289,13 +289,13 @@ class TestQinqFilter(TestCase): self.dut.send_expect('vlan set outer tpid 0x88a8 0', "testpmd") vf0_session.send_expect(r'%s -c %s -n 4 \ - --socket-mem=1024,1024 --file-prefix=vf0 -w %s -- -i --port-topology=loop \ + --socket-mem=1024,1024 --file-prefix=vf0 -a %s -- -i --port-topology=loop \ --rxq=4 --txq=4 --disable-rss' % (self.path, self.coreMask, vf_list[0]), "testpmd> ", 30) vf1_session.send_expect(r'%s -c %s -n 4 \ - --socket-mem=1024,1024 --file-prefix=vf1 -w %s -- -i --port-topology=loop \ + --socket-mem=1024,1024 --file-prefix=vf1 -a %s -- -i --port-topology=loop \ --rxq=4 --txq=4 --disable-rss' % (self.path, self.coreMask, vf_list[1]), "testpmd>", 30) diff --git a/tests/TestSuite_qos_api.py b/tests/TestSuite_qos_api.py index da2c544..143598f 100644 --- a/tests/TestSuite_qos_api.py +++ b/tests/TestSuite_qos_api.py @@ -62,7 +62,7 @@ class TestQosApi(TestCase): # each flow to 200Mbps self.bps = 200000000 self.bps_rate = [0, 0.1] - self.eal_param = ' --master-lcore=1' + self.eal_param = ' --main-lcore=1' # Verify that enough threads are available cores = self.dut.get_core_list("1S/1C/1T") self.verify(cores is not None, "Insufficient cores for speed testing") diff --git a/tests/TestSuite_runtime_vf_queue_number.py b/tests/TestSuite_runtime_vf_queue_number.py index 1d7d536..0b31642 100644 --- a/tests/TestSuite_runtime_vf_queue_number.py +++ b/tests/TestSuite_runtime_vf_queue_number.py @@ -219,10 +219,10 @@ class TestRuntimeVfQn(TestCase): """ valid_qn = (2, 4, 8,) for qn in valid_qn: - host_eal_param = '-w %s,queue-num-per-vf=%d --file-prefix=test1 --socket-mem 1024,1024' % (self.pf_pci, qn) + host_eal_param = '-a %s,queue-num-per-vf=%d --file-prefix=test1 --socket-mem 1024,1024' % (self.pf_pci, qn) self.host_testpmd.start_testpmd(self.pmdout.default_cores, param='', eal_param=host_eal_param) - gest_eal_param = '-w %s --file-prefix=test2' % self.vm_dut_0.ports_info[0]['pci'] + gest_eal_param = '-a %s --file-prefix=test2' % self.vm_dut_0.ports_info[0]['pci'] self.vm0_testpmd = PmdOutput(self.vm_dut_0) self.vm0_testpmd.start_testpmd(self.pmdout.default_cores, eal_param=gest_eal_param, param='') guest_cmds = self.testpmd_config_cmd_list(qn) @@ -253,7 +253,7 @@ class TestRuntimeVfQn(TestCase): :return: """ for invalid_qn in (0, 3, 5, 6, 7, 9, 11, 15, 17, 25,): - eal_param = '-w %s,queue-num-per-vf=%d --file-prefix=test1 --socket-mem 1024,1024' % (self.pf_pci, invalid_qn) + eal_param = '-a %s,queue-num-per-vf=%d --file-prefix=test1 --socket-mem 1024,1024' % (self.pf_pci, invalid_qn) testpmd_out = self.host_testpmd.start_testpmd(self.pmdout.default_cores, param='', eal_param=eal_param) self.verify("it must be power of 2 and equal or less than 16" in testpmd_out, "there is no 'Wrong VF queue number = 0' logs.") self.dut.send_expect("quit", "# ") @@ -263,10 +263,10 @@ class TestRuntimeVfQn(TestCase): Test case 3: set valid VF queue number in testpmd command-line options :return: """ - host_eal_param = '-w %s --file-prefix=test1 --socket-mem 1024,1024' % self.pf_pci + host_eal_param = '-a %s --file-prefix=test1 --socket-mem 1024,1024' % self.pf_pci self.host_testpmd.start_testpmd(self.pmdout.default_cores, param='', eal_param=host_eal_param) - gest_eal_param = '-w %s --file-prefix=test2' % self.vm_dut_0.ports_info[0]['pci'] + gest_eal_param = '-a %s --file-prefix=test2' % self.vm_dut_0.ports_info[0]['pci'] self.vm0_testpmd = PmdOutput(self.vm_dut_0) for valid_qn in range(1, 17): count = valid_qn * 10 @@ -292,9 +292,9 @@ class TestRuntimeVfQn(TestCase): Test case 4: set invalid VF queue number in testpmd command-line options :return: """ - host_eal_param = '-w %s --file-prefix=test1 --socket-mem 1024,1024' % self.pf_pci + host_eal_param = '-a %s --file-prefix=test1 --socket-mem 1024,1024' % self.pf_pci self.host_testpmd.start_testpmd(self.pmdout.default_cores, param='', eal_param=host_eal_param) - gest_eal_param = '-w %s --file-prefix=test2' % self.vm_dut_0.ports_info[0]['pci'] + gest_eal_param = '-a %s --file-prefix=test2' % self.vm_dut_0.ports_info[0]['pci'] self.vm0_testpmd = PmdOutput(self.vm_dut_0) app_name = self.dut.apps_name['test-pmd'] @@ -312,10 +312,10 @@ class TestRuntimeVfQn(TestCase): Test case 5: set valid VF queue number with testpmd function command :return: """ - host_eal_param = '-w %s --file-prefix=test1 --socket-mem 1024,1024' % self.pf_pci + host_eal_param = '-a %s --file-prefix=test1 --socket-mem 1024,1024' % self.pf_pci self.host_testpmd.start_testpmd(self.pmdout.default_cores, param='', eal_param=host_eal_param) - gest_eal_param = '-w %s --file-prefix=test2' % self.vm_dut_0.ports_info[0]['pci'] + gest_eal_param = '-a %s --file-prefix=test2' % self.vm_dut_0.ports_info[0]['pci'] self.vm0_testpmd = PmdOutput(self.vm_dut_0) self.vm0_testpmd.start_testpmd(self.pmdout.default_cores, eal_param=gest_eal_param, param='') for valid_qn in range(1, 17): @@ -343,9 +343,9 @@ class TestRuntimeVfQn(TestCase): expect_str = ["Warning: Either rx or tx queues should be non zero", "Fail: input rxq (257) can't be greater than max_rx_queues (256) of port 0", "Fail: input txq (257) can't be greater than max_tx_queues (256) of port 0"] - host_eal_param = '-w %s --file-prefix=test1 --socket-mem 1024,1024' % self.pf_pci + host_eal_param = '-a %s --file-prefix=test1 --socket-mem 1024,1024' % self.pf_pci self.host_testpmd.start_testpmd(self.pmdout.default_cores, param='', eal_param=host_eal_param) - gest_eal_param = '-w %s --file-prefix=test2' % self.vm_dut_0.ports_info[0]['pci'] + gest_eal_param = '-a %s --file-prefix=test2' % self.vm_dut_0.ports_info[0]['pci'] self.vm0_testpmd = PmdOutput(self.vm_dut_0) self.vm0_testpmd.start_testpmd(self.pmdout.default_cores, eal_param=gest_eal_param, param='') for invalid_qn in [0, 257]: @@ -361,7 +361,7 @@ class TestRuntimeVfQn(TestCase): Test case 7: Reserve VF queue number when VF bind to kernel driver :return: """ - host_eal_param = '-w %s,queue-num-per-vf=2 --file-prefix=test1 --socket-mem 1024,1024' % self.pf_pci + host_eal_param = '-a %s,queue-num-per-vf=2 --file-prefix=test1 --socket-mem 1024,1024' % self.pf_pci self.host_testpmd.start_testpmd(self.pmdout.default_cores, param='', eal_param=host_eal_param) self.vm0_testpmd = PmdOutput(self.vm_dut_0) self.vm_dut_0.restore_interfaces() diff --git a/tests/TestSuite_runtime_vf_queue_number_maxinum.py b/tests/TestSuite_runtime_vf_queue_number_maxinum.py index 8e93c20..72644ae 100644 --- a/tests/TestSuite_runtime_vf_queue_number_maxinum.py +++ b/tests/TestSuite_runtime_vf_queue_number_maxinum.py @@ -145,7 +145,7 @@ class TestRuntimeVfQnMaxinum(TestCase): for each vf, when requested queues exceed 4 queues, it need to realloc queues in the left queues, the reserved queues generally can't be reused. """ - pf_eal_param = '-w {} --file-prefix=test1 --socket-mem 1024,1024'.format(self.pf_pci) + pf_eal_param = '-a {} --file-prefix=test1 --socket-mem 1024,1024'.format(self.pf_pci) self.pf_pmdout.start_testpmd(self.pf_pmdout.default_cores, eal_param=pf_eal_param) vf1_allow_index = 0 vf1_allow_list = '' @@ -180,9 +180,9 @@ class TestRuntimeVfQnMaxinum(TestCase): vf_pcis.append(vf.pci) vf_pcis.sort() for pci in vf_pcis[:vf1_allow_index]: - vf1_allow_list = vf1_allow_list + '-w {} '.format(pci) + vf1_allow_list = vf1_allow_list + '-a {} '.format(pci) for pci in vf_pcis[vf1_allow_index:vf1_allow_index+vf3_allow_index]: - vf3_allow_list = vf3_allow_list + '-w {} '.format(pci) + vf3_allow_list = vf3_allow_list + '-a {} '.format(pci) self.logger.info('vf1 allow list: {}'.format(vf1_allow_list)) self.logger.info('vf3_allow_list: {}'.format(vf3_allow_list)) @@ -196,7 +196,7 @@ class TestRuntimeVfQnMaxinum(TestCase): self.start_testpmd_multiple_times(self.vf3_pmdout, '--rxq=16 --txq=16', vf3_eal_param) if vf2_queue_number > 0: - vf2_eal_param = '-w {} --file-prefix=vf2 --socket-mem 1024,1024'.format( + vf2_eal_param = '-a {} --file-prefix=vf2 --socket-mem 1024,1024'.format( vf_pcis[vf1_allow_index+vf3_allow_index]) self.vf2_pmdout.start_testpmd(self.vf2_pmdout.default_cores, param='--rxq={0} --txq={0}'.format( vf2_queue_number), eal_param=vf2_eal_param) @@ -265,7 +265,7 @@ class TestRuntimeVfQnMaxinum(TestCase): Testpmd should not crash. """ # test queue-number-per-vf exceed hardware maximum - pf_eal_param = '-w {},queue-num-per-vf=16 --file-prefix=test1 --socket-mem 1024,1024'.format(self.pf_pci) + pf_eal_param = '-a {},queue-num-per-vf=16 --file-prefix=test1 --socket-mem 1024,1024'.format(self.pf_pci) out = self.pf_pmdout.start_testpmd(self.pf_pmdout.default_cores, eal_param=pf_eal_param) self.verify('exceeds the hardware maximum' in out, 'queue number per vf limited error') out = self.pf_pmdout.execute_cmd('start') diff --git a/tests/TestSuite_softnic.py b/tests/TestSuite_softnic.py index e4934ff..2d486a9 100644 --- a/tests/TestSuite_softnic.py +++ b/tests/TestSuite_softnic.py @@ -75,7 +75,7 @@ class TestSoftnic(TestCase): self.dut.session.copy_file_to(self.firmware, self.root_path) self.dut.session.copy_file_to(self.tm_firmware, self.root_path) self.dut.session.copy_file_to(self.nat_firmware, self.root_path) - self.eal_param = " -w %s" % self.dut.ports_info[0]['pci'] + self.eal_param = " -a %s" % self.dut.ports_info[0]['pci'] self.path = self.dut.apps_name['test-pmd'] self.pmdout = PmdOutput(self.dut) # get dts output path diff --git a/tests/TestSuite_sriov_kvm.py b/tests/TestSuite_sriov_kvm.py index 1a0e3a5..7926516 100644 --- a/tests/TestSuite_sriov_kvm.py +++ b/tests/TestSuite_sriov_kvm.py @@ -344,7 +344,7 @@ class TestSriovKvm(TestCase): if driver == 'igb_uio': # start testpmd with the two VFs on the host self.host_testpmd = PmdOutput(self.dut) - eal_param = '-w %s ' % self.dut.ports_info[0]['pci'] + eal_param = '-a %s ' % self.dut.ports_info[0]['pci'] self.host_testpmd.start_testpmd( "1S/2C/2T", "--rxq=4 --txq=4", eal_param=eal_param) self.host_testpmd.execute_cmd('set fwd rxonly') diff --git a/tests/TestSuite_stats_checks.py b/tests/TestSuite_stats_checks.py index 58c5236..c5d1e48 100644 --- a/tests/TestSuite_stats_checks.py +++ b/tests/TestSuite_stats_checks.py @@ -301,5 +301,5 @@ class TestStatsChecks(TestCase): self.vf_port = self.dut.ports_info[self.dut_ports[0]]["vfs_port"][0] self.vf_port.bind_driver(driver="vfio-pci") self.vf_port_pci = self.dut.ports_info[self.dut_ports[0]]['sriov_vfs_pci'][0] - self.pmdout.start_testpmd('default', '--rxq=4 --txq=4', eal_param='-w %s' % self.vf_port_pci) + self.pmdout.start_testpmd('default', '--rxq=4 --txq=4', eal_param='-a %s' % self.vf_port_pci) self.xstats_check(0, 0, if_vf=True) diff --git a/tests/TestSuite_telemetry.py b/tests/TestSuite_telemetry.py index 82a1d40..7c9b561 100644 --- a/tests/TestSuite_telemetry.py +++ b/tests/TestSuite_telemetry.py @@ -231,7 +231,7 @@ class TestTelemetry(TestCase): if info['pci'] not in pci_addrs: continue self.used_ports.append(index) - allow_list = ' '.join(['-w ' + pci_addr for pci_addr in pci_addrs]) + allow_list = ' '.join(['-a ' + pci_addr for pci_addr in pci_addrs]) return allow_list def start_telemetry_server(self, allowlist=None): diff --git a/tests/TestSuite_unit_tests_event_timer.py b/tests/TestSuite_unit_tests_event_timer.py index 22c316e..349c0cf 100644 --- a/tests/TestSuite_unit_tests_event_timer.py +++ b/tests/TestSuite_unit_tests_event_timer.py @@ -78,9 +78,9 @@ class TestUnitTestEventTimer(TestCase): """ if self.nic == "cavium_a063" or self.nic == "cavium_a064": - self.dut.send_expect("./%s -n 1 -c %s -w %s,single_ws=1,tim_stats_ena=1" % (self.app_name, self.coremask, self.eventdev_device_bus_id), "R.*T.*E.*>.*>", 60) + self.dut.send_expect("./%s -n 1 -c %s -a %s,single_ws=1,tim_stats_ena=1" % (self.app_name, self.coremask, self.eventdev_device_bus_id), "R.*T.*E.*>.*>", 60) elif self.nic == "cavium_a034": - self.dut.send_expect("./%s -n 1 -c %s -w %s,timvf_stats=1" % (self.app_name, self.coremask, self.eventdev_timer_device_bus_id), "R.*T.*E.*>.*>", 60) + self.dut.send_expect("./%s -n 1 -c %s -a %s,timvf_stats=1" % (self.app_name, self.coremask, self.eventdev_timer_device_bus_id), "R.*T.*E.*>.*>", 60) out = self.dut.send_expect("event_timer_adapter_test", "RTE>>", 300) self.dut.send_expect("quit", "# ") self.verify("Test OK" in out, "Test failed") diff --git a/tests/TestSuite_vf_l3fwd.py b/tests/TestSuite_vf_l3fwd.py index a9bc7fa..c881f69 100644 --- a/tests/TestSuite_vf_l3fwd.py +++ b/tests/TestSuite_vf_l3fwd.py @@ -128,7 +128,7 @@ class TestVfL3fwd(TestCase): self.host_testpmd = PmdOutput(self.dut) eal_param = '--socket-mem=1024,1024 --file-prefix=pf' for i in valports: - eal_param += ' -w %s' % self.dut.ports_info[i]['pci'] + eal_param += ' -a %s' % self.dut.ports_info[i]['pci'] core_config = self.cores[:len(valports)] self.host_testpmd.start_testpmd(core_config, "", eal_param=eal_param) for i in valports: @@ -256,7 +256,7 @@ class TestVfL3fwd(TestCase): self.setup_vf_env(host_driver, vf_driver) eal_param = "" for i in valports: - eal_param += " -w " + self.sriov_vfs_port[i][0].pci + eal_param += " -a " + self.sriov_vfs_port[i][0].pci port_mask = utils.create_mask(self.dut_ports) # for fvl40g, fvl25g, use 2c/2q per VF port for performance test , diff --git a/tests/TestSuite_vf_single_core_perf.py b/tests/TestSuite_vf_single_core_perf.py index d40547c..53ee2da 100644 --- a/tests/TestSuite_vf_single_core_perf.py +++ b/tests/TestSuite_vf_single_core_perf.py @@ -225,7 +225,7 @@ class TestVfSingleCorePerf(TestCase): # ports allowlist eal_para = "" for i in range(port_num): - eal_para += " -w " + self.sriov_vfs_port[i][0].pci + eal_para += " -a " + self.sriov_vfs_port[i][0].pci port_mask = utils.create_mask(self.dut_ports) # parameters for application/testpmd param = " --portmask=%s" % (port_mask) diff --git a/tests/TestSuite_vm2vm_virtio_pmd.py b/tests/TestSuite_vm2vm_virtio_pmd.py index 44f17a3..d730e9c 100644 --- a/tests/TestSuite_vm2vm_virtio_pmd.py +++ b/tests/TestSuite_vm2vm_virtio_pmd.py @@ -151,7 +151,7 @@ class TestVM2VMVirtioPMD(TestCase): """ # deal with ports w_pci_list = [] - w_pci_list.append('-w %s,%s' % (virtio_net_pci, 'vectorized=1')) + w_pci_list.append('-a %s,%s' % (virtio_net_pci, 'vectorized=1')) w_pci_str = ' '.join(w_pci_list) if path_mode == "mergeable": command = self.app_testpmd_path + " -c 0x3 -n 4 " + \ diff --git a/tests/TestSuite_vmdq.py b/tests/TestSuite_vmdq.py index 6dae54a..1a170f8 100644 --- a/tests/TestSuite_vmdq.py +++ b/tests/TestSuite_vmdq.py @@ -113,7 +113,7 @@ class TestVmdq(TestCase): port_mask = utils.create_mask(self.dut_ports) eal_param = "" for i in self.dut_ports: - eal_param += " -w %s" % self.dut.ports_info[i]['pci'] + eal_param += " -a %s" % self.dut.ports_info[i]['pci'] # Run the application self.dut.send_expect("./%s -c %s -n 4 %s -- -p %s --nb-pools %s --enable-rss" % (self.app_vmdq_path, core_mask, eal_param, port_mask, str(npools)), "reading queues", 120) diff --git a/tests/TestSuite_vmdq_dcb.py b/tests/TestSuite_vmdq_dcb.py index 2a248f8..20d03dd 100644 --- a/tests/TestSuite_vmdq_dcb.py +++ b/tests/TestSuite_vmdq_dcb.py @@ -107,7 +107,7 @@ class TestVmdqDcb(TestCase): port_mask = utils.create_mask(self.dut_ports) eal_param = "" for i in self.dut_ports: - eal_param += " -w %s" % self.dut.ports_info[i]['pci'] + eal_param += " -a %s" % self.dut.ports_info[i]['pci'] # Run the application app_name = self.dut.apps_name['vmdq_dcb'] command = app_name + "-c %s -n 4 %s -- -p %s --nb-pools %s --nb-tcs %s " \ diff --git a/tests/flexible_common.py b/tests/flexible_common.py index 9df62ca..3a701db 100644 --- a/tests/flexible_common.py +++ b/tests/flexible_common.py @@ -340,7 +340,7 @@ class FlexibleRxdBase(object): cmd = ( "-l 1,2,3 " "-n {mem_channel} " - "-w {pci},{param_type}=vxlan " + "-a {pci},{param_type}=vxlan " "-- -i " "{port_opt}").format(**{ 'mem_channel': self.dut.get_memory_channels(), @@ -364,7 +364,7 @@ class FlexibleRxdBase(object): cmd = ( "-l 1,2,3 " "-n {mem_channel} " - "-w {pci} " + "-a {pci} " "--log-level='ice,8' " "-- -i " "{port_opt}").format(**{ @@ -501,7 +501,7 @@ class FlexibleRxdBase(object): def check_effect_replace_pkg_RXID_22_to_RXID_16(self): self.logger.info("replace ice-1.3.7.0.pkg with RXID 16") self.replace_pkg('os_default') - out = self.__pmdout.start_testpmd(cores="1S/4C/1T", param='--rxq=64 --txq=64', eal_param=f"-w {self.__pci}") + out = self.__pmdout.start_testpmd(cores="1S/4C/1T", param='--rxq=64 --txq=64', eal_param=f"-a {self.__pci}") self.verify("Fail to start port 0" in out, "RXID #16 not support start testpmd") self.__pmdout.execute_cmd("quit", "# ") self.replace_pkg('comms') diff --git a/tests/perf_test_base.py b/tests/perf_test_base.py index 02a73ee..00cf80c 100644 --- a/tests/perf_test_base.py +++ b/tests/perf_test_base.py @@ -743,7 +743,7 @@ class PerfTestBase(object): self.__is_pmd_on = False def __get_topo_option(self): - port_num = len(re.findall('-w', self.__bin_ps_allow_list)) \ + port_num = len(re.findall('-a', self.__bin_ps_allow_list)) \ if self.__bin_ps_allow_list else len(self.__valports) return 'loop' if port_num == 1 else 'chained' @@ -1410,16 +1410,16 @@ class PerfTestBase(object): pci = self.dut.ports_info[port_index].get('pci') if not pci: continue - allowlist += '-w {} '.format(pci) + allowlist += '-a {} '.format(pci) else: - allowlist = ''.join(['-w {} '.format(pci) + allowlist = ''.join(['-a {} '.format(pci) for _, info in self.__vf_ports_info.items() for pci in info.get('vfs_pci')]) return allowlist def __get_host_testpmd_allowlist(self): - allowlist = ''.join(['-w {} '.format(info.get('pf_pci')) + allowlist = ''.join(['-a {} '.format(info.get('pf_pci')) for _, info in self.__vf_ports_info.items()]) return allowlist -- 1.8.3.1