From bd9ac8df9d6ed194750b8df668e2dbedde26574c Mon Sep 17 00:00:00 2001 From: "waqas.ikram" Date: Wed, 1 Mar 2023 11:38:18 +0000 Subject: Fixing Jenkins Job Change-Id: Ib05ae4acacebd8c4ec5a0586b9376b2258aa5e17 Issue-ID: INT-2206 Signed-off-by: waqas.ikram --- plans/vfc-gvnfm-vnflcm/sanity-check/setup.sh | 1 + tests/vfc/gvnfm-vnflcm/Subscriptions.robot | 25 ++++++++++--------------- tests/vfc/gvnfm-vnflcm/test.robot | 9 ++++----- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/plans/vfc-gvnfm-vnflcm/sanity-check/setup.sh b/plans/vfc-gvnfm-vnflcm/sanity-check/setup.sh index 3fd82d29..6d5c180a 100755 --- a/plans/vfc-gvnfm-vnflcm/sanity-check/setup.sh +++ b/plans/vfc-gvnfm-vnflcm/sanity-check/setup.sh @@ -63,6 +63,7 @@ sleep 30 # start vfc-vnflcm docker run -d --name vfc-vnflcm -e MSB_ADDR=${MSB_IAG_IP}:80 -e MYSQL_ADDR=${VFC_DB_IP}:3306 -e REDIS_HOST=${VFC_REDIS_IP} nexus3.onap.org:10001/onap/vfc/vnflcm VNFLCM_IP=`get-instance-ip.sh vfc-vnflcm` +echo VNFLCM_IP=${VNFLCM_IP} # Wait for initialization for i in {1..10}; do diff --git a/tests/vfc/gvnfm-vnflcm/Subscriptions.robot b/tests/vfc/gvnfm-vnflcm/Subscriptions.robot index 8f858554..3946ac17 100644 --- a/tests/vfc/gvnfm-vnflcm/Subscriptions.robot +++ b/tests/vfc/gvnfm-vnflcm/Subscriptions.robot @@ -4,7 +4,6 @@ Library Collections Library RequestsLibrary Library OperatingSystem Library json -Library HttpLibrary.HTTP *** Variables *** @{return_ok_list}= 200 201 202 204 @@ -21,12 +20,10 @@ ${subscriptionId} Create new VNF Package subscription Log Create new VNF Package subscription [Documentation] The objective is to test the creation of a new VNF package subscription - ${json_value}= json_from_file ${vnf_subscription_json} - ${json_string}= string_from_json ${json_value} + ${data}= Get Binary File ${vnf_subscription_json} ${headers} Create Dictionary Content-Type=application/json Accept=application/json Create Session web_session http://${VNFLCM_IP}:${vnflcm_port} headers=${headers} - Set Request Body ${json_string} - ${resp}= Post Request web_session ${subscriptions_url} ${json_string} + ${resp}= POST On Session web_session ${subscriptions_url} data=${data} ${responese_code}= Convert To String ${resp.status_code} List Should Contain Value ${return_ok_list} ${responese_code} ${response_json} json.loads ${resp.content} @@ -38,12 +35,10 @@ Create new VNF Package subscription Create duplicated VNF Package subscription Log Create duplicated VNF Package subscription [Documentation] The objective is to test the attempt of a creation of a duplicated VNF package subscription - ${json_value}= json_from_file ${vnf_subscription_json} - ${json_string}= string_from_json ${json_value} + ${data}= Get Binary File ${vnf_subscription_json} ${headers} Create Dictionary Content-Type=application/json Accept=application/json Create Session web_session http://${VNFLCM_IP}:${vnflcm_port} headers=${headers} - Set Request Body ${json_string} - ${resp}= Post Request web_session ${subscriptions_url} ${json_string} + ${resp}= POST On Session web_session ${subscriptions_url} data=${data} expected_status=any Should Be Equal As Strings 502 ${resp.status_code} GET All VNF Package Subscriptions @@ -51,7 +46,7 @@ GET All VNF Package Subscriptions [Documentation] The objective is to test the retrieval of all VNF package subscriptions ${headers} Create Dictionary Content-Type=application/json Accept=application/json Create Session web_session http://${VNFLCM_IP}:${vnflcm_port} headers=${headers} - ${resp}= Get Request web_session ${subscriptions_url} + ${resp}= GET On Session web_session ${subscriptions_url} Should Be Equal As Strings 200 ${resp.status_code} PUT VNF Package Subscriptions - Method not implemented @@ -59,7 +54,7 @@ PUT VNF Package Subscriptions - Method not implemented [Documentation] The objective is to test that PUT method is not allowed to modify VNF package subscriptions ${headers} Create Dictionary Content-Type=application/json Accept=application/json Create Session web_session http://${VNFLCM_IP}:${vnflcm_port} headers=${headers} - ${resp}= Put Request web_session ${subscriptions_url} + ${resp}= Put On Session web_session ${subscriptions_url} expected_status=any Should Be Equal As Strings 405 ${resp.status_code} PATCH VNF Package Subscriptions - Method not implemented @@ -67,7 +62,7 @@ PATCH VNF Package Subscriptions - Method not implemented [Documentation] The objective is to test that PATCH method is not allowed to update VNF package subscriptions ${headers} Create Dictionary Content-Type=application/json Accept=application/json Create Session web_session http://${VNFLCM_IP}:${vnflcm_port} headers=${headers} - ${resp}= Patch Request web_session ${subscriptions_url} + ${resp}= Patch On Session web_session ${subscriptions_url} expected_status=any Should Be Equal As Strings 405 ${resp.status_code} DELETE VNF Package Subscriptions - Method not implemented @@ -75,13 +70,13 @@ DELETE VNF Package Subscriptions - Method not implemented [Documentation] The objective is to test that DELETE method is not allowed to delete VNF package subscriptions ${headers} Create Dictionary Content-Type=application/json Accept=application/json Create Session web_session http://${VNFLCM_IP}:${vnflcm_port} headers=${headers} - ${resp}= Delete Request web_session ${subscriptions_url} + ${resp}= Delete On Session web_session ${subscriptions_url} expected_status=any Should Be Equal As Strings 405 ${resp.status_code} DELETE VNF Package Subscription Log DELETE VNF Package Subscription ${headers} Create Dictionary Content-Type=application/json Accept=application/json Create Session web_session http://${VNFLCM_IP}:${vnflcm_port} headers=${headers} - ${resp}= Delete Request web_session ${subscriptions_url}/${subscriptionId} + ${resp}= Delete On Session web_session ${subscriptions_url}/${subscriptionId} ${responese_code}= Convert To String ${resp.status_code} - List Should Contain Value ${return_ok_list} ${responese_code} + List Should Contain Value ${return_ok_list} ${responese_code} \ No newline at end of file diff --git a/tests/vfc/gvnfm-vnflcm/test.robot b/tests/vfc/gvnfm-vnflcm/test.robot index c2c6a9c0..4c8b5480 100644 --- a/tests/vfc/gvnfm-vnflcm/test.robot +++ b/tests/vfc/gvnfm-vnflcm/test.robot @@ -4,7 +4,6 @@ Library Collections Library RequestsLibrary Library OperatingSystem Library json -Library HttpLibrary.HTTP *** Variables *** @{return_ok_list}= 200 201 202 204 @@ -23,7 +22,7 @@ VnflcmSwaggerTest [Documentation] query swagger info vnflcm by MSB ${headers} Create Dictionary Content-Type=application/json Accept=application/json Create Session web_session http://${VNFLCM_IP}:8801 headers=${headers} - ${resp}= Get Request web_session ${queryswagger_url} + ${resp}= GET On Session web_session ${queryswagger_url} ${responese_code}= Convert To String ${resp.status_code} List Should Contain Value ${return_ok_list} ${responese_code} ${response_json} json.loads ${resp.content} @@ -34,7 +33,7 @@ VnflcmHealthCheckTest [Documentation] check health for vnflcm by MSB ${headers} Create Dictionary Content-Type=application/json Accept=application/json Create Session web_session http://${VNFLCM_IP}:8801 headers=${headers} - ${resp}= Get Request web_session ${healthcheck_url} + ${resp}= GET On Session web_session ${healthcheck_url} ${responese_code}= Convert To String ${resp.status_code} List Should Contain Value ${return_ok_list} ${responese_code} ${response_json} json.loads ${resp.content} @@ -45,6 +44,6 @@ VnflcmQueryVnfsTest [Documentation] check health for vnflcm by MSB ${headers} Create Dictionary Content-Type=application/json Accept=application/json Create Session web_session http://${VNFLCM_IP}:8801 headers=${headers} - ${resp}= Get Request web_session ${query_vnfs_url} + ${resp}= GET On Session web_session ${query_vnfs_url} ${responese_code}= Convert To String ${resp.status_code} - List Should Contain Value ${return_ok_list} ${responese_code} + List Should Contain Value ${return_ok_list} ${responese_code} \ No newline at end of file -- cgit 1.2.3-korg