From 260a2ad0d1edcba289e019ac8a13706663ed6592 Mon Sep 17 00:00:00 2001 From: mklyus Date: Mon, 24 Feb 2020 01:02:15 +0300 Subject: [NFVBENCH-159] Python3 fix for get_intel_pci() Change-Id: I09d1f1180b0e80a34a0eec1acf4a1681b15d3e34 Signed-off-by: Yichen Wang --- nfvbench/utils.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'nfvbench') 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 -- cgit 1.2.3-korg