VSWITCH: Changes to support New VPP version.

With new VPP version, and changes to it command output,
VSPERF needs changes to complete the setup.

These changes are only in handling 'show hardware' command output.
Fixed Pylint error

Signed-off-by: Sridhar K. N. Rao <sridhar.rao@spirent.com>
Change-Id: Ie89c4d406f6b0f16baaada2eefe9558fbc4b846f

diff --git a/vswitches/vpp_dpdk_vhost.py b/vswitches/vpp_dpdk_vhost.py
index 5dfc314..af5aca5 100644 (file)
--- a/vswitches/vpp_dpdk_vhost.py
+++ b/vswitches/vpp_dpdk_vhost.py
@@ -104,12 +104,20 @@ class VppDpdkVhost(IVSwitch, tasks.Process):
             tmpif = iface.split()
             if not tmpif:
                 continue
+            if 'Link' in iface or 'local' in iface:
+                continue
             # get PCI address of given interface
             output = self.run_vppctl(['show', 'hardware', tmpif[1], 'detail'])
-            match = re.search(r'pci address:\s*([\d:\.]+)', output[0])
+            lines = output[0].split('\n')
+            #match = re.search(r'pci address:\s*([\d:\.]+)', output[0])
+            match = ''
+            for line in lines:
+                if "pci:" in line:
+                    match = line.split(' ')[6]
             if match:
                 # normalize PCI address, e.g. 0000:05:10.01 => 0000:05:10.1
-                tmp_pci = match.group(1).split('.')
+                tmp_pci = match.split('.')
+                # tmp_pci = match.group(1).split('.')
                 tmp_pci[1] = str(int(tmp_pci[1]))
                 tmpif.append('.'.join(tmp_pci))
             else: