summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoropensource-tnbt <sridhar.rao@spirent.com>2020-07-15 16:45:26 +0530
committeropensource-tnbt <sridhar.rao@spirent.com>2020-07-16 18:43:18 +0530
commit2cfcc3e56849295d3ec2da073991dbbabe2f17b2 (patch)
tree0aad8570f65ae9b5fe45d828ce469db09ba76f84
parent9145d9908a62aa05d2120569ce3bf9e296ebb07c (diff)
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
-rw-r--r--vswitches/vpp_dpdk_vhost.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/vswitches/vpp_dpdk_vhost.py b/vswitches/vpp_dpdk_vhost.py
index 5dfc314d..af5aca51 100644
--- 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: