[dts] [PATCH V1 00/10] fix script issues

[dts] [PATCH V1 00/10] fix script issues

[Lingli Chen]

Modify get_cbdma_ports_info

Lingli Chen (10):
  tests/vhost_cbdma: Modify get_cbdma_ports_info
  tests/cbdma: Modify get_cbdma_ports_info
  tests/dpdk_gro_lib: Modify get_cbdma_ports_info
  tests/vhost_event_idx_interrupt: Modify get_cbdma_ports_info
  tests/vhost_user_interrupt: Modify get_cbdma_ports_info
  tests/vhost_virtio_pmd_interrupt: Modify get_cbdma_ports_info
  tests/vhost_virtio_user_interrupt: Modify get_cbdma_ports_info
  tests/virtio_event_idx_interrupt: Modify get_cbdma_ports_info
  tests/vm2vm_virtio_user: Modify get_cbdma_ports_info
  tests/vm2vm_virtio_net_perf: Modify get_cbdma_ports_info

 tests/TestSuite_cbdma.py                       | 2 +-
 tests/TestSuite_dpdk_gro_lib.py                | 2 +-
 tests/TestSuite_vhost_cbdma.py                 | 2 +-
 tests/TestSuite_vhost_event_idx_interrupt.py   | 2 +-
 tests/TestSuite_vhost_user_interrupt.py        | 2 +-
 tests/TestSuite_vhost_virtio_pmd_interrupt.py  | 2 +-
 tests/TestSuite_vhost_virtio_user_interrupt.py | 2 +-
 tests/TestSuite_virtio_event_idx_interrupt.py  | 2 +-
 tests/TestSuite_vm2vm_virtio_net_perf.py       | 8 ++++----
 tests/TestSuite_vm2vm_virtio_user.py           | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

-- 
2.32.0

Re: [dts] [PATCH V1 00/10] fix script issues

[Chen, LingliX]

[-- Attachment #1: Type: text/plain, Size: 323 bytes --]


> -----Original Message-----
> From: Chen, LingliX <linglix.chen@intel.com>
> Sent: Friday, July 30, 2021 1:24 AM
> To: dts@dpdk.org
> Cc: Chen, LingliX <linglix.chen@intel.com>
> Subject: [dts][PATCH V1 00/10] fix script issues
> 
> Modify get_cbdma_ports_info

Tested-by: Lingli Chen <linglix.chen@intel.com>

[-- Attachment #2: TestVhostVirtioPmdInterrupt.log --]
[-- Type: application/octet-stream, Size: 358711 bytes --]

[-- Attachment #3: TestVM2VMVirtioNetPerf.log --]
[-- Type: application/octet-stream, Size: 156165 bytes --]

Re: [dts] [PATCH V1 00/10] fix script issues

[Tu, Lijuan]

> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Lingli Chen
> Sent: 2021年7月30日 1:24
> To: dts@dpdk.org
> Cc: Chen, LingliX <linglix.chen@intel.com>
> Subject: [dts] [PATCH V1 00/10] fix script issues

What are the issues? Could you please give more description?
> 
> Modify get_cbdma_ports_info
> 
> Lingli Chen (10):
>   tests/vhost_cbdma: Modify get_cbdma_ports_info
>   tests/cbdma: Modify get_cbdma_ports_info
>   tests/dpdk_gro_lib: Modify get_cbdma_ports_info
>   tests/vhost_event_idx_interrupt: Modify get_cbdma_ports_info
>   tests/vhost_user_interrupt: Modify get_cbdma_ports_info
>   tests/vhost_virtio_pmd_interrupt: Modify get_cbdma_ports_info
>   tests/vhost_virtio_user_interrupt: Modify get_cbdma_ports_info
>   tests/virtio_event_idx_interrupt: Modify get_cbdma_ports_info
>   tests/vm2vm_virtio_user: Modify get_cbdma_ports_info
>   tests/vm2vm_virtio_net_perf: Modify get_cbdma_ports_info

There are 10 test suites defined "get_cbdma_ports_info",  strongly advice to make them as a common API. It is very helpful to our maintenance.
> 
>  tests/TestSuite_cbdma.py                       | 2 +-
>  tests/TestSuite_dpdk_gro_lib.py                | 2 +-
>  tests/TestSuite_vhost_cbdma.py                 | 2 +-
>  tests/TestSuite_vhost_event_idx_interrupt.py   | 2 +-
>  tests/TestSuite_vhost_user_interrupt.py        | 2 +-
>  tests/TestSuite_vhost_virtio_pmd_interrupt.py  | 2 +-
> tests/TestSuite_vhost_virtio_user_interrupt.py | 2 +-
> tests/TestSuite_virtio_event_idx_interrupt.py  | 2 +-
>  tests/TestSuite_vm2vm_virtio_net_perf.py       | 8 ++++----
>  tests/TestSuite_vm2vm_virtio_user.py           | 2 +-
>  10 files changed, 13 insertions(+), 13 deletions(-)
> 
> --
> 2.32.0

[dts] [PATCH V1 01/10] tests/vhost_cbdma: Modify get_cbdma_ports_info

[Lingli Chen]

Signed-off-by: Lingli Chen <linglix.chen@intel.com>
---
 tests/TestSuite_vhost_cbdma.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/TestSuite_vhost_cbdma.py b/tests/TestSuite_vhost_cbdma.py
index 16fef645..6305d37e 100644
--- a/tests/TestSuite_vhost_cbdma.py
+++ b/tests/TestSuite_vhost_cbdma.py
@@ -130,7 +130,7 @@ class TestVirTioVhostCbdma(TestCase):
         out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
         device_info = out.split('\n')
         for device in device_info:
-            pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device)
+            pci_info = re.search('\s*(0000:\S*:\d*.\d*)', device)
             if pci_info is not None:
                 dev_info = pci_info.group(1)
                 # the numa id of ioat dev, only add the device which
-- 
2.32.0

Re: [dts] [PATCH V1 01/10] tests/vhost_cbdma: Modify get_cbdma_ports_info

[Wang, Yinan]

Acked-by:  Yinan Wang <yinan.wang@intel.com>

> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Lingli Chen
> Sent: 2021?7?30? 1:24
> To: dts@dpdk.org
> Cc: Chen, LingliX <linglix.chen@intel.com>
> Subject: [dts] [PATCH V1 01/10] tests/vhost_cbdma: Modify
> get_cbdma_ports_info
> 
> Signed-off-by: Lingli Chen <linglix.chen@intel.com>
> ---
>  tests/TestSuite_vhost_cbdma.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/TestSuite_vhost_cbdma.py
> b/tests/TestSuite_vhost_cbdma.py
> index 16fef645..6305d37e 100644
> --- a/tests/TestSuite_vhost_cbdma.py
> +++ b/tests/TestSuite_vhost_cbdma.py
> @@ -130,7 +130,7 @@ class TestVirTioVhostCbdma(TestCase):
>          out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev
> misc', '# ', 30)
>          device_info = out.split('\n')
>          for device in device_info:
> -            pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device)
> +            pci_info = re.search('\s*(0000:\S*:\d*.\d*)', device)
>              if pci_info is not None:
>                  dev_info = pci_info.group(1)
>                  # the numa id of ioat dev, only add the device which
> --
> 2.32.0

[dts] [PATCH V1 02/10] tests/cbdma: Modify get_cbdma_ports_info

[Lingli Chen]

Signed-off-by: Lingli Chen <linglix.chen@intel.com>
---
 tests/TestSuite_cbdma.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/TestSuite_cbdma.py b/tests/TestSuite_cbdma.py
index 0cf598dc..29517ae9 100644
--- a/tests/TestSuite_cbdma.py
+++ b/tests/TestSuite_cbdma.py
@@ -97,7 +97,7 @@ class TestCBDMA(TestCase):
         out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
         device_info = out.split('\n')
         for device in device_info:
-            pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device)
+            pci_info = re.search('\s*(0000:\S*:\d*.\d*)', device)
             if pci_info is not None:
                 dev_info = pci_info.group(1)
                 # the numa id of ioat dev, only add the device which
-- 
2.32.0

[dts] [PATCH V1 03/10] tests/dpdk_gro_lib: Modify get_cbdma_ports_info

[Lingli Chen]

Signed-off-by: Lingli Chen <linglix.chen@intel.com>
---
 tests/TestSuite_dpdk_gro_lib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/TestSuite_dpdk_gro_lib.py b/tests/TestSuite_dpdk_gro_lib.py
index f5668ad4..b673c60e 100644
--- a/tests/TestSuite_dpdk_gro_lib.py
+++ b/tests/TestSuite_dpdk_gro_lib.py
@@ -120,7 +120,7 @@ class TestDPDKGROLib(TestCase):
         out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
         device_info = out.split('\n')
         for device in device_info:
-            pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device)
+            pci_info = re.search('\s*(0000:\S*:\d*.\d*)', device)
             if pci_info is not None:
                 dev_info = pci_info.group(1)
                 # the numa id of ioat dev, only add the device which
-- 
2.32.0

[dts] [PATCH V1 04/10] tests/vhost_event_idx_interrupt: Modify get_cbdma_ports_info

[Lingli Chen]

Signed-off-by: Lingli Chen <linglix.chen@intel.com>
---
 tests/TestSuite_vhost_event_idx_interrupt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/TestSuite_vhost_event_idx_interrupt.py b/tests/TestSuite_vhost_event_idx_interrupt.py
index 6179dd1c..9db45234 100644
--- a/tests/TestSuite_vhost_event_idx_interrupt.py
+++ b/tests/TestSuite_vhost_event_idx_interrupt.py
@@ -299,7 +299,7 @@ class TestVhostEventIdxInterrupt(TestCase):
         out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
         device_info = out.split('\n')
         for device in device_info:
-            pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device)
+            pci_info = re.search('\s*(0000:\S*:\d*.\d*)', device)
             if pci_info is not None:
                 # dev_info = pci_info.group(1)
                 # the numa id of ioat dev, only add the device which
-- 
2.32.0

[dts] [PATCH V1 05/10] tests/vhost_user_interrupt: Modify get_cbdma_ports_info

[Lingli Chen]

Signed-off-by: Lingli Chen <linglix.chen@intel.com>
---
 tests/TestSuite_vhost_user_interrupt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/TestSuite_vhost_user_interrupt.py b/tests/TestSuite_vhost_user_interrupt.py
index e64a4c14..8109cd4c 100644
--- a/tests/TestSuite_vhost_user_interrupt.py
+++ b/tests/TestSuite_vhost_user_interrupt.py
@@ -121,7 +121,7 @@ class TestVhostUserInterrupt(TestCase):
         out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
         device_info = out.split('\n')
         for device in device_info:
-            pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device)
+            pci_info = re.search('\s*(0000:\S*:\d*.\d*)', device)
             if pci_info is not None:
                 dev_info = pci_info.group(1)
                 # the numa id of ioat dev, only add the device which
-- 
2.32.0

[dts] [PATCH V1 06/10] tests/vhost_virtio_pmd_interrupt: Modify get_cbdma_ports_info

[Lingli Chen]

Signed-off-by: Lingli Chen <linglix.chen@intel.com>
---
 tests/TestSuite_vhost_virtio_pmd_interrupt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/TestSuite_vhost_virtio_pmd_interrupt.py b/tests/TestSuite_vhost_virtio_pmd_interrupt.py
index 675a15ee..e2859f8e 100644
--- a/tests/TestSuite_vhost_virtio_pmd_interrupt.py
+++ b/tests/TestSuite_vhost_virtio_pmd_interrupt.py
@@ -276,7 +276,7 @@ class TestVhostVirtioPmdInterrupt(TestCase):
         self.verify(self.drivername == 'igb_uio',
                     "CBDMA test case only use igb_uio driver, need config drivername=igb_uio in execution.cfg")
         out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
-        cbdma_dev_infos = re.findall('\s*(0000:\d+:\d+.\d+)', out)
+        cbdma_dev_infos = re.findall('\s*(0000:\S+:\d+.\d+)', out)
         self.verify(len(cbdma_dev_infos) >= cbdma_num, 'There no enough cbdma device to run this suite')
 
         used_cbdma = cbdma_dev_infos[0:cbdma_num]
-- 
2.32.0

[dts] [PATCH V1 07/10] tests/vhost_virtio_user_interrupt: Modify get_cbdma_ports_info

[Lingli Chen]

Signed-off-by: Lingli Chen <linglix.chen@intel.com>
---
 tests/TestSuite_vhost_virtio_user_interrupt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/TestSuite_vhost_virtio_user_interrupt.py b/tests/TestSuite_vhost_virtio_user_interrupt.py
index 1c4a5a98..ff50d48e 100644
--- a/tests/TestSuite_vhost_virtio_user_interrupt.py
+++ b/tests/TestSuite_vhost_virtio_user_interrupt.py
@@ -196,7 +196,7 @@ class TestVirtioUserInterrupt(TestCase):
         out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
         device_info = out.split('\n')
         for device in device_info:
-            pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device)
+            pci_info = re.search('\s*(0000:\S*:\d*.\d*)', device)
             if pci_info is not None:
                 dev_info = pci_info.group(1)
                 # the numa id of ioat dev, only add the device which
-- 
2.32.0

[dts] [PATCH V1 08/10] tests/virtio_event_idx_interrupt: Modify get_cbdma_ports_info

[Lingli Chen]

Signed-off-by: Lingli Chen <linglix.chen@intel.com>
---
 tests/TestSuite_virtio_event_idx_interrupt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/TestSuite_virtio_event_idx_interrupt.py b/tests/TestSuite_virtio_event_idx_interrupt.py
index 37634f05..33c33df6 100644
--- a/tests/TestSuite_virtio_event_idx_interrupt.py
+++ b/tests/TestSuite_virtio_event_idx_interrupt.py
@@ -93,7 +93,7 @@ class TestVirtioIdxInterrupt(TestCase):
         self.verify(self.drivername == 'igb_uio',
                     "CBDMA test case only use igb_uio driver, need config drivername=igb_uio in execution.cfg")
         out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
-        cbdma_dev_infos = re.findall('\s*(0000:\d+:\d+.\d+)', out)
+        cbdma_dev_infos = re.findall('\s*(0000:\S+:\d+.\d+)', out)
         self.verify(len(cbdma_dev_infos) >= cbdma_num, 'There no enough cbdma device to run this suite')
         used_cbdma = cbdma_dev_infos[0:cbdma_num]
         dmas_info = ''
-- 
2.32.0

[dts] [PATCH V1 09/10] tests/vm2vm_virtio_user: Modify get_cbdma_ports_info

[Lingli Chen]

Signed-off-by: Lingli Chen <linglix.chen@intel.com>
---
 tests/TestSuite_vm2vm_virtio_user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/TestSuite_vm2vm_virtio_user.py b/tests/TestSuite_vm2vm_virtio_user.py
index bd1c320e..0d16c8b9 100644
--- a/tests/TestSuite_vm2vm_virtio_user.py
+++ b/tests/TestSuite_vm2vm_virtio_user.py
@@ -715,7 +715,7 @@ class TestVM2VMVirtioUser(TestCase):
         out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
         device_info = out.split('\n')
         for device in device_info:
-            pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device)
+            pci_info = re.search('\s*(0000:\S*:\d*.\d*)', device)
             if pci_info is not None:
                 dev_info = pci_info.group(1)
                 # the numa id of ioat dev, only add the device which
-- 
2.32.0

[dts] [PATCH V1 10/10] tests/vm2vm_virtio_net_perf: Modify get_cbdma_ports_info

[Lingli Chen]

1.Modify get_cbdma_ports_info.
2.fix script issues.

Signed-off-by: Lingli Chen <linglix.chen@intel.com>
---
 tests/TestSuite_vm2vm_virtio_net_perf.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/TestSuite_vm2vm_virtio_net_perf.py b/tests/TestSuite_vm2vm_virtio_net_perf.py
index 0ec542af..43e90b81 100644
--- a/tests/TestSuite_vm2vm_virtio_net_perf.py
+++ b/tests/TestSuite_vm2vm_virtio_net_perf.py
@@ -93,7 +93,7 @@ class TestVM2VMVirtioNetPerf(TestCase):
         out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
         device_info = out.split('\n')
         for device in device_info:
-            pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device)
+            pci_info = re.search('\s*(0000:\S*:\d*.\d*)', device)
             if pci_info is not None:
                 dev_info = pci_info.group(1)
                 # the numa id of ioat dev, only add the device which on same socket with nic dev
@@ -112,11 +112,11 @@ class TestVM2VMVirtioNetPerf(TestCase):
         dmas_info = ''
         for dmas in used_cbdma[0:int(cbdma_num/2)]:
             number = used_cbdma[0:int(cbdma_num/2)].index(dmas)
-            dmas = 'txq{}@{},'.format(number, dmas.replace('0000:', ''))
+            dmas = 'txq{}@{},'.format(number, dmas)
             dmas_info += dmas
         for dmas in used_cbdma[int(cbdma_num/2):]:
             number = used_cbdma[int(cbdma_num/2):].index(dmas)
-            dmas = 'txq{}@{},'.format(number, dmas.replace('0000:', ''))
+            dmas = 'txq{}@{},'.format(number, dmas)
             dmas_info += dmas
         self.dmas_info = dmas_info[:-1]
         self.device_str = ' '.join(used_cbdma)
@@ -491,7 +491,7 @@ class TestVM2VMVirtioNetPerf(TestCase):
         self.vm_args = "disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on"
         self.prepare_test_env(cbdma=True, no_pci=False, client_mode=False, enable_queues=1, nb_cores=2,
                               server_mode=False, opt_queue=None, combined=False, rxq_txq=None)
-        self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='ufo')
+        self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='tso')
 
     def test_vm2vm_packed_ring_iperf_with_ufo(self):
         """
-- 
2.32.0