From: mklyus Date: Sun, 23 Feb 2020 22:02:15 +0000 (+0300) Subject: [NFVBENCH-159] Python3 fix for get_intel_pci() X-Git-Tag: 4.2.1^0 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=260a2ad0d1edcba289e019ac8a13706663ed6592;hp=057486b092e0a4bb1989121588eb5f8afdb8e1d3;p=nfvbench.git [NFVBENCH-159] Python3 fix for get_intel_pci() Change-Id: I09d1f1180b0e80a34a0eec1acf4a1681b15d3e34 Signed-off-by: Yichen Wang --- diff --git a/nfvbench/utils.py b/nfvbench/utils.py index c8c485f..94cc11d 100644 --- a/nfvbench/utils.py +++ b/nfvbench/utils.py @@ -144,7 +144,7 @@ def get_intel_pci(nic_slot=None, nic_ports=None): devices = '' for driver in ['i40e', 'ixgbe']: - matches = re.findall(regex.format(hx=hx, driver=driver), devices) + matches = re.findall(regex.format(hx=hx, driver=driver), devices.decode("utf-8")) if not matches: continue @@ -160,9 +160,8 @@ def get_intel_pci(nic_slot=None, nic_ports=None): stdout=subprocess.PIPE, stderr=subprocess.PIPE) intf_info, _ = process.communicate() - if not re.search('team_slave|bond_slave', intf_info): + if not re.search('team_slave|bond_slave', intf_info.decode("utf-8")): pcis.append(port[1]) - if len(pcis) == 2: break