X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_20-manual_native_charm_vdu_scaling.robot;h=cb3609f3776e8cf0678794202ccf967db2539ce8;hb=fccb028b493afafb8a602953ed5125303423d3ff;hp=6ac3a9b639c6a1ec3dab0eca45df205c8eba17e0;hpb=3fd34dd479042990bd6a8b50be9a95b07ed9d587;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 6ac3a9b..cb3609f 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
@@ -11,7 +11,7 @@
 #   limitations under the License.
 
 *** Settings ***
-Documentation     [BASIC-20] Manual VDU Scaling to test juju applications are scaling for native charms (testing Bug-1609).
+Documentation   [BASIC-20] Manual VDU Scaling to test juju applications are scaling for native charms (testing Bug-1609).
 
 Library   OperatingSystem
 Library   String
@@ -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
@@ -50,165 +50,138 @@ ${scale_wait_time}   4min
 *** Test Cases ***
 Create VNF Descriptor
 
-    Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'
+    Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 Create NS Descriptor
 
-    Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
+    Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
 Instantiate Network Service
 
-    ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${publickey}
-    Set Suite Variable  ${ns_id}  ${id}
+    ${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}
-    Log List  ${vnfr_list}
-    Set Suite Variable  ${vnf_id}  ${vnfr_list}[0]
+    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]
 
 
 Get Vdus Before Scale Out
-    [Documentation]     Get the number of VDU records before the manual scaling.
+    [Documentation]   Get the number of VDU records before the manual scaling.
 
-    @{vdur_list}=  Get Vnf Vdur Names  ${vnf_id}
-    Log List  ${vdur_list}
-    ${vdurs}=  Get Length  ${vdur_list}
-    Set Suite Variable  ${initial_vdur_count}  ${vdurs}
+    @{vdur_list}=   Get Vnf Vdur Names   ${vnf_id}
+    Log List   ${vdur_list}
+    ${vdurs}=   Get Length   ${vdur_list}
+    Set Suite Variable   ${initial_vdur_count}   ${vdurs}
 
 
 Get Application Name Before Scale Out
-    [Documentation]    Get the application names.
+    [Documentation]   Get the application names.
 
-    @{name_list}=  Get Application Names  ${ns_name}
-    Log List  ${name_list}
-    Set Suite Variable  ${application_list}  ${name_list}
+    @{name_list}=   Get Application Names   ${ns_name}
+    Log List   ${name_list}
+    Set Suite Variable   ${application_list}   ${name_list}
 
 
 Check Number of Duplicated Application Name Before Scale Out
-    [Documentation]    Check the application names if there are 2 application name in the application list.
+    [Documentation]   Check the application names if there are 2 application name in the application list.
 
-    ${count_duplicated}=  Get Length  ${application_list}
-    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
+    ${count_duplicated}=   Get Length   ${application_list}
+    Run Keyword If   ${count_duplicated} != 2   Fail   msg=There are not 2 application name in the application list 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  ${scale_wait_time}
+    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   ${scale_wait_time}
 
 
 Check Vdus After Scale Out
-    [Documentation]     Check whether there is one more VDU after scaling or not.
+    [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}
-    Log List  ${vdur_list}
-    ${vdurs}=  Get Length  ${vdur_list}
-    Run Keyword Unless  ${vdurs} == ${initial_vdur_count} + 1  Fail  msg=There is no new VDU records in the VNF after Scale 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} + 1   Fail   msg=There is no new VDU records in the VNF after Scale Out
 
 
 Get Application Name After Scale Out
-    [Documentation]    Get the application names.
+    [Documentation]   Get the application names.
 
-    @{name_list}=  Get Application Names  ${ns_name}
-    Log List  ${name_list}
-    Set Suite Variable  ${application_list}  ${name_list}
+    @{name_list}=   Get Application Names   ${ns_name}
+    Log List   ${name_list}
+    Set Suite Variable   ${application_list}   ${name_list}
 
 
 Check Number of Duplicated Application Name After Scale Out
-    [Documentation]    Check the application names if there are 3 application name in the application list.
-
-    ${count_duplicated}=  Get Length  ${application_list}
-    Run Keyword Unless  ${count_duplicated} == 3  Fail  msg=There are not 2 application name in the application list after Scale Out
-
+    [Documentation]   Check the application names if there are 3 application name in the application list.
 
-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
+    ${count_duplicated}=   Get Length   ${application_list}
+    Run Keyword If   ${count_duplicated} != 3   Fail   msg=There are not 2 application name in the application list after Scale Out
 
 
 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
+    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
-    [Documentation]     Check whether there is one less VDU after scaling or not.
+    [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}
-    Log List  ${vdur_list}
-    ${vdurs}=  Get Length  ${vdur_list}
-    Run Keyword Unless  ${vdurs} == ${initial_vdur_count}  Fail  msg=There is the same number of VDU records in the VNF after Scale 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
 
 
 Get Application Name After Scale In
-    [Documentation]    Get the application names.
+    [Documentation]   Get the application names.
 
-    @{name_list}=  Get Application Names  ${ns_name}
-    Log List  ${name_list}
-    Set Suite Variable  ${application_list}  ${name_list}
+    @{name_list}=   Get Application Names   ${ns_name}
+    Log List   ${name_list}
+    Set Suite Variable   ${application_list}   ${name_list}
 
 
 Check Number of Duplicated Application Name After Scale In
-    [Documentation]    Check the application names if there are 2 application name in the application list.
-
-    ${count_duplicated}=  Get Length  ${application_list}
-    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.
+    [Documentation]   Check the application names if there are 2 application name in the application list.
 
-    ${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
+    ${count_duplicated}=   Get Length   ${application_list}
+    Run Keyword If   ${count_duplicated} != 2   Fail   msg=There are not 2 application name in the application list after Scale In
 
 
 Delete NS Instance
     [Tags]   cleanup
 
-    Delete NS  ${ns_name}
+    Delete NS   ${ns_name}
 
 
 Delete NS Descriptor
     [Tags]   cleanup
 
-    Delete NSD  ${nsd_name}
+    Delete NSD   ${nsd_name}
 
 
 Delete VNF Descriptor
     [Tags]   cleanup
 
-    Delete VNFD  ${vnfd_name}
+    Delete VNFD   ${vnfd_name}
 
 
 *** Keywords ***
 Suite Cleanup
-    [Documentation]  Test Suite Cleanup: Deleting descriptors and NS instance
+    [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 NS   ${ns_name}
 
-    Run Keyword If Any Tests Failed  Delete NSD  ${nsd_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 VNFD   ${vnfd_name}