From 00d3c4f29644b28476a38849bc2abc3a6bce920c Mon Sep 17 00:00:00 2001
From: Yichen Wang <yicwang@cisco.com>
Date: Thu, 22 Feb 2018 13:19:33 -0800
Subject: [NFVBENCH-68] Skip bonding interfaces for interface discovery

Change-Id: I446f02366a7d1801dc6740657bfea23f73bc27c7
Signed-off-by: Yichen Wang <yicwang@cisco.com>
---
 nfvbench/utils.py | 42 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 8 deletions(-)

(limited to 'nfvbench')

diff --git a/nfvbench/utils.py b/nfvbench/utils.py
index 20dc588..cc649bd 100644
--- a/nfvbench/utils.py
+++ b/nfvbench/utils.py
@@ -12,6 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import glob
 from math import isnan
 import os
 import re
@@ -94,7 +95,8 @@ def dict_to_json_dict(record):
 def get_intel_pci(nic_ports):
     """Returns the first two PCI addresses of sorted PCI list for Intel NIC (i40e, ixgbe)"""
     hx = r'[0-9a-fA-F]'
-    regex = r'{hx}{{4}}:({hx}{{2}}:{hx}{{2}}\.{hx}{{1}}).*(drv={driver}|.*unused=.*{driver})'
+    regex = r'({hx}{{4}}:({hx}{{2}}:{hx}{{2}}\.{hx}{{1}})).*(drv={driver}|.*unused=.*{driver})'
+    pcis = []
 
     try:
         trex_base_dir = '/opt/trex'
@@ -110,14 +112,38 @@ def get_intel_pci(nic_ports):
 
     for driver in ['i40e', 'ixgbe']:
         matches = re.findall(regex.format(hx=hx, driver=driver), devices)
-        if matches:
-            pcis = [x[0] for x in matches]
-            if len(pcis) < 2:
+        if not matches:
+            continue
+
+        matches.sort()
+        if nic_ports:
+            if max(nic_ports) > len(matches) - 1:
+                # If this is hard requirements (i.e. ports are defined
+                # explictly), but there are not enough ports for the
+                # current NIC, just skip the current NIC and looking for
+                # next available one.
                 continue
-            pcis.sort()
-            return [pcis[port_index] for port_index in nic_ports]
-
-    return []
+            else:
+                return [matches[idx][1] for idx in nic_ports]
+        else:
+            for port in matches:
+                intf_name = glob.glob("/sys/bus/pci/devices/%s/net/*" % port[0])
+                if not intf_name:
+                    # Interface is not bind to kernel driver, so take it
+                    pcis.append(port[1])
+                else:
+                    intf_name = intf_name[0][intf_name[0].rfind('/') + 1:]
+                    process = subprocess.Popen(['ip', '-o', '-d', 'link', 'show', intf_name],
+                                               stdout=subprocess.PIPE,
+                                               stderr=subprocess.PIPE)
+                    intf_info, _ = process.communicate()
+                    if not re.search('team_slave|bond_slave', intf_info):
+                        pcis.append(port[1])
+
+                if len(pcis) == 2:
+                    break
+
+    return pcis
 
 
 multiplier_map = {
-- 
cgit 1.2.3-korg