X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_20-manual_native_charm_vdu_scaling.robot;h=3637f561a79f18da9b842154a3edee8f2a4cce2e;hb=56e5d13508a4d0988fee261dedbd35381270239a;hp=f270617b0378b5f37dc5755e67174e20a9c4dce6;hpb=e621de67c631e6a103c9dd4515749976973a59fa;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/basic_20-manual_native_charm_vdu_scaling.robot b/robot-systest/testsuite/basic_20-manual_native_charm_vdu_scaling.robot
index f270617..3637f56 100644
--- a/robot-systest/testsuite/basic_20-manual_native_charm_vdu_scaling.robot
+++ b/robot-systest/testsuite/basic_20-manual_native_charm_vdu_scaling.robot
@@ -37,7 +37,7 @@ ${nsd_name}   native_manual_scale_charm-ns
 # NS instance name and configuration
 ${ns_name}   basic_20_manual_vdu_scaling_test
 ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-${vnf_member_index}  1
+${vnf_member_index}  vnf
 
 # SSH public key file
 ${publickey}   %{HOME}/.ssh/id_rsa.pub
@@ -45,6 +45,8 @@ ${publickey}   %{HOME}/.ssh/id_rsa.pub
 # Scaling group name of VDU instances
 ${scaling_group}   manual-scaling_mgmtVM
 
+${scale_wait_time}   4min
+
 *** Test Cases ***
 Create VNF Descriptor
 
@@ -93,19 +95,10 @@ Check Number of Duplicated Application Name Before Scale Out
     Run Keyword Unless  ${count_duplicated} == 2  Fail  msg=There are not 2 application name in the application list before Scale Out
 
 
-Check Number of not Duplicated Application Name Before Scale Out
-    [Documentation]    Check the application if there is only one application in the Juju model.
-
-    ${app_list}=  Remove Duplicates  ${application_list}
-    Log List  ${app_list}
-    ${count}=  Get Length  ${app_list}
-    Run Keyword Unless  1 == ${count}  Fail  msg=There is not only 1 application in the Juju model before Scale Out
-
-
 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
+    ${ns_op_id}=  Execute Manual VNF Scale  ${ns_name}  ${vnf_member_index}  ${scaling_group}  SCALE_OUT  ${scale_wait_time}
 
 
 Check Vdus After Scale Out
@@ -133,15 +126,6 @@ Check Number of Duplicated Application Name After Scale Out
     Run Keyword Unless  ${count_duplicated} == 3  Fail  msg=There are not 2 application name in the application list after Scale Out
 
 
-Check Number of not Duplicated Application Name After Scale Out
-    [Documentation]    Check the application if there is only one application in the Juju model.
-
-    ${app_list}=  Remove Duplicates  ${application_list}
-    Log List  ${app_list}
-    ${count}=  Get Length  ${app_list}
-    Run Keyword Unless  1 == ${count}  Fail  msg=There is not only 1 application in the Juju model after Scale Out
-
-
 Perform Manual Vdu Scale In
 
     Variable Should Exist  ${ns_id}  msg=Network service instance is not available
@@ -173,15 +157,6 @@ Check Number of Duplicated Application Name After Scale In
     Run Keyword Unless  ${count_duplicated} == 2  Fail  msg=There are not 2 application name in the application list after Scale In
 
 
-Check Number of not Duplicated Application Name After Scale In
-    [Documentation]    Check the application if there is only one application in the Juju model.
-
-    ${app_list}=  Remove Duplicates  ${application_list}
-    Log List  ${app_list}
-    ${count}=  Get Length  ${app_list}
-    Run Keyword Unless  1 == ${count}  Fail  msg=There is not only 1 application in the Juju model after Scale In
-
-
 Delete NS Instance
     [Tags]   cleanup