From: Miguel Angel Munoz Gonzalez <miguel.angel.munoz.gonzalez@ericsson.com>
Date: Thu, 31 Mar 2016 12:49:43 +0000 (+0200)
Subject: Fix SFC robot test cases in CSIT
X-Git-Tag: release/lithium-sr4~57
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F50%2F36950%2F3;p=integration%2Ftest.git

Fix SFC robot test cases in CSIT

This commit is composed of two different changes:
1. Replace ODL_VERSION variable with ODL_STREAM in SFC test cases

ODL_VERSION variable in robot test cases is no longer used and instead
ODL_STREAM is the new name, with the same content.

2. Fix SFC_FUNCTIONS_FILE variable definition in SFC Robot test cases

Definition of variables in robot test cases need to keep separation of
four spaces between the var name and the value

Tested in Jenkins Sandbox: https://jenkins.opendaylight.org/sandbox/job/sfc-csit-3node-clustering-all-beryllium/5/

Change-Id: I37b326d92f534411d45e92f88b2e0f120e6ad506
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/Clustering_Datastore/020_simple_clustering.robot
index f64a3182ca..c633787d80 100644
--- a/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot
+++ b/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot
@@ -45,16 +45,16 @@ Read JSON From File
 
 Init Variables
     [Documentation]    Initialize ODL version specific variables
-    log    ${ODL_VERSION}
-    Run Keyword If    '${ODL_VERSION}' == 'stable-lithium'    Init Variables Lithium
+    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
+    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
+    Set Suite Variable    ${SFC_FUNCTIONS_FILE}    ${CURDIR}/../../../variables/sfc/lithium/service-functions.json