From 9f3c40db9b454a9661b6367f456191e635f71041 Mon Sep 17 00:00:00 2001 From: Deepak Date: Fri, 29 Jan 2016 04:47:07 +0530 Subject: [PATCH] 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 --- .../sfc/Clustering_Datastore/020_simple_clustering.robot | 4 ++-- csit/suites/sfc/SFC_Basic/010__sfc_service_functions.robot | 2 +- csit/suites/sfc/SFC_Basic/020__sfc_service_forwarders.robot | 2 +- csit/suites/sfc/SFC_Basic/030__sfc_service_nodes.robot | 2 +- csit/suites/sfc/SFC_Basic/040__sfc_service_chains.robot | 2 +- .../sfc/SFC_Basic/050__sfc_service_schedule_types.robot | 2 +- csit/suites/sfc/SFC_Basic/060__sfc_service_paths.robot | 2 +- .../sfc/SFC_Basic/070__sfc_rendered_service_paths.robot | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot b/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot index b40e253529..bea5e411a9 100644 --- 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 4ab153559f..e3f9388d8f 100644 --- 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 9db309bcd4..adee2ad4f0 100644 --- 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 a3ce080a19..91710ae458 100644 --- 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 4db884ad28..5b81e5c85b 100644 --- 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 e2562b2b0d..d7a02a73dd 100644 --- 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 a5cbad7181..bf88709078 100644 --- 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 a608cd31f5..0b5bb51281 100644 --- 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 -- 2.36.6