From 2553b94d96db0a23b1fa3bfa6a3dae1468f4cb83 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 13 Apr 2018 11:34:33 +0200 Subject: Make default driver configurable - Make UIO driver configurable from global variables. - Prepare code for uio_pci_generic to vfio-pci change Change-Id: I2b49201177a92f51673242a30e2fd8d4f7e59694 Signed-off-by: Peter Mikus --- resources/libraries/python/VppConfigGenerator.py | 4 ++-- resources/libraries/robot/shared/default.robot | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'resources/libraries') diff --git a/resources/libraries/python/VppConfigGenerator.py b/resources/libraries/python/VppConfigGenerator.py index 1185eac7af..d1fc32ef9d 100644 --- a/resources/libraries/python/VppConfigGenerator.py +++ b/resources/libraries/python/VppConfigGenerator.py @@ -539,8 +539,8 @@ class VppConfigGenerator(object): for _ in range(retries): time.sleep(1) ret, stdout, _ = \ - ssh.exec_command('echo show hardware-interfaces | ' - 'nc 0 5002 || echo "VPP not yet running"') + ssh.exec_command('echo show pci | nc 0 5002 || ' + 'echo "VPP not yet running"') if ret == 0 and 'VPP not yet running' not in stdout: break else: diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index 43e1227f80..8331b7b928 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -121,15 +121,16 @@ | | | Run keyword | ${dut}.Add Unix Log | | | Run keyword | ${dut}.Add Unix CLI Listen | | | Run keyword | ${dut}.Add Unix Nodaemon -| | | Run keyword | ${dut}.Add DPDK Socketmem | "1024,1024" +| | | Run keyword | ${dut}.Add DPDK Socketmem | 1024,1024 | | | Run keyword | ${dut}.Add DPDK No Tx Checksum Offload | | | Run keyword | ${dut}.Add DPDK Log Level | debug -| | | Run keyword | ${dut}.Add Heapsize | "4G" +| | | Run keyword | ${dut}.Add DPDK Uio Driver | ${uio_driver} +| | | Run keyword | ${dut}.Add Heapsize | 4G | | | Run keyword | ${dut}.Add Plugin | disable | default | | | Run keyword | ${dut}.Add Plugin | enable | @{plugins_to_enable} -| | | Run keyword | ${dut}.Add IP6 Hash Buckets | "2000000" -| | | Run keyword | ${dut}.Add IP6 Heap Size | "4G" -| | | Run keyword | ${dut}.Add IP Heap Size | "4G" +| | | Run keyword | ${dut}.Add IP6 Hash Buckets | 2000000 +| | | Run keyword | ${dut}.Add IP6 Heap Size | 4G +| | | Run keyword | ${dut}.Add IP Heap Size | 4G # The following keyword results in lines longer than 80 characters. # FIXME: Rename the keyword, possibly moving arguments out of the keyword name. -- cgit 1.2.3-korg