* [dts] [PATCH V1] tests/TestSuite_vm_hotplug:Optimize scripts and enable scripts to support more NICs
@ 2019-10-10 2:12 zhang,yan
2019-10-10 2:08 ` Yao, BingX Y
2019-10-12 5:59 ` Tu, Lijuan
0 siblings, 2 replies; 3+ messages in thread
From: zhang,yan @ 2019-10-10 2:12 UTC (permalink / raw)
To: dts; +Cc: zhang,yan
Optimize scripts and enable scripts to support more NICs.
Signed-off-by: zhang,yan <yanx.a.zhang@intel.com>
---
tests/TestSuite_vm_hotplug.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/tests/TestSuite_vm_hotplug.py b/tests/TestSuite_vm_hotplug.py
index 87edad6..438f404 100644
--- a/tests/TestSuite_vm_hotplug.py
+++ b/tests/TestSuite_vm_hotplug.py
@@ -36,7 +36,7 @@ DPDK Test suite.
Test some vm hotplug function with vfio
"""
-
+import os
import re
import time
from qemu_kvm import QEMUKvm
@@ -138,6 +138,9 @@ class TestVmHotplug(TestCase):
except Exception, EnvironmentError:
pass
if '10.0.2' in out:
+ pos = self.vm0.hostfwd_addr.find(':')
+ ssh_key = '[' + self.vm0.hostfwd_addr[:pos] + ']' + self.vm0.hostfwd_addr[pos:]
+ os.system('ssh-keygen -R %s' % ssh_key)
break
time.sleep(1)
cur_time = time.time()
@@ -276,8 +279,12 @@ class TestVmHotplug(TestCase):
def check_vf_device(self, has_device=True, device=1):
time.sleep(1)
sign = 'Connection'
- if self.nic.startswith('fortville'):
+ lis1 = ['fortville_spirit', 'fortville_eagle']
+ lis2 = ['fortpark_TLV', 'fortville_25g']
+ if self.nic in lis1:
sign = 'Ethernet'
+ elif self.nic in lis2:
+ sign = 'Device'
out = self.vm_session.send_expect('./usertools/dpdk-devbind.py -s | grep %s' % sign, '#')
time.sleep(2)
if has_device:
--
2.17.2
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [dts] [PATCH V1] tests/TestSuite_vm_hotplug:Optimize scripts and enable scripts to support more NICs
2019-10-10 2:12 [dts] [PATCH V1] tests/TestSuite_vm_hotplug:Optimize scripts and enable scripts to support more NICs zhang,yan
@ 2019-10-10 2:08 ` Yao, BingX Y
2019-10-12 5:59 ` Tu, Lijuan
1 sibling, 0 replies; 3+ messages in thread
From: Yao, BingX Y @ 2019-10-10 2:08 UTC (permalink / raw)
To: Zhang, YanX A, dts; +Cc: Zhang, YanX A
[-- Attachment #1: Type: text/plain, Size: 1989 bytes --]
Tested-by: Yao, BingX Y <bingx.y.yao@intel.com>
-----Original Message-----
From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of zhang,yan
Sent: Thursday, October 10, 2019 10:12 AM
To: dts@dpdk.org
Cc: Zhang, YanX A <yanx.a.zhang@intel.com>
Subject: [dts] [PATCH V1] tests/TestSuite_vm_hotplug:Optimize scripts and enable scripts to support more NICs
Optimize scripts and enable scripts to support more NICs.
Signed-off-by: zhang,yan <yanx.a.zhang@intel.com>
---
tests/TestSuite_vm_hotplug.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/tests/TestSuite_vm_hotplug.py b/tests/TestSuite_vm_hotplug.py index 87edad6..438f404 100644
--- a/tests/TestSuite_vm_hotplug.py
+++ b/tests/TestSuite_vm_hotplug.py
@@ -36,7 +36,7 @@ DPDK Test suite.
Test some vm hotplug function with vfio
"""
-
+import os
import re
import time
from qemu_kvm import QEMUKvm
@@ -138,6 +138,9 @@ class TestVmHotplug(TestCase):
except Exception, EnvironmentError:
pass
if '10.0.2' in out:
+ pos = self.vm0.hostfwd_addr.find(':')
+ ssh_key = '[' + self.vm0.hostfwd_addr[:pos] + ']' + self.vm0.hostfwd_addr[pos:]
+ os.system('ssh-keygen -R %s' % ssh_key)
break
time.sleep(1)
cur_time = time.time()
@@ -276,8 +279,12 @@ class TestVmHotplug(TestCase):
def check_vf_device(self, has_device=True, device=1):
time.sleep(1)
sign = 'Connection'
- if self.nic.startswith('fortville'):
+ lis1 = ['fortville_spirit', 'fortville_eagle']
+ lis2 = ['fortpark_TLV', 'fortville_25g']
+ if self.nic in lis1:
sign = 'Ethernet'
+ elif self.nic in lis2:
+ sign = 'Device'
out = self.vm_session.send_expect('./usertools/dpdk-devbind.py -s | grep %s' % sign, '#')
time.sleep(2)
if has_device:
--
2.17.2
[-- Attachment #2: TestVmHotplug.log --]
[-- Type: application/octet-stream, Size: 2006658 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [dts] [PATCH V1] tests/TestSuite_vm_hotplug:Optimize scripts and enable scripts to support more NICs
2019-10-10 2:12 [dts] [PATCH V1] tests/TestSuite_vm_hotplug:Optimize scripts and enable scripts to support more NICs zhang,yan
2019-10-10 2:08 ` Yao, BingX Y
@ 2019-10-12 5:59 ` Tu, Lijuan
1 sibling, 0 replies; 3+ messages in thread
From: Tu, Lijuan @ 2019-10-12 5:59 UTC (permalink / raw)
To: Zhang, YanX A, dts; +Cc: Zhang, YanX A
Applied, thanks
> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of zhang,yan
> Sent: Thursday, October 10, 2019 10:12 AM
> To: dts@dpdk.org
> Cc: Zhang, YanX A <yanx.a.zhang@intel.com>
> Subject: [dts] [PATCH V1] tests/TestSuite_vm_hotplug:Optimize scripts and
> enable scripts to support more NICs
>
> Optimize scripts and enable scripts to support more NICs.
>
> Signed-off-by: zhang,yan <yanx.a.zhang@intel.com>
> ---
> tests/TestSuite_vm_hotplug.py | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/tests/TestSuite_vm_hotplug.py b/tests/TestSuite_vm_hotplug.py
> index 87edad6..438f404 100644
> --- a/tests/TestSuite_vm_hotplug.py
> +++ b/tests/TestSuite_vm_hotplug.py
> @@ -36,7 +36,7 @@ DPDK Test suite.
> Test some vm hotplug function with vfio
>
> """
> -
> +import os
> import re
> import time
> from qemu_kvm import QEMUKvm
> @@ -138,6 +138,9 @@ class TestVmHotplug(TestCase):
> except Exception, EnvironmentError:
> pass
> if '10.0.2' in out:
> + pos = self.vm0.hostfwd_addr.find(':')
> + ssh_key = '[' + self.vm0.hostfwd_addr[:pos] + ']' +
> self.vm0.hostfwd_addr[pos:]
> + os.system('ssh-keygen -R %s' % ssh_key)
> break
> time.sleep(1)
> cur_time = time.time()
> @@ -276,8 +279,12 @@ class TestVmHotplug(TestCase):
> def check_vf_device(self, has_device=True, device=1):
> time.sleep(1)
> sign = 'Connection'
> - if self.nic.startswith('fortville'):
> + lis1 = ['fortville_spirit', 'fortville_eagle']
> + lis2 = ['fortpark_TLV', 'fortville_25g']
> + if self.nic in lis1:
> sign = 'Ethernet'
> + elif self.nic in lis2:
> + sign = 'Device'
> out = self.vm_session.send_expect('./usertools/dpdk-devbind.py -s |
> grep %s' % sign, '#')
> time.sleep(2)
> if has_device:
> --
> 2.17.2
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-12 5:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-10 2:12 [dts] [PATCH V1] tests/TestSuite_vm_hotplug:Optimize scripts and enable scripts to support more NICs zhang,yan
2019-10-10 2:08 ` Yao, BingX Y
2019-10-12 5:59 ` Tu, Lijuan
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).