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 <pmikus@cisco.com>

4 files changed, 12 insertions, 7 deletions

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.
diff --git a/tests/kubernetes/perf/__init__.robot b/tests/kubernetes/perf/__init__.robot
index e538590587..686ead5e1c 100644
--- a/tests/kubernetes/perf/__init__.robot
+++ b/tests/kubernetes/perf/__init__.robot
@@ -43,6 +43,7 @@
 | | ... | - perf_pdr_loss_acceptance_type - Loss acceptance treshold type
 | | ... | - pkt_trace - Switch to enable packet trace for test
 | | ... | - dut_stats - Switch to enable DUT statistics
+| | ... | - uio_driver - Default UIO driver
 | | ... | - plugins_to_enable - List of plugins to be enabled for test
 | | ...
 | | Set Global Variable | ${perf_trial_duration} | 10
@@ -50,5 +51,6 @@
 | | Set Global Variable | ${perf_pdr_loss_acceptance_type} | percentage
 | | Set Global Variable | ${pkt_trace} | ${False}
 | | Set Global Variable | ${dut_stats} | ${False}
+| | Set Global Variable | ${uio_driver} | uio_pci_generic
 | | @{plugins_to_enable}= | Create List | dpdk_plugin.so
 | | Set Global Variable | @{plugins_to_enable}
diff --git a/tests/vpp/perf/__init__.robot b/tests/vpp/perf/__init__.robot
index 7bc1a81f53..aa95875dbb 100644
--- a/tests/vpp/perf/__init__.robot
+++ b/tests/vpp/perf/__init__.robot
@@ -39,6 +39,7 @@
 | | ... | - qemu_build - Whether Qemu will be built
 | | ... | - pkt_trace - Switch to enable packet trace for test
 | | ... | - dut_stats - Switch to enable DUT statistics
+| | ... | - uio_driver - Default UIO driver
 | | ... | - plugins_to_enable - List of plugins to be enabled for test
 | | ...
 | | Set Global Variable | ${perf_trial_duration} | 10
@@ -50,5 +51,6 @@
 | | Set Global Variable | ${qemu_build} | ${True}
 | | Set Global Variable | ${pkt_trace} | ${False}
 | | Set Global Variable | ${dut_stats} | ${True}
+| | Set Global Variable | ${uio_driver} | uio_pci_generic
 | | @{plugins_to_enable}= | Create List | dpdk_plugin.so
 | | Set Global Variable | @{plugins_to_enable}