X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FUscUtils.robot;h=05161a5f5ca3682f843aaf258b2c278a97dfbb39;hb=aff5ab67e558c98f530161ff014704512aade695;hp=70342188a8937516228469df2e4e4efac89a2aa0;hpb=a0c6e44a1c02d7411e6f62c3a06a7b86213a27bf;p=integration%2Ftest.git

diff --git a/csit/libraries/UscUtils.robot b/csit/libraries/UscUtils.robot
index 70342188a8..05161a5f5c 100644
--- a/csit/libraries/UscUtils.robot
+++ b/csit/libraries/UscUtils.robot
@@ -2,24 +2,25 @@
 Library           Collections
 Library           SSHLibrary
 Library           UtilLibrary.py
-Resource          Utils.robot
+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. (17/17), done." || git clone https://github.com/victorxu99/usc-tools.git ~/usc-tools
-${USC_AGENT_IP}    192.168.56.51
+${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 192.168.56.20
-${AgentUdpCallhome}    java -jar UscAgent.jar -t false -c true -h 192.168.56.20
+${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
 
@@ -28,33 +29,22 @@ Download Tools
     [Documentation]    Download UscAgent and EchoServer before any system
     ...    is run.
     Log    Download tools begin ...
-    ${tools_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    timeout=30s
-    Set Suite Variable    ${tools_conn_id}
-    Flexible Mininet Login    user=${TOOLS_SYSTEM_USER}    password=${TOOLS_SYSTEM_PASSWORD}
-    Write    ${CLONE_USC_TOOLS}
-    Read Until    (17/17), done.
+    Run Command On Remote System    ${TOOLS_SYSTEM_IP}    ${CLONE_USC_TOOLS}    prompt_timeout=30s
     Log    Download tools ended.
 
-Close Download Connection
-    [Documentation]    Close Download Connection
-    Log    Close Download Connection
-    Switch Connection    ${tools_conn_id}
-    Write    exit
-    Close Connection
-
 Start TCP
     [Documentation]    Basic setup/cleanup work that can be done safely before any system
     ...    is run.
     Log    Start USC test VM for TCP
     ${agent_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    timeout=30s
     Set Suite Variable    ${agent_conn_id}
-    Flexible Mininet Login    user=${TOOLS_SYSTEM_USER}    password=${TOOLS_SYSTEM_PASSWORD}
+    Flexible Mininet Login
     Write    ${NAV_USC_TOOLS}
     Write    ${AgentTcp}
     Read
     ${echo_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    timeout=30s
     Set Suite Variable    ${echo_conn_id}
-    Flexible Mininet Login    user=${TOOLS_SYSTEM_USER}    password=${TOOLS_SYSTEM_PASSWORD}
+    Flexible Mininet Login
     Write    ${NAV_USC_TOOLS}
     Write    ${EchoServerTcp}
     Read Until    initialized
@@ -65,13 +55,13 @@ Start UDP
     Log    Start USC test VM for UDP
     ${agent_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    timeout=30s
     Set Suite Variable    ${agent_conn_id}
-    Flexible Mininet Login    user=${TOOLS_SYSTEM_USER}    password=${TOOLS_SYSTEM_PASSWORD}
+    Flexible Mininet Login
     Write    ${NAV_USC_TOOLS}
     Write    ${AgentUdp}
     Read
     ${echo_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    timeout=30s
     Set Suite Variable    ${echo_conn_id}
-    Flexible Mininet Login    user=${TOOLS_SYSTEM_USER}    password=${TOOLS_SYSTEM_PASSWORD}
+    Flexible Mininet Login
     Write    ${NAV_USC_TOOLS}
     Write    ${EchoServerUdp}
     Read Until    initialized
@@ -82,13 +72,14 @@ Start CALLHOME_TCP
     Log    Start USC test VM for CALLHOME_TCP
     ${agent_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    timeout=30s
     Set Suite Variable    ${agent_conn_id}
-    Flexible Mininet Login    user=${TOOLS_SYSTEM_USER}    password=${TOOLS_SYSTEM_PASSWORD}
+    ${callhomeCmd}=    Catenate    ${AgentTcpCallhome}    ${ODL_SYSTEM_IP}
+    Flexible Mininet Login
     Write    ${NAV_USC_TOOLS}
-    Write    ${AgentTcpCallhome}
+    Write    ${callhomeCmd}
     Read
     ${echo_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    timeout=30s
     Set Suite Variable    ${echo_conn_id}
-    Flexible Mininet Login    user=${TOOLS_SYSTEM_USER}    password=${TOOLS_SYSTEM_PASSWORD}
+    Flexible Mininet Login
     Write    ${NAV_USC_TOOLS}
     Write    ${EchoServerTcp}
     Read Until    initialized
@@ -99,13 +90,14 @@ Start CALLHOME_UDP
     Log    Start USC test VM for CALLHOME_UDP
     ${agent_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    timeout=30s
     Set Suite Variable    ${agent_conn_id}
-    Flexible Mininet Login    user=${TOOLS_SYSTEM_USER}    password=${TOOLS_SYSTEM_PASSWORD}
+    ${callhomeCmd}=    Catenate    ${AgentUdpCallhome}    ${ODL_SYSTEM_IP}
+    Flexible Mininet Login
     Write    ${NAV_USC_TOOLS}
-    Write    ${AgentUdpCallhome}
+    Write    ${callhomeCmd}
     Read
     ${echo_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    timeout=30s
     Set Suite Variable    ${echo_conn_id}
-    Flexible Mininet Login    user=${TOOLS_SYSTEM_USER}    password=${TOOLS_SYSTEM_PASSWORD}
+    Flexible Mininet Login
     Write    ${NAV_USC_TOOLS}
     Write    ${EchoServerUdp}
     Read Until    initialized
@@ -116,7 +108,7 @@ Start Fallback_TCP
     Log    Start USC test VM for Fallback_TCP
     ${echo_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    timeout=30s
     Set Suite Variable    ${echo_conn_id}
-    Flexible Mininet Login    user=${TOOLS_SYSTEM_USER}    password=${TOOLS_SYSTEM_PASSWORD}
+    Flexible Mininet Login
     Write    ${NAV_USC_TOOLS}
     Write    ${EchoServerTcp}
     Read Until    initialized
@@ -127,7 +119,7 @@ Start Fallback_UDP
     Log    Start USC test VM for Fallback_TCP
     ${echo_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    timeout=30s
     Set Suite Variable    ${echo_conn_id}
-    Flexible Mininet Login    user=${TOOLS_SYSTEM_USER}    password=${TOOLS_SYSTEM_PASSWORD}
+    Flexible Mininet Login
     Write    ${NAV_USC_TOOLS}
     Write    ${EchoServerUdp}
     Read Until    initialized
@@ -138,19 +130,20 @@ Start Multiple_Sessions_TCP
     Log    Start USC test VM for Multiple_Sessions_TCP
     ${agent_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    timeout=30s
     Set Suite Variable    ${agent_conn_id}
-    Flexible Mininet Login    user=${TOOLS_SYSTEM_USER}    password=${TOOLS_SYSTEM_PASSWORD}
+    Flexible Mininet Login
     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    user=${TOOLS_SYSTEM_USER}    password=${TOOLS_SYSTEM_PASSWORD}
-    \    Write    ${NAV_USC_TOOLS}
-    \    Write    java -jar EchoServer.jar -t true -p ${port_index}
-    \    Read Until    initialized
+    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
@@ -159,19 +152,20 @@ Start Multiple_Sessions_UDP
     Log    Start USC test VM for Multiple_Sessions_UDP
     ${agent_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    timeout=30s
     Set Suite Variable    ${agent_conn_id}
-    Flexible Mininet Login    user=${TOOLS_SYSTEM_USER}    password=${TOOLS_SYSTEM_PASSWORD}
+    Flexible Mininet Login
     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    user=${TOOLS_SYSTEM_USER}    password=${TOOLS_SYSTEM_PASSWORD}
-    \    Write    ${NAV_USC_TOOLS}
-    \    Write    java -jar EchoServer.jar -t false -p ${port_index}
-    \    Read Until    initialized
+    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
@@ -208,9 +202,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