Fix up PrefixCounting warning

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

diff --git a/csit/libraries/UscUtils.robot b/csit/libraries/UscUtils.robot
index b96500a248b5e25418874128c2e53816836bd36c..27fc85b5ef311ebde37627f90284ae9ddfb3fc04 100644 (file)
--- a/csit/libraries/UscUtils.robot
+++ b/csit/libraries/UscUtils.robot
@@ -1,28 +1,31 @@
 *** Settings ***
-Library           Collections
-Library           SSHLibrary
-Library           UtilLibrary.py
-Resource          RemoteBash.robot
-Resource          SSHKeywords.robot
+Library     Collections
+Library     SSHLibrary
+Library     UtilLibrary.py
+Resource    RemoteBash.robot
+Resource    SSHKeywords.robot
+
 
 *** Variables ***
-${REST_VIEW_CHANNEL}    /restconf/operations/usc-channel:view-channel
-${REST_ADD_CHANNEL}    /restconf/operations/usc-channel:add-channel
-${REST_REMOVE_CHANNEL}    /restconf/operations/usc-channel:remove-channel
-${REST_REMOVE_SESSION}    /restconf/operations/usc-channel:remove-session
-${REST_SEND_MESSAGE}    /restconf/operations/usc-channel:send-message
-${NAV_USC_TOOLS}    cd ~/usc-tools
-${CLONE_USC_TOOLS}    [ -f ~/usc-tools/UscAgent.jar ] && echo "The usc-tools does exist, done." || git clone https://github.com/victorxu99/usc-tools.git ~/usc-tools
-${ECHO_SERVER_PORT}    2007
+${REST_VIEW_CHANNEL}        /restconf/operations/usc-channel:view-channel
+${REST_ADD_CHANNEL}         /restconf/operations/usc-channel:add-channel
+${REST_REMOVE_CHANNEL}      /restconf/operations/usc-channel:remove-channel
+${REST_REMOVE_SESSION}      /restconf/operations/usc-channel:remove-session
+${REST_SEND_MESSAGE}        /restconf/operations/usc-channel:send-message
+${NAV_USC_TOOLS}            cd ~/usc-tools
+${CLONE_USC_TOOLS}
+...                         [ -f ~/usc-tools/UscAgent.jar ] && echo "The usc-tools does exist, done." || git clone https://github.com/victorxu99/usc-tools.git ~/usc-tools
+${ECHO_SERVER_PORT}         2007
 @{LIST_ECHO_SERVER_PORT}    2007    2008    2009
-${TEST_MESSAGE}    This is a test message.
-${NUM_OF_MESSAGES}    100
-${AgentTcp}       java -jar UscAgent.jar -t true
-${AgentUdp}       java -jar UscAgent.jar -t false
-${AgentTcpCallhome}    java -jar UscAgent.jar -t true -c true -h
-${AgentUdpCallhome}    java -jar UscAgent.jar -t false -c true -h
-${EchoServerTcp}    java -jar EchoServer.jar -t true -p 2007
-${EchoServerUdp}    java -jar EchoServer.jar -t false -p 2007
+${TEST_MESSAGE}             This is a test message.
+${NUM_OF_MESSAGES}          100
+${AgentTcp}                 java -jar UscAgent.jar -t true
+${AgentUdp}                 java -jar UscAgent.jar -t false
+${AgentTcpCallhome}         java -jar UscAgent.jar -t true -c true -h
+${AgentUdpCallhome}         java -jar UscAgent.jar -t false -c true -h
+${EchoServerTcp}            java -jar EchoServer.jar -t true -p 2007
+${EchoServerUdp}            java -jar EchoServer.jar -t false -p 2007
+
 
 *** Keywords ***
 Download Tools
@@ -134,15 +137,16 @@ Start Multiple_Sessions_TCP
     Write    ${NAV_USC_TOOLS}
     Write    ${AgentTcp}
     Read
-    ${L1}    Create List
-    : FOR    ${port_index}    IN    @{LIST_ECHO_SERVER_PORT}
-    \    Log    ${port_index}
-    \    ${echo_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    timeout=30s
-    \    Append To List    ${L1}    ${echo_conn_id}
-    \    Flexible Mininet Login
-    \    Write    ${NAV_USC_TOOLS}
-    \    Write    java -jar EchoServer.jar -t true -p ${port_index}
-    \    Read Until    initialized
+    ${L1}=    Create List
+    FOR    ${port_index}    IN    @{LIST_ECHO_SERVER_PORT}
+        Log    ${port_index}
+        ${echo_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    timeout=30s
+        Append To List    ${L1}    ${echo_conn_id}
+        Flexible Mininet Login
+        Write    ${NAV_USC_TOOLS}
+        Write    java -jar EchoServer.jar -t true -p ${port_index}
+        Read Until    initialized
+    END
     Set Suite Variable    ${L1}
 
 Start Multiple_Sessions_UDP
@@ -155,15 +159,16 @@ Start Multiple_Sessions_UDP
     Write    ${NAV_USC_TOOLS}
     Write    ${AgentUdp}
     Read
-    ${L1}    Create List
-    : FOR    ${port_index}    IN    @{LIST_ECHO_SERVER_PORT}
-    \    Log    ${port_index}
-    \    ${echo_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    timeout=30s
-    \    Append To List    ${L1}    ${echo_conn_id}
-    \    Flexible Mininet Login
-    \    Write    ${NAV_USC_TOOLS}
-    \    Write    java -jar EchoServer.jar -t false -p ${port_index}
-    \    Read Until    initialized
+    ${L1}=    Create List
+    FOR    ${port_index}    IN    @{LIST_ECHO_SERVER_PORT}
+        Log    ${port_index}
+        ${echo_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    timeout=30s
+        Append To List    ${L1}    ${echo_conn_id}
+        Flexible Mininet Login
+        Write    ${NAV_USC_TOOLS}
+        Write    java -jar EchoServer.jar -t false -p ${port_index}
+        Read Until    initialized
+    END
     Set Suite Variable    ${L1}
 
 Stop Agent_Echo
@@ -200,9 +205,10 @@ Stop One_Agent_Multiple_Echo
     Write_Bare_Ctrl_C
     Write    exit
     Close Connection
-    : FOR    ${echo_conn_id}    IN    @{L1}
-    \    Switch Connection    ${echo_conn_id}
-    \    Read
-    \    Write_Bare_Ctrl_C
-    \    Write    exit
-    \    Close Connection
+    FOR    ${echo_conn_id}    IN    @{L1}
+        Switch Connection    ${echo_conn_id}
+        Read
+        Write_Bare_Ctrl_C
+        Write    exit
+        Close Connection
+    END