Fix for 74477

[integration/test.git] / csit / suites / examples / 2016_Summit_Tutorial_Example.robot

diff --git a/csit/suites/examples/2016_Summit_Tutorial_Example.robot b/csit/suites/examples/2016_Summit_Tutorial_Example.robot
index e531ed1e73e29df77d5fa13840a19919c64a204f..6d118690bb7d87ce014caa1a44251eb5cf238e92 100644 (file)
--- a/csit/suites/examples/2016_Summit_Tutorial_Example.robot
+++ b/csit/suites/examples/2016_Summit_Tutorial_Example.robot
@@ -2,11 +2,11 @@
 Documentation     Example Robot suite used for the CSIT tutorial at the 2016 OpenDaylight Summit
 Suite Setup       Local Suite Setup
 Suite Teardown    Local Suite Teardown
-Test Setup        Log Testcase Start To Controller Karaf
+Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Library           RequestsLibrary
 Variables         ../../variables/Variables.py
-Resource          ../../libraries/KarafKeywords.robot
 Resource          ../../libraries/OVSDB.robot
+Resource          ../../libraries/SetupUtils.robot
 
 *** Variables ***
 ${switch_name}    odl_summit_switch
@@ -40,15 +40,17 @@ Delete Openflow Rule
 Connect Ovs To Controller
     [Documentation]    Will set the ovs manager to point at the ODL IP on the openflow port
     Run Command On Remote System    ${TOOLS_SYSTEM_IP}    sudo ovs-vsctl add-br ${switch_name}
-    Run Command On Remote System    ${TOOLS_SYSTEM_IP}    sudo ovs-vsctl set-br ${switch_name} protocols=OpenFlow13
+    Run Command On Remote System    ${TOOLS_SYSTEM_IP}    sudo ovs-vsctl set bridge ${switch_name} protocols=OpenFlow13
+    Run Command On Remote System    ${TOOLS_SYSTEM_IP}    sudo ovs-vsctl set bridge ${switch_name} other-config:hwaddr=00:00:00:00:00:01
     Set Controller In OVS Bridge    ${TOOLS_SYSTEM_IP}    ${switch_name}    tcp:${ODL_SYSTEM_IP}:${ODL_OF_PORT}
 
 Local Suite Setup
     [Documentation]    Make sure the environment is in a clean state.
+    SetupUtils.Setup_Utils_For_Setup_And_Teardown
     # the variable named "session" has grandfathered it's way in to CSIT such that some keywords expect
     # it to be the name of the session with which it should make it's rest calls with.    There is no other
     # good reason than that.
-    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
     Clean OVSDB Test Environment
 
 Local Suite Teardown