Enlarge nc timeout used for netvirt SNAT test

Change-Id: I94724ef655a4974ca4887ef5369df94622333d5c
Signed-off-by: Alon Kochba <alonko@hpe.com>

diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot
index 9c15799e36b88cc7d127cf8b59fe742bcccb98c0..67224c3b53406d78457ec27349f959d3ce39e94e 100644 (file)
--- a/csit/libraries/OpenStackOperations.robot
+++ b/csit/libraries/OpenStackOperations.robot
@@ -416,11 +416,11 @@ Test Netcat Operations From Vm Instance
     ${devstack_conn_id}=    Get ControlNode Connection
     Switch Connection    ${devstack_conn_id}
     Log    ${vm_ip}
-    ${output}=    Write Commands Until Prompt    ( ( echo "${server_data}" | sudo timeout 60 nc -w 1 -l ${additional_args} ${port} ) & )
+    ${output}=    Write Commands Until Prompt    ( ( echo "${server_data}" | sudo timeout 60 nc -l ${additional_args} ${port} ) & )
     Log    ${output}
     ${output}=    Write Commands Until Prompt    sudo netstat -nlap | grep ${port}
     Log    ${output}
-    ${nc_output}=    Execute Command on VM Instance    ${net_name}    ${vm_ip}    sudo echo "${client_data}" | nc -v -w 1 ${additional_args} ${dest_ip} ${port}
+    ${nc_output}=    Execute Command on VM Instance    ${net_name}    ${vm_ip}    sudo echo "${client_data}" | nc -v -w 5 ${additional_args} ${dest_ip} ${port}
     Log    ${nc_output}
     ${output}=    Execute Command on VM Instance    ${net_name}    ${vm_ip}    sudo route -n
     Log    ${output}

diff --git a/csit/suites/openstack/connectivity/03_external_network_tests.robot b/csit/suites/openstack/connectivity/03_external_network_tests.robot
index a43876c25ddaab7f6b107389519f6be20d43570f..c40706be91c9c4c0c87f389e67722190b063f74f 100644 (file)
--- a/csit/suites/openstack/connectivity/03_external_network_tests.robot
+++ b/csit/suites/openstack/connectivity/03_external_network_tests.robot
@@ -1,13 +1,16 @@
 *** Settings ***
 Documentation     Test suite to check North-South connectivity in L3 using a router and an external network
-Suite Setup       Devstack Suite Setup    source_pwd=yes
+Suite Setup       BuiltIn.Run Keywords    SetupUtils.Setup_Utils_For_Setup_And_Teardown
+...               AND    DevstackUtils.Devstack Suite Setup
 Suite Teardown    Close All Connections
+Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Test Teardown     Get Test Teardown Debugs
 Library           SSHLibrary
 Library           OperatingSystem
 Library           RequestsLibrary
 Resource          ../../../libraries/DevstackUtils.robot
 Resource          ../../../libraries/OpenStackOperations.robot
+Resource          ../../../libraries/SetupUtils.robot
 Resource          ../../../libraries/Utils.robot
 
 *** Variables ***