X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_16-advanced_onboarding_and_scaling.robot;h=52d8069024a43fc9e97266c43f2e066a156a6074;hb=3fd34dd479042990bd6a8b50be9a95b07ed9d587;hp=78a1aa3060473d437629d29e168fa0a561fb4644;hpb=9dca3a87c3fdce0babbe6945f73c28dc75f40ae3;p=osm%2Ftests.git

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 78a1aa3..52d8069 100644
--- a/robot-systest/testsuite/basic_16-advanced_onboarding_and_scaling.robot
+++ b/robot-systest/testsuite/basic_16-advanced_onboarding_and_scaling.robot
@@ -22,39 +22,52 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_16-advanced_onboarding_and_scaling_data.py
+Force Tags   basic_16   cluster_main   daily   regression
 
 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
+
+# NS instance name and configuration
+${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
+
+# 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}  1
 
 
 *** Test Cases ***
 Create Scaling VNF Descriptor
-    [Tags]   advanced_scaling   sanity   regression
 
     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
-    [Tags]   advanced_scaling   sanity   regression
 
     Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
 Instantiate Scaling Network Service
-    [Tags]   advanced_scaling   sanity   regression
 
     ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${publickey}
     Set Suite Variable  ${ns_id}  ${id}
 
 
 Get Vnf Id
-    [Tags]   advanced_scaling   sanity   regression
 
     Variable Should Exist  ${ns_id}  msg=Network service instance is not available
     @{vnfr_list}=  Get Ns Vnfr Ids  ${ns_id}
@@ -64,7 +77,6 @@ Get Vnf Id
 
 Check Vdus Before Scale Out
     [Documentation]     Check the number of VDUs instances before the manual scaling.
-    [Tags]   advanced_scaling   sanity   regression
 
     @{vdur_list}=  Get Vnf Vdur Names  ${vnf_id}
     Log List  ${vdur_list}
@@ -74,7 +86,6 @@ Check Vdus Before Scale Out
 
 
 Perform Manual Vdu Scale Out
-    [Tags]   advanced_scaling   sanity   regression
 
     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
@@ -82,7 +93,6 @@ Perform Manual Vdu Scale Out
 
 Check Vdus After Scale Out
     [Documentation]     Check whether there is one more VDU after scaling or not.
-    [Tags]   advanced_scaling   sanity   regression
 
     Variable Should Exist  ${ns_id}  msg=Network service instance is not available
     @{vdur_list}=  Get Vnf Vdur Names  ${vnf_id}
@@ -92,7 +102,6 @@ Check Vdus After Scale Out
 
 
 Perform Manual Vdu Scale In
-    [Tags]   advanced_scaling   sanity   regression
 
     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
@@ -100,7 +109,6 @@ Perform Manual Vdu Scale In
 
 Check Vdus After Scaling In
     [Documentation]     Check whether there is one less VDU after scaling or not.
-    [Tags]   advanced_scaling   sanity   regression
 
     Variable Should Exist  ${ns_id}  msg=Network service instance is not available
     @{vdur_list}=  Get Vnf Vdur Names  ${vnf_id}
@@ -110,19 +118,19 @@ Check Vdus After Scaling In
 
 
 Delete NS Instance
-    [Tags]   advanced_scaling   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NS  ${ns_name}
 
 
 Delete NS Descriptor
-    [Tags]   advanced_scaling   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NSD  ${nsd_name}
 
 
 Delete VNF Descriptor
-    [Tags]   advanced_scaling   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete VNFD  ${vnfd_name}