From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id CE2DAA051F; Sat, 18 Jan 2020 09:32:57 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B0EEC4C93; Sat, 18 Jan 2020 09:32:57 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 12F5E378B for ; Sat, 18 Jan 2020 09:32:54 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Jan 2020 00:32:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,333,1574150400"; d="scan'208";a="258112086" Received: from unknown (HELO dpdk-wenjielx-dtspatch135.sh.intel.com) ([10.240.176.135]) by fmsmga002.fm.intel.com with ESMTP; 18 Jan 2020 00:32:53 -0800 From: "zhu,shuai" To: dts@dpdk.org Cc: yinan.wang@intel.com, "zhu,shuai" Date: Sat, 18 Jan 2020 16:38:11 +0800 Message-Id: <1579336692-98775-8-git-send-email-shuaix.zhu@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1579336692-98775-1-git-send-email-shuaix.zhu@intel.com> References: <1579336692-98775-1-git-send-email-shuaix.zhu@intel.com> Subject: [dts] [PATCH V1 8/9] tests/vhost_user_live_migration:add create_eal_parameters function. X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 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" add create_eal_parameters function. Signed-off-by: zhu,shuai --- tests/TestSuite_vhost_user_live_migration.py | 33 ++++++-------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/tests/TestSuite_vhost_user_live_migration.py b/tests/TestSuite_vhost_user_live_migration.py index 414f00e..dc8bb24 100644 --- a/tests/TestSuite_vhost_user_live_migration.py +++ b/tests/TestSuite_vhost_user_live_migration.py @@ -71,8 +71,6 @@ class TestVhostUserLiveMigration(TestCase): self.host_tintf = self.tester.get_interface(host_tport) self.backup_tintf = self.tester.get_interface(backup_tport) - self.host_mem_channels = self.host_dut.get_memory_channels() - self.backup_mem_channels = self.backup_dut.get_memory_channels() self.host_pci_info = self.host_dut.ports_info[0]['pci'] self.backup_pci_info = self.backup_dut.ports_info[0]['pci'] @@ -139,12 +137,10 @@ class TestVhostUserLiveMigration(TestCase): def get_core_list(self): core_number = self.queue_number + 1 core_config = '1S/%dC/1T' % core_number - core_list0 = self.duts[0].get_core_list(core_config) - core_list1 = self.duts[1].get_core_list(core_config) - self.verify(len(core_list0) >= core_number and len(core_list1) >= core_number, + self.core_list0 = self.duts[0].get_core_list(core_config) + self.core_list1 = self.duts[1].get_core_list(core_config) + self.verify(len(self.core_list0) >= core_number and len(core_list1) >= core_number, 'There have not enough cores to start testpmd on duts') - self.host_core_mask_user = utils.create_mask(core_list0) - self.backup_core_mask_user = utils.create_mask(core_list1) def launch_testpmd_as_vhost_on_both_dut(self, zero_copy=False): """ @@ -154,22 +150,13 @@ class TestVhostUserLiveMigration(TestCase): zero_copy_str = '' if zero_copy is True: zero_copy_str = ',dequeue-zero-copy=1' - vdev_info = 'eth_vhost0,iface=%s/vhost-net,queues=%d%s' % ( - self.base_dir, self.queue_number, zero_copy_str) - - params_info = '--nb-cores=%d --rxq=%d --txq=%d' % ( - self.queue_number, self.queue_number, self.queue_number) - - cmd_line = self.dut.target + '/app/testpmd -c %s -n %d -w %s ' + \ - "--socket-mem %s --legacy-mem --file-prefix=vhost --vdev '%s' " + \ - "-- -i %s" - host_cmd_line = cmd_line % (self.host_core_mask_user, self.host_mem_channels, - self.host_pci_info, self.host_socket_mem, - vdev_info, params_info) - backup_cmd_line = cmd_line % (self.backup_core_mask_user, self.backup_mem_channels, - self.backup_pci_info, self.backup_socket_mem, - vdev_info, params_info) - + testcmd = self.dut.target + "/app/testpmd " + vdev = [r"'eth_vhost0,iface=%s/vhost-net,queues=%d%s'" % (self.base_dir, self.queue_number, zero_copy_str)] + para = " -- -i --nb-cores=%d --rxq=%d --txq=%d" % (self.queue_number, self.queue_number, self.queue_number) + eal_params_first = self.dut.create_eal_parameters(cores=self.core_list0, prefix='vhost', ports=[self.host_pci_info], vdevs=vdev) + eal_params_secondary = self.dut.create_eal_parameters(cores=self.core_list1, prefix='vhost', ports=[self.backup_pci_info], vdevs=vdev) + host_cmd_line = testcmd + eal_params_first + para + backup_cmd_line = testcmd + eal_params_secondary + para self.host_dut.send_expect(host_cmd_line, 'testpmd> ', 30) self.backup_dut.send_expect(backup_cmd_line, 'testpmd> ', 30) -- 2.17.2