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

2 files changed, 300 insertions, 127 deletions

diff --git a/tests/resources/libraries/robot/common.robot b/tests/resources/libraries/robot/common.robot
index 21d1ace1d..921d79b4d 100644
--- a/tests/resources/libraries/robot/common.robot
+++ b/tests/resources/libraries/robot/common.robot
@@ -1,25 +1,39 @@
 *** Settings ***
-Library    OperatingSystem
-Library    Process
-Library    String
+Library     OperatingSystem
+Library     Process
+Library     String
 
-*** Variables ***
 
 *** Keywords ***
-
 Build Topology
-    [Arguments]          ${TEST_TOPOLOGY}=${NONE}                                    ${TEST_CONFIGURATION}=${NONE}
-    Log to console       Building topology ${TEST_TOPOLOGY} ${TEST_CONFIGURATION}
-    ${result_setup} =    Run Process                                                 ${EXECDIR}/config.sh              build    setup    ${TEST_TOPOLOGY}    ${TEST_CONFIGURATION}   stdout=${TEMPDIR}/stdout.txt    stderr=${TEMPDIR}/stderr.txt
-    Log to console       Done
-    Log Many             stdout: ${result_setup.stdout}                              stderr: ${result_setup.stderr}
-    Should Be Equal As Integers  ${result_setup.rc}  0
+    [Arguments]
+    ...    ${TEST_TOPOLOGY}=${NONE}
+    ...    ${TEST_CONFIGURATION}=${NONE}
+    Log to console
+    ...    Building topology ${TEST_TOPOLOGY} ${TEST_CONFIGURATION}
+    ${result_setup} =    Run Process
+    ...    ${EXECDIR}/config.sh
+    ...    build
+    ...    setup
+    ...    ${TEST_TOPOLOGY}
+    ...    ${TEST_CONFIGURATION}
+    ...    stdout=${TEMPDIR}/stdout.txt
+    ...    stderr=${TEMPDIR}/stderr.txt
+    Log to console    Done
+    Log Many
+    ...    stdout: ${result_setup.stdout}
+    ...    stderr: ${result_setup.stderr}
+    Should Be Equal As Integers    ${result_setup.rc}    0
 
 Check Environment
-    ${result} =    Run Process                 docker                      ps
-    Log Many       stdout: ${result.stdout}    stderr: ${result.stderr}
+    ${result} =    Run Process    docker    ps
+    Log Many
+    ...    stdout: ${result.stdout}
+    ...    stderr: ${result.stderr}
 
 Destroy Topology
-    ${result_teardown} =    Run Process                          ${EXECDIR}/config.sh                 stopall
-    Log Many                stdout: ${result_teardown.stdout}    stderr: ${result_teardown.stderr}
-    Should Be Equal As Integers     ${result_teardown.rc}  0
+    ${result_teardown} =    Run Process    ${EXECDIR}/config.sh    stopall
+    Log Many
+    ...    stdout: ${result_teardown.stdout}
+    ...    stderr: ${result_teardown.stderr}
+    Should Be Equal As Integers    ${result_teardown.rc}    0
diff --git a/tests/resources/libraries/robot/runtest.robot b/tests/resources/libraries/robot/runtest.robot
index 9a3da8647..e6309a9ed 100644
--- a/tests/resources/libraries/robot/runtest.robot
+++ b/tests/resources/libraries/robot/runtest.robot
@@ -1,134 +1,293 @@
 *** Settings ***
-Library    OperatingSystem
-Library    Process
-Library    String
+Library     OperatingSystem
+Library     Process
+Library     String
 
-*** Variables ***
 
 *** Keywords ***
-
 Infra ${VALUE}
     Run Process    ${EXECDIR}/config.sh    ${VALUE}
 
 Run Test
-    [Arguments]         ${TEST_SETUP}=${NONE}                    ${TESTID}=${NONE}                                                  ${EXPECTED_MIN}=${NONE}    ${EXPECTED_MAX}=${NONE}    ${EXPECTED_AVG}=${NONE}
-    ${result_test} =    Run Process                              ${EXECDIR}/config.sh                                               start                      ${TEST_SETUP}              ${TESTID}                  stdout=${TEMPDIR}/stdout.txt    stderr=${TEMPDIR}/stderr.txt
-    Log Many            stdout: ${result_test.stdout}            stderr: ${result_test.stderr}
-    @{min_max_avg} =    Split String                             ${result_test.stdout.strip()}
-    Log To Console      Min Max Average Array: @{min_max_avg}
-    IF                  '${TESTID}' == 'rtc'
-    Should Be True      ${min_max_avg}[0] == ${EXPECTED_MIN}     msg="Min does not match (${min_max_avg}[0] != ${EXPECTED_MIN})"
-    Should Be True      ${min_max_avg}[1] == ${EXPECTED_MAX}     msg="Max does not match (${min_max_avg}[1] != ${EXPECTED_MAX})"
-    Should Be True      ${min_max_avg}[2] == ${EXPECTED_AVG}     msg="Avg does not match (${min_max_avg}[2] != ${EXPECTED_AVG})"
-    ELSE IF             '${TESTID}' == 'requin'
-    Should Be True      ${min_max_avg}[0] >= ${EXPECTED_MIN}     msg="Min does not match (${min_max_avg}[0] < ${EXPECTED_MIN})"
-    Should Be True      ${min_max_avg}[1] >= ${EXPECTED_MAX}     msg="Max does not match (${min_max_avg}[1] < ${EXPECTED_MAX})"
-    Should Be True      ${min_max_avg}[2] >= ${EXPECTED_AVG}     msg="Avg does not match (${min_max_avg}[2] < ${EXPECTED_AVG})"
-    ELSE IF             '${TESTID}' == 'requin-new'
-    Should Be True      ${min_max_avg}[0] >= ${EXPECTED_MIN}     msg="Min does not match (${min_max_avg}[0] < ${EXPECTED_MIN})"
-    Should Be True      ${min_max_avg}[1] >= ${EXPECTED_MAX}     msg="Max does not match (${min_max_avg}[1] < ${EXPECTED_MAX})"
-    Should Be True      ${min_max_avg}[2] >= ${EXPECTED_AVG}     msg="Avg does not match (${min_max_avg}[2] < ${EXPECTED_AVG})"
-    ELSE IF             '${TESTID}' == 'latency'
-    Should Be True      ${min_max_avg}[0] <= ${EXPECTED_MIN}     msg="Min does not match (${min_max_avg}[0] > ${EXPECTED_MIN})"
-    Should Be True      ${min_max_avg}[1] <= ${EXPECTED_MAX}     msg="Max does not match (${min_max_avg}[1] > ${EXPECTED_MAX})"
-    Should Be True      ${min_max_avg}[2] <= ${EXPECTED_AVG}     msg="Avg does not match (${min_max_avg}[2] > ${EXPECTED_AVG})"
-    ELSE IF             '${TESTID}' == 'latency-new'
-    Should Be True      ${min_max_avg}[0] <= ${EXPECTED_MIN}     msg="Min does not match (${min_max_avg}[0] > ${EXPECTED_MIN})"
-    Should Be True      ${min_max_avg}[1] <= ${EXPECTED_MAX}     msg="Max does not match (${min_max_avg}[1] > ${EXPECTED_MAX})"
-    Should Be True      ${min_max_avg}[2] <= ${EXPECTED_AVG}     msg="Avg does not match (${min_max_avg}[2] > ${EXPECTED_AVG})"
-    ELSE IF             '${TESTID}' == 'cbr'
-    Should Be True      ${min_max_avg}[0] >= ${EXPECTED_MIN}     msg="Min does not match (${min_max_avg}[0] < ${EXPECTED_MIN})"
-    Should Be True      ${min_max_avg}[1] >= ${EXPECTED_MAX}     msg="Max does not match (${min_max_avg}[1] < ${EXPECTED_MAX})"
-    Should Be True      ${min_max_avg}[2] >= ${EXPECTED_AVG}     msg="Avg does not match (${min_max_avg}[2] < ${EXPECTED_AVG})"
-    ELSE IF             '${TESTID}' == 'cbr-new'
-    Should Be True      ${min_max_avg}[0] >= ${EXPECTED_MIN}     msg="Min does not match (${min_max_avg}[0] < ${EXPECTED_MIN})"
-    Should Be True      ${min_max_avg}[1] >= ${EXPECTED_MAX}     msg="Max does not match (${min_max_avg}[1] < ${EXPECTED_MAX})"
-    Should Be True      ${min_max_avg}[2] >= ${EXPECTED_AVG}     msg="Avg does not match (${min_max_avg}[2] < ${EXPECTED_AVG})"
+    [Arguments]
+    ...    ${TEST_TOPOLOGY}=${NONE}
+    ...    ${TEST_SETUP}=${NONE}
+    ...    ${TESTID}=${NONE}
+    ...    ${EXPECTED_MIN}=${NONE}
+    ...    ${EXPECTED_MAX}=${NONE}
+    ...    ${EXPECTED_AVG}=${NONE}
+    ${result_test} =    Run Process
+    ...    ${EXECDIR}/config.sh
+    ...    start
+    ...    ${TEST_TOPOLOGY}
+    ...    ${TEST_SETUP}
+    ...    ${TESTID}
+    ...    stdout=${TEMPDIR}/stdout.txt
+    ...    stderr=${TEMPDIR}/stderr.txt
+    Log Many    stdout: ${result_test.stdout}    stderr: ${result_test.stderr}
+    ${min_max_avg_line} =    Get Line    ${result_test.stdout}    0
+    @{min_max_avg} =    Split String    ${min_max_avg_line.strip()}
+    Log To Console    Min Max Average Array: @{min_max_avg}
+    IF    '${TESTID}' == 'rtc'
+        Should Be True
+        ...    ${min_max_avg}[0] == ${EXPECTED_MIN}
+        ...    msg="Min does not match (${min_max_avg}[0] != ${EXPECTED_MIN})"
+        Should Be True
+        ...    ${min_max_avg}[1] == ${EXPECTED_MAX}
+        ...    msg="Max does not match (${min_max_avg}[1] != ${EXPECTED_MAX})"
+        Should Be True
+        ...    ${min_max_avg}[2] == ${EXPECTED_AVG}
+        ...    msg="Avg does not match (${min_max_avg}[2] != ${EXPECTED_AVG})"
+    ELSE IF    '${TESTID}' == 'requin'
+        Should Be True
+        ...    ${min_max_avg}[0] >= ${EXPECTED_MIN}
+        ...    msg="Min does not match (${min_max_avg}[0] < ${EXPECTED_MIN})"
+        Should Be True
+        ...    ${min_max_avg}[1] >= ${EXPECTED_MAX}
+        ...    msg="Max does not match (${min_max_avg}[1] < ${EXPECTED_MAX})"
+        Should Be True
+        ...    ${min_max_avg}[2] >= ${EXPECTED_AVG}
+        ...    msg="Avg does not match (${min_max_avg}[2] < ${EXPECTED_AVG})"
+    ELSE IF    '${TESTID}' == 'requin-new-paket-format'
+        Should Be True
+        ...    ${min_max_avg}[0] >= ${EXPECTED_MIN}
+        ...    msg="Min does not match (${min_max_avg}[0] < ${EXPECTED_MIN})"
+        Should Be True
+        ...    ${min_max_avg}[1] >= ${EXPECTED_MAX}
+        ...    msg="Max does not match (${min_max_avg}[1] < ${EXPECTED_MAX})"
+        Should Be True
+        ...    ${min_max_avg}[2] >= ${EXPECTED_AVG}
+        ...    msg="Avg does not match (${min_max_avg}[2] < ${EXPECTED_AVG})"
+    ELSE IF    '${TESTID}' == 'latency'
+        Should Be True
+        ...    ${min_max_avg}[0] <= ${EXPECTED_MIN}
+        ...    msg="Min does not match (${min_max_avg}[0] > ${EXPECTED_MIN})"
+        Should Be True
+        ...    ${min_max_avg}[1] <= ${EXPECTED_MAX}
+        ...    msg="Max does not match (${min_max_avg}[1] > ${EXPECTED_MAX})"
+        Should Be True
+        ...    ${min_max_avg}[2] <= ${EXPECTED_AVG}
+        ...    msg="Avg does not match (${min_max_avg}[2] > ${EXPECTED_AVG})"
+    ELSE IF    '${TESTID}' == 'latency-new-paket-format'
+        Should Be True
+        ...    ${min_max_avg}[0] <= ${EXPECTED_MIN}
+        ...    msg="Min does not match (${min_max_avg}[0] > ${EXPECTED_MIN})"
+        Should Be True
+        ...    ${min_max_avg}[1] <= ${EXPECTED_MAX}
+        ...    msg="Max does not match (${min_max_avg}[1] > ${EXPECTED_MAX})"
+        Should Be True
+        ...    ${min_max_avg}[2] <= ${EXPECTED_AVG}
+        ...    msg="Avg does not match (${min_max_avg}[2] > ${EXPECTED_AVG})"
+    ELSE IF    '${TESTID}' == 'cbr'
+        Should Be True
+        ...    ${min_max_avg}[0] >= ${EXPECTED_MIN}
+        ...    msg="Min does not match (${min_max_avg}[0] < ${EXPECTED_MIN})"
+        Should Be True
+        ...    ${min_max_avg}[1] >= ${EXPECTED_MAX}
+        ...    msg="Max does not match (${min_max_avg}[1] < ${EXPECTED_MAX})"
+        Should Be True
+        ...    ${min_max_avg}[2] >= ${EXPECTED_AVG}
+        ...    msg="Avg does not match (${min_max_avg}[2] < ${EXPECTED_AVG})"
+    ELSE IF    '${TESTID}' == 'cbr-new-paket-format'
+        Should Be True
+        ...    ${min_max_avg}[0] >= ${EXPECTED_MIN}
+        ...    msg="Min does not match (${min_max_avg}[0] < ${EXPECTED_MIN})"
+        Should Be True
+        ...    ${min_max_avg}[1] >= ${EXPECTED_MAX}
+        ...    msg="Max does not match (${min_max_avg}[1] < ${EXPECTED_MAX})"
+        Should Be True
+        ...    ${min_max_avg}[2] >= ${EXPECTED_AVG}
+        ...    msg="Avg does not match (${min_max_avg}[2] < ${EXPECTED_AVG})"
     ELSE
-    Fail                "Provided Test ID does not exist"
+        Fail    "Provided Test ID does not exist"
     END
 
 Set Link
-    [Documentation]     Configure link rate/delay/jitter/loss
-    ...                 Arguments:
-    ...                 ${RATE} Rate of the link
-    ...                 ${DELAY} Delay of the link
-    ...                 ${JITTER} Jitter of the link
-    ...                 ${LOSS} Loss of the link
-    [Arguments]         ${TEST_SETUP}=${NONE}
-    ...                 ${RATE}=${NONE}
-    ...                 ${DELAY}=${NONE}
-    ...                 ${JITTER}=${NONE}
-    ...                 ${LOSS}=${NONE}
-    ${result_link} =    Run Process                              ${EXECDIR}/config.sh             setchannel    ${TEST_SETUP}    server    ${RATE}-${DELAY}-${JITTER}-${LOSS}
-    Log Many            stdout: ${result_link.stdout}            stderr: ${result_link.stderr}
+    [Documentation]
+    ...    Configure link rate/delay/jitter/loss
+    ...    Arguments:
+    ...    ${TEST_TOPOLOGY} The topology of the test.
+    ...    ${RATE} Rate of the link
+    ...    ${DELAY} Delay of the link
+    ...    ${JITTER} Jitter of the link
+    ...    ${LOSS} Loss of the link
+    [Arguments]
+    ...    ${TEST_TOPOLOGY}=${NONE}
+    ...    ${TEST_SETUP}=${NONE}
+    ...    ${RATE}=${NONE}
+    ...    ${DELAY}=${NONE}
+    ...    ${JITTER}=${NONE}
+    ...    ${LOSS}=${NONE}
+    ${result_link} =    Run Process
+    ...    ${EXECDIR}/config.sh
+    ...    setchannel
+    ...    ${TEST_TOPOLOGY}
+    ...    ${TEST_SETUP}
+    ...    server
+    ...    eth0
+    ...    ${RATE}-${DELAY}-${JITTER}-${LOSS}
+    Log Many    stdout: ${result_link.stdout}    stderr: ${result_link.stderr}
 
 Run Latency Test
-    [Documentation]    Run hicn-ping on the ${TEST_SETUP} topology and measure latency.
-    ...                Arguments:
-    ...                ${TEST_SETUP} The setup of the test.
-    ...                ${EXPECTED_MIN} The expected min latency
-    ...                ${EXPECTED_MAX} The expected max latency
-    ...                ${EXPECTED_AVG} The expected avg latency
-    [Arguments]        ${TEST_SETUP}=${NONE}                                               ${EXPECTED_MIN}=${NONE}    ${EXPECTED_MAX}=${NONE}    ${EXPECTED_AVG}=${NONE}
-    Run Test           ${TEST_SETUP}                                                       latency                    ${EXPECTED_MIN}            ${EXPECTED_MAX}            ${EXPECTED_AVG}
+    [Documentation]
+    ...    Run hicn-ping on the \${TEST_SETUP} topology and measure latency.
+    ...    Arguments:
+    ...    ${TEST_TOPOLOGY} The topology of the test.
+    ...    ${TEST_SETUP} The setup of the test.
+    ...    ${EXPECTED_MIN} The expected min latency
+    ...    ${EXPECTED_MAX} The expected max latency
+    ...    ${EXPECTED_AVG} The expected avg latency
+    [Arguments]
+    ...    ${TEST_TOPOLOGY}=${NONE}
+    ...    ${TEST_SETUP}=${NONE}
+    ...    ${EXPECTED_MIN}=${NONE}
+    ...    ${EXPECTED_MAX}=${NONE}
+    ...    ${EXPECTED_AVG}=${NONE}
+    Run Test
+    ...    ${TEST_TOPOLOGY}
+    ...    ${TEST_SETUP}
+    ...    latency
+    ...    ${EXPECTED_MIN}
+    ...    ${EXPECTED_MAX}
+    ...    ${EXPECTED_AVG}
 
 Run Throughput Test Raaqm
-    [Documentation]    Run hiperf on the ${TEST_SETUP} topology and measure throughput.
-    ...                Arguments:
-    ...                ${TEST_SETUP} The setup of the test.
-    ...                ${EXPECTED_MIN} The expected min throughput
-    ...                ${EXPECTED_MAX} The expected max throughput
-    ...                ${EXPECTED_AVG} The expected avg throughput
-    [Arguments]        ${TEST_SETUP}=${NONE}                                               ${EXPECTED_MIN}=${NONE}    ${EXPECTED_MAX}=${NONE}    ${EXPECTED_AVG}=${NONE}
-    Run Test           ${TEST_SETUP}                                                       requin                     ${EXPECTED_MIN}            ${EXPECTED_MAX}            ${EXPECTED_AVG}
+    [Documentation]
+    ...    Run hiperf on the \${TEST_TOPOLOGY}-\${TEST_SETUP} topology
+    ...    and measure throughput.
+    ...    Arguments:
+    ...    ${TEST_TOPOLOGY} The topology of the test.
+    ...    ${TEST_SETUP} The setup of the test.
+    ...    ${EXPECTED_MIN} The expected min throughput
+    ...    ${EXPECTED_MAX} The expected max throughput
+    ...    ${EXPECTED_AVG} The expected avg throughput
+    [Arguments]
+    ...    ${TEST_TOPOLOGY}=${NONE}
+    ...    ${TEST_SETUP}=${NONE}
+    ...    ${EXPECTED_MIN}=${NONE}
+    ...    ${EXPECTED_MAX}=${NONE}
+    ...    ${EXPECTED_AVG}=${NONE}
+    Run Test
+    ...    ${TEST_TOPOLOGY}
+    ...    ${TEST_SETUP}
+    ...    requin
+    ...    ${EXPECTED_MIN}
+    ...    ${EXPECTED_MAX}
+    ...    ${EXPECTED_AVG}
 
-Run Throughput Test Raaqm New
-    [Documentation]    Run hiperf on the ${TEST_SETUP} topology and measure throughput.
-    ...                Arguments:
-    ...                ${TEST_SETUP} The setup of the test.
-    ...                ${EXPECTED_MIN} The expected min throughput
-    ...                ${EXPECTED_MAX} The expected max throughput
-    ...                ${EXPECTED_AVG} The expected avg throughput
-    [Arguments]        ${TEST_SETUP}=${NONE}                                               ${EXPECTED_MIN}=${NONE}    ${EXPECTED_MAX}=${NONE}    ${EXPECTED_AVG}=${NONE}
-    Run Test           ${TEST_SETUP}                                                       requin                     ${EXPECTED_MIN}            ${EXPECTED_MAX}            ${EXPECTED_AVG}
+Run Throughput Test Raaqm New Packet Format
+    [Documentation]
+    ...    Run hiperf on the \${TEST_SETUP} topology and measure throughput.
+    ...    Arguments:
+    ...    ${TEST_TOPOLOGY} The topology of the test.
+    ...    ${TEST_SETUP} The setup of the test.
+    ...    ${EXPECTED_MIN} The expected min throughput
+    ...    ${EXPECTED_MAX} The expected max throughput
+    ...    ${EXPECTED_AVG} The expected avg throughput
+    [Arguments]
+    ...    ${TEST_TOPOLOGY}=${NONE}
+    ...    ${TEST_SETUP}=${NONE}
+    ...    ${EXPECTED_MIN}=${NONE}
+    ...    ${EXPECTED_MAX}=${NONE}
+    ...    ${EXPECTED_AVG}=${NONE}
+    Run Test
+    ...    ${TEST_TOPOLOGY}
+    ...    ${TEST_SETUP}
+    ...    requin-new-paket-format
+    ...    ${EXPECTED_MIN}
+    ...    ${EXPECTED_MAX}
+    ...    ${EXPECTED_AVG}
 
 Run Throughput Test CBR
-    [Documentation]    Run hiperf on the ${TEST_SETUP} topology and measure throughput.
-    ...                Arguments:
-    ...                ${TEST_SETUP} The setup of the test.
-    ...                ${EXPECTED_MIN} The expected min throughput
-    ...                ${EXPECTED_MAX} The expected max throughput
-    ...                ${EXPECTED_AVG} The expected avg throughput
-    [Arguments]        ${TEST_SETUP}=${NONE}                                               ${EXPECTED_MIN}=${NONE}    ${EXPECTED_MAX}=${NONE}    ${EXPECTED_AVG}=${NONE}
-    Run Test           ${TEST_SETUP}                                                       cbr                        ${EXPECTED_MIN}            ${EXPECTED_MAX}            ${EXPECTED_AVG}
+    [Documentation]
+    ...    Run hiperf on the \${TEST_SETUP} topology and measure throughput.
+    ...    Arguments:
+    ...    ${TEST_TOPOLOGY} The topology of the test.
+    ...    ${TEST_SETUP} The setup of the test.
+    ...    ${EXPECTED_MIN} The expected min throughput
+    ...    ${EXPECTED_MAX} The expected max throughput
+    ...    ${EXPECTED_AVG} The expected avg throughput
+    [Arguments]
+    ...    ${TEST_TOPOLOGY}=${NONE}
+    ...    ${TEST_SETUP}=${NONE}
+    ...    ${EXPECTED_MIN}=${NONE}
+    ...    ${EXPECTED_MAX}=${NONE}
+    ...    ${EXPECTED_AVG}=${NONE}
+    Run Test
+    ...    ${TEST_TOPOLOGY}
+    ...    ${TEST_SETUP}
+    ...    cbr
+    ...    ${EXPECTED_MIN}
+    ...    ${EXPECTED_MAX}
+    ...    ${EXPECTED_AVG}
 
-Run Throughput Test CBR New
-    [Documentation]    Run hiperf on the ${TEST_SETUP} topology and measure throughput.
-    ...                Arguments:
-    ...                ${TEST_SETUP} The setup of the test.
-    ...                ${EXPECTED_MIN} The expected min throughput
-    ...                ${EXPECTED_MAX} The expected max throughput
-    ...                ${EXPECTED_AVG} The expected avg throughput
-    [Arguments]        ${TEST_SETUP}=${NONE}                                               ${EXPECTED_MIN}=${NONE}    ${EXPECTED_MAX}=${NONE}    ${EXPECTED_AVG}=${NONE}
-    Run Test           ${TEST_SETUP}                                                       cbr                        ${EXPECTED_MIN}            ${EXPECTED_MAX}            ${EXPECTED_AVG}
+Run Throughput Test CBR New Packet Format
+    [Documentation]
+    ...    Run hiperf on the \${TEST_SETUP} topology and measure throughput.
+    ...    Arguments:
+    ...    ${TEST_TOPOLOGY} The topology of the test.
+    ...    ${TEST_SETUP} The setup of the test.
+    ...    ${EXPECTED_MIN} The expected min throughput
+    ...    ${EXPECTED_MAX} The expected max throughput
+    ...    ${EXPECTED_AVG} The expected avg throughput
+    [Arguments]
+    ...    ${TEST_TOPOLOGY}=${NONE}
+    ...    ${TEST_SETUP}=${NONE}
+    ...    ${EXPECTED_MIN}=${NONE}
+    ...    ${EXPECTED_MAX}=${NONE}
+    ...    ${EXPECTED_AVG}=${NONE}
+    Run Test
+    ...    ${TEST_TOPOLOGY}
+    ...    ${TEST_SETUP}
+    ...    cbr-new-paket-format
+    ...    ${EXPECTED_MIN}
+    ...    ${EXPECTED_MAX}
+    ...    ${EXPECTED_AVG}
 
 Run RTC Test
-    [Documentation]    Run hiperf RTC on the ${TEST_SETUP} topology and check consumer syncs to producer bitrate.
-    ...                Arguments:
-    ...                ${TEST_SETUP} The setup of the test.
-    ...                ${EXPECTED_MIN} The expected min bitrate
-    ...                ${EXPECTED_MAX} The expected max bitrate
-    ...                ${EXPECTED_AVG} The expected avg bitrate
-    [Arguments]        ${TEST_SETUP}=${NONE}                                                                         ${EXPECTED_MIN}=${NONE}    ${EXPECTED_MAX}=${NONE}    ${EXPECTED_AVG}=${NONE}
-    Run Test           ${TEST_SETUP}                                                                                 rtc                        ${EXPECTED_MIN}            ${EXPECTED_MAX}            ${EXPECTED_AVG}
+    [Documentation]
+    ...    Run hiperf RTC on the \${TEST_SETUP} topology and check consumer syncs to
+    ...    producer bitrate.
+    ...    Arguments:
+    ...    ${TEST_TOPOLOGY} The topology of the test.
+    ...    ${TEST_SETUP} The setup of the test.
+    ...    ${EXPECTED_MIN} The expected min bitrate
+    ...    ${EXPECTED_MAX} The expected max bitrate
+    ...    ${EXPECTED_AVG} The expected avg bitrate
+    [Arguments]
+    ...    ${TEST_TOPOLOGY}=${NONE}
+    ...    ${TEST_SETUP}=${NONE}
+    ...    ${EXPECTED_MIN}=${NONE}
+    ...    ${EXPECTED_MAX}=${NONE}
+    ...    ${EXPECTED_AVG}=${NONE}
+    Run Test
+    ...    ${TEST_TOPOLOGY}
+    ...    ${TEST_SETUP}
+    ...    rtc
+    ...    ${EXPECTED_MIN}
+    ...    ${EXPECTED_MAX}
+    ...    ${EXPECTED_AVG}
 
-Run Latency Test New
-    [Documentation]    Run hicn-ping on the ${TEST_SETUP} topology with the new packet format and measure latency.
-    ...                Arguments:
-    ...                ${TEST_SETUP} The setup of the test.
-    ...                ${EXPECTED_MIN} The expected min latency
-    ...                ${EXPECTED_MAX} The expected max latency
-    ...                ${EXPECTED_AVG} The expected avg latency
-    [Arguments]        ${TEST_SETUP}=${NONE}                                               ${EXPECTED_MIN}=${NONE}    ${EXPECTED_MAX}=${NONE}    ${EXPECTED_AVG}=${NONE}
-    Run Test           ${TEST_SETUP}                                                       latency-new                ${EXPECTED_MIN}            ${EXPECTED_MAX}            ${EXPECTED_AVG}
+Run Latency Test New Packet Format
+    [Documentation]
+    ...    Run hicn-ping on the \${TEST_SETUP} topology with the new
+    ...    packet format and measure latency.
+    ...    Arguments:
+    ...    ${TEST_TOPOLOGY} The topology of the test.
+    ...    ${TEST_SETUP} The setup of the test.
+    ...    ${EXPECTED_MIN} The expected min latency
+    ...    ${EXPECTED_MAX} The expected max latency
+    ...    ${EXPECTED_AVG} The expected avg latency
+    [Arguments]
+    ...    ${TEST_TOPOLOGY}=${NONE}
+    ...    ${TEST_SETUP}=${NONE}
+    ...    ${EXPECTED_MIN}=${NONE}
+    ...    ${EXPECTED_MAX}=${NONE}
+    ...    ${EXPECTED_AVG}=${NONE}
+    Run Test
+    ...    ${TEST_TOPOLOGY}
+    ...    ${TEST_SETUP}
+    ...    latency-new-paket-format
+    ...    ${EXPECTED_MIN}
+    ...    ${EXPECTED_MAX}
+    ...    ${EXPECTED_AVG}