Merge SFC clustering test suite into SFC rest basic

To alleviate number of jenkins generated n ODLPUB,this commit merges tests from clustering
test suite into rest basic. Note the job for clustering is removed in this commit:
https://git.opendaylight.org/gerrit/#/c/45619/

Change-Id: Ibfe31f9379b9672975a02df18cf180bca951897c
Signed-off-by: Miguel Angel Munoz Gonzalez <miguel.angel.munoz.gonzalez@ericsson.com>

diff --git a/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot b/csit/suites/sfc/SFC_Basic/080__sfc_simple_clustering.robot
similarity index 75%
rename from csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot
rename to csit/suites/sfc/SFC_Basic/080__sfc_simple_clustering.robot
index c633787d808e5c12dc289b7a217c5f8047f5afa1..f49900efa8e1e872872ba00e5f59bf023783c73d 100644 (file)
--- a/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot
+++ b/csit/suites/sfc/SFC_Basic/080__sfc_simple_clustering.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for SFC Service Functions, Operates functions from Restconf APIs.
-Suite Setup       Init Variables
+Suite Setup       Init Suite
 Suite Teardown    Delete All Sessions
 Library           RequestsLibrary
 Library           SSHLibrary
@@ -9,6 +9,9 @@ Library           OperatingSystem
 Variables         ../../../variables/Variables.py
 Resource          ../../../libraries/Utils.robot
 
+*** Variables ***
+${SFC_API}    /restconf/config/service-function:service-functions
+
 *** Test Cases ***
 Add Service Functions To First Node
     [Documentation]    Add service functions from JSON file
@@ -43,18 +46,12 @@ Read JSON From File
     ${jsonbody}    To Json    ${body}
     [Return]    ${jsonbody}
 
-Init Variables
+Init Suite
     [Documentation]    Initialize ODL version specific variables
     log    ${ODL_STREAM}
-    Run Keyword If    '${ODL_STREAM}' == 'stable-lithium'    Init Variables Lithium
-    ...    ELSE    Init Variables Master
-
-Init Variables Master
-    [Documentation]    Sets variables specific to latest(master) version
-    Set Suite Variable    ${SFC_API}    /restconf/config/service-function:service-functions
-    Set Suite Variable    ${SFC_FUNCTIONS_FILE}    ${CURDIR}/../../../variables/sfc/master/service-functions.json
-
-Init Variables Lithium
-    [Documentation]    Sets variables specific to Lithium version
-    Set Suite Variable    ${SFC_API}    /restconf/config/service-function:service-functions
-    Set Suite Variable    ${SFC_FUNCTIONS_FILE}    ${CURDIR}/../../../variables/sfc/lithium/service-functions.json
+    Run Keyword If    '${ODL_STREAM}' == 'stable-lithium'    Set Suite Variable    ${VERSION_DIR}    lithium
+    ...    ELSE    Set Suite Variable    ${VERSION_DIR}    master
+    Set Suite Variable    ${SFC_FUNCTIONS_FILE}    ${CURDIR}/../../../variables/sfc/${VERSION_DIR}/service-functions.json
+
+
+

diff --git a/csit/testplans/sfc-clustering.txt b/csit/testplans/sfc-clustering.txt
deleted file mode 100644 (file)
index 9f9c6d8..0000000
--- a/csit/testplans/sfc-clustering.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Place the suites in run order:
-integration/test/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot
\ No newline at end of file

diff --git a/csit/testplans/sfc-rest-basic.txt b/csit/testplans/sfc-rest-basic.txt
index 62c53145b6c3cc4d539c79e15bdb95c476c04359..75d09f8840302eea4ef2ac97889e24a9a46f31f1 100644 (file)
--- a/csit/testplans/sfc-rest-basic.txt
+++ b/csit/testplans/sfc-rest-basic.txt
@@ -6,3 +6,4 @@ integration/test/csit/suites/sfc/SFC_Basic/040__sfc_service_chains.robot
 integration/test/csit/suites/sfc/SFC_Basic/050__sfc_service_schedule_types.robot
 integration/test/csit/suites/sfc/SFC_Basic/060__sfc_service_paths.robot
 integration/test/csit/suites/sfc/SFC_Basic/070__sfc_rendered_service_paths.robot
+integration/test/csit/suites/sfc/SFC_Basic/080__simple_clustering.robot