Using a single point of reference for DEFAULT_LINUX_PROMPT

the idea is to have all prompts defaults come from a single place
in Variables.py.  This is only the first patch for this work.  Two
goals here:

1.  remove all local definitions of the default prompt and point
those suites/libs to use the DEFAULT_LINUX_PROMPT in Variables.py

2.  convert all default args (e.g. ${prompt}=${linux_prompt} to use
this new ${DEFAULT_LINUX_PROMPT}

future patches can be more specific and start referencing variables
not yet introduced for things like ${MININETVM0_PROMPT},
${MININETVM1_PROMPT}, ${ODLVM2_PROMPT}, etc.

Change-Id: Ic87dfb930b25b37b1e02c50750a7a2f6732b24bf
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/test/csit/libraries/Scalability.robot b/test/csit/libraries/Scalability.robot
index b655d7be407ce4bfa5919cd9282ddded0332bb2e..5344fc5c9be355024c65146a15c30a62818c99cc 100644 (file)
--- a/test/csit/libraries/Scalability.robot
+++ b/test/csit/libraries/Scalability.robot
@@ -6,9 +6,6 @@ Library           Collections
 Variables           ../variables/Variables.py
 Library           RequestsLibrary
 Library           SwitchClasses/BaseSwitch.py
-*** Variables ***
-${linux_prompt}    >
-
 
 *** Keywords ***
 Find Max Switches
@@ -119,7 +116,7 @@ Start Mininet With One Switch And ${hosts} hosts
     [Documentation]    Start mininet with one switch and ${hosts} hosts
     Log     Starting mininet with one switch and ${hosts} hosts
     Log To Console   Starting mininet with one switch and ${hosts} hosts
-    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${linux_prompt}    timeout=${hosts*3}
+    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=${hosts*3}
     Set Suite Variable    ${mininet_conn_id}
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Write    sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,1,${hosts} --switch ovsk,protocols=OpenFlow13
@@ -168,7 +165,7 @@ Start Mininet Linear
     [Arguments]    ${switches}
     [Documentation]    Start mininet linear topology with ${switches} nodes
     Log To Console    Starting mininet linear ${switches}
-    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${linux_prompt}    timeout=${switches*3}
+    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=${switches*3}
     Set Suite Variable    ${mininet_conn_id}
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Write    sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${switches} --switch ovsk,protocols=OpenFlow13
@@ -179,11 +176,11 @@ Start Mininet With Custom Topology
     [Arguments]  ${topology_file}  ${switches}   ${base_mac}=00:00:00:00:00:00  ${base_ip}=1.1.1.1  ${hosts}=0  ${mininet_start_time}=100
     [Documentation]  Start a custom mininet topology.
     Log To Console    Start a custom mininet topology with ${switches} nodes
-    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${linux_prompt}    timeout=${mininet_start_time}
+    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=${mininet_start_time}
     Set Suite Variable    ${mininet_conn_id}
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Write    python ${topology_file} ${switches} ${hosts} ${base_mac} ${base_ip}
-    Read Until    ${linux_prompt}
+    Read Until    ${DEFAULT_LINUX_PROMPT}
     Write    sudo mn --controller=remote,ip=${CONTROLLER} --custom switch.py --topo demotopo --switch ovsk,protocols=OpenFlow13
     Read Until    mininet>
     Write   sh ovs-vsctl show
@@ -247,7 +244,7 @@ Stop Mininet Simulation
     Switch Connection    ${mininet_conn_id}
     Read
     Write    exit
-    Read Until    ${linux_prompt}
+    Read Until    ${DEFAULT_LINUX_PROMPT}
     Close Connection
 
 Scalability Suite Teardown

diff --git a/test/csit/libraries/TsdrUtils.robot b/test/csit/libraries/TsdrUtils.robot
index 941aa7fbd49bd8a146b1ab939599c7965c7c5db7..402874ac6100278216b5b04f4c290245b3abdb4b 100644 (file)
--- a/test/csit/libraries/TsdrUtils.robot
+++ b/test/csit/libraries/TsdrUtils.robot
@@ -1,6 +1,8 @@
 *** Settings ***
 Library           OperatingSystem
 Resource          Utils.robot
+Variables           ../variables/Variables.py
+
 
 *** Variables ***
 ${HBASE_CLIENT}    /tmp/Hbase/hbase-0.94.15/bin
@@ -12,7 +14,7 @@ Start Tsdr Suite
     [Documentation]    TSDR specific setup/cleanup work that can be done safely before any system
     ...    is run.
     Clean Mininet System
-    ${mininet_conn_id1}=    Open Connection    ${MININET}    prompt=${LINUX_PROMPT}    timeout=30s
+    ${mininet_conn_id1}=    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=30s
     Set Suite Variable    ${mininet_conn_id1}
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Execute Command    sudo ovs-vsctl set-manager ptcp:6644
@@ -27,33 +29,33 @@ Stop Tsdr Suite
     Switch Connection    ${mininet_conn_id1}
     Read
     Write    exit
-    Read Until    ${LINUX_PROMPT}
+    Read Until    ${DEFAULT_LINUX_PROMPT}
     Close Connection
 
 Initialize the HBase for TSDR
     [Documentation]    Install and initialize the tsdr tables on HBase Server
-    ${hbase_server}=    Run Command On Remote System    ${CONTROLLER}    export JAVA_HOME=/usr && ${HBASE_CLIENT}/start-hbase.sh    ${MININET_USER}    ${LINUX_PROMPT}    120
+    ${hbase_server}=    Run Command On Remote System    ${CONTROLLER}    export JAVA_HOME=/usr && ${HBASE_CLIENT}/start-hbase.sh    ${MININET_USER}    ${prompt_timeout}=120
     Log    ${hbase_server}
     ${hbase_process}=    Run Command On Remote System    ${CONTROLLER}    ps -ef | grep HMaster
     Log    ${hbase_process}
 
 Stop the HBase Server
     [Documentation]    Stop the HBase server
-    ${hbase_server}=    Run Command On Remote System    ${CONTROLLER}    export JAVA_HOME=/usr && ${HBASE_CLIENT}/stop-hbase.sh    ${MININET_USER}    ${LINUX_PROMPT}    90
+    ${hbase_server}=    Run Command On Remote System    ${CONTROLLER}    export JAVA_HOME=/usr && ${HBASE_CLIENT}/stop-hbase.sh    ${MININET_USER}    ${prompt_timeout}=90
     Log    ${hbase_server}
 
 Configure the Queue on Switch
-    [Arguments]    ${queue_interface}    ${user}=${MININET_USER}    ${prompt}=${LINUX_PROMPT}    ${prompt_timeout}=120s
+    [Arguments]    ${queue_interface}    ${user}=${MININET_USER}    ${prompt_timeout}=120s
     [Documentation]    Configure the 2 queues on specified openvswitch interface
     Log    Configure the queue on ${queue_interface}
-    ${output}=    Run Command On Remote System    ${MININET}    sudo ovs-vsctl set port ${queue_interface} qos=@newqos -- --id=@newqos create qos type=linux-htb other-config:max-rate=200000000 queues=0=@q0,1=@q1,2=@q2 -- --id=@q0 create queue other-config:min-rate=100000 other-config:max-rate=200000 -- --id=@q1 create queue other-config:min-rate=10001 other-config:max-rate=300000 -- --id=@q2 create queue other-config:min-rate=300001 other-config:max-rate=200000000    ${MININET_USER}    ${LINUX_PROMPT}    90
+    ${output}=    Run Command On Remote System    ${MININET}    sudo ovs-vsctl set port ${queue_interface} qos=@newqos -- --id=@newqos create qos type=linux-htb other-config:max-rate=200000000 queues=0=@q0,1=@q1,2=@q2 -- --id=@q0 create queue other-config:min-rate=100000 other-config:max-rate=200000 -- --id=@q1 create queue other-config:min-rate=10001 other-config:max-rate=300000 -- --id=@q2 create queue other-config:min-rate=300001 other-config:max-rate=200000000    ${MININET_USER}    ${prompt_timeout}=90
     Log    ${output}
 
 Query the Data from HBaseClient
-    [Arguments]    ${query}    ${remote}=${CONTROLLER}    ${user}=${MININET_USER}    ${prompt}=${LINUX_PROMPT}    ${prompt_timeout}=120s
+    [Arguments]    ${query}    ${remote}=${CONTROLLER}    ${user}=${MININET_USER}    ${prompt_timeout}=120s
     [Documentation]    Execute the HBase Query and return the result
     Log    Attempting to execute ${query} on ${remote} via HbaseClient
-    ${conn_id}=    Open Connection    ${remote}    prompt=${prompt}    timeout=${prompt_timeout}
+    ${conn_id}=    Open Connection    ${remote}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=${prompt_timeout}
     Login With Public Key    ${user}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Write    export JAVA_HOME=/usr
     Write    ${HBASE_CLIENT}/hbase shell
@@ -62,14 +64,14 @@ Query the Data from HBaseClient
     ${output}=    Read Until    hbase(main):
     Write    exit
     LOG    ${output}
-    Comment    ${output}=    Read Until    ${prompt}
+    Comment    ${output}=    Read Until    ${DEFAULT_LINUX_PROMPT}
     Close Connection
     [Return]    ${output}
 
 Verify the Metric is Collected?
-    [Arguments]    ${tsdr_cmd}    ${metric}    ${remote}=${CONTROLLER}    ${user}=${MININET_USER}    ${prompt}=${LINUX_PROMPT}    ${prompt_timeout}=120s
+    [Arguments]    ${tsdr_cmd}    ${metric}    ${remote}=${CONTROLLER}    ${user}=${MININET_USER}    ${prompt_timeout}=120s
     [Documentation]    Verify the ${tsdr_cmd} output contains ${metric}
-    ${output}=    Issue Command On Karaf Console    ${tsdr_cmd}    ${CONTROLLER}    ${KARAF_SHELL_PORT}    ${prompt_timeout}
+    ${output}=    Issue Command On Karaf Console    ${tsdr_cmd}    ${remote}    ${KARAF_SHELL_PORT}    ${prompt_timeout}
     Should Contain    ${output}    ${metric}
 
 Prepare HBase Filter

diff --git a/test/csit/libraries/Utils.robot b/test/csit/libraries/Utils.robot
index dd7751daa03354e7cba6cca6da655afb5071ab28..f261655794d49b5b12ebe5be1a18516420ffa7a3 100644 (file)
--- a/test/csit/libraries/Utils.robot
+++ b/test/csit/libraries/Utils.robot
@@ -4,6 +4,7 @@ Library           String
 Library           DateTime
 Library           ./UtilLibrary.py
 Resource          KarafKeywords.robot
+Variables           ../variables/Variables.py
 
 *** Variables ***
 ${start}          sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,1 --switch ovsk,protocols=OpenFlow13
@@ -14,7 +15,7 @@ Start Suite
     ...    is run.
     Log    Start the test on the base edition
     Clean Mininet System
-    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${LINUX_PROMPT}    timeout=30s
+    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=30s
     Set Suite Variable    ${mininet_conn_id}
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Execute Command    sudo ovs-vsctl set-manager ptcp:6644
@@ -22,11 +23,11 @@ Start Suite
     Read Until    mininet>
 
 Start Mininet
-    [Arguments]    ${MININET}    ${cmd}=${start}    ${custom}=${OVSDB_CONFIG_DIR}/ovsdb.py    ${user}=${MININET_USER}    ${prompt}=${LINUX_PROMPT}    ${prompt_timeout}=30s
+    [Arguments]    ${MININET}    ${cmd}=${start}    ${custom}=${OVSDB_CONFIG_DIR}/ovsdb.py    ${user}=${MININET_USER}    ${prompt}=${DEFAULT_LINUX_PROMPT}    ${prompt_timeout}=30s
     [Documentation]    Basic setup to start mininet with custom topology
     Log    Start the test on the base edition
     Clean Mininet System
-    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${LINUX_PROMPT}    timeout=30s
+    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${prompt}    timeout=${prompt_timeout}
     Set Suite Variable    ${mininet_conn_id}
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
     Put File    ${custom}
@@ -35,11 +36,11 @@ Start Mininet
     [Return]    ${mininet_conn_id}
 
 Stop Mininet
-    [Arguments]    ${mininet_conn_id}    ${prompt}=${LINUX_PROMPT}
+    [Arguments]    ${mininet_conn_id}    ${prompt}=${DEFAULT_LINUX_PROMPT}
     [Documentation]    Basic setup to stop/clean mininet
     Switch Connection    ${mininet_conn_id}
     SSHLibrary.Write    exit
-    Read Until    ${LINUX_PROMPT}
+    Read Until    ${prompt}
     Close Connection
 
 Stop Suite
@@ -49,7 +50,7 @@ Stop Suite
     Switch Connection    ${mininet_conn_id}
     Read
     Write    exit
-    Read Until    ${LINUX_PROMPT}
+    Read Until    ${DEFAULT_LINUX_PROMPT}
     Close Connection
 
 Ensure All Nodes Are In Response
@@ -159,7 +160,7 @@ Strip Quotes
     [Return]    ${string_to_return}
 
 Run Command On Remote System
-    [Arguments]    ${remote_system}    ${cmd}    ${user}=${MININET_USER}    ${prompt}=${LINUX_PROMPT}    ${prompt_timeout}=30s
+    [Arguments]    ${remote_system}    ${cmd}    ${user}=${MININET_USER}    ${prompt}=${DEFAULT_LINUX_PROMPT}    ${prompt_timeout}=30s
     [Documentation]    Reduces the common work of running a command on a remote system to a single higher level
     ...    robot keyword, taking care to log in with a public key and. The command given is written
     ...    and the output returned. No test conditions are checked.
@@ -173,7 +174,7 @@ Run Command On Remote System
     [Return]    ${output}
 
 Verify File Exists On Remote System
-    [Arguments]    ${remote_system}    ${file}    ${user}=${MININET_USER}    ${prompt}=${LINUX_PROMPT}    ${prompt_timeout}=5s
+    [Arguments]    ${remote_system}    ${file}    ${user}=${MININET_USER}    ${prompt}=${DEFAULT_LINUX_PROMPT}    ${prompt_timeout}=5s
     [Documentation]    Will create connection with public key and will PASS if the given ${file} exists,
     ...    otherwise will FAIL
     ${conn_id}=    Open Connection    ${remote_system}    prompt=${prompt}    timeout=${prompt_timeout}

diff --git a/test/csit/libraries/VtnCoKeywords.robot b/test/csit/libraries/VtnCoKeywords.robot
index d8fc0e8db163e2ac42a3c8dd90ec7c790c28251e..f476d810c5d30d05af7c0eb1697f7a950993a8ad 100644 (file)
--- a/test/csit/libraries/VtnCoKeywords.robot
+++ b/test/csit/libraries/VtnCoKeywords.robot
@@ -28,7 +28,7 @@ Start SuiteVtnCo
     [Documentation]    Download and startup the VTN Coordinator.
     Log    Start the VTN Coordinator
     Get VtnCo
-    ${vtnc_conn_id}=    Open Connection    ${MININET}    prompt=${LINUX_PROMPT}    timeout=30s
+    ${vtnc_conn_id}=    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=30s
     Set Suite Variable    ${vtnc_conn_id}
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     ${VTNC_FILENAME}=    Catenate    SEPARATOR=/    ${WORKSPACE}    vtn_coordinator.tar.bz2

diff --git a/test/csit/suites/l2switch/Loop_Removal_OF13/010__loop_of_3.robot b/test/csit/suites/l2switch/Loop_Removal_OF13/010__loop_of_3.robot
index 80c199dc6a9f511fb30cbd01b3f7b12c727ccc5a..47ddb442d6c177f2ef08e89e529a64d81743229d 100644 (file)
--- a/test/csit/suites/l2switch/Loop_Removal_OF13/010__loop_of_3.robot
+++ b/test/csit/suites/l2switch/Loop_Removal_OF13/010__loop_of_3.robot
@@ -1,7 +1,7 @@
 *** Settings ***
 Documentation     Test suite for Ring/Loop topology of size 3
 Suite Setup       Start Suite
-Suite Teardown    Stop Suite
+Suite Teardown    Utils.Stop Suite
 Library           RequestsLibrary
 Resource          ../../../libraries/Utils.robot
 Variables         ../../../variables/Variables.py
@@ -91,7 +91,7 @@ Start Suite
     [Documentation]    Open controller session & mininet connection and start mininet custom topo
     Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
     ${start}=    Set Variable    sudo mn --controller=remote,ip=${CONTROLLER} --custom customtopo.py --topo ring --switch ovsk,protocols=OpenFlow13
-    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${linux_prompt}    timeout=30s
+    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=30s
     Set Suite Variable    ${mininet_conn_id}
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Put File    ${CURDIR}/../topologies/customtopo.py
@@ -99,13 +99,3 @@ Start Suite
     Execute Command    sudo mn -c
     Write    ${start}
     Read Until    mininet>
-
-Stop Suite
-    [Documentation]    Stop mininet topo and close connections & sessions
-    Log    Stop the test on the base edition
-    Switch Connection    ${mininet_conn_id}
-    Read
-    Write    exit
-    Read Until    ${linux_prompt}
-    Close Connection
-    Delete All Sessions

diff --git a/test/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot b/test/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot
index f4b6dfe8888eedc7fe3c50dc16aa9a287efc4109..96f4dbcd453112db89aaf3114c133e98efbd5273 100644 (file)
--- a/test/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot
+++ b/test/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot
@@ -96,7 +96,7 @@ LACP Inventory Suite Setup
 Set Host interface state\r
     [Arguments]    ${port-id}    ${port-state}\r
     [Documentation]    Will configure the port state of the Host to either up or down\r
-    Open Connection    ${MININET}    prompt=${LINUX_PROMPT}\r
+    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}\r
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any\r
     Execute Command    sudo ./m h2\r
     Execute Command    sudo ifconfig ${port-id} ${port-state}\r

diff --git a/test/csit/suites/lacp/Lacp_Feature_OF13/__init__.robot b/test/csit/suites/lacp/Lacp_Feature_OF13/__init__.robot
index d905b22562f2dc07a3779744084f9dc9f6465b3c..97d12ed54ea8549703de9ceb08d9e13076f91d43 100644 (file)
--- a/test/csit/suites/lacp/Lacp_Feature_OF13/__init__.robot
+++ b/test/csit/suites/lacp/Lacp_Feature_OF13/__init__.robot
@@ -12,7 +12,7 @@ ${bond}=     "/etc/modprobe.d/bonding.conf"
 *** Keywords ***
 Start Suite
     Log    Start mininet
-    ${mininet_session_id}=     Open Connection   ${MININET}     prompt=${LINUX_PROMPT}     timeout=30s
+    ${mininet_session_id}=     Open Connection   ${MININET}     prompt=${DEFAULT_LINUX_PROMPT}     timeout=30s
     Set Suite Variable     ${mininet_session_id}
     Login With Public Key    ${MININET_USER}   ${USER_HOME}/.ssh/${SSH_KEY}   any
     Execute Command    sudo ovs-vsctl set-manager ptcp:6633

diff --git a/test/csit/suites/openflowplugin/Longevity/020__longevity_switches_links.robot b/test/csit/suites/openflowplugin/Longevity/020__longevity_switches_links.robot
index 81bdec63c14dde85c0218475b13f53ee99124583..906703667f5ce88ad68b0f3771cadf669ad474c3 100644 (file)
--- a/test/csit/suites/openflowplugin/Longevity/020__longevity_switches_links.robot
+++ b/test/csit/suites/openflowplugin/Longevity/020__longevity_switches_links.robot
@@ -58,7 +58,7 @@ Longevity Suite Setup
     [Documentation]    In addtion to opening the REST session to the controller, the ${end_time} that this
     ...    test should not exceed is calculated and made in to a suite wide variable.
     Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
-    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${linux_prompt}
+    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Log     Copying ${CREATE_FULLYMESH_TOPOLOGY_FILE_PATH} file to Mininet VM
     Put File  ${CURDIR}/../../../${CREATE_FULLYMESH_TOPOLOGY_FILE_PATH}

diff --git a/test/csit/suites/openflowplugin/Maximum_Links/010__finding_max_links.robot b/test/csit/suites/openflowplugin/Maximum_Links/010__finding_max_links.robot
index f84b5aae4c9cce8d4e502ee2f55b083354ddc158..c04902ffcc856a5e503d0c357accfce0af9bf965 100644 (file)
--- a/test/csit/suites/openflowplugin/Maximum_Links/010__finding_max_links.robot
+++ b/test/csit/suites/openflowplugin/Maximum_Links/010__finding_max_links.robot
@@ -27,7 +27,7 @@ Find Max Switch Links
 Link Scale Suite Setup
     [Documentation]    Do initial steps for link scale tests
     Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
-    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${linux_prompt}
+    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Log     Copying ${CREATE_FULLYMESH_TOPOLOGY_FILE_PATH} file to Mininet VM
     Put File  ${CURDIR}/../../../${CREATE_FULLYMESH_TOPOLOGY_FILE_PATH}

diff --git a/test/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot b/test/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot
index 420bb58aeebc93425215f503dc3ab409792e1f31..fd02e316217cb2bf84596a0fc978ad2a6672d1f8 100644 (file)
--- a/test/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot
+++ b/test/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot
@@ -1,15 +1,15 @@
 *** Settings ***
 Documentation     Test suite to find maximum switches which can be connected to the controller
 Suite Setup       Start Suite
-Suite Teardown    Stop Suite
+Suite Teardown    Utils.Stop Suite
 Library           SSHLibrary
+Resource          ../../../libraries/Utils.robot
 Variables         ../../../variables/Variables.py
 Library           ../../../libraries/ScaleClient.py
 Library           OperatingSystem
 
 *** Variables ***
 ${start}          sudo python DynamicMininet.py
-${linux_prompt}    >
 ${max_sw}         500
 ${step_sw}        10
 ${init_sw}        10
@@ -44,14 +44,6 @@ Start Suite
     Read Until    mininet>
     Wait Until Keyword Succeeds    10s    1s    Verify Switches Connected    ${init_sw}
 
-Stop Suite
-    [Documentation]    Stops mininet
-    Log    Stop the test on the base edition
-    Read
-    Write    exit
-    Read Until    ${linux_prompt}
-    Close Connection
-
 Add Switches
     [Arguments]    ${nr_switches}
     [Documentation]    Adds requested number of switches to the network

diff --git a/test/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot b/test/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot
index 28d4cf1b02646e3fa10c10aa2d316ca09279139c..687b9188f026346a5f1de582cee38563a70ad88b 100644 (file)
--- a/test/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot
+++ b/test/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot
@@ -19,7 +19,6 @@ ${tabspread}      gauss
 ${topourl}        /restconf/operational/network-topology:network-topology/topology/flow:1
 ${invurl}         /restconf/operational/opendaylight-inventory:nodes
 @{cntls}          ${CONTROLLER}
-${linux_prompt}   >
 
 *** Test Cases ***
 Configure Flows
@@ -44,11 +43,11 @@ Check No Flows In Operational
 Connect Switches
     [Documentation]    Starts mininet with requested number of switches (${swnr})
     Log    Starting mininet with ${swnr} switches
-    Open Connection    ${MININET}    prompt=${linux_prompt}    timeout=600
+    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Write    sudo ovs-vsctl set-manager ptcp:6644
     Write    sudo mn -c
-    Read Until    ${linux_prompt}
+    Read Until    ${DEFAULT_LINUX_PROMPT}
     Write    sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
     Read Until    mininet>
     Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
@@ -60,7 +59,7 @@ Stop Switches
     Delete All Sessions
     Read
     Write    exit
-    Read Until    ${linux_prompt}
+    Read Until    ${DEFAULT_LINUX_PROMPT}
     Close Connection
 
 Are Switches Connected Topo

diff --git a/test/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot b/test/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot
index 3f346c83b89048baf03dab1ff48d8968cb59ad06..38f0cbfa572734f147d1220358fb033feef331a2 100644 (file)
--- a/test/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot
+++ b/test/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot
@@ -19,7 +19,6 @@ ${tabspread}      linear
 ${topourl}        /restconf/operational/network-topology:network-topology/topology/flow:1
 ${invurl}         /restconf/operational/opendaylight-inventory:nodes
 @{cntls}          ${CONTROLLER}
-${linux_prompt}   >
 
 *** Test Cases ***
 Configure Flows
@@ -44,11 +43,11 @@ Check No Flows In Operational
 Connect Switches
     [Documentation]    Starts mininet with requested number of switches (${swnr})
     Log    Starting mininet with ${swnr} switches
-    Open Connection    ${MININET}    prompt=${linux_prompt}    timeout=600
+    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Write    sudo ovs-vsctl set-manager ptcp:6644
     Write    sudo mn -c
-    Read Until    ${linux_prompt}
+    Read Until    ${DEFAULT_LINUX_PROMPT}
     Write    sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
     Read Until    mininet>
     Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
@@ -60,7 +59,7 @@ Stop Switches
     Delete All Sessions
     Read
     Write    exit
-    Read Until    ${linux_prompt}
+    Read Until    ${DEFAULT_LINUX_PROMPT}
     Close Connection
 
 Are Switches Connected Topo

diff --git a/test/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot b/test/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot
index 35eeb137c50c4b802c2206e478b1365ecbe0ddc3..0376125cc07d310a58d0b19982eb7815c736b70e 100644 (file)
--- a/test/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot
+++ b/test/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot
@@ -19,7 +19,6 @@ ${tabspread}      first
 ${topourl}        /restconf/operational/network-topology:network-topology/topology/flow:1
 ${invurl}         /restconf/operational/opendaylight-inventory:nodes
 @{cntls}          ${CONTROLLER}
-${linux_prompt}   >
 
 *** Test Cases ***
 Configure Flows
@@ -44,11 +43,11 @@ Check No Flows In Operational
 Connect Switches
     [Documentation]    Starts mininet with requested number of switches (${swnr})
     Log    Starting mininet with ${swnr} switches
-    Open Connection    ${MININET}    prompt=${linux_prompt}    timeout=600
+    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Write    sudo ovs-vsctl set-manager ptcp:6644
     Write    sudo mn -c
-    Read Until    ${linux_prompt}
+    Read Until    ${DEFAULT_LINUX_PROMPT}
     Write    sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
     Read Until    mininet>
     Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
@@ -60,7 +59,7 @@ Stop Switches
     Delete All Sessions
     Read
     Write    exit
-    Read Until    ${linux_prompt}
+    Read Until    ${DEFAULT_LINUX_PROMPT}
     Close Connection
 
 Are Switches Connected Topo

diff --git a/test/csit/suites/openflowplugin/Performance_Flow_Config/050_Stats_Collection_FirstTable.robot b/test/csit/suites/openflowplugin/Performance_Flow_Config/050_Stats_Collection_FirstTable.robot
index d59d0b4ee61ada43bae949a7242ce3c9f833e6e5..3b9d9faf9e187a62b07159098db78b2c2bc49ae2 100644 (file)
--- a/test/csit/suites/openflowplugin/Performance_Flow_Config/050_Stats_Collection_FirstTable.robot
+++ b/test/csit/suites/openflowplugin/Performance_Flow_Config/050_Stats_Collection_FirstTable.robot
@@ -19,7 +19,6 @@ ${tabspread}      first
 ${topourl}        /restconf/operational/network-topology:network-topology/topology/flow:1
 ${invurl}         /restconf/operational/opendaylight-inventory:nodes
 @{cntls}          ${CONTROLLER}
-${linux_prompt}   >
 
 *** Test Cases ***
 Configure Flows
@@ -44,11 +43,11 @@ Check No Flows In Operational
 Connect Switches
     [Documentation]    Starts mininet with requested number of switches (${swnr})
     Log    Starting mininet with ${swnr} switches
-    Open Connection    ${MININET}    prompt=${linux_prompt}    timeout=600
+    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Write    sudo ovs-vsctl set-manager ptcp:6644
     Write    sudo mn -c
-    Read Until    ${linux_prompt}
+    Read Until    ${DEFAULT_LINUX_PROMPT}
     Write    sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
     Read Until    mininet>
     Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
@@ -60,7 +59,7 @@ Stop Switches
     Delete All Sessions
     Read
     Write    exit
-    Read Until    ${linux_prompt}
+    Read Until    ${DEFAULT_LINUX_PROMPT}
     Close Connection
 
 Are Switches Connected Topo

diff --git a/test/csit/suites/openflowplugin/Performance_Flow_Config/060_Stats_Collection_Basic16kScenario.robot b/test/csit/suites/openflowplugin/Performance_Flow_Config/060_Stats_Collection_Basic16kScenario.robot
index 36a07f49615c50d171eed2ecefca3f9a586ffa9c..b61c4e327cc6d4521a0637e18dadd18630da106b 100644 (file)
--- a/test/csit/suites/openflowplugin/Performance_Flow_Config/060_Stats_Collection_Basic16kScenario.robot
+++ b/test/csit/suites/openflowplugin/Performance_Flow_Config/060_Stats_Collection_Basic16kScenario.robot
@@ -17,7 +17,6 @@ ${flnr}           16000
 ${swspread}       linear
 ${tabspread}      linear
 @{cntls}          ${CONTROLLER}
-${linux_prompt}    >
 ${start_cmd}      sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
 
 *** Test Cases ***
@@ -88,7 +87,7 @@ Stop Mininet End
 Connect Switches
     [Documentation]    Starts mininet with requested number of switches (${swnr})
     Log    Starting mininet with ${swnr} switches
-    Open Connection    ${MININET}    prompt=${linux_prompt}    timeout=600
+    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Execute Command    sudo ovs-vsctl set-manager ptcp:6644
     Execute Command    sudo mn -c
@@ -104,7 +103,7 @@ Stop Switches
     Log    Stopping mininet
     Read
     Write    exit
-    Read Until    ${linux_prompt}
+    Read Until    ${DEFAULT_LINUX_PROMPT}
     Close Connection
 
 Delete Http Session

diff --git a/test/csit/suites/openflowplugin/Performance_Flow_Config/070_Stats_Collection_100k_WithMininetRestart.robot b/test/csit/suites/openflowplugin/Performance_Flow_Config/070_Stats_Collection_100k_WithMininetRestart.robot
index 824a0f4d24b3d8ad85b49f8185aab8a4441d2305..e548d92034b8b22e244c310230b8f497592a200a 100644 (file)
--- a/test/csit/suites/openflowplugin/Performance_Flow_Config/070_Stats_Collection_100k_WithMininetRestart.robot
+++ b/test/csit/suites/openflowplugin/Performance_Flow_Config/070_Stats_Collection_100k_WithMininetRestart.robot
@@ -20,7 +20,6 @@ ${nrthreads}      5
 ${swspread}       linear
 ${tabspread}      first
 @{cntls}          ${CONTROLLER}
-${linux_prompt}    >
 ${start_cmd}      sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
 ${getf_cmd}       sh ./get-total-found.sh
 ${getr_cmd}       sh ./get-total-reported.sh
@@ -94,7 +93,7 @@ Stop Mininet End
 Connect Switches
     [Documentation]    Starts mininet with requested number of switches (${swnr})
     Log    Starting mininet with ${swnr} switches
-    Open Connection    ${MININET}    prompt=${linux_prompt}    timeout=600
+    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Execute Command    sudo ovs-vsctl set-manager ptcp:6644
     Execute Command    sudo mn -c
@@ -104,7 +103,7 @@ Connect Switches
 
 Create Http Session And Upload Files
     Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
-    Open Connection    ${MININET}    prompt=${linux_prompt}    timeout=600
+    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Put File    ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/*    ./
     Close Connection
@@ -114,7 +113,7 @@ Stop Switches
     Log    Stopping mininet
     Read
     Write    exit
-    Read Until    ${linux_prompt}
+    Read Until    ${DEFAULT_LINUX_PROMPT}
     Close Connection
 
 Delete Http Session And Store Plot Data

diff --git a/test/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot b/test/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot
index 845ca3eb0d6d60c31e7dfdf7542e2a577893030c..a4621c0c4567a4a609c9382559b44c6cf1969ba3 100644 (file)
--- a/test/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot
+++ b/test/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot
@@ -18,7 +18,6 @@ ${nrthreads}      5
 ${swspread}       linear
 ${tabspread}      first
 @{cntls}          ${CONTROLLER}
-${linux_prompt}    >
 ${start_cmd}      sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
 ${getf_cmd}       sh ./get-total-found.sh
 ${getr_cmd}       sh ./get-total-reported.sh
@@ -69,7 +68,7 @@ Stop Mininet End
 Connect Switches
     [Documentation]    Starts mininet with requested number of switches (${swnr})
     Log    Starting mininet with ${swnr} switches
-    Open Connection    ${MININET}    prompt=${linux_prompt}    timeout=600
+    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Execute Command    sudo ovs-vsctl set-manager ptcp:6644
     Execute Command    sudo mn -c
@@ -79,7 +78,7 @@ Connect Switches
 
 Create Http Session And Upload Files
     Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
-    Open Connection    ${MININET}    prompt=${linux_prompt}    timeout=600
+    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Put File    ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/*    ./
     Close Connection
@@ -89,7 +88,7 @@ Stop Switches
     Log    Stopping mininet
     Read
     Write    exit
-    Read Until    ${linux_prompt}
+    Read Until    ${DEFAULT_LINUX_PROMPT}
     Close Connection
 
 Delete Http Session And Store Plot Data

diff --git a/test/csit/suites/openflowplugin/Performance_Flow_Config/090_BulkMaticConfigDsSetup_100k.robot b/test/csit/suites/openflowplugin/Performance_Flow_Config/090_BulkMaticConfigDsSetup_100k.robot
index e2d2a2c914280572ffd799df22773ee20d54f7dc..d96e72fa15fa86cbfb7e6afbd455038e3e8adb1f 100644 (file)
--- a/test/csit/suites/openflowplugin/Performance_Flow_Config/090_BulkMaticConfigDsSetup_100k.robot
+++ b/test/csit/suites/openflowplugin/Performance_Flow_Config/090_BulkMaticConfigDsSetup_100k.robot
@@ -18,7 +18,6 @@ ${nrthreads}      5
 ${swspread}       linear
 ${tabspread}      first
 @{cntls}          ${CONTROLLER}
-${linux_prompt}    >
 ${start_cmd}      sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
 ${getf_cmd}       sh ./get-total-found.sh
 ${getr_cmd}       sh ./get-total-reported.sh
@@ -69,7 +68,7 @@ Stop Mininet End
 Connect Switches
     [Documentation]    Starts mininet with requested number of switches (${swnr})
     Log    Starting mininet with ${swnr} switches
-    Open Connection    ${MININET}    prompt=${linux_prompt}    timeout=600
+    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Execute Command    sudo ovs-vsctl set-manager ptcp:6644
     Execute Command    sudo mn -c
@@ -79,7 +78,7 @@ Connect Switches
 
 Create Http Session And Upload Files
     Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
-    Open Connection    ${MININET}    prompt=${linux_prompt}    timeout=600
+    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Put File    ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/*    ./
     Close Connection
@@ -89,7 +88,7 @@ Stop Switches
     Log    Stopping mininet
     Read
     Write    exit
-    Read Until    ${linux_prompt}
+    Read Until    ${DEFAULT_LINUX_PROMPT}
     Close Connection
 
 Delete Http Session And Store Plot Data

diff --git a/test/csit/suites/openflowplugin/Sanity3Node/__init__.robot b/test/csit/suites/openflowplugin/Sanity3Node/__init__.robot
index c23a8f06167d06780d40760d621f5edead08a5f3..01a18e172cbdd35aa377dd43809c45176ff976da 100644 (file)
--- a/test/csit/suites/openflowplugin/Sanity3Node/__init__.robot
+++ b/test/csit/suites/openflowplugin/Sanity3Node/__init__.robot
@@ -1,12 +1,12 @@
 *** Settings ***
 Documentation     Test suite for the OpenDaylight base edition with of13, aimed for statistics manager
 Suite Setup       Start Suite
-Suite Teardown    Stop Suite
+Suite Teardown    Utils.Stop Suite
 Library           SSHLibrary
+Resource          ../../../libraries/Utils.robot
 
 *** Variables ***
 ${start}          sudo python DynamicMininet.py
-${linux_prompt}    >
 
 *** Keywords ***
 Start Suite
@@ -20,10 +20,3 @@ Start Suite
     Read Until    mininet>
     Write    start_with_cluster ${CONTROLLER},${CONTROLLER1},${CONTROLLER2}
     Read Until    mininet>
-
-Stop Suite
-    Log    Stop the test on the base edition
-    Read
-    Write    exit
-    Read Until    ${linux_prompt}
-    Close Connection

diff --git a/test/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot b/test/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot
index 352d32ce764859dfc5407b10a74c0138d758c791..a6c098c08fe9467489ae5ea51e54e95f1a728fda 100644 (file)
--- a/test/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot
+++ b/test/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot
@@ -15,7 +15,7 @@ Variables         ../../../variables/Variables.py
 *** Variables ***
 ${SWITCH_CLASS}    Ovs
 ${SWITCH_IP}      ${MININET}
-${SWITCH_PROMPT}    ${LINUX_PROMPT}
+${SWITCH_PROMPT}    ${DEFAULT_LINUX_PROMPT}
 ${CONTROLLER}     null
 ${REST_CONTEXT}    /restconf/operational/opendaylight-inventory:nodes
 

diff --git a/test/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot b/test/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
index 0f9db58743057290314bf7a03b73fa61a1b829b3..eae35f4b742559b304d68bfd40827b4ae12d0643 100644 (file)
--- a/test/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
+++ b/test/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
@@ -28,7 +28,7 @@ Library           ../../../libraries/SwitchClasses/${SWITCH_CLASS}.py
 *** Variables ***
 ${SWITCH_CLASS}    Ovs
 ${SWITCH_IP}      ${MININET}
-${SWITCH_PROMPT}    ${LINUX_PROMPT}
+${SWITCH_PROMPT}    ${DEFAULT_LINUX_PROMPT}
 ${CONTROLLER}     null
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
 ${ipv4_src}       11.3.0.0/16

diff --git a/test/csit/suites/vpnservice/__init__.robot b/test/csit/suites/vpnservice/__init__.robot
index 5cbe48966d9974fdc923c20f79d2f27daf4317a2..750ca69ff54d13e7dfe39a671917b64d1bdef64f 100644 (file)
--- a/test/csit/suites/vpnservice/__init__.robot
+++ b/test/csit/suites/vpnservice/__init__.robot
@@ -16,28 +16,28 @@ Start Suite
     [Documentation]    Test suit for vpn service using mininet OF13 and OVS 2.3.1
     Log    Start the tests
     Clean Mininet System
-    ${mininet1_conn_id_1}=    Open Connection    ${MININET}    prompt=${LINUX_PROMPT}    timeout=30s
+    ${mininet1_conn_id_1}=    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=30s
     Set Global Variable    ${mininet1_conn_id_1}
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Execute Command    sudo ovs-vsctl set-manager ptcp:6644
     Put File    ${CURDIR}/custom.py
     Write    ${start1}
     Read Until    mininet>
-    ${mininet1_conn_id_2}=    Open Connection    ${MININET}    prompt=${LINUX_PROMPT}    timeout= 30s
+    ${mininet1_conn_id_2}=    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout= 30s
     Set Global Variable    ${mininet1_conn_id_2}
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Execute Command    sudo ovs-vsctl add-port s1 s1-gre1 -- set interface s1-gre1 type=gre options:remote_ip=${MININET1} options:local_ip=${MININET}
     ${output}    Execute Command    sudo ovs-vsctl show
     Log    ${output}
     Execute Command    sudo ovs-ofctl add-flow s1 -O OpenFlow13 arp,actions=FLOOD
-    ${mininet2_conn_id_1}=    Open Connection    ${MININET1}    prompt=${LINUX_PROMPT}    timeout=30s
+    ${mininet2_conn_id_1}=    Open Connection    ${MININET1}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=30s
     Set Global Variable    ${mininet2_conn_id_1}
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Execute Command    sudo ovs-vsctl set-manager ptcp:6644
     Put File    ${CURDIR}/custom.py
     Write    ${start2}
     Read Until    mininet>
-    ${mininet2_conn_id_2}=    Open Connection    ${MININET1}    prompt=${LINUX_PROMPT}    timeout= 30s
+    ${mininet2_conn_id_2}=    Open Connection    ${MININET1}    prompt=${DEFAULT_LINUX_PROMPT}    timeout= 30s
     Set Global Variable    ${mininet2_conn_id_2}
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Execute Command    sudo ovs-vsctl add-port s2 s2-gre1 -- set interface s2-gre1 type=gre options:remote_ip=${MININET} options:local_ip=${MININET1}
@@ -50,14 +50,14 @@ Stop Suite
     Switch Connection    ${mininet1_conn_id_1}
     Read
     Write    exit
-    Read Until    ${LINUX_PROMPT}
+    Read Until    ${DEFAULT_LINUX_PROMPT}
     Close Connection
     Switch Connection    ${mininet1_conn_id_2}
     Close Connection
     Switch Connection    ${mininet2_conn_id_1}
     Read
     Write    exit
-    Read Until    ${LINUX_PROMPT}
+    Read Until    ${DEFAULT_LINUX_PROMPT}
     Close Connection
     Switch Connection    ${mininet2_conn_id_2}
     Close Connection

diff --git a/test/csit/variables/Variables.py b/test/csit/variables/Variables.py
index 5fbc54d3307c8a73ad6e61e1e1bf9ec645e891c4..7120f179767f5638c3b247f560c504517c621269 100644 (file)
--- a/test/csit/variables/Variables.py
+++ b/test/csit/variables/Variables.py
@@ -10,9 +10,9 @@ PORT = '8080'
 RESTPORT = '8282'
 RESTCONFPORT = '8181'
 PREFIX = 'http://' + CONTROLLER + ':' + PORT
-PROMPT = '>'
+PROMPT = '>'  # TODO: remove this as it's vague.  need to fix any occurances of it first.
 CONTAINER = 'default'
-USER = 'admin'
+USER = 'admin'  # TODO: who is using this?  Can we make it more specific? (e.g.  RESTCONF_USER)
 PWD = 'admin'
 PASSWORD = 'EMPTY'
 AUTH = [u'admin', u'admin']
@@ -35,7 +35,7 @@ KARAF_USER = 'karaf'
 KARAF_PASSWORD = 'karaf'
 
 # VM Environment Variables
-LINUX_PROMPT = '>'
+DEFAULT_LINUX_PROMPT = '>'
 
 # VTN Coordinator Variables
 VTNC = '127.0.0.1'