Replace deprecated variables in suites/openflowplugin (2).

+ MININET -> TOOLS_SYSTEM_IP
+ MININET_USER -> TOOLS_SYSTEM_USER
+ MININET_PASSWORD -> TOOLS_SYSTEM_PASSWORD
+ MININET_PROMPT -> TOOLS_SYSTEM_PROMPT

Change-Id: I27f370b74550bca54872d070e4e397efad500d41
Signed-off-by: Deepak <deepak.mk17@gmail.com>

diff --git a/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot
index 160cd556c1f3943cc0f45fc17a50ccffce6921e2..854933d527bc6069e912bd8e1f16ba7268bf3ed4 100644 (file)
--- a/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot
+++ b/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot
@@ -15,8 +15,8 @@ Start Suite
     ${TOPO_TREE_DEPTH}    Convert To Integer    ${TOPO_TREE_DEPTH}
     ${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/${SSH_KEY}    any
+    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=>    timeout=${numnodes*2}
+    Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Write    sudo ovs-vsctl set-manager ptcp:6644
     Read Until    >
     Write    sudo mn -c

diff --git a/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot
index f40b6a1a9d978fd1166813f581ca058accac4613..a4a8153300ca30d727347d5ca47242a90ab8dbd0 100644 (file)
--- a/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot
+++ b/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot
@@ -15,8 +15,8 @@ Start Suite
     ${TOPO_TREE_DEPTH}    Convert To Integer    ${TOPO_TREE_DEPTH}
     ${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/${SSH_KEY}    any
+    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=>    timeout=${numnodes*3}
+    Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Write    sudo ovs-vsctl set-manager ptcp:6644
     Read Until    >
     Write    sudo mn -c

diff --git a/csit/suites/openflowplugin/Longevity/020__longevity_switches_links.robot b/csit/suites/openflowplugin/Longevity/020__longevity_switches_links.robot
index 2c7ee34f973a99f339922d55f64d4335cde519c0..b1876d7372e7d8aef456e8a13b5e056f73c53b6e 100644 (file)
--- a/csit/suites/openflowplugin/Longevity/020__longevity_switches_links.robot
+++ b/csit/suites/openflowplugin/Longevity/020__longevity_switches_links.robot
@@ -57,8 +57,8 @@ 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://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
-    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
+    ${mininet_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}
+    Login With Public Key    ${TOOLS_SYSTEM_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/csit/suites/openflowplugin/MD_SAL_NSF_OF10/010__restconf_inventory.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF10/010__restconf_inventory.robot
index c3e1d87698d68a3a0d440ffc59599c155d9c75d9..bf51a571642bf263af19c39947b151a8d07c2fd3 100644 (file)
--- a/csit/suites/openflowplugin/MD_SAL_NSF_OF10/010__restconf_inventory.robot
+++ b/csit/suites/openflowplugin/MD_SAL_NSF_OF10/010__restconf_inventory.robot
@@ -17,7 +17,7 @@ ${HARDWARE}       Open vSwitch
 *** Test Cases ***
 Get list of nodes
     [Documentation]    Get the inventory
-    Set Suite Variable    ${SW_IPADDRESS}    "flow-node-inventory:ip-address":"${MININET}"
+    Set Suite Variable    ${SW_IPADDRESS}    "flow-node-inventory:ip-address":"${TOOLS_SYSTEM_IP}"
     Set Suite Variable    ${SW_VENDOR}    "flow-node-inventory:manufacturer":"${VENDOR}"
     Set Suite Variable    ${SW_HARDWARE}    "flow-node-inventory:manufacturer":"${HARDWARE}"
     Set Suite Variable    @{SW_CAPABILITIES}    "flow-node-inventory:flow-feature-capability-flow-stats"    "flow-node-inventory:flow-feature-capability-table-stats"    "flow-node-inventory:flow-feature-capability-port-stats"    "flow-node-inventory:flow-feature-capability-queue-stats"

diff --git a/csit/suites/openflowplugin/MD_SAL_NSF_OF13/010__restconf_inventory.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF13/010__restconf_inventory.robot
index c3e1d87698d68a3a0d440ffc59599c155d9c75d9..bf51a571642bf263af19c39947b151a8d07c2fd3 100644 (file)
--- a/csit/suites/openflowplugin/MD_SAL_NSF_OF13/010__restconf_inventory.robot
+++ b/csit/suites/openflowplugin/MD_SAL_NSF_OF13/010__restconf_inventory.robot
@@ -17,7 +17,7 @@ ${HARDWARE}       Open vSwitch
 *** Test Cases ***
 Get list of nodes
     [Documentation]    Get the inventory
-    Set Suite Variable    ${SW_IPADDRESS}    "flow-node-inventory:ip-address":"${MININET}"
+    Set Suite Variable    ${SW_IPADDRESS}    "flow-node-inventory:ip-address":"${TOOLS_SYSTEM_IP}"
     Set Suite Variable    ${SW_VENDOR}    "flow-node-inventory:manufacturer":"${VENDOR}"
     Set Suite Variable    ${SW_HARDWARE}    "flow-node-inventory:manufacturer":"${HARDWARE}"
     Set Suite Variable    @{SW_CAPABILITIES}    "flow-node-inventory:flow-feature-capability-flow-stats"    "flow-node-inventory:flow-feature-capability-table-stats"    "flow-node-inventory:flow-feature-capability-port-stats"    "flow-node-inventory:flow-feature-capability-queue-stats"

diff --git a/csit/suites/openflowplugin/Maximum_Links/010__finding_max_links.robot b/csit/suites/openflowplugin/Maximum_Links/010__finding_max_links.robot
index 6271eca35fde42399d603f5985a2276d7fee7c3d..f24f4edd297b6417c331da46a03b6b3b232bfd2d 100644 (file)
--- a/csit/suites/openflowplugin/Maximum_Links/010__finding_max_links.robot
+++ b/csit/suites/openflowplugin/Maximum_Links/010__finding_max_links.robot
@@ -26,8 +26,8 @@ Find Max Switch Links
 Link Scale Suite Setup
     [Documentation]    Do initial steps for link scale tests
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
-    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
+    ${mininet_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}
+    Login With Public Key    ${TOOLS_SYSTEM_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/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot b/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot
index e2d87530b06399be1bed043a8f09b06908766893..cd9e211be0476d019bddcb8a009ab18c2c8238a0 100644 (file)
--- a/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot
+++ b/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot
@@ -33,9 +33,9 @@ Find Max Switches
 Start Suite
     [Documentation]    Starts mininet with requested number of switches
     Log    Start the test on the base edition
-    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=>    timeout=1800
+    ${mininet_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=>    timeout=1800
     Set Suite Variable    ${mininet_conn_id}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
+    Login With Public Key    ${TOOLS_SYSTEM_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/csit/suites/openflowplugin/Performance/010_Cbench.robot b/csit/suites/openflowplugin/Performance/010_Cbench.robot
index 559665dddc86608fa541b0cc4520c82ceb58d0df..145988426709538f402070a6f612f3541ca42bb0 100644 (file)
--- a/csit/suites/openflowplugin/Performance/010_Cbench.robot
+++ b/csit/suites/openflowplugin/Performance/010_Cbench.robot
@@ -18,7 +18,7 @@ ${switch_count}    8
 ${duration_in_secs}    12
 ${loops}          10
 ${num_of_unique_macs}    10000
-${cbench_system}    ${MININET}
+${cbench_system}    ${TOOLS_SYSTEM_IP}
 ${cbench_executable}    /usr/local/bin/cbench
 ${throughput_results_file}    throughput.csv
 ${latency_results_file}    latency.csv

diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot b/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot
index 4f4add24bb0dfc0691862848b66c2f423b2bb2b3..cfc144a91dce329abd42d9796c4617901feebfcc 100644 (file)
--- a/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot
+++ b/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot
@@ -43,9 +43,9 @@ Start Suite
     [Documentation]    Basic setup/cleanup work that can be done safely before any system
     ...    is run.
     Log    Start the test on the base edition
-    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=>    timeout=600s
+    ${mininet_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=>    timeout=600s
     Set Suite Variable    ${mininet_conn_id}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
+    Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Write    sudo ovs-vsctl set-manager ptcp:6644
     Read Until    >
     Write    sudo mn -c

diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot b/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot
index 8e0679c1b5cacf2bcd47b6a2a4ffcc5e16acb500..cc9ab8aa90c9e099ab4db8be2847344cecbff986 100644 (file)
--- a/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot
+++ b/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot
@@ -43,8 +43,8 @@ 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=${DEFAULT_LINUX_PROMPT}    timeout=600
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
+    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
+    Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Write    sudo ovs-vsctl set-manager ptcp:6644
     Write    sudo mn -c
     Read Until    ${DEFAULT_LINUX_PROMPT}

diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot b/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot
index 8d3cb677f7184c486675f268e793fd72fd2d0676..e02fd72b062887ef3fd6628fe609b4cf4919dd5b 100644 (file)
--- a/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot
+++ b/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot
@@ -43,8 +43,8 @@ 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=${DEFAULT_LINUX_PROMPT}    timeout=600
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
+    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
+    Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Write    sudo ovs-vsctl set-manager ptcp:6644
     Write    sudo mn -c
     Read Until    ${DEFAULT_LINUX_PROMPT}

diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot b/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot
index c7a040bf7678fd578522a382ba4cf536d04b9de5..9d309d5b43b431e990470a52c06c0cc716557b00 100644 (file)
--- a/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot
+++ b/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot
@@ -43,8 +43,8 @@ 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=${DEFAULT_LINUX_PROMPT}    timeout=600
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
+    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
+    Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Write    sudo ovs-vsctl set-manager ptcp:6644
     Write    sudo mn -c
     Read Until    ${DEFAULT_LINUX_PROMPT}

diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/050_Stats_Collection_FirstTable.robot b/csit/suites/openflowplugin/Performance_Flow_Config/050_Stats_Collection_FirstTable.robot
index 601169c1534e74cfca1e2660c012d1649e658938..0653e2cd2ac74a58b5743cde4d54116f45e47660 100644 (file)
--- a/csit/suites/openflowplugin/Performance_Flow_Config/050_Stats_Collection_FirstTable.robot
+++ b/csit/suites/openflowplugin/Performance_Flow_Config/050_Stats_Collection_FirstTable.robot
@@ -43,8 +43,8 @@ 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=${DEFAULT_LINUX_PROMPT}    timeout=600
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
+    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
+    Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Write    sudo ovs-vsctl set-manager ptcp:6644
     Write    sudo mn -c
     Read Until    ${DEFAULT_LINUX_PROMPT}

diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/060_Stats_Collection_Basic16kScenario.robot b/csit/suites/openflowplugin/Performance_Flow_Config/060_Stats_Collection_Basic16kScenario.robot
index 302c2efbc5ec1c8e5c50246fceeae0963f1d5c26..76fbae4663bf717a7a3809bb6bd293c53248f3e3 100644 (file)
--- a/csit/suites/openflowplugin/Performance_Flow_Config/060_Stats_Collection_Basic16kScenario.robot
+++ b/csit/suites/openflowplugin/Performance_Flow_Config/060_Stats_Collection_Basic16kScenario.robot
@@ -87,8 +87,8 @@ Stop Mininet End
 Connect Switches
     [Documentation]    Starts mininet with requested number of switches (${swnr})
     Log    Starting mininet with ${swnr} switches
-    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
+    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
+    Login With Public Key    ${TOOLS_SYSTEM_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/csit/suites/openflowplugin/Performance_Flow_Config/070_Stats_Collection_100k_WithMininetRestart.robot b/csit/suites/openflowplugin/Performance_Flow_Config/070_Stats_Collection_100k_WithMininetRestart.robot
index dfef1dca8b4e69096c191d74afb8a96cd9f8bbb0..3526451946ab69f314a8726a3584eb00263eea3e 100644 (file)
--- a/csit/suites/openflowplugin/Performance_Flow_Config/070_Stats_Collection_100k_WithMininetRestart.robot
+++ b/csit/suites/openflowplugin/Performance_Flow_Config/070_Stats_Collection_100k_WithMininetRestart.robot
@@ -93,8 +93,8 @@ Stop Mininet End
 Connect Switches
     [Documentation]    Starts mininet with requested number of switches (${swnr})
     Log    Starting mininet with ${swnr} switches
-    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
+    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
+    Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Execute Command    sudo ovs-vsctl set-manager ptcp:6644
     Execute Command    sudo mn -c
     Write    ${start_cmd}
@@ -103,8 +103,8 @@ Connect Switches
 
 Create Http Session And Upload Files
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
-    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
+    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
+    Login With Public Key    ${TOOLS_SYSTEM_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/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot b/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot
index c794ef9a50a114cb04bca9553714e6bea7e94227..09ff91f5c6765b66fc9798c8116d2f3725d81390 100644 (file)
--- a/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot
+++ b/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot
@@ -68,8 +68,8 @@ Stop Mininet End
 Connect Switches
     [Documentation]    Starts mininet with requested number of switches (${swnr})
     Log    Starting mininet with ${swnr} switches
-    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
+    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
+    Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Execute Command    sudo ovs-vsctl set-manager ptcp:6644
     Execute Command    sudo mn -c
     Write    ${start_cmd}
@@ -78,8 +78,8 @@ Connect Switches
 
 Create Http Session And Upload Files
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
-    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
+    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
+    Login With Public Key    ${TOOLS_SYSTEM_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/csit/suites/openflowplugin/Performance_Flow_Config/090_BulkMaticConfigDsSetup_100k.robot b/csit/suites/openflowplugin/Performance_Flow_Config/090_BulkMaticConfigDsSetup_100k.robot
index f051f1a0553522f1395bad928b822982078a1714..4474e0a2b3d19c4d96655e34e538c49d30f8a9c3 100644 (file)
--- a/csit/suites/openflowplugin/Performance_Flow_Config/090_BulkMaticConfigDsSetup_100k.robot
+++ b/csit/suites/openflowplugin/Performance_Flow_Config/090_BulkMaticConfigDsSetup_100k.robot
@@ -68,8 +68,8 @@ Stop Mininet End
 Connect Switches
     [Documentation]    Starts mininet with requested number of switches (${swnr})
     Log    Starting mininet with ${swnr} switches
-    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
+    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
+    Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Execute Command    sudo ovs-vsctl set-manager ptcp:6644
     Execute Command    sudo mn -c
     Write    ${start_cmd}
@@ -78,8 +78,8 @@ Connect Switches
 
 Create Http Session And Upload Files
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
-    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
+    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
+    Login With Public Key    ${TOOLS_SYSTEM_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/csit/suites/openflowplugin/Sanity3Node/__init__.robot b/csit/suites/openflowplugin/Sanity3Node/__init__.robot
index 678bc2bc47750f7faa1ca5bd4f9cd808cdd875c1..395e83698382f8910ce871229b06fd98c11ac970 100644 (file)
--- a/csit/suites/openflowplugin/Sanity3Node/__init__.robot
+++ b/csit/suites/openflowplugin/Sanity3Node/__init__.robot
@@ -11,9 +11,9 @@ ${start}          sudo python DynamicMininet.py
 *** Keywords ***
 Start Suite
     Log    Start the test on the base edition
-    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=>
+    ${mininet_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=>
     Set Suite Variable    ${mininet_conn_id}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
+    Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/id_rsa    any
     Put File    ${CURDIR}/../../../libraries/DynamicMininet.py    .
     Execute Command    sudo ovs-vsctl set-manager ptcp:6644
     Execute Command    sudo mn -c

diff --git a/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot b/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot
index 16049227cbb59dc16e21cb6a6f7665cec8a27150..28e59d9095a0b072f4a7759318eab95fba35d578 100644 (file)
--- a/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot
+++ b/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot
@@ -14,7 +14,7 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${SWITCH_CLASS}    Ovs
-${SWITCH_IP}      ${MININET}
+${SWITCH_IP}      ${TOOLS_SYSTEM_IP}
 ${SWITCH_PROMPT}    ${DEFAULT_LINUX_PROMPT}
 ${ODL_SYSTEM_IP}     null
 ${REST_CONTEXT}    /restconf/operational/opendaylight-inventory:nodes

diff --git a/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot b/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
index c02d102ab82100ef19e0ab40a88d409784ca999f..8f7c5919b740fdb13af44e177a27cbc28e6219d7 100644 (file)
--- a/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
+++ b/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
@@ -27,7 +27,7 @@ Library           ../../../libraries/SwitchClasses/${SWITCH_CLASS}.py
 
 *** Variables ***
 ${SWITCH_CLASS}    Ovs
-${SWITCH_IP}      ${MININET}
+${SWITCH_IP}      ${TOOLS_SYSTEM_IP}
 ${SWITCH_PROMPT}    ${DEFAULT_LINUX_PROMPT}
 ${ODL_SYSTEM_IP}     null
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes