From d0f7243b350e9b1705629aa9d8e01c2d242928c5 Mon Sep 17 00:00:00 2001 From: victorxu Date: Fri, 19 Feb 2016 14:53:31 -0800 Subject: [PATCH] Add suite setup for TCP and UDP suite tests 1. Need to move suite setup (download usc test tools) from root folder USC to subfolders TCP and Udp 2. Replace static callhome IP with ${ODL_SYSTEM_IP} 3. Add csit/testplans/usc-tcp.txt 4. Change the keyword to download USC Tools Change-Id: I5b8b195f5274eb48d434351ce5f7657868e0091e Signed-off-by: victorxu --- csit/libraries/UscUtils.robot | 54 ++++++++++++------------------ csit/suites/usc/__init__.robot | 1 - csit/suites/usc/tcp/__init__.robot | 2 ++ csit/suites/usc/udp/__init__.robot | 2 ++ 4 files changed, 26 insertions(+), 33 deletions(-) diff --git a/csit/libraries/UscUtils.robot b/csit/libraries/UscUtils.robot index 70342188a8..fb8831b2d1 100644 --- a/csit/libraries/UscUtils.robot +++ b/csit/libraries/UscUtils.robot @@ -10,16 +10,15 @@ ${REST_ADD_CHANNEL} /restconf/operations/usc-channel:add-channel ${REST_REMOVE_CHANNEL} /restconf/operations/usc-channel:remove-channel ${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 +27,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} user=${TOOLS_SYSTEM_USER} password=${TOOLS_SYSTEM_PASSWORD} 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 +53,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 +70,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 +88,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 +106,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 +117,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,7 +128,7 @@ 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 @@ -147,7 +137,7 @@ Start Multiple_Sessions_TCP \ 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} + \ Flexible Mininet Login \ Write ${NAV_USC_TOOLS} \ Write java -jar EchoServer.jar -t true -p ${port_index} \ Read Until initialized @@ -159,7 +149,7 @@ 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 @@ -168,7 +158,7 @@ Start Multiple_Sessions_UDP \ 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} + \ Flexible Mininet Login \ Write ${NAV_USC_TOOLS} \ Write java -jar EchoServer.jar -t false -p ${port_index} \ Read Until initialized diff --git a/csit/suites/usc/__init__.robot b/csit/suites/usc/__init__.robot index 89a87eb777..45b74bd844 100644 --- a/csit/suites/usc/__init__.robot +++ b/csit/suites/usc/__init__.robot @@ -1,4 +1,3 @@ *** Settings *** Suite Setup Download Tools -Suite Teardown Close Download Connection Resource ../../libraries/UscUtils.robot diff --git a/csit/suites/usc/tcp/__init__.robot b/csit/suites/usc/tcp/__init__.robot index b49d8ea30e..7392e44bc1 100644 --- a/csit/suites/usc/tcp/__init__.robot +++ b/csit/suites/usc/tcp/__init__.robot @@ -1,2 +1,4 @@ *** Settings *** +Suite Setup Download Tools Force Tags TCP +Resource ../../../libraries/UscUtils.robot diff --git a/csit/suites/usc/udp/__init__.robot b/csit/suites/usc/udp/__init__.robot index 5a93cb1d77..fcac8a354f 100644 --- a/csit/suites/usc/udp/__init__.robot +++ b/csit/suites/usc/udp/__init__.robot @@ -1,2 +1,4 @@ *** Settings *** +Suite Setup Download Tools Force Tags UDP +Resource ../../../libraries/UscUtils.robot -- 2.36.6