Replace deprecated variables in suites/sfc (1).

+ CONTROLLER -> ODL_SYSTEM_IP
+ CONTROLLER1 -> ODL_SYSTEM_2_IP
+ CONTROLLER2 -> ODL_SYSTEM_3_IP

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

diff --git a/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot b/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot
index b40e253529ddd5c2e6065ec67b030b2906a7bb04..bea5e411a9e15c1a1054d6df99cca9ccb175af6c 100644 (file)
--- a/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot
+++ b/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot
@@ -15,7 +15,7 @@ ${SFC_FUNCTIONS_FILE}    ${CURDIR}/../../../variables/sfc/service-functions.json
 *** Test Cases ***
 Add Service Functions To One Node
     [Documentation]    Add service functions from JSON file
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
     ${jsonbody}    Read JSON From File    ${SFC_FUNCTIONS_FILE}
     Add Elements To URI From File    ${SFC__API}    ${SFC_FUNCTIONS_FILE}
     ${resp}    RequestsLibrary.Get    session    ${SFC_API}
@@ -24,7 +24,7 @@ Add Service Functions To One Node
     Lists Should be Equal    ${result}    ${jsonbody}
 
 Read Service Functions From Other Node
-    Create Session    session    http://${CONTROLLER1}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+    Create Session    session    http://${ODL_SYSTEM_2_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
     ${jsonbody}    Read JSON From File    ${SFC_FUNCTIONS_FILE}
     ${resp}    RequestsLibrary.Get    session    ${SFC_API}
     Should Be Equal As Strings    ${resp.status_code}    200

diff --git a/csit/suites/sfc/SFC_Basic/010__sfc_service_functions.robot b/csit/suites/sfc/SFC_Basic/010__sfc_service_functions.robot
index 4ab153559f89d1ff51526dda2441b467df535d48..e3f9388d8fee54c30647c3e2e5318b2162e67606 100644 (file)
--- a/csit/suites/sfc/SFC_Basic/010__sfc_service_functions.robot
+++ b/csit/suites/sfc/SFC_Basic/010__sfc_service_functions.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for SFC Service Functions, Operates functions from Restconf APIs.
-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           SSHLibrary
 Library           Collections

diff --git a/csit/suites/sfc/SFC_Basic/020__sfc_service_forwarders.robot b/csit/suites/sfc/SFC_Basic/020__sfc_service_forwarders.robot
index 9db309bcd4cee04640008445255355478d8bc557..adee2ad4f062a75bdb7d568e8cbe4a0a1cf79ab9 100644 (file)
--- a/csit/suites/sfc/SFC_Basic/020__sfc_service_forwarders.robot
+++ b/csit/suites/sfc/SFC_Basic/020__sfc_service_forwarders.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for SFC Service Function Forwarders, Operates SFFs from Restconf APIs.
-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           SSHLibrary
 Library           Collections

diff --git a/csit/suites/sfc/SFC_Basic/030__sfc_service_nodes.robot b/csit/suites/sfc/SFC_Basic/030__sfc_service_nodes.robot
index a3ce080a193e93183a0ba0e2e233b26fe90fca0c..91710ae4584fef85d1f5bc55cdac0e603ff92e18 100644 (file)
--- a/csit/suites/sfc/SFC_Basic/030__sfc_service_nodes.robot
+++ b/csit/suites/sfc/SFC_Basic/030__sfc_service_nodes.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for SFC Service Nodes, Operates Nodes from Restconf APIs.
-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           SSHLibrary
 Library           Collections

diff --git a/csit/suites/sfc/SFC_Basic/040__sfc_service_chains.robot b/csit/suites/sfc/SFC_Basic/040__sfc_service_chains.robot
index 4db884ad28bc998379b3ea350d8563a79c92f5e1..5b81e5c85ba5a6750afa772d0d7ff3d55201e6a4 100644 (file)
--- a/csit/suites/sfc/SFC_Basic/040__sfc_service_chains.robot
+++ b/csit/suites/sfc/SFC_Basic/040__sfc_service_chains.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for SFC Service Function Chains, Operates Chains from Restconf APIs.
-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           SSHLibrary
 Library           Collections

diff --git a/csit/suites/sfc/SFC_Basic/050__sfc_service_schedule_types.robot b/csit/suites/sfc/SFC_Basic/050__sfc_service_schedule_types.robot
index e2562b2b0d054cbe9a80325b6f32b40c63241b39..d7a02a73dd4735e1be5470d0474d2814972278ea 100644 (file)
--- a/csit/suites/sfc/SFC_Basic/050__sfc_service_schedule_types.robot
+++ b/csit/suites/sfc/SFC_Basic/050__sfc_service_schedule_types.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for SFC Function Schedule Algorithm Types, Operates types from Restconf APIs.
-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           SSHLibrary
 Library           Collections

diff --git a/csit/suites/sfc/SFC_Basic/060__sfc_service_paths.robot b/csit/suites/sfc/SFC_Basic/060__sfc_service_paths.robot
index a5cbad71816d3f77961d35c6551c720777a91a20..bf887090782022860fb590bc0b22fe55e69ca0ab 100644 (file)
--- a/csit/suites/sfc/SFC_Basic/060__sfc_service_paths.robot
+++ b/csit/suites/sfc/SFC_Basic/060__sfc_service_paths.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for SFC Service Function Paths, Operates paths from Restconf APIs.
-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           SSHLibrary
 Library           Collections

diff --git a/csit/suites/sfc/SFC_Basic/070__sfc_rendered_service_paths.robot b/csit/suites/sfc/SFC_Basic/070__sfc_rendered_service_paths.robot
index a608cd31f54bb8fa3c268e945f7d1a3b6f8f0162..0b5bb512812374713ea7715e896d08f360cffdb1 100644 (file)
--- a/csit/suites/sfc/SFC_Basic/070__sfc_rendered_service_paths.robot
+++ b/csit/suites/sfc/SFC_Basic/070__sfc_rendered_service_paths.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for SFC Service Functions, Operates functions from Restconf APIs.
-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           SSHLibrary
 Library           Collections