Move bgp global api to BgpOperations library

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

diff --git a/csit/libraries/MininetKeywords.robot b/csit/libraries/MininetKeywords.robot
index 317db1bde9490b88fc89000ff11b09c5a114d256..b8faeed66b1c02d790a8dd3351af2ca20421dbfe 100644 (file)
--- a/csit/libraries/MininetKeywords.robot
+++ b/csit/libraries/MininetKeywords.robot
@@ -21,7 +21,7 @@ Start Mininet Single Controller
     [Documentation]    Start Mininet with custom topology and connect to controller.
     Log    Clear any existing mininet
     Utils.Clean Mininet System    ${mininet}
-    ${mininet_conn_id}=    SSHKeywords.Open_Connection_To_Tools_System
+    ${mininet_conn_id}=    SSHKeywords.Open_Connection_To_Tools_System    ip_address=${mininet}    timeout=${timeout}
     Set Suite Variable    ${mininet_conn_id}
     Run Keyword If    '${custom}' != '${EMPTY}'    Put File    ${custom}
     Log    Start mininet ${options} to ${controller}
@@ -39,7 +39,7 @@ Start Mininet Multiple Controllers
     ${index_list} =    ClusterManagement.List Indices Or All    given_list=${controller_index_list}
     Log    Clear any existing mininet
     Utils.Clean Mininet System    ${mininet}
-    ${mininet_conn_id}=    SSHKeywords.Open_Connection_To_Tools_System
+    ${mininet_conn_id}=    SSHKeywords.Open_Connection_To_Tools_System    ip_address=${mininet}    timeout=${timeout}
     Set Suite Variable    ${mininet_conn_id}
     Run Keyword If    '${custom}' != '${EMPTY}'    Put File    ${custom}
     Run Keyword If    '${protocol}' == 'ssl'    Install Certificates In Mininet
@@ -52,13 +52,16 @@ Start Mininet Multiple Controllers
     \    ${controller_opt}=    Catenate    ${controller_opt}    ${SPACE}${protocol}:${ODL_SYSTEM_${index}_IP}:${ofport}
     \    Log    ${controller_opt}
     Log    Open extra SSH connection to configure the OVS bridges
-    SSHKeywords.Open_Connection_To_Tools_System
+    SSHKeywords.Open_Connection_To_Tools_System    ip_address=${mininet}    timeout=${timeout}
     ${num_bridges}    SSHLibrary.Execute Command    sudo ovs-vsctl show | grep Bridge | wc -l
     ${num_bridges}=    Convert To Integer    ${num_bridges}
-    Log    Configure OVS controllers ${controller_opt} in all bridges
+    ${bridges}=    Create List
     : FOR    ${i}    IN RANGE    1    ${num_bridges+1}
     \    ${bridge}=    SSHLibrary.Execute Command    sudo ovs-vsctl show | grep Bridge | cut -c 12- | sort | head -${i} | tail -1
-    \    SSHLibrary.Execute Command    sudo ovs-vsctl set bridge ${bridge} protocols=OpenFlow${ofversion}
+    \    SSHLibrary.Execute Command    sudo ovs-vsctl del-controller ${bridge} && sudo ovs-vsctl set bridge ${bridge} protocols=OpenFlow${ofversion}
+    \    Collections.Append To List    ${bridges}    ${bridge}
+    Log    Configure OVS controllers ${controller_opt} in all bridges
+    : FOR    ${bridge}    IN    @{bridges}
     \    SSHLibrary.Execute Command    sudo ovs-vsctl set-controller ${bridge} ${controller_opt}
     Log    Check OVS configuratiom
     ${output}=    SSHLibrary.Execute Command    sudo ovs-vsctl show
@@ -112,7 +115,7 @@ Send Mininet Command Multiple Sessions
     ${output_list}=    Create List
     : FOR    ${mininet_conn}    IN    @{mininet_conn_list}
     \    ${output}=    Utils.Send Mininet Command    ${mininet_conn}    ${cmd}
-    \    Append To List    ${output_list}    ${output}
+    \    Collections.Append To List    ${output_list}    ${output}
     [Return]    ${output_list}
 
 Stop Mininet And Exit
@@ -199,7 +202,7 @@ Get Mininet Hosts
     @{words}=    String.Split String    ${out}    ${SPACE}
     : FOR    ${item}    IN    @{words}
     \    ${h}=    String.Get Lines Matching Regexp    ${item}    h[0-9]*
-    \    Run Keyword If    '${h}' != '${EMPTY}'    Append To List    ${host_list}    ${h}
+    \    Run Keyword If    '${h}' != '${EMPTY}'    Collections.Append To List    ${host_list}    ${h}
     [Return]    ${host_list}
 
 Install Certificates In Mininet