X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fsfc%2FSFC_Basic%2F020__sfc_service_forwarders.robot;h=a4e4b44e1906593ee38a9f08d48cfe9a5acebe13;hb=ff086b395dc8d40721bd81ce6f34bda7a09ec401;hp=adee2ad4f062a75bdb7d568e8cbe4a0a1cf79ab9;hpb=9f3c40db9b454a9661b6367f456191e635f71041;p=integration%2Ftest.git 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