From d45195617e23255049c1234b49cd677f7b06f72d Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Wed, 22 Feb 2017 14:07:24 +0200 Subject: Dumping interface info was broken in v2.18 Change-Id: Icec84cb2912d6e179c5aac536825a04b47bebb2b Signed-off-by: Yaroslav Brustinov --- scripts/dpdk_nic_bind.py | 2 +- scripts/dpdk_setup_ports.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'scripts') 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) -- cgit 1.2.3-korg