test: instrument functional tests with more logs

Also:
 - Do not tun tests with privileged containers HICN-806
 - Refactor robot test files and config.sh

Currently some logs are missing from the robot output of the functional tests.
This patch adds them.

Ticket: HICN-805

Signed-off-by: Mauro Sardara <msardara@cisco.com>
Change-Id: I9893eb356a4dd12f4bc6347b8fe02e358c9bf737

6 files changed, 248 insertions, 100 deletions

diff --git a/tests/functional-tests/2-nodes-hicn-light.robot b/tests/functional-tests/2-nodes-hicn-light.robot
index fedcc9797..1686ca9e6 100644
--- a/tests/functional-tests/2-nodes-hicn-light.robot
+++ b/tests/functional-tests/2-nodes-hicn-light.robot
@@ -1,34 +1,84 @@
 *** Settings ***
-Resource          resources/libraries/robot/runtest.robot
-Resource          resources/libraries/robot/common.robot
-Suite Setup       Run Keywords
-...               Build Topology                             2-nodes    hicn-light    AND
-...               Check Environment
-Suite Teardown    Run Keywords
-...               Destroy Topology
-Resource          resources/libraries/robot/runtest.robot
+Resource            ../resources/libraries/robot/runtest.robot
+Resource            ../resources/libraries/robot/common.robot
+
+Suite Setup         Run Keywords
+...                     Build Topology
+...                     2-nodes
+...                     hicn-light
+...                     AND
+...                     Check Environment
+Suite Teardown      Run Keywords
+...                     Destroy Topology
 
-*** Test Cases ***
 
+*** Test Cases ***
 Throughput Testing Raaqm Mobile
-    Run Throughput Test Raaqm    hicn-light    200    500    400
+    Run Throughput Test Raaqm
+    ...    2-nodes
+    ...    hicn-light
+    ...    200
+    ...    500
+    ...    400
 
-Throughput Testing Raaqm Mobile New
-    Run Throughput Test Raaqm New    hicn-light    200    500    400
+Throughput Testing Raaqm Mobile New Packet Format
+    Run Throughput Test Raaqm New Packet Format
+    ...    2-nodes
+    ...    hicn-light
+    ...    200
+    ...    500
+    ...    400
 
 Throughput Testing CBR Mobile
-    Run Throughput Test CBR    hicn-light    200    500    400
+    Run Throughput Test CBR
+    ...    2-nodes
+    ...    hicn-light
+    ...    20
+    ...    500
+    ...    400
 
-Throughput Testing CBR Mobile New
-    Run Throughput Test CBR New    hicn-light    200    500    400
+Throughput Testing CBR Mobile New Packet Format
+    Run Throughput Test CBR New Packet Format
+    ...    2-nodes
+    ...    hicn-light
+    ...    200
+    ...    500
+    ...    400
 
 RTC Testing Mobile
-    Run RTC Test    hicn-light    4    4    4
+    Run RTC Test
+    ...    2-nodes
+    ...    hicn-light
+    ...    4
+    ...    4
+    ...    4
 
 Latency Testing Mobile
-    Set Link            hicn-light    500     1       0       0
-    Run Latency Test    hicn-light    3000    3000    3000
+    Set Link
+    ...    2-nodes
+    ...    hicn-light
+    ...    500
+    ...    1
+    ...    0
+    ...    0
+    Run Latency Test
+    ...    2-nodes
+    ...    hicn-light
+    ...    3000
+    ...    3000
+    ...    3000
 
-Latency Testing Mobile New
-    Set Link                    hicn-light    500     1       0       0
-    Run Latency Test New        hicn-light    3000    3000    3000
+Latency Testing Mobile New Packet Format
+    Set Link
+    ...    2-nodes
+    ...    hicn-light
+    ...    500
+    ...    1
+    ...    0
+    ...    0
+    Run Latency Test New Packet Format
+    ...    2-nodes
+    ...    hicn-light
+    ...    3000
+    ...    3000
+    ...    3000
diff --git a/tests/functional-tests/2-nodes-vpp-bridge.robot b/tests/functional-tests/2-nodes-vpp-bridge.robot
index 83c8818ab..fd3d42fe0 100644
--- a/tests/functional-tests/2-nodes-vpp-bridge.robot
+++ b/tests/functional-tests/2-nodes-vpp-bridge.robot
@@ -1,24 +1,53 @@
 *** Settings ***
-Resource          resources/libraries/robot/runtest.robot
-Resource          resources/libraries/robot/common.robot
-Suite Setup       Run Keywords
-...               Build Topology                             2-nodes    vpp-bridge    AND
-...               Check Environment
-Suite Teardown    Run Keywords
-...               Destroy Topology
-Resource          resources/libraries/robot/runtest.robot
+Resource            ../resources/libraries/robot/runtest.robot
+Resource            ../resources/libraries/robot/common.robot
+
+Suite Setup         Run Keywords
+...                     Build Topology
+...                     2-nodes
+...                     vpp-bridge
+...                     AND
+...                     Check Environment
+Suite Teardown      Run Keywords
+...                     Destroy Topology
 
-*** Test Cases ***
 
+*** Test Cases ***
 Throughput Testing Raaqm Server VPP bridge
-    Run Throughput Test Raaqm    vpp-bridge    500    500    500
+    Run Throughput Test Raaqm
+    ...    2-nodes
+    ...    vpp-bridge
+    ...    500
+    ...    500
+    ...    500
 
 Throughput Testing CBR Server VPP bridge
-    Run Throughput Test CBR    vpp-bridge    1000    1300    1200
+    Run Throughput Test CBR
+    ...    2-nodes
+    ...    vpp-bridge
+    ...    1000
+    ...    1300
+    ...    1200
 
 RTC Testing Server VPP bridge
-    Run RTC Test    vpp-bridge    4    4    4
+    Run RTC Test
+    ...    2-nodes
+    ...    vpp-bridge
+    ...    4
+    ...    4
+    ...    4
 
 Latency Testing Server VPP bridge
-    Set Link            hicn-light    500     1       0       0
-    Run Latency Test    vpp-bridge    3000    3000    3000
+    Set Link
+    ...    2-nodes
+    ...    hicn-light
+    ...    500
+    ...    1
+    ...    0
+    ...    0
+    Run Latency Test
+    ...    2-nodes
+    ...    vpp-bridge
+    ...    3000
+    ...    3000
+    ...    3000
diff --git a/tests/functional-tests/2-nodes-vpp-memif-replication.robot b/tests/functional-tests/2-nodes-vpp-memif-replication.robot
index 8c13f4fb9..186eb5c94 100644
--- a/tests/functional-tests/2-nodes-vpp-memif-replication.robot
+++ b/tests/functional-tests/2-nodes-vpp-memif-replication.robot
@@ -1,23 +1,46 @@
 *** Settings ***
-Resource          resources/libraries/robot/runtest.robot
-Resource          resources/libraries/robot/common.robot
-Suite Setup       Run Keywords
-...               Build Topology                             2-nodes    vpp-memif-replication    AND
-...               Check Environment
-Suite Teardown    Run Keywords
-...               Destroy Topology
-Resource          resources/libraries/robot/runtest.robot
+Resource            ../resources/libraries/robot/runtest.robot
+Resource            ../resources/libraries/robot/common.robot
+
+Suite Setup         Run Keywords
+...                     Build Topology
+...                     2-nodes
+...                     vpp-memif-replication
+...                     AND
+...                     Check Environment
+Suite Teardown      Run Keywords
+...                     Destroy Topology
 
-*** Test Cases ***
 
+*** Test Cases ***
 Throughput Testing Raaqm Server VPP memif replication
-    Run Throughput Test Raaqm     vpp-memif-replication    500    500    500
+    Run Throughput Test Raaqm
+    ...    2-nodes
+    ...    vpp-memif-replication
+    ...    500
+    ...    500
+    ...    500
 
 Throughput Testing CBR Server VPP memif
-    Run Throughput Test CBR     vpp-memif-replication    2000    2000    2000
+    Run Throughput Test CBR
+    ...    2-nodes
+    ...    vpp-memif-replication
+    ...    2000
+    ...    2000
+    ...    2000
 
 RTC Testing Server VPP memif replication
-    Run RTC Test     vpp-memif-replication    4    4    4
+    Run RTC Test
+    ...    2-nodes
+    ...    vpp-memif-replication
+    ...    4
+    ...    4
+    ...    4
 
 Latency Testing Server VPP memif replication
-    Run Latency Test     vpp-memif-replication    3000    3000    3000
+    Run Latency Test
+    ...    2-nodes
+    ...    vpp-memif-replication
+    ...    3000
+    ...    3000
+    ...    3000
diff --git a/tests/functional-tests/2-nodes-vpp-memif.robot b/tests/functional-tests/2-nodes-vpp-memif.robot
index 1a69da787..ed9ab1143 100644
--- a/tests/functional-tests/2-nodes-vpp-memif.robot
+++ b/tests/functional-tests/2-nodes-vpp-memif.robot
@@ -1,23 +1,46 @@
 *** Settings ***
-Resource          resources/libraries/robot/runtest.robot
-Resource          resources/libraries/robot/common.robot
-Suite Setup       Run Keywords
-...               Build Topology                             2-nodes    vpp-memif    AND
-...               Check Environment
-Suite Teardown    Run Keywords
-...               Destroy Topology
-Resource          resources/libraries/robot/runtest.robot
+Resource            ../resources/libraries/robot/runtest.robot
+Resource            ../resources/libraries/robot/common.robot
+
+Suite Setup         Run Keywords
+...                     Build Topology
+...                     2-nodes
+...                     vpp-memif
+...                     AND
+...                     Check Environment
+Suite Teardown      Run Keywords
+...                     Destroy Topology
 
-*** Test Cases ***
 
+*** Test Cases ***
 Throughput Testing Raaqm Server VPP memif
-    Run Throughput Test Raaqm    vpp-memif    500    500    500
+    Run Throughput Test Raaqm
+    ...    2-nodes
+    ...    vpp-memif
+    ...    500
+    ...    500
+    ...    500
 
 Throughput Testing CBR Server VPP memif
-    Run Throughput Test CBR    vpp-memif    2000    2000    2000
+    Run Throughput Test CBR
+    ...    2-nodes
+    ...    vpp-memif
+    ...    2000
+    ...    2000
+    ...    2000
 
 RTC Testing Server VPP memif
-    Run RTC Test    vpp-memif    4    4    4
+    Run RTC Test
+    ...    2-nodes
+    ...    vpp-memif
+    ...    4
+    ...    4
+    ...    4
 
 Latency Testing Server VPP memif
-    Run Latency Test    vpp-memif    3000    3000    3000
+    Run Latency Test
+    ...    2-nodes
+    ...    vpp-memif
+    ...    3000
+    ...    3000
+    ...    3000
diff --git a/tests/functional-tests/hicn-light-control.robot b/tests/functional-tests/hicn-light-control.robot
index e29fc51d6..147226188 100644
--- a/tests/functional-tests/hicn-light-control.robot
+++ b/tests/functional-tests/hicn-light-control.robot
@@ -1,29 +1,48 @@
 *** Settings ***
-Resource          resources/libraries/robot/common.robot
-Test Setup        Run Keywords
-...               Build Topology                             1-node    AND
-...               Check Environment
-Test Teardown     Run Keywords
-...               Destroy Topology
+Resource            ../resources/libraries/robot/common.robot
+
+Test Setup          Run Keywords
+...                     Build Topology
+...                     1-node
+...                     AND
+...                     Check Environment
+Test Teardown       Run Keywords
+...                     Destroy Topology
+
 
 *** Test Cases ***
 Listeners
-  Log to console      Test listeners
-  ${result} =         Run Process       ${EXECDIR}/config.sh    ctrl  listeners
-  Log Many            stdout:           ${result.stdout}
-  Should Be Equal As Integers   ${result.rc}        0
-  Should Not Contain            ${result.stdout}    FAILED
+    Log to console    Test listeners
+    ${result} =    Run Process
+    ...    bash
+    ...    -x
+    ...    ${EXECDIR}/config.sh
+    ...    ctrl
+    ...    listeners
+    Log Many    stdout:    ${result.stdout}
+    Should Be Equal As Integers    ${result.rc}    0
+    Should Not Contain    ${result.stdout}    FAILED
 
 Connections
-  Log to console      Test connections
-  ${result} =         Run Process       ${EXECDIR}/config.sh    ctrl  connections
-  Log Many            stdout:           ${result.stdout}
-  Should Be Equal As Integers   ${result.rc}        0
-  Should Not Contain            ${result.stdout}    FAILED
+    Log to console    Test connections
+    ${result} =    Run Process
+    ...    bash
+    ...    -x
+    ...    ${EXECDIR}/config.sh
+    ...    ctrl
+    ...    connections
+    Log Many    stdout:    ${result.stdout}
+    Should Be Equal As Integers    ${result.rc}    0
+    Should Not Contain    ${result.stdout}    FAILED
 
 Routes
-  Log to console      Test routes
-  ${result} =         Run Process       ${EXECDIR}/config.sh    ctrl  routes
-  Log Many            stdout:           ${result.stdout}
-  Should Be Equal As Integers   ${result.rc}        0
-  Should Not Contain            ${result.stdout}    FAILED
+    Log to console    Test routes
+    ${result} =    Run Process
+    ...    bash
+    ...    -x
+    ...    ${EXECDIR}/config.sh
+    ...    ctrl
+    ...    routes
+    Log Many    stdout:    ${result.stdout}
+    Should Be Equal As Integers    ${result.rc}    0
+    Should Not Contain    ${result.stdout}    FAILED
diff --git a/tests/functional-tests/hicn-light-ping.robot b/tests/functional-tests/hicn-light-ping.robot
index 238f49e0e..ba6beed42 100644
--- a/tests/functional-tests/hicn-light-ping.robot
+++ b/tests/functional-tests/hicn-light-ping.robot
@@ -1,26 +1,30 @@
 *** Settings ***
-Resource          resources/libraries/robot/common.robot
-Test Setup        Run Keywords
-...               Build Topology                             1-node    AND
-...               Check Environment
-Test Teardown     Run Keywords
-...               Destroy Topology
+Resource            ../resources/libraries/robot/common.robot
+
+Test Setup          Run Keywords
+...                     Build Topology
+...                     1-node
+...                     AND
+...                     Check Environment
+Test Teardown       Run Keywords
+...                     Destroy Topology
+
 
 *** Test Cases ***
 Ping with manifest
-  Log to console      Test ping with manifest
-  ${result} =         Run Process       ${EXECDIR}/config.sh    ping  manifest
-  Log Many            stdout:           ${result.stdout}
-  Should Be Equal As Integers   ${result.rc}        0
+    Log to console    Test ping with manifest
+    ${result} =    Run Process    bash    -x    ${EXECDIR}/config.sh    ping    manifest
+    Log Many    stdout:    ${result.stdout}
+    Should Be Equal As Integers    ${result.rc}    0
 
 Ping wrong signature
-  Log to console      Test ping with wrong signature
-  ${result} =         Run Process       ${EXECDIR}/config.sh    ping  signature
-  Log Many            stdout:           ${result.stdout}
-  Should Be Equal As Integers   ${result.rc}        0
+    Log to console    Test ping with wrong signature
+    ${result} =    Run Process    bash    -x    ${EXECDIR}/config.sh    ping    signature
+    Log Many    stdout:    ${result.stdout}
+    Should Be Equal As Integers    ${result.rc}    0
 
 Ping timeout
-  Log to console      Test ping timeout
-  ${result} =         Run Process       ${EXECDIR}/config.sh    ping  timeout
-  Log Many            stdout:           ${result.stdout}
-  Should Be Equal As Integers   ${result.rc}        0
+    Log to console    Test ping timeout
+    ${result} =    Run Process    bash    -x    ${EXECDIR}/config.sh    ping    timeout
+    Log Many    stdout:    ${result.stdout}
+    Should Be Equal As Integers    ${result.rc}    0