X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=test%2Fcsit%2Fsuites%2Fopenflowplugin%2FSwitch_Qualification%2F010_OpenFlow_Connection.robot;h=70e36e87fdcd1b56178925ecd1632f83ede2247a;hb=732659be50eedc962e9cf09b09ac15e459523c7a;hp=fa03952b6406c447dd0d7f1d64d595c936b7cc0b;hpb=eb612f593ed8731417c8aff2a0768b516cee6c39;p=integration.git

diff --git a/test/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot b/test/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot
index fa03952b..70e36e87 100644
--- a/test/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot
+++ b/test/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot
@@ -5,9 +5,9 @@ Suite Teardown    Switch Qualification Suite Teardown
 Test Timeout      5m
 Library           Collections
 Library           OperatingSystem
-Resource          ../../../libraries/SwitchUtils.txt
-Resource          ../../../libraries/Utils.txt
-Library           ../../../libraries/RequestsLibrary.py
+Resource          ../../../libraries/SwitchUtils.robot
+Resource          ../../../libraries/Utils.robot
+Library           RequestsLibrary
 Library           ../../../libraries/Common.py
 Library           ../../../libraries/SwitchClasses/${SWITCH_CLASS}.py
 Variables         ../../../variables/Variables.py
@@ -15,6 +15,7 @@ Variables         ../../../variables/Variables.py
 *** Variables ***
 ${SWITCH_CLASS}    Ovs
 ${SWITCH_IP}      ${MININET}
+${SWITCH_PROMPT}    ${DEFAULT_LINUX_PROMPT}
 ${CONTROLLER}     null
 ${REST_CONTEXT}    /restconf/operational/opendaylight-inventory:nodes
 
@@ -26,7 +27,7 @@ OF1.3 Connection Between Switch and Controller
     ${datapath_id_from_switch}=    Get Switch Datapath ID    ${test_switch}
     Verify Switch In Operational Data Store    ${test_switch}
     Disable OpenFlow    ${test_switch}
-    Verify Switch Not In Operational Data Store    ${test_switch}
+    Wait Until Keyword Succeeds    3s    1s    Verify Switch Not In Operational Data Store    ${test_switch}
     ##MORE CHECKS TO ADD ON SWITCH AND OPERATIONAL DATA STORE
     ##- proper OF version
     ##- proper default flow rules
@@ -38,6 +39,7 @@ Switch Qualification Suite Setup
     Set Suite Variable    ${test_switch}
     Call Method    ${test_switch}    set_mgmt_ip    ${SWITCH_IP}
     Call Method    ${test_switch}    set_controller_ip    ${CONTROLLER}
+    Call Method    ${test_switch}    set_mgmt_prompt    ${SWITCH_PROMPT}
     Log    MAKE: ${test_switch.make}\n MODEL: ${test_switch.model}\n IP: ${test_switch.mgmt_ip}\n PROMPT: ${test_switch.mgmt_prompt}\n CONTROLLER_IP: ${test_switch.of_controller_ip}\n MGMT_PROTOCOL: ${test_switch.mgmt_protocol}
     Ping    ${test_switch.mgmt_ip}
     Initialize Switch    ${test_switch}