X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Ftests.git;a=blobdiff_plain;f=robot-systest%2Flib%2Fsol003_common_lib.robot;h=c0e73234549171b01e5b8fff17bd8c828b71d81b;hp=795a1a3bebab86e0b26f8772bfce5ba7a96a3b4d;hb=d90c14aa761a796cf74563812fb5a01f3b145ee9;hpb=44c59336599f1e0e58fe8a8ed78a5cd335419dad diff --git a/robot-systest/lib/sol003_common_lib.robot b/robot-systest/lib/sol003_common_lib.robot index 795a1a3..c0e7323 100644 --- a/robot-systest/lib/sol003_common_lib.robot +++ b/robot-systest/lib/sol003_common_lib.robot @@ -22,8 +22,6 @@ Library OperatingSystem Resource %{ROBOT_DEVOPS_FOLDER}/lib/vim_lib.robot *** Variables *** -&{HEADERS} Content-Type=application/json Accept=application/json -&{data} username=admin password=admin project-id=admin @{success_status_code_list} 200 201 202 204 ${descriptor_content_type_gzip} application/gzip ${auth_token_uri} /osm/admin/v1/tokens @@ -37,8 +35,9 @@ Get Auth Token [Tags] auth_token Get Hostname Create Session osmhit ${HOST} - Log Many ${auth_token_uri} @{data} ${data} - ${resp}= Post Request osmhit ${auth_token_uri} data=${data} headers=${HEADERS} + &{headers} Create Dictionary Content-Type=application/json Accept=application/json + &{data} Create Dictionary username=admin password=admin project-id=admin + ${resp}= Post On Session osmhit ${auth_token_uri} json=${data} headers=${headers} log ${resp} Pass Execution If ${resp.status_code} in ${success_status_code_list} Get Auth Token completed Set Suite Variable ${token_status_code} ${resp.status_code} @@ -66,7 +65,7 @@ Post Api Request [Documentation] Keword to Post API Request Create Session APISession ${HOST} &{headers} Create Dictionary Content-Type=application/json Accept=application/json Authorization=Bearer ${access_token} - ${request_response}= Post Request APISession ${PostApi} data=${updated_json_obj} headers=${headers} + ${request_response}= Post On Session APISession ${PostApi} json=${updated_json_obj} headers=${headers} Set Suite Variable ${request_response} ${response_statuscode} Convert To String ${request_response.status_code} Set Suite Variable ${response_statuscode} @@ -97,7 +96,7 @@ Get Api Request [Documentation] Keyword to Get API Request Create Session Session ${HOST} &{headers} Create Dictionary Content-Type=application/json Accept=application/json Authorization=Bearer ${access_token} - ${request_response}= Get Request Session ${uri} headers=${Headers} + ${request_response}= Get On Session Session ${uri} headers=${Headers} Set Suite Variable ${request_response} ${response_statuscode} Convert To String ${request_response.status_code} Set Suite Variable ${response_statuscode}