diff options
| author |   Sridhar Rao <sridhar.rao@spirent.com> | 2020-07-22 13:10:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2020-07-22 13:10:39 +0000 |
| commit | e5eef0ffdf2d281fecf12597041fd8af23d65e42 (patch) | |
| tree | 9cd8e0672b80ec32b71151adeae2acb55c8ebcbe | |
| parent | 1fe9ace8ff03f71d47e156c1cf82dbb07fe96c27 (diff) | |
| parent | 2cfcc3e56849295d3ec2da073991dbbabe2f17b2 (diff) | |
Merge "VSWITCH: Changes to support New VPP version."
| -rw-r--r-- | vswitches/vpp_dpdk_vhost.py | 12 |
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: |