Making ssh key configurable in all tests. ${SSH_KEY} variable placed in variables...

Change-Id: I8baf760ad1b331129ea430ff53d344c4686fbbba
Signed-off-by: Kailash Khalasi <kkhalasi@iix.net>

diff --git a/test/csit/libraries/AAAKeywords.txt b/test/csit/libraries/AAAKeywords.txt
index 7419d33247802ee17d7066b82f1bb927f85e7c4a..29ea1f5b3c351648d6e15c9bb40a5249ef288f92 100644 (file)
--- a/test/csit/libraries/AAAKeywords.txt
+++ b/test/csit/libraries/AAAKeywords.txt
@@ -33,7 +33,7 @@ Disable Authentication On Controller
     [Arguments]    ${controller_ip}
     [Documentation]    Will disable token based authentication. Currently, that is done with a config file change
     SSHLibrary.Open Connection    ${controller_ip}
-    Login With Public Key    ${CONTROLLER_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    Login With Public Key    ${CONTROLLER_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     ${cmd}=    Set Variable    sed -i 's/^authEnabled=.*$/authEnabled=false/g' ${AUTHN_CFG_FILE}
     SSHLibrary.Execute Command    ${cmd}
     SSHLibrary.Close Connection
@@ -42,7 +42,7 @@ Enable Authentication On Controller
     [Arguments]    ${controller_ip}
     [Documentation]    Will enable token based authentication. Currently, that is done with a config file change
     SSHLibrary.Open Connection    ${controller_ip}
-    Login With Public Key    ${CONTROLLER_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    Login With Public Key    ${CONTROLLER_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     ${cmd}=    Set Variable    sed -i 's/^authEnabled=.*$/authEnabled=true/g' ${AUTHN_CFG_FILE}
     SSHLibrary.Execute Command    ${cmd}
     SSHLibrary.Close Connection

diff --git a/test/csit/libraries/Scalability.txt b/test/csit/libraries/Scalability.txt
index db4becda8fc340ef0c8bc5fc9c68d8e5935e5e7a..c72668eef788a25911605bf002ea2e506e413f36 100644 (file)
--- a/test/csit/libraries/Scalability.txt
+++ b/test/csit/libraries/Scalability.txt
@@ -121,7 +121,7 @@ Start 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}
     Set Suite Variable    ${mininet_conn_id}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    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
     Read Until    mininet>
 
@@ -170,7 +170,7 @@ Start Mininet Linear
     Log To Console    Starting mininet linear ${switches}
     ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${linux_prompt}    timeout=${switches*3}
     Set Suite Variable    ${mininet_conn_id}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    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
     Read Until    mininet>
     Sleep    6
@@ -181,7 +181,7 @@ Start Mininet With Custom 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}
     Set Suite Variable    ${mininet_conn_id}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    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}
     Write    sudo mn --controller=remote,ip=${CONTROLLER} --custom switch.py --topo demotopo --switch ovsk,protocols=OpenFlow13

diff --git a/test/csit/libraries/SwitchUtils.txt b/test/csit/libraries/SwitchUtils.txt
index f9d06b14c9b823f06ebf2a5dde8d41863daa6cd3..227a9ea8c22c7e4a6ac88efc861f23a4d8faa6cc 100644 (file)
--- a/test/csit/libraries/SwitchUtils.txt
+++ b/test/csit/libraries/SwitchUtils.txt
@@ -88,9 +88,9 @@ Open Connection Wrapper
     [Documentation]    Some switches require telnet access and others require ssh access. \ Based on the
     ...    switch.mgmt_protocol, the connection open will be handled by the right robot
     ...    library (Telnet or SSHLibrary). \ The connection_index is returned.
-    Run Keyword If    "${switch.mgmt_protocol}" == "ssh"    Call Method    ${switch}    set_ssh_key    ${USER_HOME}/.ssh/id_rsa
+    Run Keyword If    "${switch.mgmt_protocol}" == "ssh"    Call Method    ${switch}    set_ssh_key    ${USER_HOME}/.ssh/${SSH_KEY}
     Run Keyword If    "${switch.mgmt_protocol}" == "ssh"    Call Method    ${switch}    set_mgmt_user    ${MININET_USER}
-    ${connection_index}=    Run Keyword If    "${switch.mgmt_protocol}" == "ssh"    SSHLibrary.Open Connection    ${switch.mgmt_ip}    prompt=${switch.mgmt_prompt}
+    ${connection_index}=    Run Keyword If    "${switch.mgmt_protocol}" == "ssh"    SSHLibrary.Open Connection    ${switch.mgmt_ip}    prompt=${switch.mgmt_prompt}    timeout=30s
     Run Keyword If    "${switch.mgmt_protocol}" == "ssh"    Login With Public Key    ${switch.mgmt_user}    ${switch.ssh_key}    any
     ${connection_index}=    Run Keyword If    "${switch.mgmt_protocol}" == "telnet"    Telnet.Open Connection    ${switch.mgmt_ip}    ELSE    Set Variable
     ...    ${connection_index}

diff --git a/test/csit/libraries/TsdrUtils.txt b/test/csit/libraries/TsdrUtils.txt
index ce8f07aa3dd05d9d5358464c856b15abd3720782..ca9484e055c3475f53316ec2cda7ab1f8f94f73e 100644 (file)
--- a/test/csit/libraries/TsdrUtils.txt
+++ b/test/csit/libraries/TsdrUtils.txt
@@ -14,7 +14,7 @@ Start Tsdr Suite
     Clean Mininet System\r
     ${mininet_conn_id1}=    Open Connection    ${MININET}    prompt=${LINUX_PROMPT}    timeout=30s\r
     Set Suite Variable    ${mininet_conn_id1}\r
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any\r
+    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any\r
     Execute Command    sudo ovs-vsctl set-manager ptcp:6644\r
     ${start}=    Set Variable    sudo mn --controller=remote,ip=${CONTROLLER} --topo=linear,3 --switch ${switch},protocols=OpenFlow13\r
     Log    ${start}\r
@@ -54,7 +54,7 @@ Query the Data from HBaseClient
     [Documentation]    Execute the HBase Query and return the result\r
     Log    Attempting to execute ${query} on ${remote} via HbaseClient\r
     ${conn_id}=    Open Connection    ${remote}    prompt=${prompt}    timeout=${prompt_timeout}\r
-    Login With Public Key    ${user}    ${USER_HOME}/.ssh/id_rsa    any\r
+    Login With Public Key    ${user}    ${USER_HOME}/.ssh/${SSH_KEY}    any\r
     Write    export JAVA_HOME=/usr\r
     Write    ${HBASE_CLIENT}/hbase shell\r
     Read Until    hbase(main):001:0>\r

diff --git a/test/csit/libraries/Utils.txt b/test/csit/libraries/Utils.txt
index 8a28ad081795411f776fe6a5eaa2a3cf40b4c1a2..6a95514b5f64fd048ddb1c546251717cb22fcd63 100644 (file)
--- a/test/csit/libraries/Utils.txt
+++ b/test/csit/libraries/Utils.txt
@@ -16,7 +16,7 @@ Start Suite
     Clean Mininet System
     ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${LINUX_PROMPT}    timeout=30s
     Set Suite Variable    ${mininet_conn_id}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Execute Command    sudo ovs-vsctl set-manager ptcp:6644
     Write    ${start}
     Read Until    mininet>
@@ -165,7 +165,7 @@ Run Command On Remote System
     ...    are checked.
     Log    Attempting to execute ${cmd} on ${remote_system} by ${user} with ${keyfile_pass} and ${prompt}
     ${conn_id}=    SSHLibrary.Open Connection    ${remote_system}    prompt=${prompt}    timeout=${prompt_timeout}
-    Login With Public Key    ${user}    ${USER_HOME}/.ssh/id_rsa    ${KEYFILE_PASS}
+    Login With Public Key    ${user}    ${USER_HOME}/.ssh/${SSH_KEY}    ${KEYFILE_PASS}
     SSHLibrary.Write    ${cmd}
     ${output}=    SSHLibrary.Read Until    ${prompt}
     SSHLibrary.Close Connection
@@ -176,7 +176,7 @@ Verify File Exists On Remote System
     [Arguments]    ${remote_system}    ${file}    ${user}=${MININET_USER}    ${prompt}=${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}
-    Login With Public Key    ${user}    ${USER_HOME}/.ssh/id_rsa    any
+    Login With Public Key    ${user}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     SSHLibrary.File Should Exist    ${file}
     Close Connection
 

diff --git a/test/csit/libraries/VtnCoKeywords.txt b/test/csit/libraries/VtnCoKeywords.txt
index aaa3530346d88ca03b6a7ea0074d99ced632331c..04bdd7e890e009d26cb2226242d719d22fd18628 100644 (file)
--- a/test/csit/libraries/VtnCoKeywords.txt
+++ b/test/csit/libraries/VtnCoKeywords.txt
@@ -15,12 +15,12 @@ Get VtnCo
     [Documentation]    Download the VTN Coordinator from Controller VM
     Log    Download the VTN Coordinator bz2 file
     SSHLibrary.Open_Connection    ${CONTROLLER}
-    SSHLibrary.Login_With_Public_Key    ${CONTROLLER_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    SSHLibrary.Login_With_Public_Key    ${CONTROLLER_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     ${VTNC_FILENAME}=    Catenate    SEPARATOR=/    ${WORKSPACE}    vtn_coordinator.tar.bz2
     SSHLibrary.Get_File    ${WORKSPACE}/${BUNDLEFOLDER}/externalapps/*vtn-coordinator*-bin.tar.bz2    ${VTNC_FILENAME}
     SSHLibrary.Close_Connection
     SSHLibrary.Open_Connection    ${MININET}
-    SSHLibrary.Login_With_Public_Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    SSHLibrary.Login_With_Public_Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     SSHLibrary.Put_File    ${VTNC_FILENAME}    /tmp
     SSHLibrary.Close_Connection
 
@@ -30,7 +30,7 @@ Start SuiteVtnCo
     Get VtnCo
     ${vtnc_conn_id}=    Open Connection    ${MININET}    prompt=${LINUX_PROMPT}    timeout=30s
     Set Suite Variable    ${vtnc_conn_id}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     ${VTNC_FILENAME}=    Catenate    SEPARATOR=/    ${WORKSPACE}    vtn_coordinator.tar.bz2
     Execute Command    tar -C/ -jxvf ${VTNC_FILENAME}
     Execute Command    /usr/local/vtn/sbin/db_setup

diff --git a/test/csit/suites/bgpcep/bgpuser/cases.robot b/test/csit/suites/bgpcep/bgpuser/cases.robot
index 5ea08a25967e77109383001626baf0930ebddc56..fd2dcc0a383e17fabfc90e049bad175747353902 100644 (file)
--- a/test/csit/suites/bgpcep/bgpuser/cases.robot
+++ b/test/csit/suites/bgpcep/bgpuser/cases.robot
@@ -128,7 +128,7 @@ Setup_Everything
     [Documentation]    SSH-login to mininet machine, save prompt to variable, create HTTP session,
     ...    prepare directories for responses, put Python tool to mininet machine, setup imported resources.
     SSHLibrary.Open_Connection    ${MININET}
-    SSHLibrary.Login_With_Public_Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    SSHLibrary.Login_With_Public_Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     ${current_connection}=    Get_Connection
     ${current_prompt}=    BuiltIn.Set_Variable    ${current_connection.prompt}
     BuiltIn.Log    ${current_prompt}

diff --git a/test/csit/suites/bgpcep/pcepuser/pcepuser.robot b/test/csit/suites/bgpcep/pcepuser/pcepuser.robot
index b15abf1b144698ac35d25f1fc7bd15df2103efce..4c320b4a1a0ca2b275fc3d2d2804c25dc2fbf8c7 100644 (file)
--- a/test/csit/suites/bgpcep/pcepuser/pcepuser.robot
+++ b/test/csit/suites/bgpcep/pcepuser/pcepuser.robot
@@ -114,7 +114,7 @@ Set_It_Up
     ...    Figure out latest pcc-mock version and download it from Nexus to Mininet.
     ...    Also, delete and create directories for json diff handling.
     Open_Connection    ${MININET}
-    Login_With_Public_Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    Login_With_Public_Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Create_Session    ses    http://${CONTROLLER}:${RESTCONFPORT}/restconf/operational/network-topology:network-topology    auth=${AUTH}
     ${urlbase}=    Set_Variable    ${NEXUSURL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/bgpcep/pcep-pcc-mock
     ${version}=    Execute_Command    curl ${urlbase}/maven-metadata.xml | grep latest | cut -d '>' -f 2 | cut -d '<' -f 1

diff --git a/test/csit/suites/bgpcep/tcpmd5user/tcpmd5user.robot b/test/csit/suites/bgpcep/tcpmd5user/tcpmd5user.robot
index c4615cdbd1f049de8b5bb307f5d9df162d74dc05..606aa98a5b10356824e5da061ba09b07f816d196 100644 (file)
--- a/test/csit/suites/bgpcep/tcpmd5user/tcpmd5user.robot
+++ b/test/csit/suites/bgpcep/tcpmd5user/tcpmd5user.robot
@@ -141,7 +141,7 @@ Set_It_Up
     ...    Figure out latest pcc-mock version and download it from Nexus to Mininet.
     ...    Also, delete and create directories for json diff handling.
     SSHLibrary.Open_Connection    ${MININET}
-    SSHLibrary.Login_With_Public_Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    SSHLibrary.Login_With_Public_Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     ${current_connection}=    SSHLibrary.Get_Connection
     ${current_prompt}=    BuiltIn.Set_Variable    ${current_connection.prompt}
     BuiltIn.Log    ${current_prompt}

diff --git a/test/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot b/test/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot
index f9a97f30b9e43d491d3cb3f92aa5b462a3464c60..cefbd0c6c7d62294b5734ceb4d6ae47283af0239 100644 (file)
--- a/test/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot
+++ b/test/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot
@@ -16,7 +16,7 @@ Start Suite
     ${TOPO_TREE_FANOUT}    Convert To Integer    ${TOPO_TREE_FANOUT}
     ${numnodes}    Num Of Nodes    ${TOPO_TREE_DEPTH}    ${TOPO_TREE_FANOUT}
     Open Connection    ${MININET}    prompt=>    timeout=${numnodes*3}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Write    sudo ovs-vsctl set-manager ptcp:6644
     Read Until    >
     Write    sudo mn -c

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 90c7ea62ff1fa9625475d0c6bb30c1a60d7a9547..78ea57379f90355320436f64ef2d56d287d9aa60 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
@@ -93,7 +93,7 @@ Start Suite
     ${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
     Set Suite Variable    ${mininet_conn_id}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Put File    ${CURDIR}/../topologies/customtopo.py
     Execute Command    sudo ovs-vsctl set-manager ptcp:6644
     Execute Command    sudo mn -c

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 5fd5bbe55ffeb618ae72eb160e83632380742a9d..26c956c2a5ef5f2a1ecd9a32c6cb9056172021db 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
@@ -97,7 +97,7 @@ Set Host interface state
     [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
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any\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
     Execute Command    sudo ifconfig ${port-id}\r

diff --git a/test/csit/suites/lacp/Lacp_Feature_OF13/__init__.robot b/test/csit/suites/lacp/Lacp_Feature_OF13/__init__.robot
index e0f6fc313e86169b25b030c3661fd545eca808e5..d905b22562f2dc07a3779744084f9dc9f6465b3c 100644 (file)
--- a/test/csit/suites/lacp/Lacp_Feature_OF13/__init__.robot
+++ b/test/csit/suites/lacp/Lacp_Feature_OF13/__init__.robot
@@ -14,7 +14,7 @@ Start Suite
     Log    Start mininet
     ${mininet_session_id}=     Open Connection   ${MININET}     prompt=${LINUX_PROMPT}     timeout=30s
     Set Suite Variable     ${mininet_session_id}
-    Login With Public Key    ${MININET_USER}   ${USER_HOME}/.ssh/id_rsa   any
+    Login With Public Key    ${MININET_USER}   ${USER_HOME}/.ssh/${SSH_KEY}   any
     Execute Command    sudo ovs-vsctl set-manager ptcp:6633
     Execute Command    sudo rm -rf ${bond}
     Put File    ${CURDIR}/LACP_custom1.py

diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot b/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot
index e72ea503565702a78edab1f3e131c8d44ead0ab4..478b7a21083ddd576f5e3db0efdd84b4fb67d111 100644 (file)
--- a/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot
+++ b/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot
@@ -16,7 +16,7 @@ Start Suite
     ${TOPO_TREE_FANOUT}    Convert To Integer    ${TOPO_TREE_FANOUT}
     ${numnodes}    Num Of Nodes    ${TOPO_TREE_DEPTH}    ${TOPO_TREE_FANOUT}
     Open Connection    ${MININET}    prompt=>    timeout=${numnodes*2}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Write    sudo ovs-vsctl set-manager ptcp:6644
     Read Until    >
     Write    sudo mn -c

diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot b/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot
index f9a97f30b9e43d491d3cb3f92aa5b462a3464c60..cefbd0c6c7d62294b5734ceb4d6ae47283af0239 100644 (file)
--- a/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot
+++ b/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot
@@ -16,7 +16,7 @@ Start Suite
     ${TOPO_TREE_FANOUT}    Convert To Integer    ${TOPO_TREE_FANOUT}
     ${numnodes}    Num Of Nodes    ${TOPO_TREE_DEPTH}    ${TOPO_TREE_FANOUT}
     Open Connection    ${MININET}    prompt=>    timeout=${numnodes*3}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Write    sudo ovs-vsctl set-manager ptcp:6644
     Read Until    >
     Write    sudo mn -c

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 199bb8ec7801e30afeaf8e08b0e41eb9013e9ff1..0d9819006e68886b6b4c1c02dec2afd9603c286a 100644 (file)
--- a/test/csit/suites/openflowplugin/Longevity/020__longevity_switches_links.robot
+++ b/test/csit/suites/openflowplugin/Longevity/020__longevity_switches_links.robot
@@ -59,7 +59,7 @@ Longevity Suite Setup
     ...    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}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    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}
     Close Connection

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 7ebedd132294f12f0ce20636daa7236547810050..952be391eba3a1066bf46cc30d450155c62dbd8f 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
@@ -28,7 +28,7 @@ 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}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    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}
     Close Connection
\ No newline at end of file

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 1c53258976b5978d86d790c3e618200d0697faea..85ce0b3c040f8ad4cafdc6bec5caddf380ef0a90 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
@@ -33,7 +33,7 @@ Start Suite
     [Documentation]    Starts mininet with requested number of switches
     Log    Start the test on the base edition
     Open Connection    ${MININET}    prompt=>    timeout=1800
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Put File    ${CURDIR}/../../../libraries/DynamicMininet.py    DynamicMininet.py
     Execute Command    sudo ovs-vsctl set-manager ptcp:6644
     Execute Command    sudo mn -c

diff --git a/test/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot b/test/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot
index 68dd4e67a081dc197f7f6cdb26db2e15da0728d3..ee5b5989bbd3a7fd34ae80384d7ff3e5e14f8dae 100644 (file)
--- a/test/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot
+++ b/test/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot
@@ -44,7 +44,7 @@ Start Suite
     Log    Start the test on the base edition
     ${mininet_conn_id}=     Open Connection    ${MININET}    prompt=>    timeout=600s
     Set Suite Variable  ${mininet_conn_id}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Write    sudo ovs-vsctl set-manager ptcp:6644
     Read Until    >
     Write    sudo mn -c

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 f7c1e280b00476a503d235a1037ad39556f64fb7..3a09b735cd6d6403bcee12efdb99816df17251f6 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
@@ -45,7 +45,7 @@ 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
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    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}

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 3557c47229ef757b0ca00fddd1f46ba955af539a..2f4d95b7f3a325aa510c8b8d7e8cb9f1b1b4c5b9 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
@@ -45,7 +45,7 @@ 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
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    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}

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 b582667ed896372bd01408c74848776ae69772ba..af18d96b6e96d9e34995ffa8a0c82230463514f3 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
@@ -45,7 +45,7 @@ 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
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    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}

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 e5980bd2cf4840b4c49418987bff760eb4827936..951caffb72d384a370af766c2b77407e2b077c7c 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
@@ -45,7 +45,7 @@ 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
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    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}

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 ae3bd1653899d019c8af6f5fea0adb184ba7f115..36a07f49615c50d171eed2ecefca3f9a586ffa9c 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
@@ -89,7 +89,7 @@ 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
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    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
     Write    ${start_cmd}

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 e28457f4c41a104e92fd3f24a009c990e205dba7..824a0f4d24b3d8ad85b49f8185aab8a4441d2305 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
@@ -95,7 +95,7 @@ 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
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    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
     Write    ${start_cmd}
@@ -105,7 +105,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
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    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
 

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 60266a18cc311b34b21c40fa40fea13883334166..845ca3eb0d6d60c31e7dfdf7542e2a577893030c 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
@@ -70,7 +70,7 @@ 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
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    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
     Write    ${start_cmd}
@@ -80,7 +80,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
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    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
 

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 9191841d6bb9a90c98b5fb1b53a4f240e21bca4a..e2d2a2c914280572ffd799df22773ee20d54f7dc 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
@@ -70,7 +70,7 @@ 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
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    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
     Write    ${start_cmd}
@@ -80,7 +80,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
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    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
 

diff --git a/test/csit/suites/vpnservice/__init__.robot b/test/csit/suites/vpnservice/__init__.robot
index 001bc65e826e1da71816774198d4d1c2ec393394..5128bf71c28642bda614ef4cdf8eb27bca96a528 100644 (file)
--- a/test/csit/suites/vpnservice/__init__.robot
+++ b/test/csit/suites/vpnservice/__init__.robot
@@ -18,28 +18,28 @@ Start Suite
     Clean Mininet System
     ${mininet1_conn_id_1}=    Open Connection    ${MININET}    prompt=${LINUX_PROMPT}    timeout=30s
     Set Global Variable    ${mininet1_conn_id_1}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    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
     Set Global Variable    ${mininet1_conn_id_2}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    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
     Set Global Variable    ${mininet2_conn_id_1}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    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
     Set Global Variable    ${mininet2_conn_id_2}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    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}
     ${output}    Execute Command    sudo ovs-vsctl show
     Log    ${output}

diff --git a/test/csit/variables/Variables.py b/test/csit/variables/Variables.py
index 6bfb25b299bd32b2aa1229f7de94de7b622a20e2..5fbc54d3307c8a73ad6e61e1e1bf9ec645e891c4 100644 (file)
--- a/test/csit/variables/Variables.py
+++ b/test/csit/variables/Variables.py
@@ -26,6 +26,7 @@ TOPO_TREE_DEPTH = 3
 TOPO_TREE_FANOUT = 2
 CONTROLLERS = ['CONTROLLER', 'CONTROLLER1', 'CONTROLLER2']
 KEYFILE_PASS = 'any'
+SSH_KEY = 'id_rsa'
 
 # KARAF Variaable
 KARAF_SHELL_PORT = '8101'