X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fsol003_01-vnf-lifecycle-management.robot;h=a238fb170a4ed95dc889d796e2cf21128ff5cdf5;hb=c1dc4d643a6995d58ccbbacf9ed24abfae80da3e;hp=18801a185dc8f97a7f721570dbda049962145860;hpb=f4ebaa88025189ede4f073ab8a1f27c95efff867;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/sol003_01-vnf-lifecycle-management.robot b/robot-systest/testsuite/sol003_01-vnf-lifecycle-management.robot
index 18801a1..a238fb1 100644
--- a/robot-systest/testsuite/sol003_01-vnf-lifecycle-management.robot
+++ b/robot-systest/testsuite/sol003_01-vnf-lifecycle-management.robot
@@ -12,8 +12,7 @@
 
 *** Settings ***
 Documentation   [SOL003-01] Sol003 Api testing
-Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
-Force Tags   sol003_01   cluster_sol003   daily
+
 Library   OperatingSystem
 Library   String
 Library   Collections
@@ -21,17 +20,33 @@ Library   RequestsLibrary
 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
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/vim_lib.robot
 
+Force Tags   sol003_01   cluster_osm_rest   daily
+
+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
 
+
 *** Test Cases ***
 Create VNF package from JSON file descriptor
     [Documentation]   Test case to create a VNF Identifier
+    Get VNFDs List
     ${id}=   Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
     Set Suite Variable   ${vnfid}   ${id}
     ${created_vim_account_id}=   Get VIM Target ID   %{VIM_TARGET}
@@ -40,29 +55,37 @@ Create VNF package from JSON file descriptor
     ${json_path}=   Read Directory
     ${json_obj}=   Load JSON From File   ${json_path}/sol003_01-vnf-lifecycle-management.json
     ${json_obj}=   Get Variable Value   ${json_obj['data'][0]}
-    ${updated_json_obj}   JSONLibrary.Update Value To Json   ${json_obj}   $..vimAccountId   ${created_vim_account_id}
-    ${updated_json_obj}   JSONLibrary.Update Value To Json   ${updated_json_obj}   $..additionalParams.virtual-link-desc[0][id]   %{VIM_MGMT_NET}
-    ${updated_json_obj}   JSONLibrary.Update Value To Json   ${updated_json_obj}   $..additionalParams.virtual-link-profile-id   %{VIM_MGMT_NET}
+    ${updated_json_obj}=   JSONLibrary.Update Value To Json   ${json_obj}   $..vimAccountId   ${created_vim_account_id}
+    Log   ${updated_json_obj}
+    ${updated_json_obj}=   JSONLibrary.Update Value To Json   ${updated_json_obj}   $..additionalParams.virtual-link-desc[0][id]   %{VIM_MGMT_NET}
+    Log   ${updated_json_obj}
+    ${updated_json_obj}=   JSONLibrary.Update Value To Json   ${updated_json_obj}   $..additionalParams.virtual-link-profile-id   %{VIM_MGMT_NET}
+    Log   ${updated_json_obj}
     Set Test Variable   ${updated_json_obj}
     Post API Request   ${vnf_instance_uri}
     Pass Execution If   ${request_response.status_code} in ${success_status_code_list}   Query VNF Instance completed
     ${id}=   Get Value From Json   ${request_response.json()}   $..id
     Set Suite Variable   ${createid}   ${id[0]}
+    Get VNFDs List
 
 Instantiate VNF
     [Documentation]   Test case to Instantiate a VNF
+    Get Ns List
+    Get Vnf List
     Get Auth Token
     ${json_path}=   Read Directory
     ${json_obj}=   Load JSON From File   ${json_path}/sol003_01-vnf-lifecycle-management.json
     ${json_obj}=   Get Variable Value   ${json_obj['data'][1]}
-    ${updated_json_obj}   JSONLibrary.Update Value To Json   ${json_obj}   $..vimAccountId   ${created_vim_account_id}
-    ${updated_json_obj}   JSONLibrary.Update Value To Json   ${json_obj}   $..vnfId   ${createid}
+    ${updated_json_obj}=   JSONLibrary.Update Value To Json   ${json_obj}   $..vimAccountId   ${created_vim_account_id}
+    ${updated_json_obj}=   JSONLibrary.Update Value To Json   ${updated_json_obj}   $..vnfId   ${createid}
     Set Test Variable   ${updated_json_obj}
     Post API Request   ${vnf_instantiate_uri}/${createid}/instantiate
     Pass Execution If   ${request_response.status_code} in ${success_status_code_list}   Instantiate VNF Instance completed
     ${id}=   Get Value From Json   ${request_response.json()}   $..id
     Set Suite Variable   ${instantiateid}   ${id[0]}
     Sleep   12s
+    Get Ns List
+    Get Vnf List
 
 Query VNF Instances
     [Documentation]   Test case to query VNF Instance
@@ -169,8 +192,10 @@ Delete VNF Descriptor Test
 
     Delete VNFD   ${vnfd_name}
 
+
 *** Keywords ***
 Suite Cleanup
     [Documentation]   Test Suit Cleanup: Deleting Descriptor
 
     Run Keyword If Any Tests Failed   Delete VNFD   ${vnfd_name}
+