Refactor SFC CSIT Variables

[integration/test.git] / csit / suites / sfc / SFC_Basic / 140__sfc_service_function_classifier.robot

diff --git a/csit/suites/sfc/SFC_Basic/140__sfc_service_function_classifier.robot b/csit/suites/sfc/SFC_Basic/140__sfc_service_function_classifier.robot
index 7b669feb44b8f757ee54aa2ee37b09aaf54050c8..d2a2beb5d664412a7c9f4a221e39abf5d3e1e000 100644 (file)
--- a/csit/suites/sfc/SFC_Basic/140__sfc_service_function_classifier.robot
+++ b/csit/suites/sfc/SFC_Basic/140__sfc_service_function_classifier.robot
@@ -2,8 +2,8 @@
 Documentation     Test suite for SFC Service Function Classifiers, Operates functions from Restconf APIs.
 Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
-Test Setup        Remove All Elements If Exist    ${SERVICE_CLASSIFIER_URI}
-Test Teardown     Remove All Elements At URI    ${SERVICE_CLASSIFIER_URI}
+Test Setup        Remove All Elements If Exist    ${SERVICE_CLASSIFIERS_URI}
+Test Teardown     Remove All Elements At URI    ${SERVICE_CLASSIFIERS_URI}
 Library           SSHLibrary
 Library           Collections
 Library           OperatingSystem
@@ -12,17 +12,16 @@ Resource          ../../../variables/sfc/Variables.robot
 Resource          ../../../libraries/Utils.robot
 
 *** Variables ***
-${SERVICE_CLASSIFIER_URI}    /restconf/config/service-function-classifier:service-function-classifiers/
 ${SERVICE_CLASSIFIER_FILE}    ${CURDIR}/../../../variables/sfc/master/service-function-classifiers.json
 
 *** Test Cases ***
 Add Service Function Classifier
     [Documentation]    Add Service Function Classifiers from JSON file
-    Add Elements To URI From File    ${SERVICE_CLASSIFIER_URI}    ${SERVICE_CLASSIFIER_FILE}
+    Add Elements To URI From File    ${SERVICE_CLASSIFIERS_URI}    ${SERVICE_CLASSIFIER_FILE}
     ${body}    OperatingSystem.Get File    ${SERVICE_CLASSIFIER_FILE}
     ${jsonbody}    To Json    ${body}
     ${functions}    Get From Dictionary    ${jsonbody}    service-function-classifiers
-    ${resp}    RequestsLibrary.Get Request    session    ${SERVICE_CLASSIFIER_URI}
+    ${resp}    RequestsLibrary.Get Request    session    ${SERVICE_CLASSIFIERS_URI}
     ${result}    To JSON    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
     ${function}    Get From Dictionary    ${result}    service-function-classifiers
@@ -31,30 +30,30 @@ Add Service Function Classifier
 Delete All Classifiers
     [Documentation]    Delete all Classifiers
     ${body}    OperatingSystem.Get File    ${SERVICE_CLASSIFIER_FILE}
-    Add Elements To URI From File    ${SERVICE_CLASSIFIER_URI}    ${SERVICE_CLASSIFIER_FILE}
-    ${resp}    RequestsLibrary.Get Request    session    ${SERVICE_CLASSIFIER_URI}
+    Add Elements To URI From File    ${SERVICE_CLASSIFIERS_URI}    ${SERVICE_CLASSIFIER_FILE}
+    ${resp}    RequestsLibrary.Get Request    session    ${SERVICE_CLASSIFIERS_URI}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
-    Remove All Elements At URI    ${SERVICE_CLASSIFIER_URI}
-    ${resp}    RequestsLibrary.Get Request    session    ${SERVICE_CLASSIFIER_URI}
+    Remove All Elements At URI    ${SERVICE_CLASSIFIERS_URI}
+    ${resp}    RequestsLibrary.Get Request    session    ${SERVICE_CLASSIFIERS_URI}
     Should Be Equal As Strings    ${resp.status_code}    404
     [Teardown]    NONE
 
 Get one Classifier
     [Documentation]    Get one Classifier
-    Add Elements To URI From File    ${SERVICE_CLASSIFIER_URI}    ${SERVICE_CLASSIFIER_FILE}
-    ${resp}    RequestsLibrary.Get Request    session    ${SERVICE_CLASSIFIER_URI}service-function-classifier/Classifier1
+    Add Elements To URI From File    ${SERVICE_CLASSIFIERS_URI}    ${SERVICE_CLASSIFIER_FILE}
+    ${resp}    RequestsLibrary.Get Request    session    ${SERVICE_CLASSIFIERS_URI}/service-function-classifier/Classifier1
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Get A Non-existing Classifier
     [Documentation]    Get A Non-existing Classifier
-    Add Elements To URI From File    ${SERVICE_CLASSIFIER_URI}    ${SERVICE_CLASSIFIER_FILE}
-    ${resp}    RequestsLibrary.Get Request    session    ${SERVICE_CLASSIFIER_URI}service-function-classifier/unexisting-classifier
+    Add Elements To URI From File    ${SERVICE_CLASSIFIERS_URI}    ${SERVICE_CLASSIFIER_FILE}
+    ${resp}    RequestsLibrary.Get Request    session    ${SERVICE_CLASSIFIERS_URI}/service-function-classifier/nonexistant-classifier
     Should Be Equal As Strings    ${resp.status_code}    404
 
 Delete a Classifier
     [Documentation]    Delete a classifier
-    Add Elements To URI From File    ${SERVICE_CLASSIFIER_URI}    ${SERVICE_CLASSIFIER_FILE}
-    Remove All Elements At URI    ${SERVICE_CLASSIFIER_URI}service-function-classifier/Classifier1
-    ${resp}    RequestsLibrary.Get Request    session    ${SERVICE_CLASSIFIER_URI}
+    Add Elements To URI From File    ${SERVICE_CLASSIFIERS_URI}    ${SERVICE_CLASSIFIER_FILE}
+    Remove All Elements At URI    ${SERVICE_CLASSIFIERS_URI}/service-function-classifier/Classifier1
+    ${resp}    RequestsLibrary.Get Request    session    ${SERVICE_CLASSIFIERS_URI}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
     Should Not Contain    ${resp.content}    Classifier1