[dts] [PATCH V1 0/3] bind test nic to driver specified in cfg

[dts] [PATCH V1 0/3] bind test nic to driver specified in cfg

[Xiao Qimai]

*** BLURB HERE ***

Xiao Qimai (3):
  set test nic to driver specified in cfg
  set test nic to driver specified in cfg
  set test nic to driver specified in cfg

 tests/TestSuite_dpdk_gro_lib.py                    | 6 +++---
 tests/TestSuite_dpdk_gso_lib.py                    | 8 ++++----
 tests/TestSuite_virtio_user_as_exceptional_path.py | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

-- 
1.8.3.1

[dts] [PATCH V1 1/3]dpdk_gro_lib: set test nic to driver specified in cfg

[Xiao Qimai]

Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
---
 tests/TestSuite_dpdk_gro_lib.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/TestSuite_dpdk_gro_lib.py b/tests/TestSuite_dpdk_gro_lib.py
index 36841b9..0e1e3c8 100644
--- a/tests/TestSuite_dpdk_gro_lib.py
+++ b/tests/TestSuite_dpdk_gro_lib.py
@@ -53,6 +53,7 @@ class TestDPDKGROLib(TestCase):
 
         # unbind the port which config in ports.cfg
         self.dut_ports = self.dut.get_ports()
+        self.def_driver = self.dut.ports_info[self.dut_ports[0]]['port'].get_nic_driver()
         for i in self.dut_ports:
             port = self.dut.ports_info[i]['port']
             port.bind_driver()
@@ -66,9 +67,8 @@ class TestDPDKGROLib(TestCase):
                     and len(self.peer_pci) != 0
                     and len(self.nic_in_kernel) != 0,
                     'Pls config the direct connection info in vhost_peer_conf.cfg')
-        self.dut.send_expect(
-            "./usertools/dpdk-devbind.py -b igb_uio %s" %
-            self.pci, '#', 30)
+        bind_script_path = self.dut.get_dpdk_bind_script()
+        self.dut.send_expect('%s --bind=%s %s' % (bind_script_path, self.def_driver, self.pci), '# ')
 
         # get the numa info about the pci info which config in peer cfg
         bus = int(self.pci[5:7], base=16)
-- 
1.8.3.1

Re: [dts] [PATCH V1 1/3]dpdk_gro_lib: set test nic to driver specified in cfg

[Tu, Lijuan]

Applied, thanks

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Xiao Qimai
> Sent: Sunday, April 26, 2020 6:39 PM
> To: dts@dpdk.org
> Cc: Xiao, QimaiX <qimaix.xiao@intel.com>
> Subject: [dts] [PATCH V1 1/3]dpdk_gro_lib: set test nic to driver specified in
> cfg
> 
> Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
> ---
>  tests/TestSuite_dpdk_gro_lib.py | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/TestSuite_dpdk_gro_lib.py
> b/tests/TestSuite_dpdk_gro_lib.py index 36841b9..0e1e3c8 100644
> --- a/tests/TestSuite_dpdk_gro_lib.py
> +++ b/tests/TestSuite_dpdk_gro_lib.py
> @@ -53,6 +53,7 @@ class TestDPDKGROLib(TestCase):
> 
>          # unbind the port which config in ports.cfg
>          self.dut_ports = self.dut.get_ports()
> +        self.def_driver =
> + self.dut.ports_info[self.dut_ports[0]]['port'].get_nic_driver()
>          for i in self.dut_ports:
>              port = self.dut.ports_info[i]['port']
>              port.bind_driver()
> @@ -66,9 +67,8 @@ class TestDPDKGROLib(TestCase):
>                      and len(self.peer_pci) != 0
>                      and len(self.nic_in_kernel) != 0,
>                      'Pls config the direct connection info in vhost_peer_conf.cfg')
> -        self.dut.send_expect(
> -            "./usertools/dpdk-devbind.py -b igb_uio %s" %
> -            self.pci, '#', 30)
> +        bind_script_path = self.dut.get_dpdk_bind_script()
> +        self.dut.send_expect('%s --bind=%s %s' % (bind_script_path,
> + self.def_driver, self.pci), '# ')
> 
>          # get the numa info about the pci info which config in peer cfg
>          bus = int(self.pci[5:7], base=16)
> --
> 1.8.3.1

[dts] [PATCH V1 2/3]dpdk_gso_lib: set test nic to driver specified in cfg

[Xiao Qimai]

Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
---
 tests/TestSuite_dpdk_gso_lib.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/TestSuite_dpdk_gso_lib.py b/tests/TestSuite_dpdk_gso_lib.py
index 4839ab2..72b1372 100644
--- a/tests/TestSuite_dpdk_gso_lib.py
+++ b/tests/TestSuite_dpdk_gso_lib.py
@@ -54,6 +54,7 @@ class TestDPDKGsoLib(TestCase):
 
         # unbind the port which config in ports.cfg
         self.dut_ports = self.dut.get_ports()
+        self.def_driver = self.dut.ports_info[self.dut_ports[0]]['port'].get_nic_driver()
         for i in self.dut_ports:
             port = self.dut.ports_info[i]['port']
             port.bind_driver()
@@ -67,9 +68,8 @@ class TestDPDKGsoLib(TestCase):
                     and len(self.peer_pci) != 0
                     and len(self.nic_in_kernel) != 0,
                     'Pls config the direct connection info in vhost_peer_conf.cfg')
-        self.dut.send_expect(
-            "./usertools/dpdk-devbind.py -b igb_uio %s" %
-            self.pci, '#', 30)
+        bind_script_path = self.dut.get_dpdk_bind_script()
+        self.dut.send_expect('%s --bind=%s %s' % (bind_script_path, self.def_driver, self.pci), '# ')
 
         # get the numa info about the pci info which config in peer cfg
         bus = int(self.pci[5:7], base=16)
@@ -262,7 +262,7 @@ class TestDPDKGsoLib(TestCase):
 
         time.sleep(5)
         try:
-            self.vm1_dut = self.vm1.start(load_config=False)
+            self.vm1_dut = self.vm1.start(load_config=False, set_target=False)
             if self.vm1_dut is None:
                 raise Exception("Set up VM ENV failed")
         except Exception as e:
-- 
1.8.3.1

Re: [dts] [PATCH V1 2/3]dpdk_gso_lib: set test nic to driver specified in cfg

[Tu, Lijuan]

Applied, thanks

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Xiao Qimai
> Sent: Sunday, April 26, 2020 6:39 PM
> To: dts@dpdk.org
> Cc: Xiao, QimaiX <qimaix.xiao@intel.com>
> Subject: [dts] [PATCH V1 2/3]dpdk_gso_lib: set test nic to driver specified in
> cfg
> 
> Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
> ---
>  tests/TestSuite_dpdk_gso_lib.py | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/TestSuite_dpdk_gso_lib.py
> b/tests/TestSuite_dpdk_gso_lib.py index 4839ab2..72b1372 100644
> --- a/tests/TestSuite_dpdk_gso_lib.py
> +++ b/tests/TestSuite_dpdk_gso_lib.py
> @@ -54,6 +54,7 @@ class TestDPDKGsoLib(TestCase):
> 
>          # unbind the port which config in ports.cfg
>          self.dut_ports = self.dut.get_ports()
> +        self.def_driver =
> + self.dut.ports_info[self.dut_ports[0]]['port'].get_nic_driver()
>          for i in self.dut_ports:
>              port = self.dut.ports_info[i]['port']
>              port.bind_driver()
> @@ -67,9 +68,8 @@ class TestDPDKGsoLib(TestCase):
>                      and len(self.peer_pci) != 0
>                      and len(self.nic_in_kernel) != 0,
>                      'Pls config the direct connection info in vhost_peer_conf.cfg')
> -        self.dut.send_expect(
> -            "./usertools/dpdk-devbind.py -b igb_uio %s" %
> -            self.pci, '#', 30)
> +        bind_script_path = self.dut.get_dpdk_bind_script()
> +        self.dut.send_expect('%s --bind=%s %s' % (bind_script_path,
> + self.def_driver, self.pci), '# ')
> 
>          # get the numa info about the pci info which config in peer cfg
>          bus = int(self.pci[5:7], base=16) @@ -262,7 +262,7 @@ class
> TestDPDKGsoLib(TestCase):
> 
>          time.sleep(5)
>          try:
> -            self.vm1_dut = self.vm1.start(load_config=False)
> +            self.vm1_dut = self.vm1.start(load_config=False,
> + set_target=False)
>              if self.vm1_dut is None:
>                  raise Exception("Set up VM ENV failed")
>          except Exception as e:
> --
> 1.8.3.1

[dts] [PATCH V1 3/3]virtio_user_as_exceptional_path: set test nic to driver specified in cfg

[Xiao Qimai]

Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
---
 tests/TestSuite_virtio_user_as_exceptional_path.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/TestSuite_virtio_user_as_exceptional_path.py b/tests/TestSuite_virtio_user_as_exceptional_path.py
index 470e0de..35a0a98 100644
--- a/tests/TestSuite_virtio_user_as_exceptional_path.py
+++ b/tests/TestSuite_virtio_user_as_exceptional_path.py
@@ -48,6 +48,7 @@ class TestVirtioUserAsExceptionalPath(TestCase):
         # Get and verify the ports
         self.dut_ports = self.dut.get_ports()
         self.verify(len(self.dut_ports) >= 1, "Insufficient ports for testing")
+        self.def_driver = self.dut.ports_info[self.dut_ports[0]]['port'].get_nic_driver()
         self.pci0 = self.dut.ports_info[0]['pci']
         pf_info = self.dut_ports[0]
         netdev = self.dut.ports_info[pf_info]['port']
@@ -96,9 +97,8 @@ class TestVirtioUserAsExceptionalPath(TestCase):
         for i in self.dut_ports:
             port = self.dut.ports_info[i]['port']
             port.bind_driver()
-        self.dut.send_expect(
-            "./usertools/dpdk-devbind.py -b igb_uio %s" %
-            self.pci, '#', 30)
+        bind_script_path = self.dut.get_dpdk_bind_script()
+        self.dut.send_expect('%s --bind=%s %s' % (bind_script_path, self.def_driver, self.pci), '# ')
         self.peer_pci_setup = True
 
     def launch_testpmd_vhost(self):
-- 
1.8.3.1

Re: [dts] [PATCH V1 3/3]virtio_user_as_exceptional_path: set test nic to driver specified in cfg

[Tu, Lijuan]

Applied, thanks

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Xiao Qimai
> Sent: Sunday, April 26, 2020 6:39 PM
> To: dts@dpdk.org
> Cc: Xiao, QimaiX <qimaix.xiao@intel.com>
> Subject: [dts] [PATCH V1 3/3]virtio_user_as_exceptional_path: set test nic to
> driver specified in cfg
> 
> Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
> ---
>  tests/TestSuite_virtio_user_as_exceptional_path.py | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/TestSuite_virtio_user_as_exceptional_path.py
> b/tests/TestSuite_virtio_user_as_exceptional_path.py
> index 470e0de..35a0a98 100644
> --- a/tests/TestSuite_virtio_user_as_exceptional_path.py
> +++ b/tests/TestSuite_virtio_user_as_exceptional_path.py
> @@ -48,6 +48,7 @@ class TestVirtioUserAsExceptionalPath(TestCase):
>          # Get and verify the ports
>          self.dut_ports = self.dut.get_ports()
>          self.verify(len(self.dut_ports) >= 1, "Insufficient ports for testing")
> +        self.def_driver =
> self.dut.ports_info[self.dut_ports[0]]['port'].get_nic_driver()
>          self.pci0 = self.dut.ports_info[0]['pci']
>          pf_info = self.dut_ports[0]
>          netdev = self.dut.ports_info[pf_info]['port']
> @@ -96,9 +97,8 @@ class TestVirtioUserAsExceptionalPath(TestCase):
>          for i in self.dut_ports:
>              port = self.dut.ports_info[i]['port']
>              port.bind_driver()
> -        self.dut.send_expect(
> -            "./usertools/dpdk-devbind.py -b igb_uio %s" %
> -            self.pci, '#', 30)
> +        bind_script_path = self.dut.get_dpdk_bind_script()
> +        self.dut.send_expect('%s --bind=%s %s' % (bind_script_path,
> self.def_driver, self.pci), '# ')
>          self.peer_pci_setup = True
> 
>      def launch_testpmd_vhost(self):
> --
> 1.8.3.1