Replace deprecated variables in suites/openflowplugin (1). 32/33732/2
authorDeepak <deepak.mk17@gmail.com>
Thu, 28 Jan 2016 22:59:32 +0000 (04:29 +0530)
committerGerrit Code Review <gerrit@opendaylight.org>
Sat, 30 Jan 2016 21:10:59 +0000 (21:10 +0000)
+ CONTROLLER -> ODL_SYSTEM_IP
+ CONTROLLER1 -> ODL_SYSTEM_2_IP
+ CONTROLLER2 -> ODL_SYSTEM_3_IP

Change-Id: I93689ae884be29fb37173ddc90fea45f40171a34
Signed-off-by: Deepak <deepak.mk17@gmail.com>
86 files changed:
csit/suites/openflowplugin/AD_SAL_NSF_OF10/010__switch_manager.robot
csit/suites/openflowplugin/AD_SAL_NSF_OF10/020__topology_manager.robot
csit/suites/openflowplugin/AD_SAL_NSF_OF10/030__statistics_manager.robot
csit/suites/openflowplugin/AD_SAL_NSF_OF10/040__flow_programmer.robot
csit/suites/openflowplugin/AD_SAL_NSF_OF10/__init__.robot
csit/suites/openflowplugin/AD_SAL_NSF_OF13/010__switch_manager.robot
csit/suites/openflowplugin/AD_SAL_NSF_OF13/020__topology_manager.robot
csit/suites/openflowplugin/AD_SAL_NSF_OF13/030__statistics_manager.robot
csit/suites/openflowplugin/AD_SAL_NSF_OF13/040__flow_programmer.robot
csit/suites/openflowplugin/AD_SAL_NSF_OF13/__init__.robot
csit/suites/openflowplugin/Bug_Validation/2429.robot
csit/suites/openflowplugin/Flows_Additional_TCs/010_Lithium_Rps_Calls_Ovs.robot
csit/suites/openflowplugin/Flows_Additional_TCs/020_Lithium_Rps_Calls_Cpqd.robot
csit/suites/openflowplugin/Flows_Additional_TCs/030_Flow_Update_Test.robot
csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/010_SM_add_upd_del_flows.robot
csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/020_SM_sal_add_upd_del_flows.robot
csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/__init__.robot
csit/suites/openflowplugin/Flows_OF13/300__dst_ip.robot
csit/suites/openflowplugin/Flows_OF13/301__src_ip.robot
csit/suites/openflowplugin/Flows_OF13/302__dst_mac.robot
csit/suites/openflowplugin/Flows_OF13/304__eth_ip_port.robot
csit/suites/openflowplugin/Flows_OF13/305__ttl.robot
csit/suites/openflowplugin/Flows_OF13/306__eth_ip_qos.robot
csit/suites/openflowplugin/Flows_OF13/307__eth_ip_qos_port_tcpport.robot
csit/suites/openflowplugin/Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.robot
csit/suites/openflowplugin/Flows_OF13/309__eth_ip_qos_sctp.robot
csit/suites/openflowplugin/Flows_OF13/310__eth_ip_qos_icmp.robot
csit/suites/openflowplugin/Flows_OF13/311__eth_arp.robot
csit/suites/openflowplugin/Flows_OF13/312__eth_arp_transport.robot
csit/suites/openflowplugin/Flows_OF13/313__eth_arp_transport_hardware.robot
csit/suites/openflowplugin/Flows_OF13/314__eth_vlan.robot
csit/suites/openflowplugin/Flows_OF13/315__timeout_vlan_pcp_vlan.robot
csit/suites/openflowplugin/Flows_OF13/316__eth_mpls_tc_bos.robot
csit/suites/openflowplugin/Flows_OF13/317__eth_ipv6.robot
csit/suites/openflowplugin/Flows_OF13/318__metadata.robot
csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot
csit/suites/openflowplugin/Flows_OF13/320__ipv6_meta_qos_udp.robot
csit/suites/openflowplugin/Flows_OF13/321__ipv6_meta_qos_tcp.robot
csit/suites/openflowplugin/Flows_OF13/322__ipv6_flow.robot
csit/suites/openflowplugin/Flows_OF13/323__tunnel.robot
csit/suites/openflowplugin/Flows_OF13/324__ipv6_flow_label.robot
csit/suites/openflowplugin/Flows_Stats_OF13/010__SM_add_upd_del_flows.robot
csit/suites/openflowplugin/Groups_Meters_OF13/005__openflow_group.robot
csit/suites/openflowplugin/Groups_Meters_OF13/010__openflow_meter.robot
csit/suites/openflowplugin/Groups_Meters_OF13/__init__.robot
csit/suites/openflowplugin/Inventory_Scalability_OF10/010__restconf_inventory.robot
csit/suites/openflowplugin/Inventory_Scalability_OF10/020__restconf_topology.robot
csit/suites/openflowplugin/Inventory_Scalability_OF10/030__switch_manager.robot
csit/suites/openflowplugin/Inventory_Scalability_OF10/040__statistics_manager.robot
csit/suites/openflowplugin/Inventory_Scalability_OF10/050__topology_manager.robot
csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot
csit/suites/openflowplugin/Inventory_Scalability_OF13/010__restconf_inventory.robot
csit/suites/openflowplugin/Inventory_Scalability_OF13/020__restconf_topology.robot
csit/suites/openflowplugin/Inventory_Scalability_OF13/030__switch_manager.robot
csit/suites/openflowplugin/Inventory_Scalability_OF13/040__statistics_manager.robot
csit/suites/openflowplugin/Inventory_Scalability_OF13/050__topology_manager.robot
csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot
csit/suites/openflowplugin/Longevity/010__longevity_switches.robot
csit/suites/openflowplugin/Longevity/020__longevity_switches_links.robot
csit/suites/openflowplugin/MD_SAL_NSF_OF10/010__restconf_inventory.robot
csit/suites/openflowplugin/MD_SAL_NSF_OF10/020__restconf_topology.robot
csit/suites/openflowplugin/MD_SAL_NSF_OF10/030__restconf_statistics.robot
csit/suites/openflowplugin/MD_SAL_NSF_OF10/040__restconf_frm.robot
csit/suites/openflowplugin/MD_SAL_NSF_OF10/__init__.robot
csit/suites/openflowplugin/MD_SAL_NSF_OF13/010__restconf_inventory.robot
csit/suites/openflowplugin/MD_SAL_NSF_OF13/020__restconf_topology.robot
csit/suites/openflowplugin/MD_SAL_NSF_OF13/030__restconf_statistics.robot
csit/suites/openflowplugin/MD_SAL_NSF_OF13/040__restconf_frm.robot
csit/suites/openflowplugin/MD_SAL_NSF_OF13/__init__.robot
csit/suites/openflowplugin/Maximum_Links/010__finding_max_links.robot
csit/suites/openflowplugin/Maximum_Switches/010__finding_max_switches.robot
csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot
csit/suites/openflowplugin/Performance/010_Cbench.robot
csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot
csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot
csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot
csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot
csit/suites/openflowplugin/Performance_Flow_Config/050_Stats_Collection_FirstTable.robot
csit/suites/openflowplugin/Performance_Flow_Config/060_Stats_Collection_Basic16kScenario.robot
csit/suites/openflowplugin/Performance_Flow_Config/070_Stats_Collection_100k_WithMininetRestart.robot
csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot
csit/suites/openflowplugin/Performance_Flow_Config/090_BulkMaticConfigDsSetup_100k.robot
csit/suites/openflowplugin/Sanity3Node/010__Flows_OF13_Cluster.robot
csit/suites/openflowplugin/Sanity3Node/__init__.robot
csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot
csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot

index 23d86cbc6466b264e992d6b5dd942999f6d282e5..a5bf5162fe485dac7c8a2d2be16ada0f30702509 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Switch Manager
-Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${ODL_SYSTEM_IP}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index 3fb8747dc63bb4dee0c4d39ad8e922597a8be855..2f2ed819560fc97fb3950c568d7c8f84125b6c3e 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Topology Manager
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index b7a14fc270420edc78a7bdb0c3cc762077ada99f..4f0b1567dc48a7410a7bbfcb39a07dd2dcd34b59 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Statistics Manager
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index 9d0bc242f107898e3012ac6c0947c0c9d20b7211..44826dbd1f37558c9e964a03e1ba1176492d80af 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Flow Programmer
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index 5ca22a0f2315dc680f35dc4d03a3ace1435895f7..ea076a814b65022b72a96d909c8fa59255ca719a 100644 (file)
@@ -6,6 +6,6 @@ Library           SSHLibrary
 Resource          ../../../libraries/Utils.robot
 
 *** Variables ***
-${start}          sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2
+${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2
 
 *** Keywords ***
index 23d86cbc6466b264e992d6b5dd942999f6d282e5..a5bf5162fe485dac7c8a2d2be16ada0f30702509 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Switch Manager
-Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${ODL_SYSTEM_IP}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index 3fb8747dc63bb4dee0c4d39ad8e922597a8be855..2f2ed819560fc97fb3950c568d7c8f84125b6c3e 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Topology Manager
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index b7a14fc270420edc78a7bdb0c3cc762077ada99f..4f0b1567dc48a7410a7bbfcb39a07dd2dcd34b59 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Statistics Manager
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index 9d0bc242f107898e3012ac6c0947c0c9d20b7211..44826dbd1f37558c9e964a03e1ba1176492d80af 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Flow Programmer
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index f9121975974afffc8274aed54d60aa7d69f40158..9ec60fc5ff3c054b7416c1a17cebf57711eb5b97 100644 (file)
@@ -6,6 +6,6 @@ Library           SSHLibrary
 Resource          ../../../libraries/Utils.robot
 
 *** Variables ***
-${start}          sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 --switch ovsk,protocols=OpenFlow13
+${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2 --switch ovsk,protocols=OpenFlow13
 
 *** Keywords ***
index 52f0c91b2b5cbaa84c3967b631ef89c40923a3a6..4fc89666cb77a053a0dd5e413ba286ca32b4185c 100644 (file)
@@ -24,14 +24,14 @@ Bug_2429
     ...    a larger number of failed connections will be used and a small margin of error will
     ...    determine if the test is a PASS or FAIL
     Log Environment Details
-    ${controller_pid}=    Get Process ID Based On Regex On Remote System    ${CONTROLLER}    java.*distribution.*karaf    ${CONTROLLER_USER}
+    ${controller_pid}=    Get Process ID Based On Regex On Remote System    ${ODL_SYSTEM_IP}    java.*distribution.*karaf    ${CONTROLLER_USER}
     Should Match Regexp    ${controller_pid}    [0-9]+    PID was not discovered
-    ${starting_thread_count}=    Get Process Thread Count On Remote System    ${CONTROLLER}    ${controller_pid}    ${CONTROLLER_USER}
-    Repeat Keyword    ${number_ofconnections_to_fail}    Start Process    nc    -w    1    ${CONTROLLER}
+    ${starting_thread_count}=    Get Process Thread Count On Remote System    ${ODL_SYSTEM_IP}    ${controller_pid}    ${CONTROLLER_USER}
+    Repeat Keyword    ${number_ofconnections_to_fail}    Start Process    nc    -w    1    ${ODL_SYSTEM_IP}
     ...    ${openflow_port}
     Run    pkill -f 'nc -w'
     Log Environment Details
-    ${ending_thread_count}=    Get Process Thread Count On Remote System    ${CONTROLLER}    ${controller_pid}    ${CONTROLLER_USER}
+    ${ending_thread_count}=    Get Process Thread Count On Remote System    ${ODL_SYSTEM_IP}    ${controller_pid}    ${CONTROLLER_USER}
     Log Environment Details
     Log    starting count: ${starting_thread_count}\nending count: ${ending_thread_count}
     ${acceptable_thread_count}=    Evaluate    ${starting_thread_count} + (${number_of_connections_to_fail} * ${margin_of_error})
@@ -42,7 +42,7 @@ Bug_2429
 Log Environment Details
     [Documentation]    Will display relevant details of the test environement to help aid debugging efforts if
     ...    needed in the future.
-    ${output}=    Get Process ID Based On Regex On Remote System    ${CONTROLLER}    java.*distribution.*karaf    ${CONTROLLER_USER}
+    ${output}=    Get Process ID Based On Regex On Remote System    ${ODL_SYSTEM_IP}    java.*distribution.*karaf    ${CONTROLLER_USER}
     Log    ${output}
-    ${output}=    Run Command On Remote System    ${CONTROLLER}    netstat -na | grep 6633    ${CONTROLLER_USER}
+    ${output}=    Run Command On Remote System    ${ODL_SYSTEM_IP}    netstat -na | grep 6633    ${CONTROLLER_USER}
     Log    ${output}
index dbb1ff27e000d20233fd62a92dd0a19cb945e3f2..232b230391709abf5939a8b8f4a6bf653a68fee7 100644 (file)
@@ -29,7 +29,7 @@ Sending Echo
 Initialization Phase
     [Documentation]    Starts mininet and verify if topology is in operational ds
     Start Suite
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
     Wait Until Keyword Succeeds    10s    1s    Are Switches Connected Topo
 
 Final Phase
index b2ac64fc71aa2dbadc54f10cd17d80cf16e4a090..e433485cafc6efe0aad26fc48bcc5ac5d4d52002 100644 (file)
@@ -10,7 +10,7 @@ Variables         ../../../variables/ofplugin/RpcVariables.py
 
 *** Variables ***
 ${send_update_table_url}    /restconf/operations/sal-table:update-table
-${start}          sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,1 --switch user
+${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,1 --switch user
 
 *** Test Cases ***
 Sending Update Table
@@ -23,7 +23,7 @@ Sending Update Table
 Initialization Phase
     [Documentation]    Starts mininet and verify if topology is in operational ds
     Start Suite
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
     Wait Until Keyword Succeeds    10s    1s    Are Switches Connected Topo
 
 Final Phase
index a9a568e0b203c7c10e11d81dfa76dafb8c794d93..405314740bd29ce4767757cecb8c5e32b93a724b 100644 (file)
@@ -43,7 +43,7 @@ Log Switch Flows
 Initialization Phase
     [Documentation]    Starts mininet and verify if topology is in operational ds
     Start Suite
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
     Wait Until Keyword Succeeds    10s    1s    Are Switches Connected Topo
 
 Final Phase
index cddc28be452099ab03f0376a5a73f3e8d075f37d..2231af4f2ae027ec34f746ec54efa6c587851241 100644 (file)
@@ -555,6 +555,6 @@ Test Is Flow 220 Deleted
 *** Keywords ***
 Initialization Phase
     [Documentation]    Initiate tcp connection with controller
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
     Write    dpctl dump-flows -O OpenFlow13
     Read Until    mininet>
index 94c4eadf072dc0207354fd0372fbc8d5d9f20b55..5b3fedc14cf6cda2bc44850076455b31c43e81a2 100644 (file)
@@ -546,6 +546,6 @@ Test Is Flow 220 Deleted
 *** Keywords ***
 Initialization Phase
     [Documentation]    Initiate tcp connection with controller
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
     Write    dpctl dump-flows -O OpenFlow13
     Read Until    mininet>
index d85087adbad38672096c2560a1cefb70a222684f..6e1e576129cd08be46d4b86d69e25b00afa1b247 100644 (file)
@@ -6,4 +6,4 @@ Library           SSHLibrary
 Resource          ../../../../libraries/Utils.robot
 
 *** Variables ***
-${start}          sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,1 --switch ovsk,protocols=OpenFlow13
+${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,1 --switch ovsk,protocols=OpenFlow13
index 2a0347e5ecc6519b13902958211939c4cc1cdf24..7bab1e98b16a5166653f273151016327cfe01bb1 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for pushing/verify/remove a flow through RESTCONF
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index c8f16900ecaf985e407ac4158aa281e8b2f6bb7f..d6b3c099fef25db4c22e37bc66319470a235507b 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for pushing/verify/remove a flow through RESTCONF
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index f4906c40381ecfaec45f3ccc936c9137f366819f..e435c97b20809d3ece46c663381ce1271646f476 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for pushing/verify/remove a flow through RESTCONF
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index ea6e39cf0c46dbf4f55f86aec394dcdb34ce57a3..02e75a544de7ef33f78300ff919f3702b5e22a50 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for IP,Ethernet and port
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index acdd41914b3608c65f9ea804621b3bb57470892f..f8f6c2988c589c109d295f9be527eea21fd957d1 100644 (file)
@@ -8,7 +8,7 @@ Documentation     OF1.3 Suite to cover TTL Actions
 ...               - Decrement MPLS TTL
 ...
 ...               NOTE: for OVS, it appears that set_ttl, and both copy in/out are not supported, so need to skip those checks for now.
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Test Template     Create And Remove Flow
 Library           SSHLibrary
index 620b6dfbab913ceb88d6061b3ee1df1654bdd6a8..e8452e7c884060dbdcf513f6464a44aa16280684 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for IP,Ethernet,DSCP and Action dec TTL
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index a91c7c42e5c3f15d69ce8a72dee3aa7f0f484f7c..29b690bf615097d534bd8e7092afb71b55f9b7e3 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for IP,Ethernet,QoS, TCP dst/src port and Action dec MPLS TTL
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index a9fa00f8bf5b478689d4d22bf5bd0cd373011d63..812d3e14895ab47a8f52d555f8bc964e593dbcfe 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for IP,Ethernet,QoS, TCP dst/src port and Action dec MPLS TTL
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index f2bc364be55bda3484042ec2973fd72ab9569de2..92b253e188038bf1d56e1230d399798d647fc4e1 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for IP,Ethernet,QoS, SCTP dst/src port and Action dec TTL
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index a577323c8f63a9ef02ddd2069147209801117fb6..d81c1f53111df7bae35ed5b102af2ed10f6507ee 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for IP,Ethernet,QoS, SCTP dst/src port and Action dec TTL
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index f39737a2304325c4aa61b9888e5c6013df5e20b0..01c5b58907dc25e7c1398fd7a544c95d9c138cc2 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Ethernet,QoS, ARP and Action drop
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index f0fc4fd9c648599b149fcc0f29fc6b3fe9e1a1f1..22d1c3529238c7105d8d71f1aadeaad04ca53716 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Ethernet,QoS, ARP and Action drop
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index 335c048f1fcc6c733ff35595fb1226de6b3f7d56..3d7f732e730abb84e5c39e5406d9d02893c7ba7e 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Ethernet,QoS, ARP and Action drop
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index 61755be5e6d13858addfb08b4d3dbe6cf9685ce1..6d27a9e55ad75f41f3f75f62b6442bbd0a57dc98 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Ethernet,QoS, ARP and Action drop
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index 6200317beb7417c119ab4c4f9320cff276303934..b99efd2d8e325e09839a15636b8e5b201ba40d0a 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Time our values and Vlan and PCP Vlan
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index e0448c7acfa64855980854dd22d8c5bc2c0315b7..b5c4572b952c7695e33e31a62a9668a7991241f8 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Ethernet,QoS, ARP and Action drop
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index 57e302d5f33a6097a6686b7223d1b15a0338ab99..d973672995c79a59dfa8f5791ace8456bbe00cc6 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for IPv6
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index 2c193d35941b41353138f59fa297c0f03af41986..2d95024affdee456f71b6920ed08829638cc03ff 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for metadata
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index 4af6e46b4eadbf6f2bce36102bf8557daf74f4e4..6c4223eb93769002fd42498d47bb9c055b5a77cd 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for metadata and mask
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index bc0dea8efefd022e209ad35ec7cc1aa7e4ef0c51..a35eb4cd6f2bf311c586c9dedcd18fb6c5a31d00 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for metadata and mask
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index 20e4505353766f682fdb68045bc2e5ac98c497c2..d4d69de0b1abe70b4646e6d9410017a91e600b86 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for metadata and mask
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index 5050402084bcbc1400729505ddb15f93035e1d90..8249383be17cd2b54dd17350674e4973bfa33166 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for IPv6 flow labelk
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index aaa4ea23c9a977bc6aed504999affcb689db5d9c..4a57cd205452e2fc0dc6b67a2d940e9821d79da6 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Tunnel ID
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index 743635eb2b91425616329528286546a755447111..89dee31fd7d29c33ce48d8c4f2d6e14ae122e7c6 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for IPv6 Flow label and ICMP type
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index 5ef483eae23ea038283cff8c7369184d30a6a628..ea715903e153f3db32f7168908601dc0b1684f03 100644 (file)
@@ -287,7 +287,7 @@ Delete All Flows
 
 Initialization Phase
     [Documentation]    Initiate tcp connection with controller
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 
 Teardown Phase
     [Documentation]    Closes tcp connection with controller and removes flows
index b274e8d0c39ed760089ba9f93e1acd27e5b6d06d..afe4f7fd2572f7178eddf3623d5066e5fe6eb3b4 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for OpenFlow group
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index 66fc48545cf09213b14f8fc7e49d2f75998f7305..9f3dd3238648b27b0ebc9c0f16826908e915341b 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for OpenFlow meter
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
index 8405e4134e999dd0d61c43710d746a3a021bdd25..867e24b499d7db8ae0cd5f3a6d9f110770c0f6b1 100644 (file)
@@ -7,6 +7,6 @@ Resource          ../../../libraries/Utils.robot
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
-${start}          sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,1 --switch user
+${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,1 --switch user
 
 *** Keywords ***
index 85a205abcdef97c665d2899a2072209be1f48da6..7c449abfef668a666f6f6c4ff241be6efc08f9e9 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF inventory
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index 5d8c9b20581ec1621c579be9cacb0c4ea57ca3e7..dab8c7db407b1d62ced67f8b5db20da1cad9b53e 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF topology
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           XML
index f3c0ff76f22dbe67d468954b682d88f6d8af990e..8c18402e476677ae0025b7a8bf2277be8fe0e6db 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Switch Manager
-Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${ODL_SYSTEM_IP}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index 083408ff38bfa93232d12df0417fa4524e65e721..315502d21fb0fa5d5a611975cf4b3131ff8f3367 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Statistics Manager
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index f5093cb3ee0037fc1a7c4e8b2edd7ad0d11995f3..e5749fdaa0f92f086be9b0c4ea5d8ca2807ad48b 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Topology Manager
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index 478b7a21083ddd576f5e3db0efdd84b4fb67d111..160cd556c1f3943cc0f45fc17a50ccffce6921e2 100644 (file)
@@ -7,7 +7,7 @@ Library           ../../../libraries/Common.py
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
-${start}          sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,${TOPO_TREE_DEPTH},${TOPO_TREE_FANOUT}
+${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,${TOPO_TREE_DEPTH},${TOPO_TREE_FANOUT}
 
 *** Keywords ***
 Start Suite
index 85a205abcdef97c665d2899a2072209be1f48da6..7c449abfef668a666f6f6c4ff241be6efc08f9e9 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF inventory
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index 5d8c9b20581ec1621c579be9cacb0c4ea57ca3e7..dab8c7db407b1d62ced67f8b5db20da1cad9b53e 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF topology
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           XML
index f3c0ff76f22dbe67d468954b682d88f6d8af990e..8c18402e476677ae0025b7a8bf2277be8fe0e6db 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Switch Manager
-Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${ODL_SYSTEM_IP}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index 083408ff38bfa93232d12df0417fa4524e65e721..315502d21fb0fa5d5a611975cf4b3131ff8f3367 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Statistics Manager
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index f5093cb3ee0037fc1a7c4e8b2edd7ad0d11995f3..e5749fdaa0f92f086be9b0c4ea5d8ca2807ad48b 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Topology Manager
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index cefbd0c6c7d62294b5734ceb4d6ae47283af0239..f40b6a1a9d978fd1166813f581ca058accac4613 100644 (file)
@@ -7,7 +7,7 @@ Library           ../../../libraries/Common.py
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
-${start}          sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,${TOPO_TREE_DEPTH},${TOPO_TREE_FANOUT} --switch ovsk,protocols=OpenFlow13
+${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,${TOPO_TREE_DEPTH},${TOPO_TREE_FANOUT} --switch ovsk,protocols=OpenFlow13
 
 *** Keywords ***
 Start Suite
index 2de30ddd657e740e70518ce74904df044abb48fe..b17dedde9caf223610b2f2fe3c7fe83d2907d7f1 100644 (file)
@@ -36,8 +36,8 @@ Check If There Is A Reason To Exit Test Or If Duration Has Expired
     ...    indicate if the requested duration of the longevity test has elapsed. The caller does not have to use
     ...    that return value.
     Should Be Equal    ${comparator1}    ${comparator2}    ${comparator_failure_message}
-    Verify Controller Is Not Dead    ${CONTROLLER}
-    Verify Controller Has No Null Pointer Exceptions    ${CONTROLLER}
+    Verify Controller Is Not Dead    ${ODL_SYSTEM_IP}
+    Verify Controller Has No Null Pointer Exceptions    ${ODL_SYSTEM_IP}
     ${is_expired}=    Check If Test Duration Is Expired
     [Return]    ${is_expired}
 
@@ -53,7 +53,7 @@ Check If Test Duration Is Expired
 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}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
     ${start_time}=    Get Current Date
     ${end_time}=    Add Time To Date    ${start_time}    ${TEST_LENGTH}
     ${end_time}=    Convert Date    ${end_time}    epoch
index 63bb8a543f03193c6b73561088b75b24a9712e4b..2c7ee34f973a99f339922d55f64d4335cde519c0 100644 (file)
@@ -40,7 +40,7 @@ Check If There Is A Reason To Exit Test Or If Duration Has Expired
     ...    indicate if the requested duration of the longevity test has elapsed. The caller does not have to use
     ...    that return value.
     Should Be Equal    ${comparator1}    ${comparator2}    ${comparator_failure_message}
-    Verify Controller Is Not Dead    ${CONTROLLER}
+    Verify Controller Is Not Dead    ${ODL_SYSTEM_IP}
     ${is_expired}=    Check If Test Duration Is Expired
     [Return]    ${is_expired}
 
@@ -56,7 +56,7 @@ Check If Test Duration Is Expired
 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}
+    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
     Log    Copying ${CREATE_FULLYMESH_TOPOLOGY_FILE_PATH} file to Mininet VM
index dd557013bf7a75799033284a76988f055edf998a..c3e1d87698d68a3a0d440ffc59599c155d9c75d9 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF inventory
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index 0ed6fdf3c04903e1c5193b71994628ae6cabfa00..3cd5b63d436a029766a3fc9cf6bc41ee9141ba07 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF Topology
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index e1b22b3f7debbcd719dd88b407b5aa0ebb866cc2..d64b05d55c3ac2b7b18a056c97be35c7f1b01bf8 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF statistics
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index 3f8a7ab25dda8f8583439809e7a7373963c6659a..10b5db3d5d9ddddbfdb2b805a6610fe4e30c5477 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF FRM
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index 05e5b1f859e07edd3e976a559ffe74c73b1e83c8..7c42042c24fc27f408ea2998b0d30695aa2bda6e 100644 (file)
@@ -6,4 +6,4 @@ Library           SSHLibrary
 Resource          ../../../libraries/Utils.robot
 
 *** Variables ***
-${start}          sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2
+${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2
index dd557013bf7a75799033284a76988f055edf998a..c3e1d87698d68a3a0d440ffc59599c155d9c75d9 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF inventory
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index 0ed6fdf3c04903e1c5193b71994628ae6cabfa00..3cd5b63d436a029766a3fc9cf6bc41ee9141ba07 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF Topology
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index e1b22b3f7debbcd719dd88b407b5aa0ebb866cc2..d64b05d55c3ac2b7b18a056c97be35c7f1b01bf8 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF statistics
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index 0b5836d444f27a4982d6e5758fd46517f2f74b0b..f5ab5b34b5c8a21d4ee7f170e09cfde5ee3dabf9 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF FRM
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
index c0a4b223fc2d091caaca617eae1979e07f6bfd27..f372134b23b1f8ae441afb04e10cf23bbb68bb59 100644 (file)
@@ -6,6 +6,6 @@ Library           SSHLibrary
 Resource          ../../../libraries/Utils.robot
 
 *** Variables ***
-${start}          sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 --switch ovsk,protocols=OpenFlow13
+${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2 --switch ovsk,protocols=OpenFlow13
 
 *** Keywords ***
index f7526107d7f36d816758ed6ee2bc00db1512f8b5..6271eca35fde42399d603f5985a2276d7fee7c3d 100644 (file)
@@ -25,7 +25,7 @@ Find Max Switch Links
 *** Keywords ***
 Link Scale Suite Setup
     [Documentation]    Do initial steps for link scale tests
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    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
     Log    Copying ${CREATE_FULLYMESH_TOPOLOGY_FILE_PATH} file to Mininet VM
index fa37f03cd7cef1ef92d726efe1b4b32bf5ceed45..d51a4dc1910e0cc68c6d6a67dfde5102f316ddc4 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for finding out max number of switches
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Scalability Suite Teardown
 Library           OperatingSystem
 Library           RequestsLibrary
index 2813f6aebd1133f170f068291ee5d52fcafa93de..e2d87530b06399be1bed043a8f09b06908766893 100644 (file)
@@ -41,7 +41,7 @@ Start Suite
     Execute Command    sudo mn -c
     Write    ${start}
     Read Until    mininet>
-    Write    start ${CONTROLLER} ${init_sw}
+    Write    start ${ODL_SYSTEM_IP} ${init_sw}
     Read Until    mininet>
     Wait Until Keyword Succeeds    10s    1s    Verify Switches Connected    ${init_sw}
 
@@ -54,7 +54,7 @@ Add Switches
 Verify Switches Connected
     [Arguments]    ${exp_switches}
     [Documentation]    Verifies if switches are connected/present in operational inventory
-    ${sw}    ${rep}    ${found}=    Flow Stats Collected    controller=${CONTROLLER}
+    ${sw}    ${rep}    ${found}=    Flow Stats Collected    controller=${ODL_SYSTEM_IP}
     Should Be Equal As Numbers    ${sw}    ${exp_switches}
 
 Log Store Max Found
index 251f45625165d0e7eec4f58cd56b3ca579be8701..559665dddc86608fa541b0cc4520c82ceb58d0df 100644 (file)
@@ -47,7 +47,7 @@ Run Cbench And Log Results
     ##down can catch this problem and log the results as zero.    However, we need to know which
     ##file to log to, so setting it as a suite variable here.
     Set Suite Variable    ${output_filename}
-    ${output}=    Run Command On Remote System    ${cbench_system}    ${cbench_executable} -c ${CONTROLLER} ${cbench_args}    prompt_timeout=${test_timeout}
+    ${output}=    Run Command On Remote System    ${cbench_system}    ${cbench_executable} -c ${ODL_SYSTEM_IP} ${cbench_args}    prompt_timeout=${test_timeout}
     Log    ${output}
     Should Contain    ${output}    RESULT
     ${result_line}=    Get Lines Containing String    ${output}    RESULT
index a7c70b873a09cf470acf91c04966bcfdd350f35d..4f4add24bb0dfc0691862848b66c2f423b2bb2b3 100644 (file)
@@ -15,7 +15,7 @@ Library           SSHLibrary
 ${switches}       25
 ${flows}          2000
 ${threads}        5
-${start}          sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${switches},1 --switch ovsk,protocols=OpenFlow13
+${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${switches},1 --switch ovsk,protocols=OpenFlow13
 ${PERFSCRIPT}     ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_add_delete_test.py
 ${PARSESCRIPT}    ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/create_plot_data_files.py
 
@@ -30,7 +30,7 @@ Are Switches Connected
     [Teardown]    Stop Http Session
 
 Configure And Deconfigure Flows
-    ${result}=    Run Process    ${PERFSCRIPT}    --host    ${CONTROLLER}    --flows    ${flows}
+    ${result}=    Run Process    ${PERFSCRIPT}    --host    ${ODL_SYSTEM_IP}    --flows    ${flows}
     ...    --threads    ${threads}    --auth    shell=yes
     Log    ${result.stdout}
     Create File    out.log.txt    content=${result.stdout}
@@ -68,8 +68,8 @@ Stop Suite
 
 Start Http Session
     [Documentation]    Starts http session
-    Log    http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML}
-    Create Session    tcsession    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Log    http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML}
+    Create Session    tcsession    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 
 Stop Http Session
     [Documentation]    Stops http session
index 233ff08df2a4625501e6e85cd4448533e4204967..8e0679c1b5cacf2bcd47b6a2a4ffcc5e16acb500 100644 (file)
@@ -18,7 +18,7 @@ ${swspread}       gauss
 ${tabspread}      gauss
 ${topourl}        /restconf/operational/network-topology:network-topology/topology/flow:1
 ${invurl}         /restconf/operational/opendaylight-inventory:nodes
-@{cntls}          ${CONTROLLER}
+@{cntls}          ${ODL_SYSTEM_IP}
 
 *** Test Cases ***
 Configure Flows
@@ -29,7 +29,7 @@ Configure Flows
     Set Suite Variable    ${flows}
 
 Check Configured Are Operational
-    Wait Until Keyword Succeeds    110s    20s    Check Flows Inventory    ${flows}    ${CONTROLLER}
+    Wait Until Keyword Succeeds    110s    20s    Check Flows Inventory    ${flows}    ${ODL_SYSTEM_IP}
 
 Deconfigure Flows
     ${res}=    Deconfigure Flows    flow_details=${flows}    controllers=@{cntls}    nrthreads=5
@@ -37,7 +37,7 @@ Deconfigure Flows
 
 Check No Flows In Operational
     ${noflows}=    Create List
-    Wait Until Keyword Succeeds    110s    20s    Check Flows Inventory    ${noflows}    ${CONTROLLER}
+    Wait Until Keyword Succeeds    110s    20s    Check Flows Inventory    ${noflows}    ${ODL_SYSTEM_IP}
 
 *** Keywords ***
 Connect Switches
@@ -48,9 +48,9 @@ Connect Switches
     Write    sudo ovs-vsctl set-manager ptcp:6644
     Write    sudo mn -c
     Read Until    ${DEFAULT_LINUX_PROMPT}
-    Write    sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
+    Write    sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
     Read Until    mininet>
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
     Wait Until Keyword Succeeds    10s    1s    Are Switches Connected Topo
 
 Stop Switches
index 00f2d98ff10b42f3ac30331e244bf66ec2698c76..8d3cb677f7184c486675f268e793fd72fd2d0676 100644 (file)
@@ -18,7 +18,7 @@ ${swspread}       linear
 ${tabspread}      linear
 ${topourl}        /restconf/operational/network-topology:network-topology/topology/flow:1
 ${invurl}         /restconf/operational/opendaylight-inventory:nodes
-@{cntls}          ${CONTROLLER}
+@{cntls}          ${ODL_SYSTEM_IP}
 
 *** Test Cases ***
 Configure Flows
@@ -29,7 +29,7 @@ Configure Flows
     Set Suite Variable    ${flows}
 
 Check Configured Are Operational
-    Wait Until Keyword Succeeds    110s    20s    Check Flows Inventory    ${flows}    ${CONTROLLER}
+    Wait Until Keyword Succeeds    110s    20s    Check Flows Inventory    ${flows}    ${ODL_SYSTEM_IP}
 
 Deconfigure Flows
     ${res}=    Deconfigure Flows    flow_details=${flows}    controllers=@{cntls}    nrthreads=5
@@ -37,7 +37,7 @@ Deconfigure Flows
 
 Check No Flows In Operational
     ${noflows}=    Create List
-    Wait Until Keyword Succeeds    110s    20s    Check Flows Inventory    ${noflows}    ${CONTROLLER}
+    Wait Until Keyword Succeeds    110s    20s    Check Flows Inventory    ${noflows}    ${ODL_SYSTEM_IP}
 
 *** Keywords ***
 Connect Switches
@@ -48,9 +48,9 @@ Connect Switches
     Write    sudo ovs-vsctl set-manager ptcp:6644
     Write    sudo mn -c
     Read Until    ${DEFAULT_LINUX_PROMPT}
-    Write    sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
+    Write    sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
     Read Until    mininet>
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
     Wait Until Keyword Succeeds    10s    1s    Are Switches Connected Topo
 
 Stop Switches
index bb8557b14d462203985d9c0bb02efa13c22dc4ba..c7a040bf7678fd578522a382ba4cf536d04b9de5 100644 (file)
@@ -18,7 +18,7 @@ ${swspread}       first
 ${tabspread}      first
 ${topourl}        /restconf/operational/network-topology:network-topology/topology/flow:1
 ${invurl}         /restconf/operational/opendaylight-inventory:nodes
-@{cntls}          ${CONTROLLER}
+@{cntls}          ${ODL_SYSTEM_IP}
 
 *** Test Cases ***
 Configure Flows
@@ -29,7 +29,7 @@ Configure Flows
     Set Suite Variable    ${flows}
 
 Check Configured Are Operational
-    Wait Until Keyword Succeeds    110s    20s    Check Flows Inventory    ${flows}    ${CONTROLLER}
+    Wait Until Keyword Succeeds    110s    20s    Check Flows Inventory    ${flows}    ${ODL_SYSTEM_IP}
 
 Deconfigure Flows
     ${res}=    Deconfigure Flows    flow_details=${flows}    controllers=@{cntls}    nrthreads=5
@@ -37,7 +37,7 @@ Deconfigure Flows
 
 Check No Flows In Operational
     ${noflows}=    Create List
-    Wait Until Keyword Succeeds    110s    20s    Check Flows Inventory    ${noflows}    ${CONTROLLER}
+    Wait Until Keyword Succeeds    110s    20s    Check Flows Inventory    ${noflows}    ${ODL_SYSTEM_IP}
 
 *** Keywords ***
 Connect Switches
@@ -48,9 +48,9 @@ Connect Switches
     Write    sudo ovs-vsctl set-manager ptcp:6644
     Write    sudo mn -c
     Read Until    ${DEFAULT_LINUX_PROMPT}
-    Write    sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
+    Write    sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
     Read Until    mininet>
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
     Wait Until Keyword Succeeds    10s    1s    Are Switches Connected Topo
 
 Stop Switches
index 2a7b039e726b38d915a861c95263ed279970aba2..601169c1534e74cfca1e2660c012d1649e658938 100644 (file)
@@ -18,7 +18,7 @@ ${swspread}       linear
 ${tabspread}      first
 ${topourl}        /restconf/operational/network-topology:network-topology/topology/flow:1
 ${invurl}         /restconf/operational/opendaylight-inventory:nodes
-@{cntls}          ${CONTROLLER}
+@{cntls}          ${ODL_SYSTEM_IP}
 
 *** Test Cases ***
 Configure Flows
@@ -29,7 +29,7 @@ Configure Flows
     Set Suite Variable    ${flows}
 
 Check Configured Are Operational
-    Wait Until Keyword Succeeds    110s    20s    Check Flows Inventory    ${flows}    ${CONTROLLER}
+    Wait Until Keyword Succeeds    110s    20s    Check Flows Inventory    ${flows}    ${ODL_SYSTEM_IP}
 
 Deconfigure Flows
     ${res}=    Deconfigure Flows    flow_details=${flows}    controllers=@{cntls}    nrthreads=5
@@ -37,7 +37,7 @@ Deconfigure Flows
 
 Check No Flows In Operational
     ${noflows}=    Create List
-    Wait Until Keyword Succeeds    110s    20s    Check Flows Inventory    ${noflows}    ${CONTROLLER}
+    Wait Until Keyword Succeeds    110s    20s    Check Flows Inventory    ${noflows}    ${ODL_SYSTEM_IP}
 
 *** Keywords ***
 Connect Switches
@@ -48,9 +48,9 @@ Connect Switches
     Write    sudo ovs-vsctl set-manager ptcp:6644
     Write    sudo mn -c
     Read Until    ${DEFAULT_LINUX_PROMPT}
-    Write    sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
+    Write    sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
     Read Until    mininet>
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
     Wait Until Keyword Succeeds    10s    1s    Are Switches Connected Topo
 
 Stop Switches
index b61c4e327cc6d4521a0637e18dadd18630da106b..302c2efbc5ec1c8e5c50246fceeae0963f1d5c26 100644 (file)
@@ -16,8 +16,8 @@ ${swnr}           16
 ${flnr}           16000
 ${swspread}       linear
 ${tabspread}      linear
-@{cntls}          ${CONTROLLER}
-${start_cmd}      sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
+@{cntls}          ${ODL_SYSTEM_IP}
+${start_cmd}      sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
 
 *** Test Cases ***
 Connect Mininet
@@ -33,7 +33,7 @@ Configure Flows
 
 Are Flows Operational
     [Documentation]    Operational datastore check if all flows are present there
-    Wait Until Keyword Succeeds    110s    5s    Check Flows Inventory    ${flows}    ${CONTROLLER}
+    Wait Until Keyword Succeeds    110s    5s    Check Flows Inventory    ${flows}    ${ODL_SYSTEM_IP}
 
 Deconfigure Flows
     [Documentation]    Removal of 16k flows from config datastore
@@ -43,7 +43,7 @@ Deconfigure Flows
 Check No Flows In Operational
     [Documentation]    Operational datastore to be without any flows
     ${noflows}=    Create List
-    Wait Until Keyword Succeeds    110s    5s    Check Flows Inventory    ${noflows}    ${CONTROLLER}
+    Wait Until Keyword Succeeds    110s    5s    Check Flows Inventory    ${noflows}    ${ODL_SYSTEM_IP}
 
 Configure Flows Again
     [Documentation]    Configuration of 16k flows into config datastore again
@@ -52,7 +52,7 @@ Configure Flows Again
 
 Are Flows Operational Again
     [Documentation]    Operational datastore check if all flows are present there
-    Wait Until Keyword Succeeds    110s    5s    Check Flows Inventory    ${flows}    ${CONTROLLER}
+    Wait Until Keyword Succeeds    110s    5s    Check Flows Inventory    ${flows}    ${ODL_SYSTEM_IP}
 
 Stop Mininet
     [Documentation]    Disconnect/Stop mininet
@@ -68,7 +68,7 @@ Connect Mininet Again
 
 Check Flows Are Operational Again
     [Documentation]    All 16k switches should be present in the operational datastore after mininet reconnection
-    Wait Until Keyword Succeeds    110s    5s    Check Flows Inventory    ${flows}    ${CONTROLLER}
+    Wait Until Keyword Succeeds    110s    5s    Check Flows Inventory    ${flows}    ${ODL_SYSTEM_IP}
 
 Deconfigure Flows End
     [Documentation]    Flows deconfiguration
@@ -78,7 +78,7 @@ Deconfigure Flows End
 Check No Flows In Operational Last
     [Documentation]    Operational datastore to be without any flows
     ${noflows}=    Create List
-    Wait Until Keyword Succeeds    110s    5s    Check Flows Inventory    ${noflows}    ${CONTROLLER}
+    Wait Until Keyword Succeeds    110s    5s    Check Flows Inventory    ${noflows}    ${ODL_SYSTEM_IP}
 
 Stop Mininet End
     Stop Switches
@@ -96,7 +96,7 @@ Connect Switches
     Wait Until Keyword Succeeds    10s    1s    Are Switches Connected Topo
 
 Create Http Session
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 
 Stop Switches
     [Documentation]    Stops mininet
index ed1d1e565f7b78b1c25583edbdf3579c7750e138..dfef1dca8b4e69096c191d74afb8a96cd9f8bbb0 100644 (file)
@@ -19,8 +19,8 @@ ${fpr}            25
 ${nrthreads}      5
 ${swspread}       linear
 ${tabspread}      first
-@{cntls}          ${CONTROLLER}
-${start_cmd}      sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
+@{cntls}          ${ODL_SYSTEM_IP}
+${start_cmd}      sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
 ${getf_cmd}       sh ./get-total-found.sh
 ${getr_cmd}       sh ./get-total-reported.sh
 ${iperiod}        1s
@@ -102,7 +102,7 @@ Connect Switches
     Wait Until Keyword Succeeds    10s    1s    Are Switches Connected Topo
 
 Create Http Session And Upload Files
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    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
     Put File    ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/*    ./
@@ -134,7 +134,7 @@ Are Switches Connected Topo
 Check Flows Inventory
     [Arguments]    ${rswitches}    ${rflows}
     [Documentation]    Checks in inventory has required state
-    ${sw}    ${repf}    ${foundf}=    Flow Stats Collected    controller=${CONTROLLER}
+    ${sw}    ${repf}    ${foundf}=    Flow Stats Collected    controller=${ODL_SYSTEM_IP}
     Should Be Equal As Numbers    ${rswitches}    ${sw}
     Should Be Equal As Numbers    ${rflows}    ${foundf}
 
index 51be2416b9aecdf828e0243f10504185fd431322..c794ef9a50a114cb04bca9553714e6bea7e94227 100644 (file)
@@ -17,8 +17,8 @@ ${fpr}            25
 ${nrthreads}      5
 ${swspread}       linear
 ${tabspread}      first
-@{cntls}          ${CONTROLLER}
-${start_cmd}      sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
+@{cntls}          ${ODL_SYSTEM_IP}
+${start_cmd}      sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
 ${getf_cmd}       sh ./get-total-found.sh
 ${getr_cmd}       sh ./get-total-reported.sh
 ${iperiod}        1s
@@ -77,7 +77,7 @@ Connect Switches
     Wait Until Keyword Succeeds    10s    1s    Are Switches Connected Topo
 
 Create Http Session And Upload Files
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    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
     Put File    ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/*    ./
@@ -107,7 +107,7 @@ Are Switches Connected Topo
 Check Flows Inventory
     [Arguments]    ${rswitches}    ${rflows}
     [Documentation]    Checks in inventory has required state
-    ${sw}    ${repf}    ${foundf}=    Flow Stats Collected    controller=${CONTROLLER}
+    ${sw}    ${repf}    ${foundf}=    Flow Stats Collected    controller=${ODL_SYSTEM_IP}
     Should Be Equal As Numbers    ${rswitches}    ${sw}
     Should Be Equal As Numbers    ${rflows}    ${foundf}
 
index 8c9927630d63b19324e893fc5a03ecb814905be3..f051f1a0553522f1395bad928b822982078a1714 100644 (file)
@@ -17,8 +17,8 @@ ${fpr}            25
 ${nrthreads}      5
 ${swspread}       linear
 ${tabspread}      first
-@{cntls}          ${CONTROLLER}
-${start_cmd}      sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
+@{cntls}          ${ODL_SYSTEM_IP}
+${start_cmd}      sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
 ${getf_cmd}       sh ./get-total-found.sh
 ${getr_cmd}       sh ./get-total-reported.sh
 ${iperiod}        1s
@@ -77,7 +77,7 @@ Connect Switches
     Wait Until Keyword Succeeds    10s    1s    Are Switches Connected Topo
 
 Create Http Session And Upload Files
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    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
     Put File    ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/*    ./
@@ -107,7 +107,7 @@ Are Switches Connected Topo
 Check Flows Inventory
     [Arguments]    ${rswitches}    ${rflows}
     [Documentation]    Checks in inventory has required state
-    ${sw}    ${repf}    ${foundf}=    Flow Stats Collected    controller=${CONTROLLER}
+    ${sw}    ${repf}    ${foundf}=    Flow Stats Collected    controller=${ODL_SYSTEM_IP}
     Should Be Equal As Numbers    ${rswitches}    ${sw}
     Should Be Equal As Numbers    ${rflows}    ${foundf}
 
index b66b1d686eb051a8dd17cd751058f8c4888a0818..86d4808076f1a1a3b0c9c84e6dbbcd79a693383b 100644 (file)
@@ -396,9 +396,9 @@ Init Flow Variables
     Set Suite Variable    ${xmlroot}
 
 Create Controllers Sessions
-    Create Session    session1    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
-    Create Session    session2    http://${CONTROLLER1}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
-    Create Session    session3    http://${CONTROLLER2}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session1    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session2    http://${ODL_SYSTEM_2_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session3    http://${ODL_SYSTEM_3_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 
 Get Controller Response
     [Arguments]    ${session}    ${url}
index e232ced22e00392ced5eccde59581459d8222d6d..678bc2bc47750f7faa1ca5bd4f9cd808cdd875c1 100644 (file)
@@ -19,5 +19,5 @@ Start Suite
     Execute Command    sudo mn -c
     Write    ${start}
     Read Until    mininet>
-    Write    start_with_cluster ${CONTROLLER},${CONTROLLER1},${CONTROLLER2}
+    Write    start_with_cluster ${ODL_SYSTEM_IP},${ODL_SYSTEM_2_IP},${ODL_SYSTEM_3_IP}
     Read Until    mininet>
index 70e36e87fdcd1b56178925ecd1632f83ede2247a..16049227cbb59dc16e21cb6a6f7665cec8a27150 100644 (file)
@@ -16,7 +16,7 @@ Variables         ../../../variables/Variables.py
 ${SWITCH_CLASS}    Ovs
 ${SWITCH_IP}      ${MININET}
 ${SWITCH_PROMPT}    ${DEFAULT_LINUX_PROMPT}
-${CONTROLLER}     null
+${ODL_SYSTEM_IP}     null
 ${REST_CONTEXT}    /restconf/operational/opendaylight-inventory:nodes
 
 *** Test Cases ***
@@ -38,12 +38,12 @@ Switch Qualification Suite Setup
     ${test_switch}=    Get Switch    ${SWITCH_CLASS}
     Set Suite Variable    ${test_switch}
     Call Method    ${test_switch}    set_mgmt_ip    ${SWITCH_IP}
-    Call Method    ${test_switch}    set_controller_ip    ${CONTROLLER}
+    Call Method    ${test_switch}    set_controller_ip    ${ODL_SYSTEM_IP}
     Call Method    ${test_switch}    set_mgmt_prompt    ${SWITCH_PROMPT}
     Log    MAKE: ${test_switch.make}\n MODEL: ${test_switch.model}\n IP: ${test_switch.mgmt_ip}\n PROMPT: ${test_switch.mgmt_prompt}\n CONTROLLER_IP: ${test_switch.of_controller_ip}\n MGMT_PROTOCOL: ${test_switch.mgmt_protocol}
     Ping    ${test_switch.mgmt_ip}
     Initialize Switch    ${test_switch}
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 
 Switch Qualification Suite Teardown
     Cleanup Switch    ${test_switch}
index 185662ed2d464d3b07357e27249b3133be7f6080..c02d102ab82100ef19e0ab40a88d409784ca999f 100644 (file)
@@ -29,7 +29,7 @@ Library           ../../../libraries/SwitchClasses/${SWITCH_CLASS}.py
 ${SWITCH_CLASS}    Ovs
 ${SWITCH_IP}      ${MININET}
 ${SWITCH_PROMPT}    ${DEFAULT_LINUX_PROMPT}
-${CONTROLLER}     null
+${ODL_SYSTEM_IP}     null
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
 ${ipv4_src}       11.3.0.0/16
 ${ipv4_dst}       99.0.0.0/8
@@ -107,14 +107,14 @@ OpenFlow Actions Suite Setup
     ${test_switch}=    Get Switch    ${SWITCH_CLASS}
     Set Suite Variable    ${test_switch}
     Call Method    ${test_switch}    set_mgmt_ip    ${SWITCH_IP}
-    Call Method    ${test_switch}    set_controller_ip    ${CONTROLLER}
+    Call Method    ${test_switch}    set_controller_ip    ${ODL_SYSTEM_IP}
     Call Method    ${test_switch}    set_mgmt_prompt    ${SWITCH_PROMPT}
-    Run Command On Remote System    ${CONTROLLER}    ps -elf | grep java
+    Run Command On Remote System    ${ODL_SYSTEM_IP}    ps -elf | grep java
     Log    MAKE: ${test_switch.make}\n MODEL: ${test_switch.model}\n IP: ${test_switch.mgmt_ip}\n PROMPT: ${test_switch.mgmt_prompt}\n CONTROLLER_IP: ${test_switch.of_controller_ip}\n MGMT_PROTOCOL: ${test_switch.mgmt_protocol}
     Ping    ${test_switch.mgmt_ip}
     Initialize Switch    ${test_switch}
     Configure OpenFlow    ${test_switch}
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 
 OpenFlow Actions Suite Teardown
     Cleanup Switch    ${test_switch}