From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 879221B00C for ; Tue, 19 Dec 2017 10:25:31 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Dec 2017 01:25:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,425,1508828400"; d="scan'208";a="14807661" Received: from unknown (HELO dpdk-fedora20.icx.intel.com) ([10.240.176.135]) by fmsmga001.fm.intel.com with ESMTP; 19 Dec 2017 01:25:30 -0800 From: "zhao,meijuan" To: dts@dpdk.org Cc: "zhao,meijuan" Date: Tue, 19 Dec 2017 17:26:43 +0800 Message-Id: <1513675603-81487-1-git-send-email-meijuanx.zhao@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dts] [PATCH V1] change RTE_LIBRTE_VHOST param and vm_testpmd location and vm close method 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: , X-List-Received-Date: Tue, 19 Dec 2017 09:25:31 -0000 in commons_base file, no RTE_LIBRTE_VHOST var; in tear_down method, vm_testpmd is none, so need to set value in set_up method; vm close fail Signed-off-by: zhao,meijuan --- tests/TestSuite_vxlan_sample.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/tests/TestSuite_vxlan_sample.py b/tests/TestSuite_vxlan_sample.py index 8115a18..6696345 100644 --- a/tests/TestSuite_vxlan_sample.py +++ b/tests/TestSuite_vxlan_sample.py @@ -101,8 +101,7 @@ class TestVxlanSample(TestCase): self.vm_dut = None self.tep_app = "./examples/tep_termination/build/tep_termination" self.vxlan_port = 4789 - self.vm_testpmd = "./x86_64-native-linuxapp-gcc/app/testpmd -c f -n 3" \ - + " -- -i --txqflags=0xf00 --disable-hw-vlan" + # params for tep_termination self.cores = self.dut.get_core_list("1S/4C/1T", socket=self.socket) @@ -135,6 +134,8 @@ class TestVxlanSample(TestCase): """ Run before each test case. """ + self.vm_testpmd = "./x86_64-native-linuxapp-gcc/app/testpmd -c f -n 3" \ + + " -- -i --txqflags=0xf00 --disable-hw-vlan" # create coremask self.coremask = utils.create_mask(self.cores) @@ -212,16 +213,13 @@ class TestVxlanSample(TestCase): return True def clear_vxlan_sample_env(self): - if self.vm_dut: - self.vm_dut.kill_all() - time.sleep(1) - - if self.vm: - self.vm.stop() + if getattr(self, 'vm', None): + self.dut.virt_exit() + time.sleep(5) + self.vm_testpmd = None + self.vm_dut_ports = None self.vm = None - self.dut.virt_exit() - def mac_address_add(self, number): if number > 15: return '' @@ -632,8 +630,8 @@ class TestVxlanSample(TestCase): Run after each test suite. """ # Restore the config file and recompile the package. - self.dut.send_expect("sed -i -e 's/RTE_LIBRTE_VHOST=y$/" - + "RTE_LIBRTE_VHOST=n/' config/common_base", + self.dut.send_expect("sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST=y$/" + + "CONFIG_RTE_LIBRTE_VHOST=n/' config/common_base", "# ", 30) # temporary disable skip_setup skip_setup = self.dut.skip_setup -- 1.9.3