[dts] [PATCH V1] tests/TestSuite_vm_hotplug:Optimize scripts and enable scripts to support more NICs

[Tu, Lijuan]

Applied, thanks

> -----Original Message-----
> From: dts [mailto:dts-bounces at dpdk.org] On Behalf Of zhang,yan
> Sent: Thursday, October 10, 2019 10:12 AM
> To: dts at dpdk.org
> Cc: Zhang, YanX A <yanx.a.zhang at 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 at 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