X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_09-manual_vdu_scaling.robot;h=fe99726c76bcd5b2e810bd9c14c87078cb412c58;hb=f25782945b1e3db0a2442c572a5f8607bb42460e;hp=b81e70f3f502ab8854db63af8007ab7839c4d523;hpb=f96bb45c0a03f2188688d90d67ea718851cec2de;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/basic_09-manual_vdu_scaling.robot b/robot-systest/testsuite/basic_09-manual_vdu_scaling.robot
index b81e70f..fe99726 100644
--- a/robot-systest/testsuite/basic_09-manual_vdu_scaling.robot
+++ b/robot-systest/testsuite/basic_09-manual_vdu_scaling.robot
@@ -22,40 +22,50 @@ 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_09-manual_vdu_scaling_data.py
+Force Tags   basic_09   cluster_main   daily   regression
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+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_09_manual_scaling_test
 ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 ${scaling_group}   vdu_autoscale
-${vnf_member_index}  1
+${vnf_member_index}  vnf
+
+# SSH public key file
+${publickey}   %{HOME}/.ssh/id_rsa.pub
 
 
 *** Test Cases ***
 Create Scaling VNF Descriptor
-    [Tags]   manual_scaling   sanity   regression
-
+    [Tags]   prepare
     Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 
 Create Scaling NS Descriptor
-    [Tags]   manual_scaling   sanity   regression
-
+    [Tags]   prepare
     Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
 Instantiate Scaling Network Service
-    [Tags]   manual_scaling   sanity   regression
-
+    [Tags]   prepare
     ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${publickey}
-    Set Suite Variable  ${ns_id}  ${id}
 
+Get Ns Id
+    [Tags]   verify
+    ${id}=   Get Ns Id   ${ns_name}
+    Set Suite Variable   ${ns_id}   ${id}
 
 Get Vnf Id
-    [Tags]   manual_scaling   sanity   regression
-
+    [Tags]   verify
     Variable Should Exist  ${ns_id}  msg=Network service instance is not available
     @{vnfr_list}=  Get Ns Vnfr Ids  ${ns_id}
     Log List  ${vnfr_list}
@@ -63,8 +73,8 @@ Get Vnf Id
 
 
 Get Vdus Before Scale Out
+    [Tags]   verify
     [Documentation]     Get the number of VDU records before the manual scaling.
-    [Tags]   manual_scaling   sanity   regression
 
     @{vdur_list}=  Get Vnf Vdur Names  ${vnf_id}
     Log List  ${vdur_list}
@@ -73,15 +83,14 @@ Get Vdus Before Scale Out
 
 
 Perform Manual Vdu Scale Out
-    [Tags]   manual_scaling   sanity   regression
-
+    [Tags]   verify
     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
 
 
 Check Vdus After Scale Out
+    [Tags]   verify
     [Documentation]     Check whether there is one more VDU after scaling or not.
-    [Tags]   manual_scaling   sanity   regression
 
     Variable Should Exist  ${ns_id}  msg=Network service instance is not available
     @{vdur_list}=  Get Vnf Vdur Names  ${vnf_id}
@@ -91,15 +100,14 @@ Check Vdus After Scale Out
 
 
 Perform Manual Vdu Scale In
-    [Tags]   manual_scaling   sanity   regression
-
+    [Tags]   verify
     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
 
 
 Check Vdus After Scaling In
+    [Tags]   verify
     [Documentation]     Check whether there is one less VDU after scaling or not.
-    [Tags]   manual_scaling   sanity   regression
 
     Variable Should Exist  ${ns_id}  msg=Network service instance is not available
     @{vdur_list}=  Get Vnf Vdur Names  ${vnf_id}
@@ -109,30 +117,30 @@ Check Vdus After Scaling In
 
 
 Delete NS Instance
-    [Tags]   manual_scaling   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NS  ${ns_name}
 
 
 Delete NS Descriptor
-    [Tags]   manual_scaling   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NSD  ${nsd_name}
 
 
 Delete VNF Descriptor
-    [Tags]   manual_scaling   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete VNFD  ${vnfd_name}
 
 
 *** Keywords ***
-Test Cleanup
+Suite Cleanup
     [Documentation]  Test Suite Cleanup: Deleting descriptors and NS instance
 
-    Run Keyword If Test Failed  Delete NS  ${ns_name}
+    Run Keyword If Any Tests Failed  Delete NS  ${ns_name}
 
-    Run Keyword If Test Failed  Delete NSD  ${nsd_name}
+    Run Keyword If Any Tests Failed  Delete NSD  ${nsd_name}
 
-    Run Keyword If Test Failed  Delete VNFD  ${vnfd_name}
+    Run Keyword If Any Tests Failed  Delete VNFD  ${vnfd_name}