Dumping interface info was broken in v2.18

Change-Id: Icec84cb2912d6e179c5aac536825a04b47bebb2b
Signed-off-by: Yaroslav Brustinov <ybrustin@cisco.com>

3 files changed, 7 insertions, 4 deletions

diff --git a/scripts/dpdk_nic_bind.py b/scripts/dpdk_nic_bind.py
index 44d618b5..7908b7c7 100755
--- a/scripts/dpdk_nic_bind.py
+++ b/scripts/dpdk_nic_bind.py
@@ -603,7 +603,7 @@ def get_info_from_trex(pci_addr_list):
         else:
             print('Error upon running TRex to get interfaces info:\n%s' % stdout)
         sys.exit(1)
-    pci_mac_str = 'PCI: (\S+).+?MAC: (\S+).+?Driver: (\S+)'
+    pci_mac_str = 'PCI: (\S+).+?MAC: (\S+).+?Driver: (\S*)'
     pci_mac_re = re.compile(pci_mac_str)
     for line in stdout.splitlines():
         match = pci_mac_re.match(line)
diff --git a/scripts/dpdk_setup_ports.py b/scripts/dpdk_setup_ports.py
index d1f4f31e..f619bc6c 100755
--- a/scripts/dpdk_setup_ports.py
+++ b/scripts/dpdk_setup_ports.py
@@ -607,12 +607,15 @@ Other network devices
             'net_virtio': 'virtio-pci',
             'net_enic': 'enic',
         }
-        for pci, info in dpdk_nic_bind.get_info_from_trex(dpdk_interfaces).items():
+        nics_info = dpdk_nic_bind.get_info_from_trex(dpdk_interfaces)
+        if not nics_info:
+            raise DpdkSetup('Could not determine interfaces information. Try to run manually: sudo ./t-rex-64 --dump-interfaces')
+        for pci, info in nics_info.items():
             if pci not in self.m_devices:
                 raise DpdkSetup('Internal error: PCI %s is not found among devices' % pci)
             dev = self.m_devices[pci]
             if info['TRex_Driver'] not in drivers_table:
-                print('Got unknown driver %s, description: %s' % (info['TRex_Driver'], dev['Device_str']))
+                print("Got unknown driver '%s', description: %s" % (info['TRex_Driver'], dev['Device_str']))
             else:
                 print('Returning to Linux %s' % pci)
                 dpdk_nic_bind.bind_one(pci, drivers_table[info['TRex_Driver']], False)
diff --git a/src/main_dpdk.cpp b/src/main_dpdk.cpp
index f8ec0556..df6f63ae 100644
--- a/src/main_dpdk.cpp
+++ b/src/main_dpdk.cpp
@@ -5743,7 +5743,7 @@ void dump_interfaces_info() {
         ether_format_addr(mac_str, sizeof mac_str, &mac_addr);
         printf("PCI: %04x:%02x:%02x.%d - MAC: %s - Driver: %s\n",
             pci_addr.domain, pci_addr.bus, pci_addr.devid, pci_addr.function, mac_str,
-            rte_eth_devices[port_id].device->devargs->virt.drv_name);
+            rte_eth_devices[port_id].data->drv_name);
     }
 }