Cardinal simple system test suites

[integration/test.git] / csit / libraries / OVSDB.robot

diff --git a/csit/libraries/OVSDB.robot b/csit/libraries/OVSDB.robot
index 58cd7ba75a4db7f245c7c6971b2bd8c7ba51b10c..43557343fc1c083d2ac7e4ef6181d32f4d6fb653 100644 (file)
--- a/csit/libraries/OVSDB.robot
+++ b/csit/libraries/OVSDB.robot
@@ -66,6 +66,7 @@ Verify OVS Reports Connected
     [Documentation]    Uses "vsctl show" to check for string "is_connected"
     ${output}=    Utils.Run Command On Remote System    ${tools_system}    sudo ovs-vsctl show
     Should Contain    ${output}    is_connected
+    [Return]    ${output}
 
 Get OVSDB UUID
     [Arguments]    ${ovs_system_ip}=${TOOLS_SYSTEM_IP}    ${controller_ip}=${ODL_SYSTEM_IP}    ${controller_http_session}=session
@@ -127,8 +128,8 @@ Add Multiple Managers to OVS
     \    Log    ${ovs_opt}
     Log    Configure OVS Managers in the OVS
     Utils.Run Command On Mininet    ${tools_system}    sudo ovs-vsctl set-manager ${ovs_opt}
-    Log    Check OVS configuratiom
-    ${output}=    Utils.Run Command On Mininet    ${tools_system}    sudo ovs-vsctl show
+    Log    Check OVS configuration
+    ${output}=    Wait Until Keyword Succeeds    5s    1s    Verify OVS Reports Connected    ${tools_system}
     Log    ${output}
-    ${ovsdb_uuid}=    Get OVSDB UUID    controller_http_session=controller1
+    ${ovsdb_uuid}=    Wait Until Keyword Succeeds    30s    2s    Get OVSDB UUID    controller_http_session=controller1
     [Return]    ${ovsdb_uuid}