Use proper variable dirs according to each release

Different releases should use different robot variables for test cases
Suite setup should initialize correctly this variables with a proper procedure

Note also that some checkpoints were using incorrect tags to validate tests.

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

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 0f1857d4e2b0183fc03fd3a7e4b259d241384e00..7f387a09f4675bc1ee7d0563fa14b40441207ac2 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://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Init Suite
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
@@ -9,13 +9,6 @@ Library           RequestsLibrary
 Variables         ../../../variables/Variables.py
 Resource          ../../../libraries/Utils.robot
 
-*** Variables ***
-${SERVICE_FUNCTIONS_URI}    /restconf/config/service-function:service-functions/
-${SERVICE_FUNCTIONS_FILE}    ../../../variables/sfc/service-functions.json
-${SF_DPI102100_URI}    /restconf/config/service-function:service-functions/service-function/dpi-102-100/
-${SF_DPI102100_FILE}    ../../../variables/sfc/sf_dpi_102_100.json
-${SF_DPL101_FILE}    ../../../variables/sfc/sf_dpl_101.json
-
 *** Test Cases ***
 Add Service Functions
     [Documentation]    Add Service Functions from JSON file
@@ -43,7 +36,7 @@ Get one Service Function
     [Documentation]    Get one Service Function
     Remove All Elements At URI    ${SERVICE_FUNCTIONS_URI}
     Add Elements To URI From File    ${SERVICE_FUNCTIONS_URI}    ${SERVICE_FUNCTIONS_FILE}
-    ${elements}=    Create List    dpi-102-1    service-function-type:dpi
+    ${elements}=    Create List    dpi-102-1    dpi
     Check For Elements At URI    ${SERVICE_FUNCTIONS_URI}service-function/dpi-102-1    ${elements}
 
 Get A Non-existing Service Function
@@ -80,7 +73,7 @@ Put one Service Function
     [Documentation]    Put one Service Function
     Remove All Elements At URI    ${SERVICE_FUNCTIONS_URI}
     Add Elements To URI From File    ${SF_DPI102100_URI}    ${SF_DPI102100_FILE}
-    ${elements}=    Create List    dpi-102-100    service-function-type:dpi
+    ${elements}=    Create List    dpi-102-100    dpi
     Check For Elements At URI    ${SF_DPI102100_URI}    ${elements}
     Check For Elements At URI    ${SERVICE_FUNCTIONS_URI}    ${elements}
 
@@ -123,3 +116,17 @@ Delete Service Function DPL
 Clean Datastore After Tests
     [Documentation]    Clean All Service Functions In Datastore After Tests
     Remove All Elements At URI    ${SERVICE_FUNCTIONS_URI}
+
+*** Keywords ***
+Init Suite
+    [Documentation]    Initialize session and ODL version specific variables
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+    log    ${ODL_STREAM}
+    Run Keyword If    '${ODL_STREAM}' == 'stable-lithium'    Set Suite Variable    ${VERSION_DIR}    lithium
+    ...    ELSE    Set Suite Variable    ${VERSION_DIR}    master
+    Set Suite Variable    ${SERVICE_FUNCTIONS_URI}    /restconf/config/service-function:service-functions/
+    Set Suite Variable    ${SERVICE_FUNCTIONS_FILE}    ../../../variables/sfc/${VERSION_DIR}/service-functions.json
+    Set Suite Variable    ${SF_DPI102100_URI}    /restconf/config/service-function:service-functions/service-function/dpi-102-100/
+    Set Suite Variable    ${SF_DPI102100_FILE}    ../../../variables/sfc/${VERSION_DIR}/sf_dpi_102_100.json
+    Set Suite Variable    ${SF_DPL101_FILE}    ../../../variables/sfc/${VERSION_DIR}/sf_dpl_101.json
+