X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Flib%2Fsol003_common_lib.robot;h=c0e73234549171b01e5b8fff17bd8c828b71d81b;hb=d90c14aa761a796cf74563812fb5a01f3b145ee9;hp=7d3d73decb7669bff2176d39af1635a07d99b3ce;hpb=cc3f879f1dadc08ab63ef2d11d80d6ae8e5edea6;p=osm%2Ftests.git diff --git a/robot-systest/lib/sol003_common_lib.robot b/robot-systest/lib/sol003_common_lib.robot index 7d3d73d..c0e7323 100644 --- a/robot-systest/lib/sol003_common_lib.robot +++ b/robot-systest/lib/sol003_common_lib.robot @@ -22,7 +22,6 @@ Library OperatingSystem Resource %{ROBOT_DEVOPS_FOLDER}/lib/vim_lib.robot *** Variables *** -&{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 @@ -36,9 +35,9 @@ Get Auth Token [Tags] auth_token Get Hostname Create Session osmhit ${HOST} - Log Many ${auth_token_uri} @{data} ${data} &{headers} Create Dictionary Content-Type=application/json Accept=application/json - ${resp}= Post On Session osmhit ${auth_token_uri} data=${data} headers=${HEADERS} + &{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} @@ -49,26 +48,26 @@ Get Auth Token Set Dockerized Host [Arguments] ${env_host} - Set Suite Variable ${HOST} https://${env_host} + Set Suite Variable ${HOST} https://${env_host} Set Standalone Host [Arguments] ${env_host} - Set Suite Variable ${HOST} https://${env_host}:9999 + Set Suite Variable ${HOST} https://${env_host}:9999 Read Directory - [Documentation] To Read Current Direct ory - ${Directory}= Replace String ${CURDIR} lib resources/ - ${json_path}= Set Variable ${Directory} + [Documentation] To Read Current Direct ory + ${Directory}= Replace String ${CURDIR} lib resources/ + ${json_path}= Set Variable ${Directory} [Return] ${JsonPath} Post Api Request [Arguments] ${PostApi} [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 On Session APISession ${PostApi} data=${updated_json_obj} headers=${headers} - Set Suite Variable ${request_response} - ${response_statuscode} Convert To String ${request_response.status_code} + Create Session APISession ${HOST} + &{headers} Create Dictionary Content-Type=application/json Accept=application/json Authorization=Bearer ${access_token} + ${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} Get HostName