bug fixing

before it's move to csit some revork will be needed

Change-Id: I6752a41894975199e15ce6a6a10ca4c33f27d6be
Signed-off-by: Peter Gubka <pgubka@cisco.com>

diff --git a/test/tools/OF_Test/robot_suites/500__OF_Cluster_Sanity_OF/010__Flows_OF13_Cluster.txt b/test/tools/OF_Test/robot_suites/500__OF_Cluster_Sanity_OF/010__Flows_OF13_Cluster.txt
index 679d5819e4bae2b3921dc40e8823f01ba9e0db78..7025b0311aabf2b6b886b5e251593015cd60c896 100644 (file)
--- a/test/tools/OF_Test/robot_suites/500__OF_Cluster_Sanity_OF/010__Flows_OF13_Cluster.txt
+++ b/test/tools/OF_Test/robot_suites/500__OF_Cluster_Sanity_OF/010__Flows_OF13_Cluster.txt
@@ -355,9 +355,9 @@ Init Flow Variables   [Arguments]   ${tableid}  ${flowid}  ${priority}
       Set Suite Variable   ${data}
       Set Suite Variable   ${xmlroot}
 Create Controllers Sessions
-    Create Session    session1    http://${CONTROLLER1}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
-    Create Session    session2    http://${CONTROLLER2}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
-    Create Session    session3    http://${CONTROLLER3}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session1    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session2    http://${CONTROLLER1}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session3    http://${CONTROLLER2}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Get Controller Response  [Arguments]  ${session}  ${url}
     ${headers}=      Create Dictionary   Accept   application/xml
     ${resp}=   Get  ${session}  ${url}   headers=${headers}

diff --git a/test/tools/OF_Test/robot_suites/500__OF_Cluster_Sanity_OF/SanityLibrary.py b/test/tools/OF_Test/robot_suites/500__OF_Cluster_Sanity_OF/SanityLibrary.py
index faf0ec0187aec6112c52d0383eddaaad0c090a4c..c0db468921b3f993b2b29077206383a59e40f629 100644 (file)
--- a/test/tools/OF_Test/robot_suites/500__OF_Cluster_Sanity_OF/SanityLibrary.py
+++ b/test/tools/OF_Test/robot_suites/500__OF_Cluster_Sanity_OF/SanityLibrary.py
@@ -37,7 +37,7 @@ class SanityLibrary:
     <barrier>false</barrier>
 </flow>'''
 
-        flow_data = flow_template % (tid, fid, fid, 'TestFlow-{}'.format(fid), priority)
+        flow_data = flow_template % (tid, fid, fid, 'TestFlow-{0}'.format(fid), priority)
         return flow_data
 
     def is_cluter_set_up(self, rsp1, rsp2, rsp3):
@@ -59,3 +59,4 @@ class SanityLibrary:
             return rj['module'][0]['distributed-datastore-provider:config-properties']['persistent']
         except:
             pass
+

diff --git a/test/tools/OF_Test/robot_suites/500__OF_Cluster_Sanity_OF/__init__.txt b/test/tools/OF_Test/robot_suites/500__OF_Cluster_Sanity_OF/__init__.txt
index f4bec22ffb9ac070d3b96940a74194621b5822fd..b505689d4f7081e14344b5a2b3847c1ed048123e 100644 (file)
--- a/test/tools/OF_Test/robot_suites/500__OF_Cluster_Sanity_OF/__init__.txt
+++ b/test/tools/OF_Test/robot_suites/500__OF_Cluster_Sanity_OF/__init__.txt
@@ -5,24 +5,23 @@ Suite Teardown    Stop Suite
 Library           SSHLibrary
 
 *** Variables ***
-${start}          sudo python mininetwork.py --controllers=${CONTROLLER1},${CONTROLLER2},${CONTROLLER3}
+${start}          sudo python mininetwork.py --controllers=${CONTROLLER},${CONTROLLER1},${CONTROLLER2}
+${linux_prompt}    >
 
 *** Keywords ***
 Start Suite
     Log    Start the test on the base edition
     Open Connection    ${MININET}    prompt=>
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
-    Put File    ${CURDIR}/mininetwork.py   mininetwork.py
-    Write    sudo ovs-vsctl set-manager ptcp:6644
-    Write    sudo mn -c
-    Read Until   >
+    Put File    ${CURDIR}/mininetwork.py    mininetwork.py
+    Execute Command    sudo ovs-vsctl set-manager ptcp:6644
+    Execute Command    sudo mn -c
     Write    ${start}
-    Read Until   mininet>
+    Read Until    mininet>
 
 Stop Suite
     Log    Stop the test on the base edition
     Read
     Write    exit
-    Sleep    2
-    Read
+    Read Until    ${linux_prompt}
     Close Connection

diff --git a/test/tools/OF_Test/robot_suites/500__OF_Cluster_Sanity_OF/mininetwork.py b/test/tools/OF_Test/robot_suites/500__OF_Cluster_Sanity_OF/mininetwork.py
index 80e12c56cc295e16136a3a83c9597a5d77650fcf..114a43e2c2ea516612a1c8e5f3f5913bd3e0bc48 100644 (file)
--- a/test/tools/OF_Test/robot_suites/500__OF_Cluster_Sanity_OF/mininetwork.py
+++ b/test/tools/OF_Test/robot_suites/500__OF_Cluster_Sanity_OF/mininetwork.py
@@ -16,7 +16,7 @@ a = 1
 
 def get_next_ip():
     global a, b, c, d
-    rip = "{}.{}.{}.{}".format(d, c, b, a)
+    rip = "{0}.{1}.{2}.{3}".format(d, c, b, a)
     a += 1
     if a == 255:
         a = 1
@@ -47,14 +47,14 @@ def get_next_sid():
 
 
 def get_switch(net, hosts):
-    sname = 's{}'.format(get_next_sid())
+    sname = 's{0}'.format(get_next_sid())
     s = net.addSwitch(sname)
     for i in range(hosts):
-        hname = 'h{}'.format(get_next_hid())
+        hname = 'h{0}'.format(get_next_hid())
         hip = get_next_ip()
         h = net.addHost(hname, ip=hip)
         s.linkTo(h)
-        print "switch {}: host {}-{} added".format(sname, hname, hip)
+        print "switch {0}: host {1}-{2} added".format(sname, hname, hip)
     return s
 
 
@@ -64,9 +64,9 @@ def get_net(switches, hostpswtich, controllers=['10.25.2.9']):
 
     cs = []
     for i, cip in enumerate(controllers):
-        c = net.addController('c{}'.format(i), controller=RemoteController, ip=cip, port=6633)
+        c = net.addController('c{0}'.format(i), controller=RemoteController, ip=cip, port=6633)
         cs.append(c)
-        print "contrller {} created".format(c)
+        print "contrller {0} created".format(c)
 
     ss = []
     for i in range(switches):
@@ -112,3 +112,4 @@ if __name__ == '__main__':
     net.staticArp()
     CLI(net)
     net.stop()
+