From: JiangYuX <yux.jiang@intel.com>
To: dts@dpdk.org
Cc: JiangYu <yux.jiang@intel.com>
Subject: [dts] [PATCH V2] tests/vm2vm_virtio_pmd: Adapt RTE_LIBRTE_PMD_PCAP updates
Date: Thu, 5 Nov 2020 09:53:49 +0000 [thread overview]
Message-ID: <20201105095349.1706988-1-yux.jiang@intel.com> (raw)
From: JiangYu <yux.jiang@intel.com>
DPDK commit b0b672aea: PMD_PCAP has been defined by default, should not redefine.
Signed-off-by: JiangYu <yux.jiang@intel.com>
---
tests/TestSuite_vm2vm_virtio_pmd.py | 30 ------------------------------
1 file changed, 30 deletions(-)
diff --git a/tests/TestSuite_vm2vm_virtio_pmd.py b/tests/TestSuite_vm2vm_virtio_pmd.py
index a5c4032..9cb51a8 100644
--- a/tests/TestSuite_vm2vm_virtio_pmd.py
+++ b/tests/TestSuite_vm2vm_virtio_pmd.py
@@ -55,7 +55,6 @@ class TestVM2VMVirtioPMD(TestCase):
self.socket_mem = ','.join(['1024']*socket_num)
self.base_dir = self.dut.base_dir.replace('~', '/root')
self.vhost_user = self.dut.new_session(suite="vhost")
- self.enable_pcap_lib_in_dpdk(self.dut)
self.virtio_user0 = None
self.virtio_user1 = None
self.pci_info = self.dut.ports_info[0]['pci']
@@ -86,22 +85,6 @@ class TestVM2VMVirtioPMD(TestCase):
"There has not enough cores to test this case %s" %
self.running_case)
- def enable_pcap_lib_in_dpdk(self, client_dut):
- """
- enable pcap lib in dpdk code and recompile
- """
- client_dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_PCAP=n$/CONFIG_RTE_LIBRTE_PMD_PCAP=y/' config/common_base", "#")
- client_dut.set_build_options({'RTE_LIBRTE_PMD_PCAP': 'y'})
- client_dut.build_install_dpdk(self.target)
-
- def disable_pcap_lib_in_dpdk(self, client_dut):
- """
- reset pcap lib in dpdk and recompile
- """
- client_dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_PCAP=y$/CONFIG_RTE_LIBRTE_PMD_PCAP=n/' config/common_base", "#")
- client_dut.set_build_options({'RTE_LIBRTE_PMD_PCAP': 'n'})
- client_dut.build_install_dpdk(self.target)
-
def start_vhost_testpmd(self):
"""
launch the testpmd on vhost side
@@ -359,8 +342,6 @@ class TestVM2VMVirtioPMD(TestCase):
self.get_core_list(2)
self.start_vhost_testpmd()
self.start_vms(mode=0, mergeable=True)
- # enable pcap in VM0
- self.enable_pcap_lib_in_dpdk(self.vm_dut[0])
# git the vm enough huge to run pdump
self.vm_dut[0].set_huge_pages(2048)
# start testpmd and pdump in VM0
@@ -375,8 +356,6 @@ class TestVM2VMVirtioPMD(TestCase):
self.vm_dut[1].send_expect('start tx_first 10', 'testpmd> ', 30)
# check the packet in vm0
self.check_packet_payload_valid(self.vm_dut[0])
- # reset the evn in vm
- self.disable_pcap_lib_in_dpdk(self.vm_dut[0])
def test_vhost_vm2vm_virito_10_pmd_with_mergeable_path(self):
"""
@@ -388,8 +367,6 @@ class TestVM2VMVirtioPMD(TestCase):
self.get_core_list(2)
self.start_vhost_testpmd()
self.start_vms(mode=1, mergeable=True)
- # enable pcap in VM0
- self.enable_pcap_lib_in_dpdk(self.vm_dut[0])
# git the vm enough huge to run pdump
self.vm_dut[0].set_huge_pages(2048)
# start testpmd and pdump in VM0
@@ -404,8 +381,6 @@ class TestVM2VMVirtioPMD(TestCase):
self.vm_dut[1].send_expect('start tx_first 10', 'testpmd> ', 30)
# check the packet in vm0
self.check_packet_payload_valid(self.vm_dut[0])
- # reset the evn in vm
- self.disable_pcap_lib_in_dpdk(self.vm_dut[0])
def test_vhost_vm2vm_virito_11_pmd_with_normal_path(self):
"""
@@ -429,8 +404,6 @@ class TestVM2VMVirtioPMD(TestCase):
self.get_core_list(2)
self.start_vhost_testpmd()
self.start_vms(mode=2, mergeable=True)
- # enable pcap in VM0
- self.enable_pcap_lib_in_dpdk(self.vm_dut[0])
# git the vm enough huge to run pdump
self.vm_dut[0].set_huge_pages(2048)
# start testpmd and pdump in VM0
@@ -445,8 +418,6 @@ class TestVM2VMVirtioPMD(TestCase):
self.vm_dut[1].send_expect('start tx_first 10', 'testpmd> ', 30)
# check the packet in vm0
self.check_packet_payload_valid(self.vm_dut[0])
- # reset the evn in vm
- self.disable_pcap_lib_in_dpdk(self.vm_dut[0])
def tear_down(self):
#
@@ -461,5 +432,4 @@ class TestVM2VMVirtioPMD(TestCase):
"""
Run after each test suite.
"""
- self.disable_pcap_lib_in_dpdk(self.dut)
self.dut.close_session(self.vhost_user)
--
2.7.4
next reply other threads:[~2020-11-05 1:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-05 9:53 JiangYuX [this message]
2020-11-05 1:58 ` Jiang, YuX
2020-11-11 3:32 ` Tu, Lijuan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201105095349.1706988-1-yux.jiang@intel.com \
--to=yux.jiang@intel.com \
--cc=dts@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).