From ff086b395dc8d40721bd81ce6f34bda7a09ec401 Mon Sep 17 00:00:00 2001 From: Junaid Zulfiqar Date: Sun, 14 Feb 2016 15:18:57 -0800 Subject: [PATCH] Moved calls to "RequestLibrary. Request" in suites/sfc/ + RequestsLibrary.Get Request + RequestsLibrary.Post Request Change-Id: I300d6c6a3ef0b8f05b8a8647831ab9eb194a3f86 Signed-off-by: Junaid Zulfiqar --- .../020_simple_clustering.robot | 6 +-- .../010__sfc_service_functions.robot | 16 +++---- .../020__sfc_service_forwarders.robot | 48 +++++++++---------- .../SFC_Basic/030__sfc_service_nodes.robot | 12 ++--- .../SFC_Basic/040__sfc_service_chains.robot | 16 +++---- .../050__sfc_service_schedule_types.robot | 12 ++--- .../SFC_Basic/060__sfc_service_paths.robot | 20 ++++---- .../070__sfc_rendered_service_paths.robot | 40 ++++++++-------- 8 files changed, 85 insertions(+), 85 deletions(-) diff --git a/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot b/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot index d94b311e80..f64a3182ca 100644 --- a/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot +++ b/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot @@ -15,7 +15,7 @@ Add Service Functions To First Node Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} ${jsonbody} Read JSON From File ${SFC_FUNCTIONS_FILE} Add Elements To URI From File ${SFC_API} ${SFC_FUNCTIONS_FILE} ${HEADERS_YANG_JSON} - ${resp} RequestsLibrary.Get session ${SFC_API} + ${resp} RequestsLibrary.Get Request session ${SFC_API} Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} Lists Should be Equal ${result} ${jsonbody} @@ -23,7 +23,7 @@ Add Service Functions To First Node Read Service Functions From Second Node Create Session session http://${ODL_SYSTEM_2_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} ${jsonbody} Read JSON From File ${SFC_FUNCTIONS_FILE} - ${resp} RequestsLibrary.Get session ${SFC_API} + ${resp} RequestsLibrary.Get Request session ${SFC_API} Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} Lists Should be Equal ${result} ${jsonbody} @@ -31,7 +31,7 @@ Read Service Functions From Second Node Read Service Functions From Third Node Create Session session http://${ODL_SYSTEM_3_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} ${jsonbody} Read JSON From File ${SFC_FUNCTIONS_FILE} - ${resp} RequestsLibrary.Get session ${SFC_API} + ${resp} RequestsLibrary.Get Request session ${SFC_API} Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} Lists Should be Equal ${result} ${jsonbody} 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 e3f9388d8f..0f1857d4e2 100644 --- a/csit/suites/sfc/SFC_Basic/010__sfc_service_functions.robot +++ b/csit/suites/sfc/SFC_Basic/010__sfc_service_functions.robot @@ -23,7 +23,7 @@ Add Service Functions ${body} OperatingSystem.Get File ${SERVICE_FUNCTIONS_FILE} ${jsonbody} To Json ${body} ${functions} Get From Dictionary ${jsonbody} service-functions - ${resp} RequestsLibrary.Get session ${SERVICE_FUNCTIONS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTIONS_URI} Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} ${function} Get From Dictionary ${result} service-functions @@ -33,10 +33,10 @@ Delete All Service Functions [Documentation] Delete all Service Functions ${body} OperatingSystem.Get File ${SERVICE_FUNCTIONS_FILE} Add Elements To URI From File ${SERVICE_FUNCTIONS_URI} ${SERVICE_FUNCTIONS_FILE} - ${resp} RequestsLibrary.Get session ${SERVICE_FUNCTIONS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTIONS_URI} Should Be Equal As Strings ${resp.status_code} 200 Remove All Elements At URI ${SERVICE_FUNCTIONS_URI} - ${resp} RequestsLibrary.Get session ${SERVICE_FUNCTIONS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTIONS_URI} Should Be Equal As Strings ${resp.status_code} 404 Get one Service Function @@ -50,7 +50,7 @@ Get A Non-existing Service Function [Documentation] Get A Non-existing Service Function Remove All Elements At URI ${SERVICE_FUNCTIONS_URI} Add Elements To URI From File ${SERVICE_FUNCTIONS_URI} ${SERVICE_FUNCTIONS_FILE} - ${resp} RequestsLibrary.Get session ${SERVICE_FUNCTIONS_URI}service-function/non-existing-sf + ${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTIONS_URI}service-function/non-existing-sf Should Be Equal As Strings ${resp.status_code} 404 Delete A Service Function @@ -58,7 +58,7 @@ Delete A Service Function Remove All Elements At URI ${SERVICE_FUNCTIONS_URI} Add Elements To URI From File ${SERVICE_FUNCTIONS_URI} ${SERVICE_FUNCTIONS_FILE} Remove All Elements At URI ${SERVICE_FUNCTIONS_URI}service-function/dpi-102-1 - ${resp} RequestsLibrary.Get session ${SERVICE_FUNCTIONS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTIONS_URI} Should Be Equal As Strings ${resp.status_code} 200 Should Not Contain ${resp.content} dpi-102-1 @@ -70,7 +70,7 @@ Delete A Non-existing Empty Service Function ${jsonbody} To Json ${body} ${functions} Get From Dictionary ${jsonbody} service-functions Remove All Elements At URI ${SERVICE_FUNCTIONS_URI}service-function/non-existing-sf - ${resp} RequestsLibrary.Get session ${SERVICE_FUNCTIONS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTIONS_URI} Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} ${function} Get From Dictionary ${result} service-functions @@ -104,7 +104,7 @@ Put Service Function DPL to a Non-existing Service Function [Documentation] Put Service Function DPL to a Non-existing Service Function Remove All Elements At URI ${SERVICE_FUNCTIONS_URI} Add Elements To URI From File ${SF_DPI102100_URI}sf-data-plane-locator/dpl-101 ${SF_DPL101_FILE} - ${resp} RequestsLibrary.Get session ${SERVICE_FUNCTIONS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTIONS_URI} Should Be Equal As Strings ${resp.status_code} 200 Should Contain ${resp.content} dpi-102-100 ${elements}= Create List dpl-101 10101 @@ -116,7 +116,7 @@ Delete Service Function DPL Remove All Elements At URI ${SERVICE_FUNCTIONS_URI} Add Elements To URI From File ${SF_DPI102100_URI} ${SF_DPI102100_FILE} Remove All Elements At URI ${SF_DPI102100_URI}sf-data-plane-locator/dpl-100 - ${resp} RequestsLibrary.Get session ${SF_DPI102100_URI} + ${resp} RequestsLibrary.Get Request session ${SF_DPI102100_URI} Should Be Equal As Strings ${resp.status_code} 200 Should Not Contain ${resp.content} dpl-100 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 adee2ad4f0..a4e4b44e19 100644 --- a/csit/suites/sfc/SFC_Basic/020__sfc_service_forwarders.robot +++ b/csit/suites/sfc/SFC_Basic/020__sfc_service_forwarders.robot @@ -28,7 +28,7 @@ Put Service Function Forwarders ${body} OperatingSystem.Get File ${SERVICE_FORWARDERS_FILE} ${jsonbody} To Json ${body} ${forwarders} Get From Dictionary ${jsonbody} service-function-forwarders - ${resp} RequestsLibrary.Get session ${SERVICE_FORWARDERS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_FORWARDERS_URI} Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} ${forwarder} Get From Dictionary ${result} service-function-forwarders @@ -36,10 +36,10 @@ Put Service Function Forwarders Delete All Service Function Forwarders [Documentation] Delete all Service Function Forwarders - ${resp} RequestsLibrary.Get session ${SERVICE_FORWARDERS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_FORWARDERS_URI} Should Be Equal As Strings ${resp.status_code} 200 Remove All Elements At URI ${SERVICE_FORWARDERS_URI} - ${resp} RequestsLibrary.Get session ${SERVICE_FORWARDERS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_FORWARDERS_URI} Should Be Equal As Strings ${resp.status_code} 404 Get one Service Function Forwarder @@ -53,19 +53,19 @@ Get A Non-existing Service Function Forwarder [Documentation] Get A Non-existing Service Function Forwarder Remove All Elements At URI ${SERVICE_FORWARDERS_URI} Add Elements To URI From File ${SERVICE_FORWARDERS_URI} ${SERVICE_FORWARDERS_FILE} - ${resp} RequestsLibrary.Get session ${SERVICE_FORWARDERS_URI}service-function-forwarder/non-existing-sff + ${resp} RequestsLibrary.Get Request session ${SERVICE_FORWARDERS_URI}service-function-forwarder/non-existing-sff Should Be Equal As Strings ${resp.status_code} 404 Delete A Service Function Forwarder [Documentation] Delete A Service Function Forwarder Remove All Elements At URI ${SERVICE_FORWARDERS_URI} Add Elements To URI From File ${SERVICE_FORWARDERS_URI} ${SERVICE_FORWARDERS_FILE} - ${resp} RequestsLibrary.Get session ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap + ${resp} RequestsLibrary.Get Request session ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap Should Be Equal As Strings ${resp.status_code} 200 Remove All Elements At URI ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap - ${resp} RequestsLibrary.Get session ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap + ${resp} RequestsLibrary.Get Request session ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap Should Be Equal As Strings ${resp.status_code} 404 - ${resp} RequestsLibrary.Get session ${SERVICE_FORWARDERS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_FORWARDERS_URI} Should Be Equal As Strings ${resp.status_code} 200 Should Not Contain ${resp.content} SF1 @@ -77,7 +77,7 @@ Delete A Non-existing Service Function Forwarder ${jsonbody} To Json ${body} ${forwarders} Get From Dictionary ${jsonbody} service-function-forwarders Remove All Elements At URI ${SERVICE_FORWARDERS_URI}service-function-forwarder/non-existing-sff - ${resp} RequestsLibrary.Get session ${SERVICE_FORWARDERS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_FORWARDERS_URI} Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} ${forwarder} Get From Dictionary ${result} service-function-forwarders @@ -87,7 +87,7 @@ Put one Service Function Forwarder [Documentation] Put one Service Function Forwarder Remove All Elements At URI ${SERVICE_FORWARDERS_URI} Add Elements To URI From File ${SFF_OVS100_URI} ${SFF_OVS100_FILE} - ${resp} RequestsLibrary.Get session ${SFF_OVS100_URI} + ${resp} RequestsLibrary.Get Request session ${SFF_OVS100_URI} Should Be Equal As Strings ${resp.status_code} 200 ${elements}= Create List ovs-100 SF7 Check For Elements At URI ${SFF_OVS100_URI} ${elements} @@ -113,7 +113,7 @@ Put DPL to a Non-existing Service Function Forwarder [Documentation] Put Service Function DPL to a Non-existing Service Function Remove All Elements At URI ${SERVICE_FORWARDERS_URI} Add Elements To URI From File ${SFF_OVS100_URI}sff-data-plane-locator/dpl-101 ${SFF_DPL101_FILE} - ${resp} RequestsLibrary.Get session ${SERVICE_FORWARDERS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_FORWARDERS_URI} Should Be Equal As Strings ${resp.status_code} 200 Should Contain ${resp.content} ovs-100 ${elements}= Create List dpl-101 6101 @@ -125,7 +125,7 @@ Delete Service Function Forwarder DPL Remove All Elements At URI ${SERVICE_FORWARDERS_URI} Add Elements To URI From File ${SFF_OVS100_URI} ${SFF_OVS100_FILE} Remove All Elements At URI ${SFF_OVS100_URI}sff-data-plane-locator/eth0 - ${resp} RequestsLibrary.Get session ${SFF_OVS100_URI} + ${resp} RequestsLibrary.Get Request session ${SFF_OVS100_URI} Should Be Equal As Strings ${resp.status_code} 200 Should Not Contain ${resp.content} eth0 @@ -155,12 +155,12 @@ Delete Service Function Forwarder DPL's Locator Add Elements To URI From File ${SFF_OVS100_URI}sff-data-plane-locator/dpl-101 ${SFF_DPL101_FILE} Add Elements To URI From File ${SFF_OVS100_URI}sff-data-plane-locator/dpl-101/data-plane-locator/ ${SFF_DPL_LOCATOR_FILE} Remove All Elements At URI ${SFF_OVS100_URI}sff-data-plane-locator/dpl-101/data-plane-locator - ${resp} RequestsLibrary.Get session ${SFF_OVS100_URI}sff-data-plane-locator/dpl-101 + ${resp} RequestsLibrary.Get Request session ${SFF_OVS100_URI}sff-data-plane-locator/dpl-101 Should Be Equal As Strings ${resp.status_code} 200 Should Contain ${resp.content} dpl-101 Should Not Contain ${resp.content} 6101 Should Not Contain ${resp.content} service-locator:vxlan-gpe - ${resp} RequestsLibrary.Get session ${SFF_OVS100_URI} + ${resp} RequestsLibrary.Get Request session ${SFF_OVS100_URI} Should Be Equal As Strings ${resp.status_code} 200 Should Contain ${resp.content} dpl-101 Should Not Contain ${resp.content} 6101 @@ -176,12 +176,12 @@ Delete Service Function Dictionary From SFF [Documentation] Delete 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} - ${resp} RequestsLibrary.Get session ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/service-function-dictionary/SF1 + ${resp} RequestsLibrary.Get Request session ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/service-function-dictionary/SF1 Should Be Equal As Strings ${resp.status_code} 200 Remove All Elements At URI ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/service-function-dictionary/SF1 - ${resp} RequestsLibrary.Get session ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/service-function-dictionary/SF1 + ${resp} RequestsLibrary.Get Request session ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/service-function-dictionary/SF1 Should Be Equal As Strings ${resp.status_code} 404 - ${resp} RequestsLibrary.Get session ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/ + ${resp} RequestsLibrary.Get Request session ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/ Should Be Equal As Strings ${resp.status_code} 200 Should Contain ${resp.content} service-function-dictionary Should Not Contain ${resp.content} SF1 @@ -207,10 +207,10 @@ Delete Service Function Dictionary's DPL From SFF [Documentation] Delete 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} - ${resp} RequestsLibrary.Get session ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/service-function-dictionary/SF1/sff-sf-data-plane-locator/ + ${resp} RequestsLibrary.Get Request session ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/service-function-dictionary/SF1/sff-sf-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/service-function-dictionary/SF1/sff-sf-data-plane-locator/ - ${resp} RequestsLibrary.Get session ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/service-function-dictionary/SF1/sff-sf-data-plane-locator/ + ${resp} RequestsLibrary.Get Request session ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/service-function-dictionary/SF1/sff-sf-data-plane-locator/ Should Be Equal As Strings ${resp.status_code} 404 Put DPL of Service Function Dictionary to SFF @@ -228,7 +228,7 @@ Get Connected SFF Dictionary From SFF Add Elements To URI From File ${SERVICE_FORWARDERS_URI} ${SERVICE_FORWARDERS_FILE} ${elements}= create list connected-sff-dictionary br-int-ovs-2 sff-sff-data-plane-locator Check For Elements At URI ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/connected-sff-dictionary/br-int-ovs-2 ${elements} - ${resp} RequestsLibrary.Get session ${SERVICE_FORWARDERS_URI}service-function-forwarder/br-int-ovs-2/connected-sff-dictionary/SFF-bootstrap + ${resp} RequestsLibrary.Get Request session ${SERVICE_FORWARDERS_URI}service-function-forwarder/br-int-ovs-2/connected-sff-dictionary/SFF-bootstrap Should Be Equal As Strings ${resp.status_code} 200 Should Contain ${resp.content} SFF-bootstrap @@ -236,12 +236,12 @@ Delete Connected SFF Dictionary From SFF [Documentation] Delete Connected SFF Dictionary 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 session ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/connected-sff-dictionary/br-int-ovs-2 + ${resp} RequestsLibrary.Get Request session ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/connected-sff-dictionary/br-int-ovs-2 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 - ${resp} RequestsLibrary.Get session ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/connected-sff-dictionary/br-int-ovs-2 + ${resp} RequestsLibrary.Get Request session ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/connected-sff-dictionary/br-int-ovs-2 Should Be Equal As Strings ${resp.status_code} 404 - ${resp} RequestsLibrary.Get session ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/ + ${resp} RequestsLibrary.Get Request session ${SERVICE_FORWARDERS_URI}service-function-forwarder/SFF-bootstrap/ Should Be Equal As Strings ${resp.status_code} 200 Should Not Contain ${resp.content} br-int-ovs-2 @@ -265,10 +265,10 @@ 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 session ${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} 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 session ${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 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 91710ae458..ab8722dab2 100644 --- a/csit/suites/sfc/SFC_Basic/030__sfc_service_nodes.robot +++ b/csit/suites/sfc/SFC_Basic/030__sfc_service_nodes.robot @@ -22,7 +22,7 @@ Put Service Nodes ${body} OperatingSystem.Get File ${SERVICE_NODES_FILE} ${jsonbody} To Json ${body} ${nodes} Get From Dictionary ${jsonbody} service-nodes - ${resp} RequestsLibrary.Get session ${SERVICE_NODES_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_NODES_URI} Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} ${node} Get From Dictionary ${result} service-nodes @@ -31,10 +31,10 @@ Put Service Nodes Delete All Service Nodes [Documentation] Delete all Service Nodes Add Elements To URI From File ${SERVICE_NODES_URI} ${SERVICE_NODES_FILE} - ${resp} RequestsLibrary.Get session ${SERVICE_NODES_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_NODES_URI} Should Be Equal As Strings ${resp.status_code} 200 Remove All Elements At URI ${SERVICE_NODES_URI} - ${resp} RequestsLibrary.Get session ${SERVICE_NODES_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_NODES_URI} Should Be Equal As Strings ${resp.status_code} 404 Get one Service Node @@ -48,7 +48,7 @@ Get A Non-existing Service Node [Documentation] Get A Non-existing Service Node Remove All Elements At URI ${SERVICE_NODES_URI} Add Elements To URI From File ${SERVICE_NODES_URI} ${SERVICE_NODES_FILE} - ${resp} RequestsLibrary.Get session ${SERVICE_NODES_URI}service-node/non-existing-sf + ${resp} RequestsLibrary.Get Request session ${SERVICE_NODES_URI}service-node/non-existing-sf Should Be Equal As Strings ${resp.status_code} 404 Delete A Service Node @@ -56,7 +56,7 @@ Delete A Service Node Remove All Elements At URI ${SERVICE_NODES_URI} Add Elements To URI From File ${SERVICE_NODES_URI} ${SERVICE_NODES_FILE} Remove All Elements At URI ${SERVICE_NODES_URI}service-node/node-101 - ${resp} RequestsLibrary.Get session ${SERVICE_NODES_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_NODES_URI} Should Be Equal As Strings ${resp.status_code} 200 Should Not Contain ${resp.content} node-101 @@ -68,7 +68,7 @@ Delete A Non-existing Service Node ${jsonbody} To Json ${body} ${nodes} Get From Dictionary ${jsonbody} service-nodes Remove All Elements At URI ${SERVICE_NODES_URI}service-node/non-existing-sn - ${resp} RequestsLibrary.Get session ${SERVICE_NODES_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_NODES_URI} Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} ${node} Get From Dictionary ${result} service-nodes diff --git a/csit/suites/sfc/SFC_Basic/040__sfc_service_chains.robot b/csit/suites/sfc/SFC_Basic/040__sfc_service_chains.robot index 5b81e5c85b..47e72e8c7a 100644 --- a/csit/suites/sfc/SFC_Basic/040__sfc_service_chains.robot +++ b/csit/suites/sfc/SFC_Basic/040__sfc_service_chains.robot @@ -24,7 +24,7 @@ Put Service Function Chains ${body} OperatingSystem.Get File ${SERVICE_CHAINS_FILE} ${jsonbody} To Json ${body} ${chains} Get From Dictionary ${jsonbody} service-function-chains - ${resp} RequestsLibrary.Get session ${SERVICE_CHAINS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_CHAINS_URI} Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} ${chain} Get From Dictionary ${result} service-function-chains @@ -32,10 +32,10 @@ Put Service Function Chains Delete All Service Function Chains [Documentation] Delete all Service Function Chains - ${resp} RequestsLibrary.Get session ${SERVICE_CHAINS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_CHAINS_URI} Should Be Equal As Strings ${resp.status_code} 200 Remove All Elements At URI ${SERVICE_CHAINS_URI} - ${resp} RequestsLibrary.Get session ${SERVICE_CHAINS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_CHAINS_URI} Should Be Equal As Strings ${resp.status_code} 404 Get one Service Function Chain @@ -49,14 +49,14 @@ Get A Non-existing Service Function Chain [Documentation] Get A Non-existing Service Function Chain Remove All Elements At URI ${SERVICE_CHAINS_URI} Add Elements To URI From File ${SERVICE_CHAINS_URI} ${SERVICE_CHAINS_FILE} - ${resp} RequestsLibrary.Get session ${SERVICE_CHAINS_URI}service-function-chain/non-existing-sfc + ${resp} RequestsLibrary.Get Request session ${SERVICE_CHAINS_URI}service-function-chain/non-existing-sfc Should Be Equal As Strings ${resp.status_code} 404 Delete A Service Function Chain [Documentation] Delete A Service Function Chain Remove All Elements At URI ${SERVICE_CHAINS_URI} Add Elements To URI From File ${SERVICE_CHAINS_URI} ${SERVICE_CHAINS_FILE} - ${resp} RequestsLibrary.Get session ${SERVICE_CHAINS_URI}service-function-chain/SFC1 + ${resp} RequestsLibrary.Get Request session ${SERVICE_CHAINS_URI}service-function-chain/SFC1 Should Be Equal As Strings ${resp.status_code} 200 Remove All Elements At URI ${SERVICE_CHAINS_URI}service-function-chain/SFC1 ${elements}= Create List SFC1 dpi-abstract1 napt44-abstract1 firewall-abstract1 @@ -70,7 +70,7 @@ Delete A Non-existing Service Function Chain ${jsonbody} To Json ${body} ${chains} Get From Dictionary ${jsonbody} service-function-chains Remove All Elements At URI ${SERVICE_CHAINS_URI}service-function-chain/non-existing-sfc - ${resp} RequestsLibrary.Get session ${SERVICE_CHAINS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_CHAINS_URI} Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} ${chain} Get From Dictionary ${result} service-function-chains @@ -95,7 +95,7 @@ Get A Non-existing Service Function From Chain [Documentation] Get A Non-existing Service Function From Chain Remove All Elements At URI ${SERVICE_CHAINS_URI} Add Elements To URI From File ${SERVICE_CHAINS_URI} ${SERVICE_CHAINS_FILE} - ${resp} RequestsLibrary.Get session ${SERVICE_CHAINS_URI}service-function-chain/SFC1/sfc-service-function/non-existing-sft + ${resp} RequestsLibrary.Get Request session ${SERVICE_CHAINS_URI}service-function-chain/SFC1/sfc-service-function/non-existing-sft Should Be Equal As Strings ${resp.status_code} 404 Delete A Service Function From Chain @@ -103,7 +103,7 @@ Delete A Service Function From Chain Remove All Elements At URI ${SERVICE_CHAINS_URI} Add Elements To URI From File ${SERVICE_CHAINS_URI} ${SERVICE_CHAINS_FILE} Remove All Elements At URI ${SERVICE_CHAINS_URI}service-function-chain/SFC1/sfc-service-function/dpi-abstract1 - ${resp} RequestsLibrary.Get session ${SERVICE_CHAINS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_CHAINS_URI} Should Be Equal As Strings ${resp.status_code} 200 Should Contain ${resp.content} SFC1 ${elements}= Create List dpi-abstract1 service-function-type:dpi diff --git a/csit/suites/sfc/SFC_Basic/050__sfc_service_schedule_types.robot b/csit/suites/sfc/SFC_Basic/050__sfc_service_schedule_types.robot index d7a02a73dd..74fc3f4840 100644 --- a/csit/suites/sfc/SFC_Basic/050__sfc_service_schedule_types.robot +++ b/csit/suites/sfc/SFC_Basic/050__sfc_service_schedule_types.robot @@ -22,7 +22,7 @@ Add Service Function Schedule Algorithm Types ${body} OperatingSystem.Get File ${SERVICE_SCHED_TYPES_FILE} ${jsonbody} To Json ${body} ${types} Get From Dictionary ${jsonbody} service-function-scheduler-types - ${resp} RequestsLibrary.Get session ${SERVICE_SCHED_TYPES_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_SCHED_TYPES_URI} Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} ${type} Get From Dictionary ${result} service-function-scheduler-types @@ -30,10 +30,10 @@ Add Service Function Schedule Algorithm Types Delete All Service Function Schedule Algorithm Types [Documentation] Delete Service Function Schedule Algorithm Types - ${resp} RequestsLibrary.Get session ${SERVICE_SCHED_TYPES_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_SCHED_TYPES_URI} Should Be Equal As Strings ${resp.status_code} 200 Remove All Elements At URI ${SERVICE_SCHED_TYPES_URI} - ${resp} RequestsLibrary.Get session ${SERVICE_SCHED_TYPES_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_SCHED_TYPES_URI} Should Be Equal As Strings ${resp.status_code} 404 Get Ramdom Schedule Algorithm Type @@ -42,13 +42,13 @@ Get Ramdom Schedule Algorithm Type Add Elements To URI From File ${SERVICE_SCHED_TYPES_URI} ${SERVICE_SCHED_TYPES_FILE} ${elements}= Create List random "enabled":false service-function-scheduler-type:random Check For Elements At URI ${SERVICE_SCHED_TYPES_URI}service-function-scheduler-type/service-function-scheduler-type:random ${elements} - ${resp} RequestsLibrary.Get session ${SERVICE_SCHED_TYPES_URI}service-function-scheduler-type/service-function-scheduler-type:random + ${resp} RequestsLibrary.Get Request session ${SERVICE_SCHED_TYPES_URI}service-function-scheduler-type/service-function-scheduler-type:random Get A Non-existing Service Function Schedule Algorithm Type [Documentation] Get A Non-existing Service Function Schedule Algorithm Type Remove All Elements At URI ${SERVICE_SCHED_TYPES_URI} Add Elements To URI From File ${SERVICE_SCHED_TYPES_URI} ${SERVICE_SCHED_TYPES_FILE} - ${resp} RequestsLibrary.Get session ${SERVICE_SCHED_TYPES_URI}service-function-scheduler-type/service-function-scheduler-type:user-defined + ${resp} RequestsLibrary.Get Request session ${SERVICE_SCHED_TYPES_URI}service-function-scheduler-type/service-function-scheduler-type:user-defined Should Be Equal As Strings ${resp.status_code} 404 Delete Ramdom Schedule Algorithm Type @@ -67,7 +67,7 @@ Delete A Non-existing Service Function Schedule Algorithm Type ${jsonbody} To Json ${body} ${types} Get From Dictionary ${jsonbody} service-function-scheduler-types Remove All Elements At URI ${SERVICE_SCHED_TYPES_URI}service-function-scheduler-type/service-function-scheduler-type:user-defined - ${resp} RequestsLibrary.Get session ${SERVICE_SCHED_TYPES_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_SCHED_TYPES_URI} Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} ${type} Get From Dictionary ${result} service-function-scheduler-types diff --git a/csit/suites/sfc/SFC_Basic/060__sfc_service_paths.robot b/csit/suites/sfc/SFC_Basic/060__sfc_service_paths.robot index bf88709078..1c8608f86b 100644 --- a/csit/suites/sfc/SFC_Basic/060__sfc_service_paths.robot +++ b/csit/suites/sfc/SFC_Basic/060__sfc_service_paths.robot @@ -22,7 +22,7 @@ Add Service Function Paths ${body} OperatingSystem.Get File ${SERVICE_FUNCTION_PATHS_FILE} ${jsonbody} To Json ${body} ${paths} Get From Dictionary ${jsonbody} service-function-paths - ${resp} RequestsLibrary.Get session ${SERVICE_FUNCTION_PATHS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTION_PATHS_URI} Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} ${path} Get From Dictionary ${result} service-function-paths @@ -30,10 +30,10 @@ Add Service Function Paths Delete All Service Function Paths [Documentation] Delete all Service Function Paths - ${resp} RequestsLibrary.Get session ${SERVICE_FUNCTION_PATHS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTION_PATHS_URI} Should Be Equal As Strings ${resp.status_code} 200 Remove All Elements At URI ${SERVICE_FUNCTION_PATHS_URI} - ${resp} RequestsLibrary.Get session ${SERVICE_FUNCTION_PATHS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTION_PATHS_URI} Should Be Equal As Strings ${resp.status_code} 404 Get one Service Function Path @@ -47,19 +47,19 @@ Get A Non-existing Service Function Path [Documentation] Get A Non-existing Service Function Path Remove All Elements At URI ${SERVICE_FUNCTION_PATHS_URI} Add Elements To URI From File ${SERVICE_FUNCTION_PATHS_URI} ${SERVICE_FUNCTION_PATHS_FILE} - ${resp} RequestsLibrary.Get session ${SERVICE_FUNCTION_PATHS_URI}service-function-path/non-existing-sfp + ${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTION_PATHS_URI}service-function-path/non-existing-sfp Should Be Equal As Strings ${resp.status_code} 404 Delete A Service Function Path [Documentation] Delete A Service Function Path Remove All Elements At URI ${SERVICE_FUNCTION_PATHS_URI} Add Elements To URI From File ${SERVICE_FUNCTION_PATHS_URI} ${SERVICE_FUNCTION_PATHS_FILE} - ${resp} RequestsLibrary.Get session ${SERVICE_FUNCTION_PATHS_URI}service-function-path/SFC1-100 + ${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTION_PATHS_URI}service-function-path/SFC1-100 Should Be Equal As Strings ${resp.status_code} 200 Remove All Elements At URI ${SERVICE_FUNCTION_PATHS_URI}service-function-path/SFC1-100 - ${resp} RequestsLibrary.Get session ${SERVICE_FUNCTION_PATHS_URI}service-function-path/SFC1-100 + ${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTION_PATHS_URI}service-function-path/SFC1-100 Should Be Equal As Strings ${resp.status_code} 404 - ${resp} RequestsLibrary.Get session ${SERVICE_FUNCTION_PATHS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTION_PATHS_URI} Should Be Equal As Strings ${resp.status_code} 200 Should Not Contain ${resp.content} SFC1-100 @@ -71,7 +71,7 @@ Delete A Non-existing Empty Service Function Path ${jsonbody} To Json ${body} ${paths} Get From Dictionary ${jsonbody} service-function-paths Remove All Elements At URI ${SERVICE_FUNCTION_PATHS_URI}service-function-path/non-existing-sfp - ${resp} RequestsLibrary.Get session ${SERVICE_FUNCTION_PATHS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTION_PATHS_URI} Should Be Equal As Strings ${resp.status_code} 200 ${result} To JSON ${resp.content} ${path} Get From Dictionary ${result} service-function-paths @@ -81,10 +81,10 @@ Put one Service Function [Documentation] Put one Service Function Remove All Elements At URI ${SERVICE_FUNCTION_PATHS_URI} Add Elements To URI From File ${SERVICE_FUNCTION_PATH400_URI} ${SERVICE_FUNCTION_PATH400_FILE} - ${resp} RequestsLibrary.Get session ${SERVICE_FUNCTION_PATH400_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTION_PATH400_URI} Should Be Equal As Strings ${resp.status_code} 200 Should Contain ${resp.content} SFC1-400 - ${resp} RequestsLibrary.Get session ${SERVICE_FUNCTION_PATHS_URI} + ${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTION_PATHS_URI} Should Be Equal As Strings ${resp.status_code} 200 Should Contain ${resp.content} SFC1-400 diff --git a/csit/suites/sfc/SFC_Basic/070__sfc_rendered_service_paths.robot b/csit/suites/sfc/SFC_Basic/070__sfc_rendered_service_paths.robot index 0b5bb51281..2c577d25b0 100644 --- a/csit/suites/sfc/SFC_Basic/070__sfc_rendered_service_paths.robot +++ b/csit/suites/sfc/SFC_Basic/070__sfc_rendered_service_paths.robot @@ -60,7 +60,7 @@ Basic Environment Setup Tests Create and Get Rendered Service Path [Documentation] Create and Get Rendered Service Path Through RESTConf APIs Post Elements To URI As JSON ${OPERATIONS_CREATE_RSP_URI} ${CREATE_RSP1_INPUT} - ${resp} RequestsLibrary.Get session ${OPERATIONAL_RSPS_URI} + ${resp} RequestsLibrary.Get Request session ${OPERATIONAL_RSPS_URI} Should Be Equal As Strings ${resp.status_code} 200 ${elements}= Create List SFC1-100-Path-1 "parent-service-function-path":"SFC1-100" "hop-number":0 "service-index":255 "hop-number":1 ... "service-index":254 "hop-number":2 "service-index":253 @@ -68,13 +68,13 @@ Create and Get Rendered Service Path Create Get Rendered Service Path Failure [Documentation] Create Rendered Service Path Failure Cases - ${resp} RequestsLibrary.Post session ${OPERATIONS_CREATE_RSP_URI} data=${CREATE_RSP_FAILURE_INPUT} headers=${headers} + ${resp} RequestsLibrary.Post Request session ${OPERATIONS_CREATE_RSP_URI} data=${CREATE_RSP_FAILURE_INPUT} headers=${headers} Should Be Equal As Strings ${resp.status_code} 500 Get Rendered Service Path By Name [Documentation] Get Rendered Service Path By Name Through RESTConf APIs Post Elements To URI As JSON ${OPERATIONS_CREATE_RSP_URI} ${CREATE_RSP1_INPUT} - ${resp} RequestsLibrary.Get session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1 + ${resp} RequestsLibrary.Get Request session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1 Should Be Equal As Strings ${resp.status_code} 200 ${elements}= Create List SFC1-100-Path-1 "parent-service-function-path":"SFC1-100" "hop-number":0 "service-index":255 "hop-number":1 ... "service-index":254 "hop-number":2 "service-index":253 @@ -83,40 +83,40 @@ Get Rendered Service Path By Name Get Non Existing Rendered Service Path [Documentation] Get Non Existing Rendered Service Path Through RESTConf APIs Post Elements To URI As JSON ${OPERATIONS_CREATE_RSP_URI} ${CREATE_RSP1_INPUT} - ${resp} RequestsLibrary.Get session ${OPERATIONAL_RSPS_URI}rendered-service-path/non-existing-rsp + ${resp} RequestsLibrary.Get Request session ${OPERATIONAL_RSPS_URI}rendered-service-path/non-existing-rsp Should Be Equal As Strings ${resp.status_code} 404 - ${resp} RequestsLibrary.Get session ${OPERATIONAL_RSPS_URI} + ${resp} RequestsLibrary.Get Request session ${OPERATIONAL_RSPS_URI} Should Be Equal As Strings ${resp.status_code} 200 Should Not Contain ${resp.content} non-existing-rsp Delete one Rendered Service Path By Name [Documentation] Delete One Rendered Service Path By Name Through RESTConf APIs Post Elements To URI As JSON ${OPERATIONS_CREATE_RSP_URI} ${CREATE_RSP1_INPUT} - ${resp} RequestsLibrary.Get session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1 + ${resp} RequestsLibrary.Get Request session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1 Should Be Equal As Strings ${resp.status_code} 200 Should Contain ${resp.content} SFC1-100-Path-1 Post Elements To URI As JSON ${OPERATIONS_DELETE_RSP_URI} ${DELETE_RSP1_INPUT} - ${resp} RequestsLibrary.Get session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1 + ${resp} RequestsLibrary.Get Request session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1 Should Be Equal As Strings ${resp.status_code} 404 - ${resp} RequestsLibrary.Get session ${OPERATIONAL_RSPS_URI} + ${resp} RequestsLibrary.Get Request session ${OPERATIONAL_RSPS_URI} Should Be Equal As Strings ${resp.status_code} 200 Should Not Contain ${resp.content} SFC1-100-Path-1 Delete Non Existing Rendered Service Path By Name [Documentation] Delete One Rendered Service Path By Name Through RESTConf APIs Post Elements To URI As JSON ${OPERATIONS_CREATE_RSP_URI} ${CREATE_RSP1_INPUT} - ${resp} RequestsLibrary.Get session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1 + ${resp} RequestsLibrary.Get Request session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1 Should Be Equal As Strings ${resp.status_code} 200 Should Contain ${resp.content} SFC1-100-Path-1 Post Elements To URI As JSON ${OPERATIONS_DELETE_RSP_URI} ${DELETE_RSP2_INPUT} - ${resp} RequestsLibrary.Get session ${OPERATIONAL_RSPS_URI} + ${resp} RequestsLibrary.Get Request session ${OPERATIONAL_RSPS_URI} Should Be Equal As Strings ${resp.status_code} 200 Should Not Contain ${resp.content} {"rendered-service-paths":{}} Get Rendered Service Path Hop [Documentation] Get Rendered Service Path By Name Through RESTConf APIs Post Elements To URI As JSON ${OPERATIONS_CREATE_RSP_URI} ${CREATE_RSP1_INPUT} - ${resp} RequestsLibrary.Get session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1/rendered-service-path-hop/0/ + ${resp} RequestsLibrary.Get Request session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1/rendered-service-path-hop/0/ Should Be Equal As Strings ${resp.status_code} 200 ${elements}= Create List "hop-number":0 "service-index":255 "service-function-name":"dpi Check For Elements At URI ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1/rendered-service-path-hop/0/ ${elements} @@ -124,7 +124,7 @@ Get Rendered Service Path Hop Check For Elements At URI ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1/rendered-service-path-hop/1/ ${elements} ${elements}= Create List "hop-number":2 "service-index":253 "service-function-name":"firewall Check For Elements At URI ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1/rendered-service-path-hop/2/ ${elements} - ${resp} RequestsLibrary.Get session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1/rendered-service-path-hop/3/ + ${resp} RequestsLibrary.Get Request session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1/rendered-service-path-hop/3/ Should Be Equal As Strings ${resp.status_code} 404 Post Elements To URI As JSON ${OPERATIONS_DELETE_RSP_URI} ${DELETE_RSP1_INPUT} @@ -213,25 +213,25 @@ Generate RSPs with Shortest Path Schedule Algorithm type Check For Elements At URI ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1/rendered-service-path-hop/1/ ${elements} ${elements}= Create List "hop-number":2 "service-index":253 "service-function-name":"firewall Check For Elements At URI ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1/rendered-service-path-hop/2/ ${elements} - ${resp} RequestsLibrary.Get session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1/rendered-service-path-hop/0/ + ${resp} RequestsLibrary.Get Request session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1/rendered-service-path-hop/0/ Should Be Equal As Strings ${resp.status_code} 200 ${fwd_hop1} Extract Value From Content ${resp.content} service-function-forwarder - ${resp} RequestsLibrary.Get session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1/rendered-service-path-hop/1/ + ${resp} RequestsLibrary.Get Request session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1/rendered-service-path-hop/1/ Should Be Equal As Strings ${resp.status_code} 200 ${fwd_hop2} Extract Value From Content ${resp.content} service-function-forwarder - ${resp} RequestsLibrary.Get session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1/rendered-service-path-hop/2/ + ${resp} RequestsLibrary.Get Request session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-1/rendered-service-path-hop/2/ Should Be Equal As Strings ${resp.status_code} 200 ${fwd_hop3} Extract Value From Content ${resp.content} service-function-forwarder Should Be Equal ${fwd_hop1} ${fwd_hop2} Should Be Equal ${fwd_hop2} ${fwd_hop3} Post Elements To URI As JSON ${OPERATIONS_CREATE_RSP_URI} ${CREATE_RSP2_INPUT} - ${resp} RequestsLibrary.Get session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-2/rendered-service-path-hop/0/ + ${resp} RequestsLibrary.Get Request session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-2/rendered-service-path-hop/0/ Should Be Equal As Strings ${resp.status_code} 200 ${fwd_hop1} Extract Value From Content ${resp.content} service-function-forwarder - ${resp} RequestsLibrary.Get session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-2/rendered-service-path-hop/1/ + ${resp} RequestsLibrary.Get Request session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-2/rendered-service-path-hop/1/ Should Be Equal As Strings ${resp.status_code} 200 ${fwd_hop2} Extract Value From Content ${resp.content} service-function-forwarder - ${resp} RequestsLibrary.Get session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-2/rendered-service-path-hop/2/ + ${resp} RequestsLibrary.Get Request session ${OPERATIONAL_RSPS_URI}rendered-service-path/SFC1-100-Path-2/rendered-service-path-hop/2/ Should Be Equal As Strings ${resp.status_code} 200 ${fwd_hop3} Extract Value From Content ${resp.content} service-function-forwarder Should Be Equal ${fwd_hop1} ${fwd_hop2} @@ -251,11 +251,11 @@ Clean Datastore After Tests *** Keywords *** Post Elements To URI As JSON [Arguments] ${uri} ${data} - ${resp} RequestsLibrary.Post session ${uri} data=${data} headers=${headers} + ${resp} RequestsLibrary.Post Request session ${uri} data=${data} headers=${headers} Should Be Equal As Strings ${resp.status_code} 200 Get JSON Elements From URI [Arguments] ${uri} - ${resp} RequestsLibrary.Get session ${uri} + ${resp} RequestsLibrary.Get Request session ${uri} ${value} To Json ${resp.content} [Return] ${value} -- 2.36.6