Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com> --- tests/TestSuite_vhost_event_idx_interrupt.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/TestSuite_vhost_event_idx_interrupt.py b/tests/TestSuite_vhost_event_idx_interrupt.py index abbdc42..38cdc77 100644 --- a/tests/TestSuite_vhost_event_idx_interrupt.py +++ b/tests/TestSuite_vhost_event_idx_interrupt.py @@ -108,7 +108,7 @@ class TestVhostEventIdxInterrupt(TestCase): example_para = "./examples/l3fwd-power/build/app/l3fwd-power " para = " --log-level=9 %s -- -p %s --parse-ptype 1 --config '%s'" % (vdev_info, port_info, config_info) - eal_params = self.dut.create_eal_parameters(cores=self.core_list_l3fwd, no_pci=True, ports=[self.pci_info]) + eal_params = self.dut.create_eal_parameters(cores=self.core_list_l3fwd, no_pci=True) command_line_client = example_para + eal_params + para self.vhost.get_session_before(timeout=2) self.vhost.send_expect(command_line_client, "POWER", 40) @@ -126,6 +126,10 @@ class TestVhostEventIdxInterrupt(TestCase): relauch l3fwd-power sample for port up """ self.dut.send_expect("killall -s INT l3fwd-power", "#") + # make sure l3fwd-power be killed + pid = self.dut.send_expect("ps -ef |grep l3|grep -v grep |awk '{print $2}'", "#") + if pid: + self.dut.send_expect("kill -9 %s" % pid, "#") self.lanuch_l3fwd_power() def set_vm_cpu_number(self, vm_config): @@ -162,7 +166,7 @@ class TestVhostEventIdxInterrupt(TestCase): start qemus """ for i in range(vm_num): - vm_info = VM(self.dut, 'vm%d' % i, 'vhost_sample') + vm_info = VM(self.dut, 'vm%d' % i, 'vhost_event_idx_interrupt') vm_info.load_config() vm_params = {} vm_params['driver'] = 'vhost-user' @@ -180,7 +184,7 @@ class TestVhostEventIdxInterrupt(TestCase): self.check_qemu_version(vm_info) vm_dut = None try: - vm_dut = vm_info.start(load_config=False) + vm_dut = vm_info.start(load_config=False,set_target=False) if vm_dut is None: raise Exception("Set up VM ENV failed") except Exception as e: -- 1.8.3.1
Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com> --- conf/vhost_event_idx_interrupt.cfg | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 conf/vhost_event_idx_interrupt.cfg diff --git a/conf/vhost_event_idx_interrupt.cfg b/conf/vhost_event_idx_interrupt.cfg new file mode 100644 index 0000000..39a5f11 --- /dev/null +++ b/conf/vhost_event_idx_interrupt.cfg @@ -0,0 +1,36 @@ +[vm0] +cpu = + model=host,number=8,cpupin=52 53 54 55; +mem = + size=4096,hugepage=yes; +disk = + file=/home/image/ubuntu1910.img; +login = + user=root,password=tester; +vnc = + displayNum=4; +net = + type=user,opt_vlan=2; + type=nic,opt_vlan=2; +daemon = + enable=yes; +qemu = + path=/usr/local/qemu-2.12.0/bin/qemu-system-x86_64; +[vm1] +cpu = + model=host,number=8,cpupin=56 57 58 59; +mem = + size=4096,hugepage=yes; +disk = + file=/home/image/ubuntu1910_2.img; +login = + user=root,password=tester; +net = + type=nic,opt_vlan=3; + type=user,opt_vlan=3; +vnc = + displayNum=5; +daemon = + enable=yes; +qemu = + path=/usr/local/qemu-2.12.0/bin/qemu-system-x86_64; -- 1.8.3.1
[-- Attachment #1: Type: text/plain, Size: 2823 bytes --] Tested-by: Xiao Qimai <qimaix.xiao@intel.com> > -----Original Message----- > From: Xiao, QimaiX > Sent: Thursday, February 27, 2020 5:48 PM > To: dts@dpdk.org > Cc: Xiao, QimaiX <qimaix.xiao@intel.com> > Subject: [PATCH V1 1/2] update script saving runtime and use new config file > > Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com> > --- > tests/TestSuite_vhost_event_idx_interrupt.py | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/tests/TestSuite_vhost_event_idx_interrupt.py > b/tests/TestSuite_vhost_event_idx_interrupt.py > index abbdc42..38cdc77 100644 > --- a/tests/TestSuite_vhost_event_idx_interrupt.py > +++ b/tests/TestSuite_vhost_event_idx_interrupt.py > @@ -108,7 +108,7 @@ class TestVhostEventIdxInterrupt(TestCase): > > example_para = "./examples/l3fwd-power/build/app/l3fwd-power " > para = " --log-level=9 %s -- -p %s --parse-ptype 1 --config '%s'" % > (vdev_info, port_info, config_info) > - eal_params = > self.dut.create_eal_parameters(cores=self.core_list_l3fwd, no_pci=True, > ports=[self.pci_info]) > + eal_params = > + self.dut.create_eal_parameters(cores=self.core_list_l3fwd, > + no_pci=True) > command_line_client = example_para + eal_params + para > self.vhost.get_session_before(timeout=2) > self.vhost.send_expect(command_line_client, "POWER", 40) @@ -126,6 > +126,10 @@ class TestVhostEventIdxInterrupt(TestCase): > relauch l3fwd-power sample for port up > """ > self.dut.send_expect("killall -s INT l3fwd-power", "#") > + # make sure l3fwd-power be killed > + pid = self.dut.send_expect("ps -ef |grep l3|grep -v grep |awk '{print > $2}'", "#") > + if pid: > + self.dut.send_expect("kill -9 %s" % pid, "#") > self.lanuch_l3fwd_power() > > def set_vm_cpu_number(self, vm_config): > @@ -162,7 +166,7 @@ class TestVhostEventIdxInterrupt(TestCase): > start qemus > """ > for i in range(vm_num): > - vm_info = VM(self.dut, 'vm%d' % i, 'vhost_sample') > + vm_info = VM(self.dut, 'vm%d' % i, > + 'vhost_event_idx_interrupt') > vm_info.load_config() > vm_params = {} > vm_params['driver'] = 'vhost-user' > @@ -180,7 +184,7 @@ class TestVhostEventIdxInterrupt(TestCase): > self.check_qemu_version(vm_info) > vm_dut = None > try: > - vm_dut = vm_info.start(load_config=False) > + vm_dut = > + vm_info.start(load_config=False,set_target=False) > if vm_dut is None: > raise Exception("Set up VM ENV failed") > except Exception as e: > -- > 1.8.3.1 [-- Attachment #2: TestVhostEventIdxInterrupt.log --] [-- Type: application/octet-stream, Size: 47430 bytes --]
Applied the series, thanks
> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Xiao Qimai
> Sent: Thursday, February 27, 2020 5:48 PM
> To: dts@dpdk.org
> Cc: Xiao, QimaiX <qimaix.xiao@intel.com>
> Subject: [dts] [PATCH V1 1/2] update script saving runtime and use new
> config file
>
> Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
> ---
> tests/TestSuite_vhost_event_idx_interrupt.py | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/tests/TestSuite_vhost_event_idx_interrupt.py
> b/tests/TestSuite_vhost_event_idx_interrupt.py
> index abbdc42..38cdc77 100644
> --- a/tests/TestSuite_vhost_event_idx_interrupt.py
> +++ b/tests/TestSuite_vhost_event_idx_interrupt.py
> @@ -108,7 +108,7 @@ class TestVhostEventIdxInterrupt(TestCase):
>
> example_para = "./examples/l3fwd-power/build/app/l3fwd-power "
> para = " --log-level=9 %s -- -p %s --parse-ptype 1 --config '%s'" %
> (vdev_info, port_info, config_info)
> - eal_params =
> self.dut.create_eal_parameters(cores=self.core_list_l3fwd, no_pci=True,
> ports=[self.pci_info])
> + eal_params =
> + self.dut.create_eal_parameters(cores=self.core_list_l3fwd,
> + no_pci=True)
> command_line_client = example_para + eal_params + para
> self.vhost.get_session_before(timeout=2)
> self.vhost.send_expect(command_line_client, "POWER", 40) @@ -126,6
> +126,10 @@ class TestVhostEventIdxInterrupt(TestCase):
> relauch l3fwd-power sample for port up
> """
> self.dut.send_expect("killall -s INT l3fwd-power", "#")
> + # make sure l3fwd-power be killed
> + pid = self.dut.send_expect("ps -ef |grep l3|grep -v grep |awk '{print
> $2}'", "#")
> + if pid:
> + self.dut.send_expect("kill -9 %s" % pid, "#")
> self.lanuch_l3fwd_power()
>
> def set_vm_cpu_number(self, vm_config):
> @@ -162,7 +166,7 @@ class TestVhostEventIdxInterrupt(TestCase):
> start qemus
> """
> for i in range(vm_num):
> - vm_info = VM(self.dut, 'vm%d' % i, 'vhost_sample')
> + vm_info = VM(self.dut, 'vm%d' % i,
> + 'vhost_event_idx_interrupt')
> vm_info.load_config()
> vm_params = {}
> vm_params['driver'] = 'vhost-user'
> @@ -180,7 +184,7 @@ class TestVhostEventIdxInterrupt(TestCase):
> self.check_qemu_version(vm_info)
> vm_dut = None
> try:
> - vm_dut = vm_info.start(load_config=False)
> + vm_dut =
> + vm_info.start(load_config=False,set_target=False)
> if vm_dut is None:
> raise Exception("Set up VM ENV failed")
> except Exception as e:
> --
> 1.8.3.1