Fix version dir variables for service nodes and SFFs suites

Service Nodes and Service Function Forwarders test
are using wrong references to directories. They should
include the name of the release they refer to.

Aside, there are minor checks wrong, based on old models.

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

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 a4e4b44e1906593ee38a9f08d48cfe9a5acebe13..49365e6f695611c77bfe3c8e4ca0cd92998d7fb9 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://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Init Suite
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
@@ -9,18 +9,6 @@ Library           RequestsLibrary
 Variables         ../../../variables/Variables.py
 Resource          ../../../libraries/Utils.robot
 
-*** Variables ***
-${SERVICE_FORWARDERS_URI}    /restconf/config/service-function-forwarder:service-function-forwarders/
-${SERVICE_FORWARDERS_FILE}    ../../../variables/sfc/service-function-forwarders.json
-${SFF_OVS100_URI}    /restconf/config/service-function-forwarder:service-function-forwarders/service-function-forwarder/ovs-100/
-${SFF_OVS100_FILE}    ../../../variables/sfc/sff_ovs_100.json
-${SFF_DPL101_FILE}    ../../../variables/sfc/sff_dpl_101.json
-${SFF_DPL_LOCATOR_FILE}    ../../../variables/sfc/sff_dpl_locator.json
-${SFF_SFD_SF100_FILE}    ../../../variables/sfc/sff_sfd_sf100.json
-${SFF_SFD_LOCATOR_FILE}    ../../../variables/sfc/sff_sfd_locator.json
-${SFF_CSD_SFF100_FILE}    ../../../variables/sfc/sff_csd_sff100.json
-${SFF_CSD_LOCATOR_FILE}    ../../../variables/sfc/sff_csd_locator.json
-
 *** Test Cases ***
 Put Service Function Forwarders
     [Documentation]    Add Service Function Forwarders from JSON file
@@ -127,7 +115,7 @@ Delete Service Function Forwarder DPL
     Remove All Elements At URI    ${SFF_OVS100_URI}sff-data-plane-locator/eth0
     ${resp}    RequestsLibrary.Get Request    session    ${SFF_OVS100_URI}
     Should Be Equal As Strings    ${resp.status_code}    200
-    Should Not Contain    ${resp.content}    eth0
+    Should Not Contain    ${resp.content}    "name":"eth0"
 
 Get Service Function Forwarder DPL's Locator
     [Documentation]    Get Service Function Data Plane Locator
@@ -169,7 +157,7 @@ Get Service Function Dictionary From SFF
     [Documentation]    Get Service Function Dictionary From SFF
     Remove All Elements At URI    ${SERVICE_FORWARDERS_URI}
     Add Elements To URI From File    ${SERVICE_FORWARDERS_URI}    ${SERVICE_FORWARDERS_FILE}
-    ${elements}=    Create List    service-function-dictionary    service-function-type:dpi    SF1
+    ${elements}=    Create List    service-function-dictionary    SF1    SF1-DPL    eth0
     Check For Elements At URI    ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/service-function-dictionary/SF1    ${elements}
 
 Delete Service Function Dictionary From SFF
@@ -191,16 +179,16 @@ Put Service Function Dictionary to SFF
     Remove All Elements At URI    ${SERVICE_FORWARDERS_URI}
     Add Elements To URI From File    ${SERVICE_FORWARDERS_URI}    ${SERVICE_FORWARDERS_FILE}
     Add Elements To URI From File    ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/service-function-dictionary/SF100    ${SFF_SFD_SF100_FILE}
-    ${elements}=    Create List    service-function-type:napt44    SF100
+    ${elements}=    Create List    SF100    SF2-DPL    eth0
     Check For Elements At URI    ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/service-function-dictionary/SF100    ${elements}
-    ${elements}=    create list    service-function-dictionary    service-function-type:napt44    SF100
+    ${elements}=    create list    service-function-dictionary    SF100    SF2-DPL    eth0
     Check For Elements At URI    ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/    ${elements}
 
 Get Service Function Dictionary's DPL From SFF
     [Documentation]    Get Service Function Dictionary From SFF
     Remove All Elements At URI    ${SERVICE_FORWARDERS_URI}
     Add Elements To URI From File    ${SERVICE_FORWARDERS_URI}    ${SERVICE_FORWARDERS_FILE}
-    ${elements}=    create list    sff-sf-data-plane-locator    5000    10.1.1.1
+    ${elements}=    create list    sff-sf-data-plane-locator    SF1-DPL    eth0
     Check For Elements At URI    ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/service-function-dictionary/SF1/sff-sf-data-plane-locator/    ${elements}
 
 Delete Service Function Dictionary's DPL From SFF
@@ -218,7 +206,7 @@ Put DPL of Service Function Dictionary to SFF
     Remove All Elements At URI    ${SERVICE_FORWARDERS_URI}
     Add Elements To URI From File    ${SERVICE_FORWARDERS_URI}    ${SERVICE_FORWARDERS_FILE}
     Add Elements To URI From File    ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/service-function-dictionary/SF1/sff-sf-data-plane-locator/    ${SFF_SFD_LOCATOR_FILE}
-    ${elements}=    create list    sff-sf-data-plane-locator    6000    10.1.1.1
+    ${elements}=    create list    sff-sf-data-plane-locator    SF2-DPL    eth0
     Check For Elements At URI    ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/service-function-dictionary/SF1/sff-sf-data-plane-locator/    ${elements}
     Check For Elements At URI    ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/service-function-dictionary/SF1/    ${elements}
 
@@ -261,16 +249,6 @@ Get Connected SFF Dictionary's DPL From SFF
     ${elements}=    create list    sff-sff-data-plane-locator    5000    192.168.1.2
     Check For Elements At URI    ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/connected-sff-dictionary/br-int-ovs-2/sff-sff-data-plane-locator/    ${elements}
 
-Delete Connected SFF Dictionary's DPL From SFF
-    [Documentation]    Connected SFF Dictionary's DPL From SFF
-    Remove All Elements At URI    ${SERVICE_FORWARDERS_URI}
-    Add Elements To URI From File    ${SERVICE_FORWARDERS_URI}    ${SERVICE_FORWARDERS_FILE}
-    ${resp}    RequestsLibrary.Get Request    session    ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/connected-sff-dictionary/br-int-ovs-2/sff-sff-data-plane-locator/
-    Should Be Equal As Strings    ${resp.status_code}    200
-    Remove All Elements At URI    ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/connected-sff-dictionary/br-int-ovs-2/sff-sff-data-plane-locator/
-    ${resp}    RequestsLibrary.Get Request    session    ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/connected-sff-dictionary/br-int-ovs-2/sff-sff-data-plane-locator/
-    Should Be Equal As Strings    ${resp.status_code}    404
-
 Put DPL of Connected SFF Dictionary to SFF
     [Documentation]    Put DPL of Connected SFF Dictionary to SFF
     Remove All Elements At URI    ${SERVICE_FORWARDERS_URI}
@@ -283,3 +261,22 @@ Put DPL of Connected SFF Dictionary to SFF
 Clean The Datastore After Tests
     [Documentation]    Clean All Service Function Forwarders In Datastore After Tests
     Remove All Elements At URI    ${SERVICE_FORWARDERS_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_FORWARDERS_URI}    /restconf/config/service-function-forwarder:service-function-forwarders/
+    Set Suite Variable    ${SERVICE_FORWARDERS_FILE}    ${CURDIR}/../../../variables/sfc/${VERSION_DIR}/service-function-forwarders.json
+    Set Suite Variable    ${SFF_OVS100_URI}    /restconf/config/service-function-forwarder:service-function-forwarders/service-function-forwarder/ovs-100/
+    Set Suite Variable    ${SFF_OVS100_FILE}    ${CURDIR}/../../../variables/sfc/${VERSION_DIR}/sff_ovs_100.json
+    Set Suite Variable    ${SFF_DPL101_FILE}    ${CURDIR}/../../../variables/sfc/${VERSION_DIR}/sff_dpl_101.json
+    Set Suite Variable    ${SFF_DPL_LOCATOR_FILE}    ${CURDIR}/../../../variables/sfc/${VERSION_DIR}/sff_dpl_locator.json
+    Set Suite Variable    ${SFF_SFD_SF100_FILE}    ${CURDIR}/../../../variables/sfc/${VERSION_DIR}/sff_sfd_sf100.json
+    Set Suite Variable    ${SFF_SFD_LOCATOR_FILE}    ${CURDIR}/../../../variables/sfc/${VERSION_DIR}/sff_sfd_locator.json
+    Set Suite Variable    ${SFF_CSD_SFF100_FILE}    ${CURDIR}/../../../variables/sfc/${VERSION_DIR}/sff_csd_sff100.json
+    Set Suite Variable    ${SFF_CSD_LOCATOR_FILE}    ${CURDIR}/../../../variables/sfc/${VERSION_DIR}/sff_csd_locator.json
+

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 ab8722dab2d5ee6be31e3a093b5cc66270eaeba8..5fa97a328a172e785504cd0dcab2c696bf765e3d 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://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Init Suite
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
@@ -9,11 +9,6 @@ Library           RequestsLibrary
 Variables         ../../../variables/Variables.py
 Resource          ../../../libraries/Utils.robot
 
-*** Variables ***
-${SERVICE_NODES_URI}    /restconf/config/service-node:service-nodes/
-${SERVICE_NODES_FILE}    ../../../variables/sfc/service-nodes.json
-${SN_NODE100_URI}    /restconf/config/service-node:service-nodes/service-node/node-100
-${SN_NODE100_FILE}    ../../../variables/sfc/sn_node_100.json
 
 *** Test Cases ***
 Put Service Nodes
@@ -85,3 +80,16 @@ Put one Service Node
 Clean All Service Nodes After Tests
     [Documentation]    Delete all Service Nodes From Datastore After Tests
     Remove All Elements At URI    ${SERVICE_NODES_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_NODES_URI}    /restconf/config/service-node:service-nodes/
+    Set Suite Variable    ${SERVICE_NODES_FILE}    ${CURDIR}/../../../variables/sfc/${VERSION_DIR}/service-nodes.json
+    Set Suite Variable    ${SN_NODE100_URI}    /restconf/config/service-node:service-nodes/service-node/node-100
+    Set Suite Variable    ${SN_NODE100_FILE}    ${CURDIR}/../../../variables/sfc/${VERSION_DIR}/sn_node_100.json
+