change from set-br to set bridge and use XML header 55/46155/1
authorJamo Luhrsen <jluhrsen@redhat.com>
Fri, 23 Sep 2016 22:53:42 +0000 (15:53 -0700)
committerJamo Luhrsen <jluhrsen@redhat.com>
Fri, 23 Sep 2016 22:53:42 +0000 (15:53 -0700)
Change-Id: Ia853a1809ba920c72c6e32db63c841842cd981dc
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
csit/suites/examples/2016_Summit_Tutorial_Example.robot

index e531ed1e73e29df77d5fa13840a19919c64a204f..50c56077741745b16f208544aeea17a06deef2b0 100644 (file)
@@ -40,7 +40,8 @@ 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
@@ -48,7 +49,7 @@ Local Suite Setup
     # 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