X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Ftests.git;a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_16-advanced_onboarding_and_scaling.robot;h=7cd462eb99ca162efdf6d51b73c06b2ea27951a8;hp=0263552b7f1835caf5792f7e3586a3da497b7886;hb=7a9e031926d2fa7ed5041485b3d41b0c1e85d2a9;hpb=23ff8f980f66ef57fb4d254336a018e3a697a187

diff --git a/robot-systest/testsuite/basic_16-advanced_onboarding_and_scaling.robot b/robot-systest/testsuite/basic_16-advanced_onboarding_and_scaling.robot
index 0263552..7cd462e 100644
--- a/robot-systest/testsuite/basic_16-advanced_onboarding_and_scaling.robot
+++ b/robot-systest/testsuite/basic_16-advanced_onboarding_and_scaling.robot
@@ -1,3 +1,4 @@
+*** Comments ***
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 #   You may obtain a copy of the License at
@@ -10,6 +11,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
+
 *** Settings ***
 Documentation   [BASIC-16] Advanced onboarding with override and complex scaling (3 initial instances, scaled by two).
 
@@ -17,129 +19,116 @@ Library   OperatingSystem
 Library   String
 Library   Collections
 
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/vnfd_lib.robot
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
+Resource   ../lib/vnfd_lib.resource
+Resource   ../lib/nsd_lib.resource
+Resource   ../lib/ns_lib.resource
+Resource   ../lib/ns_operation_lib.resource
+Resource   ../lib/ssh_lib.resource
 
-Force Tags   basic_16   cluster_main   daily   regression   azure
+Test Tags   basic_16   cluster_main   daily   regression   azure
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
 # NS and VNF descriptor package folder and ids
-${vnfd_pkg}   hackfest_basic_metrics_vnf
-${vnfd_name}   hackfest_basic_metrics-vnf
-${nsd_pkg}   hackfest_basic_metrics_ns
-${nsd_name}   hackfest_basic-ns-metrics
+${VNFD_PKG}   hackfest_basic_metrics_vnf
+${VNFD_NAME}   hackfest_basic_metrics-vnf
+${NSD_PKG}   hackfest_basic_metrics_ns
+${NSD_NAME}   hackfest_basic-ns-metrics
 
 # NS instance name and configuration
-${ns_name}   basic_16
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+${NS_NAME}   basic_16
+${NS_CONFIG}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 
 # SSH public keys file
-${publickey}   %{HOME}/.ssh/id_rsa.pub
+${PUBLICKEY}   %{HOME}/.ssh/id_rsa.pub
 
 # Initial, delta, min and max number of VDU instances
-${init_instances}   3
-${min_instances}   3
-${max_instances}   5
-${delta_instances}   2
-${scaling_group}   vdu_autoscale
-${vnf_member_index}   vnf
+${INIT_INSTANCES}   3
+${MIN_INSTANCES}   3
+${MAX_INSTANCES}   5
+${DELTA_INSTANCES}   2
+${SCALING_GROUP}   vdu_autoscale
+${VNF_MEMBER_INDEX}   vnf
 
 
 *** Test Cases ***
 Create Scaling VNF Descriptor
-
-    Create VNFD Overriding Fields   '%{PACKAGES_FOLDER}/${vnfd_pkg}'   df.0.instantiation-level.0.vdu-level.0.number-of-instances=${init_instances};df.0.vdu-profile.0.min-number-of-instances=${min_instances};df.0.vdu-profile.0.max-number-of-instances=${max_instances};df.0.scaling-aspect.0.aspect-delta-details.deltas.0.vdu-delta.0.number-of-instances=${delta_instances}
-
+    [Documentation]   Upload VNF package for the testsuite.
+    Create VNFD Overriding Fields   '%{PACKAGES_FOLDER}/${VNFD_PKG}'   df.0.instantiation-level.0.vdu-level.0.number-of-instances=${INIT_INSTANCES};df.0.vdu-profile.0.min-number-of-instances=${MIN_INSTANCES};df.0.vdu-profile.0.max-number-of-instances=${MAX_INSTANCES};df.0.scaling-aspect.0.aspect-delta-details.deltas.0.vdu-delta.0.number-of-instances=${DELTA_INSTANCES}
 
 Create Scaling NS Descriptor
-
-    Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
-
+    [Documentation]   Upload NS package for the testsuite.
+    Create NSD   '%{PACKAGES_FOLDER}/${NSD_PKG}'
 
 Instantiate Scaling Network Service
-
-    ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}   ${publickey}
-    Set Suite Variable   ${ns_id}   ${id}
-
+    [Documentation]   Instantiate NS for the testsuite.
+    ${id}=   Create Network Service   ${NSD_NAME}   %{VIM_TARGET}   ${NS_NAME}   ${NS_CONFIG}   ${PUBLICKEY}
+    Set Suite Variable   ${NS_ID}   ${id}
 
 Get Vnf Id
-
-    Variable Should Exist   ${ns_id}   msg=Network service instance is not available
-    @{vnfr_list}=   Get Ns Vnfr Ids   ${ns_id}
+    [Documentation]   Retrieve VNF instance id to be used later on.
+    Variable Should Exist   ${NS_ID}   msg=Network service instance is not available
+    @{vnfr_list}=   Get Ns Vnfr Ids   ${NS_ID}
     Log List   ${vnfr_list}
-    Set Suite Variable   ${vnf_id}   ${vnfr_list}[0]
-
+    Set Suite Variable   ${VNF_ID}   ${vnfr_list}[0]
 
 Check Vdus Before Scale Out
     [Documentation]   Check the number of VDUs instances before the manual scaling.
-
-    @{vdur_list}=   Get Vnf Vdur Names   ${vnf_id}
+    @{vdur_list}=   Get Vnf Vdur Names   ${VNF_ID}
     Log List   ${vdur_list}
     ${vdurs}=   Get Length   ${vdur_list}
-    Set Suite Variable   ${initial_vdur_count}   ${vdurs}
-    Run Keyword If   ${init_instances} != ${initial_vdur_count}   Fail   msg=Instantiated VDUs (${initial_vdur_count}) don't match specified number in descriptor (${init_instances})
-
+    Set Suite Variable   ${INITIAL_VDUR_COUNT}   ${vdurs}
+    IF   ${INIT_INSTANCES} != ${INITIAL_VDUR_COUNT}   Fail   msg=Instantiated VDUs (${INITIAL_VDUR_COUNT}) don't match specified number in descriptor (${INIT_INSTANCES})
 
 Perform Manual Vdu Scale Out
-
-    Variable Should Exist   ${ns_id}   msg=Network service instance is not available
-    ${ns_op_id}=   Execute Manual VNF Scale   ${ns_name}   ${vnf_member_index}   ${scaling_group}   SCALE_OUT
-
+    [Documentation]   Perform a manual scale-out operation of the VNF.
+    Variable Should Exist   ${NS_ID}   msg=Network service instance is not available
+    ${ns_op_id}=   Execute Manual VNF Scale   ${NS_NAME}   ${VNF_MEMBER_INDEX}   ${SCALING_GROUP}   SCALE_OUT
+    Log   ${ns_op_id}
 
 Check Vdus After Scale Out
-    [Documentation]   Check whether there is one more VDU after scaling or not.
-
-    Variable Should Exist   ${ns_id}   msg=Network service instance is not available
-    @{vdur_list}=   Get Vnf Vdur Names   ${vnf_id}
+    [Documentation]   Check whether there is one extra VDU after scaling out.
+    Variable Should Exist   ${NS_ID}   msg=Network service instance is not available
+    @{vdur_list}=   Get Vnf Vdur Names   ${VNF_ID}
     Log List   ${vdur_list}
     ${vdurs}=   Get Length   ${vdur_list}
-    Run Keyword If   ${vdurs} != ${initial_vdur_count} + ${delta_instances}   Fail   msg=VDU instances in the VNF (${vdurs}) don't match after Scale Out (${initial_vdur_count} + ${delta_instances})
-
+    IF   ${vdurs} != ${INITIAL_VDUR_COUNT} + ${DELTA_INSTANCES}   Fail   msg=VDU instances in the VNF (${vdurs}) don't match after Scale Out (${INITIAL_VDUR_COUNT} + ${DELTA_INSTANCES})
 
 Perform Manual Vdu Scale In
-
-    Variable Should Exist   ${ns_id}   msg=Network service instance is not available
-    ${ns_op_id}=   Execute Manual VNF Scale   ${ns_name}   ${vnf_member_index}   ${scaling_group}   SCALE_IN
-
+    [Documentation]   Perform a manual scale-in operation of the VNF.
+    Variable Should Exist   ${NS_ID}   msg=Network service instance is not available
+    ${ns_op_id}=   Execute Manual VNF Scale   ${NS_NAME}   ${VNF_MEMBER_INDEX}   ${SCALING_GROUP}   SCALE_IN
+    Log   ${ns_op_id}
 
 Check Vdus After Scaling In
-    [Documentation]   Check whether there is one less VDU after scaling or not.
-
-    Variable Should Exist   ${ns_id}   msg=Network service instance is not available
-    @{vdur_list}=   Get Vnf Vdur Names   ${vnf_id}
+    [Documentation]   Check whether there is one less VDU after scaling in.
+    Variable Should Exist   ${NS_ID}   msg=Network service instance is not available
+    @{vdur_list}=   Get Vnf Vdur Names   ${VNF_ID}
     Log List   ${vdur_list}
     ${vdurs}=   Get Length   ${vdur_list}
-    Run Keyword If   ${vdurs} != ${initial_vdur_count}   Fail   msg=There is the same number of VDU records in the VNF after Scale In
-
+    IF   ${vdurs} != ${INITIAL_VDUR_COUNT}   Fail   msg=There is the same number of VDU records in the VNF after Scale In
 
 Delete NS Instance
+    [Documentation]   Delete NS intance.
     [Tags]   cleanup
-
-    Delete NS   ${ns_name}
-
+    Delete NS   ${NS_NAME}
 
 Delete NS Descriptor
+    [Documentation]   Delete NS package from OSM.
     [Tags]   cleanup
-
-    Delete NSD   ${nsd_name}
-
+    Delete NSD   ${NSD_NAME}
 
 Delete VNF Descriptor
+    [Documentation]   Delete VNF package from OSM.
     [Tags]   cleanup
-
-    Delete VNFD   ${vnfd_name}
+    Delete VNFD   ${VNFD_NAME}
 
 
 *** Keywords ***
 Suite Cleanup
     [Documentation]   Test Suite Cleanup: Deleting descriptors and NS instance
-
-    Run Keyword If Any Tests Failed   Delete NS   ${ns_name}
-    Run Keyword If Any Tests Failed   Delete NSD   ${nsd_name}
-    Run Keyword If Any Tests Failed   Delete VNFD   ${vnfd_name}
-
+    Run Keyword If Any Tests Failed   Delete NS   ${NS_NAME}
+    Run Keyword If Any Tests Failed   Delete NSD   ${NSD_NAME}
+    Run Keyword If Any Tests Failed   Delete VNFD   ${VNFD_NAME}