Remove HTTP library

[integration/test.git] / csit / suites / sfc / Full_Deploy / 015__sfc_rendered_service_paths_logical.robot

diff --git a/csit/suites/sfc/Full_Deploy/015__sfc_rendered_service_paths_logical.robot b/csit/suites/sfc/Full_Deploy/015__sfc_rendered_service_paths_logical.robot
index eeeb0a49a74f7f0b90613b3be52a165d63573f35..92bbbeb5b249471afa2243fce3010dfc777ce391 100644 (file)
--- a/csit/suites/sfc/Full_Deploy/015__sfc_rendered_service_paths_logical.robot
+++ b/csit/suites/sfc/Full_Deploy/015__sfc_rendered_service_paths_logical.robot
@@ -6,12 +6,26 @@ Library           SSHLibrary
 Library           Collections
 Library           OperatingSystem
 Library           RequestsLibrary
-Library           HttpLibrary.HTTP
 Resource          ../../../libraries/SFC/SfcKeywords.robot
 Resource          ../../../variables/sfc/Variables.robot
 Resource          ../../../libraries/Utils.robot
 Resource          ../../../libraries/TemplatedRequests.robot
 
+*** Variables ***
+${VERSION_DIR}    master
+${TEST_DIR}       ${CURDIR}/../../../variables/sfc/${VERSION_DIR}
+${SERVICE_FUNCTIONS_FILE}    ${TEST_DIR}/service-functions-logicalsff.json
+${SERVICE_FORWARDERS_FILE}    ${TEST_DIR}/service-function-forwarders-logicallsff.json
+${SERVICE_CHAINS_FILE}    ${TEST_DIR}/service-function-chains-logicalsff.json
+${SERVICE_FUNCTION_PATHS_FILE}    ${TEST_DIR}/service-function-paths-logicalsff.json
+${CREATE_RSP1_INPUT}    {"input":{"name": "RSP1","parent-service-function-path": "SFP1","symmetric": "true"}}
+${CREATE_RSP2_INPUT}    {"input":{"name": "RSP2","parent-service-function-path": "SFP2","symmetric": "true"}}
+${CREATE_RSP_FAILURE_INPUT}    {"input":{"name": "RSP1","parent-service-function-path": "SFP3","symmetric": "true"}}
+${DELETE_RSP1_INPUT}    {"input":{"name":"RSP1"}}
+${DELETE_RSP1_REVERSE_INPUT}    {"input":{"name":"RSP1-Reverse"}}
+${DELETE_RSP2_INPUT}    {"input":{"name":"RSP2"}}
+@{SF_NAMES}       "name":"firewall-1"    "name":"dpi-1"
+
 *** Test Cases ***
 Basic Environment Setup Tests
     [Documentation]    Prepare Basic Test Environment. Logical SFF
@@ -25,9 +39,9 @@ Get Rendered Service Path By Name
     [Documentation]    Get Rendered Service Path By Name Through RESTConf APIs. Logical SFF
     # The RSP should be symetric, so 2 should be created for the SFP
     ${rsp_name} =    SfcKeywords.Get Rendered Service Path Name    ${SFP_NAME}
-    Utils.Get URI And Verify    ${OPERATIONAL_RSP_URI}${rsp_name}
+    Utils.Get URI And Verify    ${OPERATIONAL_RSP_URI}/${rsp_name}
     ${rsp_name_rev} =    SfcKeywords.Get Rendered Service Path Name    ${SFP_NAME}
-    Utils.Get URI And Verify    ${OPERATIONAL_RSP_URI}${rsp_name_rev}
+    Utils.Get URI And Verify    ${OPERATIONAL_RSP_URI}/${rsp_name_rev}
     ${elements} =    Create List    "parent-service-function-path":"${SFP_NAME}"    "hop-number":0    "service-index":255    "hop-number":1    "service-index":254
     Utils.Check For Elements At URI    ${OPERATIONAL_RSPS_URI}    ${elements}
 
@@ -35,9 +49,9 @@ Delete one Rendered Service Path By Name
     [Documentation]    Delete One Rendered Service Path By Name Through RESTConf APIs. Logical SFF
     # First verify that the RSPs exist
     ${rsp_name} =    SfcKeywords.Get Rendered Service Path Name    ${SFP_NAME}
-    Utils.Get URI And Verify    ${OPERATIONAL_RSP_URI}${rsp_name}
+    Utils.Get URI And Verify    ${OPERATIONAL_RSP_URI}/${rsp_name}
     ${rsp_name_rev} =    SfcKeywords.Get Rendered Service Path Name    ${SFP_NAME}    True
-    Utils.Get URI And Verify    ${OPERATIONAL_RSP_URI}${rsp_name_rev}
+    Utils.Get URI And Verify    ${OPERATIONAL_RSP_URI}/${rsp_name_rev}
     # Delete the SFP, which will delete the RSPs
     SfcKeywords.Delete Sfp And Wait For Rsps Deletion    ${SFP_NAME}
 
@@ -47,10 +61,10 @@ Get Rendered Service Path Hop
     SfcKeywords.Create Sfp And Wait For Rsp Creation    ${SERVICE_FUNCTION_PATHS_FILE}
     ${rsp_name} =    SfcKeywords.Get Rendered Service Path Name    ${SFP_NAME}
     ${elements} =    BuiltIn.Create List    "hop-number":0    "service-index":255    "service-function-name":"dpi-1
-    Utils.Check For Elements At URI    ${OPERATIONAL_RSPS_URI}rendered-service-path/${rsp_name}/rendered-service-path-hop/0/    ${elements}
+    Utils.Check For Elements At URI    ${OPERATIONAL_RSP_URI}/${rsp_name}/rendered-service-path-hop/0/    ${elements}
     ${elements} =    BuiltIn.Create List    "hop-number":1    "service-index":254    "service-function-name":"firewall-1
-    Utils.Check For Elements At URI    ${OPERATIONAL_RSPS_URI}rendered-service-path/${rsp_name}/rendered-service-path-hop/1/    ${elements}
-    ${resp} =    RequestsLibrary.Get Request    session    ${OPERATIONAL_RSPS_URI}rendered-service-path/RSP1/rendered-service-path-hop/2/
+    Utils.Check For Elements At URI    ${OPERATIONAL_RSP_URI}/${rsp_name}/rendered-service-path-hop/1/    ${elements}
+    ${resp} =    RequestsLibrary.Get Request    session    ${OPERATIONAL_RSP_URI}/${rsp_name}/rendered-service-path-hop/2/
     BuiltIn.Should Be Equal As Strings    ${resp.status_code}    404
 
 *** Keywords ***