From 68eac4adc72e599c83053a8806dfd61986237369 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 27 Jun 2023 11:21:05 +0200 Subject: [PATCH] Rename sol003_common_lib to rest_lib and move variables to sol003_01 testsuite Change-Id: I1bb45dfe6fd5915798ad859eb23ff8d11be5a4f4 Signed-off-by: garciadeblas --- .../lib/{sol003_common_lib.robot => rest_lib.robot} | 6 +----- .../testsuite/sol003_01-vnf-lifecycle-management.robot | 8 +++++++- 2 files changed, 8 insertions(+), 6 deletions(-) rename robot-systest/lib/{sol003_common_lib.robot => rest_lib.robot} (94%) diff --git a/robot-systest/lib/sol003_common_lib.robot b/robot-systest/lib/rest_lib.robot similarity index 94% rename from robot-systest/lib/sol003_common_lib.robot rename to robot-systest/lib/rest_lib.robot index d233498..7541a52 100644 --- a/robot-systest/lib/sol003_common_lib.robot +++ b/robot-systest/lib/rest_lib.robot @@ -24,12 +24,8 @@ Variables %{ROBOT_DEVOPS_FOLDER}/resources/sol003_01-vnf_lifecycle_management. *** Variables *** @{success_status_code_list} 200 201 202 204 -${descriptor_content_type_gzip} application/gzip ${auth_token_uri} /osm/admin/v1/tokens ${HOST} ${EMPTY} -${vnf_instance_uri} /osm/vnflcm/v1/vnf_instances -${vnf_instantiate_uri} /osm/vnflcm/v1/vnf_instances -${vnf_instance_lcm_ops} /osm/vnflcm/v1/vnf_lcm_op_occs *** Keywords *** Get Auth Token @@ -71,7 +67,7 @@ Post Api Request ${response_statuscode} Convert To String ${request_response.status_code} Set Suite Variable ${response_statuscode} -Get HostName +Get Hostname [Documentation] Keyword to get the default osm Hostname ${nbi_host}= Get Environment Variable OSM_HOSTNAME ${passed}= Run Keyword And Return Status Should Contain ${nbi_host} : diff --git a/robot-systest/testsuite/sol003_01-vnf-lifecycle-management.robot b/robot-systest/testsuite/sol003_01-vnf-lifecycle-management.robot index 750ea84..9dfcd76 100644 --- a/robot-systest/testsuite/sol003_01-vnf-lifecycle-management.robot +++ b/robot-systest/testsuite/sol003_01-vnf-lifecycle-management.robot @@ -21,7 +21,7 @@ Library yaml Library JsonValidator Library JSONLibrary -Resource %{ROBOT_DEVOPS_FOLDER}/lib/sol003_common_lib.robot +Resource %{ROBOT_DEVOPS_FOLDER}/lib/rest_lib.robot Resource %{ROBOT_DEVOPS_FOLDER}/lib/vnfd_lib.robot Resource %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot Resource %{ROBOT_DEVOPS_FOLDER}/lib/vnf_lib.robot @@ -33,6 +33,12 @@ Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** +# SOL003 API URI paths +${vnf_instance_uri} /osm/vnflcm/v1/vnf_instances +${vnf_instantiate_uri} /osm/vnflcm/v1/vnf_instances +${vnf_instance_lcm_ops} /osm/vnflcm/v1/vnf_lcm_op_occs + +# NS and VNF descriptor package folder and ids ${vnfd_pkg} hackfest_basic_metrics_vnf ${vnfd_name} hackfest_basic_metrics-vnf -- 2.17.1