From fcc77752111a4fbe8caa341cf5249efbad305a2a Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Fri, 18 Oct 2019 14:15:32 +0000
Subject: Tests: Introduce driver layer

+ Small bugfixes in various suites

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: I051af0a6da7340fe3f617400370c3846ca5241ab
---
 resources/libraries/python/PapiExecutor.py        |  2 +-
 resources/libraries/robot/shared/interfaces.robot | 42 +++++++++++++++++------
 2 files changed, 33 insertions(+), 11 deletions(-)

(limited to 'resources')

diff --git a/resources/libraries/python/PapiExecutor.py b/resources/libraries/python/PapiExecutor.py
index 60d35a8543..0e0a9332c4 100644
--- a/resources/libraries/python/PapiExecutor.py
+++ b/resources/libraries/python/PapiExecutor.py
@@ -448,7 +448,7 @@ class PapiSocketExecutor(object):
         if log:
             logger.info(
                 "{cmd} ({host} - {remote_vpp_socket}):\n{reply}".
-                format(cmd=cmd, reply=reply,
+                format(cmd=cmd, reply=reply.encode('utf-8').strip(),
                        remote_vpp_socket=remote_vpp_socket, host=node['host']))
         return reply
 
diff --git a/resources/libraries/robot/shared/interfaces.robot b/resources/libraries/robot/shared/interfaces.robot
index 514ed91a5b..86ae61d3a4 100644
--- a/resources/libraries/robot/shared/interfaces.robot
+++ b/resources/libraries/robot/shared/interfaces.robot
@@ -138,9 +138,40 @@
 | | Set Test Variable | ${prev_layer} | if
 | | Set interfaces in path up
 
+| Initialize layer driver
+| | [Documentation]
+| | ... | Initialize driver based interfaces on each DUT. Interfaces are
+| | ... | brought up.
+| | ...
+| | [Arguments] | ${driver}
+| | ...
+# TODO: Introduce the Pre- Initialize layer driver for preparing driver before
+# VPP starts and then Post- Initialize layer driver for preparing interfaces
+# after VPP starts. This way we can control actions needed for proper handling
+# of various driver-based interfaces in VPP.
+| | :FOR | ${dut} | IN | @{duts}
+| | | Run Keyword | Initialize layer ${driver} on node | ${dut}
+| | Set Test Variable | ${prev_layer} | vf
+| | Set interfaces in path up
+
+| Initialize layer vfio-pci on node
+| | [Documentation]
+| | ... | Initialize vfio-pci interfaces on DUT.
+| | ...
+| | ... | *Arguments:*
+| | ... | - dut - DUT node. Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Initialize layer vfio-pci on node \| DUT1 \|
+| | ...
+| | [Arguments] | ${dut}
+| | ...
+| | No operation
+
 | Initialize layer avf on node
 | | [Documentation]
-| | ... | Initialize AVF interfaces on DUT. Interfaces are brought up.
+| | ... | Initialize AVF interfaces on DUT.
 | | ...
 | | ... | *Arguments:*
 | | ... | - dut - DUT node. Type: string
@@ -173,15 +204,6 @@
 | | Set Test Variable | ${${dut_str}_if1_mac} | ${dut_eth_vf_if1_mac}
 | | Set Test Variable | ${${dut_str}_if2_mac} | ${dut_eth_vf_if2_mac}
 
-| Initialize AVF interfaces
-| | [Documentation]
-| | ... | Initialize AVF interfaces on each DUT. Interfaces are brought up.
-| | ...
-| | :FOR | ${dut} | IN | @{duts}
-| | | Initialize layer avf on node | ${dut}
-| | Set Test Variable | ${prev_layer} | vf
-| | Set interfaces in path up
-
 | Initialize layer bonding on node
 | | [Documentation]
 | | ... | Bonded interface and variables to be created on across east and
-- 
cgit 1.2.3-korg