X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fk8s_08-simple_k8s_scaling.robot;h=90171a198b8fd2d212966c1def19f475c0c1f566;hb=40744a476f4335d2107866db5ab1d5f6d35f9851;hp=b2d33dff4e89e88e40a783a366136e5653c7d91e;hpb=71e24ea27944fdc3710aa5eb744c308486f060d7;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/k8s_08-simple_k8s_scaling.robot b/robot-systest/testsuite/k8s_08-simple_k8s_scaling.robot
index b2d33df..90171a1 100644
--- a/robot-systest/testsuite/k8s_08-simple_k8s_scaling.robot
+++ b/robot-systest/testsuite/k8s_08-simple_k8s_scaling.robot
@@ -11,7 +11,7 @@
 #   limitations under the License.
 
 *** Settings ***
-Documentation     [K8s-08] Simple K8s Scale.
+Documentation   [K8s-08] Simple K8s Scale.
 
 Library   OperatingSystem
 Library   String
@@ -32,19 +32,20 @@ Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# K8s cluster name and version
-${k8scluster_name}   k8s-test
-${k8scluster_version}   v1
-
 # NS and VNF descriptor package folder and ids
 ${vnfd_pkg}   charm-packages/native_k8s_scale_charm_vnf
 ${vnfd_name}   native_k8s_scale_charm-vnf
 ${nsd_pkg}   charm-packages/native_k8s_scale_charm_ns
 ${nsd_name}   native_k8s_scale_charm-ns
 
+${kdu_name}   native-kdu
+${application_name}   nginx
+${vnf_member_index}   native_k8s_scale_charm-vnf
+${instantiation_count}   2
+
 # NS instance name and configuration
 ${ns_name}   native-k8s-scale
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ], additionalParamsForVnf: [{member-vnf-index: ${vnf_member_index}, additionalParamsForKdu: [{ kdu_name: ${kdu_name}, additionalParams: { overlay: { applications: { ${application_name}: { scale: ${instantiation_count} } }}}}]}]}
 ${ns_id}   ${EMPTY}
 ${publickey}   %{HOME}/.ssh/id_rsa.pub
 
@@ -54,10 +55,7 @@ ${password}   ${EMPTY}
 ${privatekey}   %{OSM_RSA_FILE}
 
 ${model_name}   ${EMPTY}
-${vnf_member_index}   native_k8s_scale_charm-vnf
 ${action_name}   changecontent
-${kdu_name}   native-kdu
-${application_name}   nginx
 ${scaling_group}   scale-kdu
 
 *** Test Cases ***
@@ -67,58 +65,52 @@ Create Simple K8s Scale VNF Descriptor
 Create Simple K8s Scale NS Descriptor
     Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
-Add K8s Cluster To OSM
-    Create K8s Cluster  %{K8S_CREDENTIALS}  ${k8scluster_version}  %{VIM_TARGET}  %{VIM_MGMT_NET}  ${k8scluster_name}
-
 Network Service K8s Instance Test
-    ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}  ${publickey}
+    ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}   ${publickey}
     Set Suite Variable   ${ns_id}   ${id}
 
 Get KDU Model Name
-    [Documentation]     Get the model name of the network service k8s instance
+    [Documentation]   Get the model name of the network service k8s instance
 
-    Variable Should Exist   ${ns_id}  msg=Network service instance is not available
+    Variable Should Exist   ${ns_id}   msg=Network service instance is not available
     ${name}=   Get Model Name   %{OSM_HOSTNAME}   ${username}   ${password}   ${privatekey}   ${ns_id}   ${kdu_name}
     Set Suite Variable   ${model_name}   ${name}
 
 Get Scale Count Before Scale Out
-    [Documentation]     Get the scale count of the application of network service k8s instance
+    [Documentation]   Get the scale count of the application of network service k8s instance
 
-    Variable Should Exist   ${model_name}  msg=Model name is not available
-    ${kdu_count}=  Get Scale Number   %{OSM_HOSTNAME}   ${username}   ${password}   ${privatekey}   ${application_name}   ${model_name}
-    Set Suite Variable  ${initial_kdu_count}  ${kdu_count}
+    Variable Should Exist   ${model_name}   msg=Model name is not available
+    ${kdu_count}=   Get Scale Number   %{OSM_HOSTNAME}   ${username}   ${password}   ${privatekey}   ${application_name}   ${model_name}
+    Set Suite Variable   ${initial_kdu_count}   ${kdu_count}
+    Run Keyword If   ${initial_kdu_count} != ${instantiation_count}   Fail   msg=Instantiation parameters were not applied.
 
 Perform Manual KDU Scale Out
-    [Documentation]     Scale out the application of network service k8s instance.
+    [Documentation]   Scale out the application of network service k8s instance.
 
-    ${ns_op_id_2}=   Execute Manual VNF Scale  ${ns_name}  ${vnf_member_index}  ${scaling_group}  SCALE_OUT
+    ${ns_op_id_2}=   Execute Manual VNF Scale   ${ns_name}   ${vnf_member_index}   ${scaling_group}   SCALE_OUT
 
 Check Scale Count After Scale Out
-    [Documentation]     Check whether the scale count is more than one.
+    [Documentation]   Check whether the scale count is more than one.
 
-    Variable Should Exist  ${initial_kdu_count}  msg=Initial KDU count is not available
-    ${kdu_count}=  Get Scale Number   %{OSM_HOSTNAME}   ${username}   ${password}   ${privatekey}   ${application_name}   ${model_name}
-    Run Keyword Unless  ${kdu_count} == ${initial_kdu_count} + 1  Fail  msg=There is no new KDU in the model after Scale Out
+    Variable Should Exist   ${initial_kdu_count}   msg=Initial KDU count is not available
+    ${kdu_count}=   Get Scale Number   %{OSM_HOSTNAME}   ${username}   ${password}   ${privatekey}   ${application_name}   ${model_name}
+    Run Keyword If   ${kdu_count} != ${initial_kdu_count} + 1   Fail   msg=There is no new KDU in the model after Scale Out
 
 Perform Manual KDU Scale In
-    [Documentation]     Scale in the application of network service k8s instance.
+    [Documentation]   Scale in the application of network service k8s instance.
 
-    ${ns_op_id_3}=   Execute Manual VNF Scale  ${ns_name}  ${vnf_member_index}  ${scaling_group}  SCALE_IN
+    ${ns_op_id_3}=   Execute Manual VNF Scale   ${ns_name}   ${vnf_member_index}   ${scaling_group}   SCALE_IN
 
 Check Scale Count After Scale In
-    [Documentation]     Check whether the scale count is one less.
+    [Documentation]   Check whether the scale count is one less.
 
-    ${kdu_count}=  Get Scale Number   %{OSM_HOSTNAME}   ${username}   ${password}   ${privatekey}   ${application_name}   ${model_name}
-    Run Keyword Unless  ${kdu_count} == ${initial_kdu_count}  Fail  msg=There is the same number of KDU in the model after Scale In
+    ${kdu_count}=   Get Scale Number   %{OSM_HOSTNAME}   ${username}   ${password}   ${privatekey}   ${application_name}   ${model_name}
+    Run Keyword If   ${kdu_count} != ${initial_kdu_count}   Fail   msg=There is the same number of KDU in the model after Scale In
 
 Delete NS K8s Instance Test
     [Tags]   cleanup
     Delete NS   ${ns_name}
 
-Remove K8s Cluster from OSM
-    [Tags]   cleanup
-    Delete K8s Cluster  ${k8scluster_name}
-
 Delete NS Descriptor Test
     [Tags]   cleanup
     Delete NSD   ${nsd_name}
@@ -130,8 +122,7 @@ Delete VNF Descriptor Test
 
 *** Keywords ***
 Suite Cleanup
-    [Documentation]  Test Suit Cleanup: Deleting Descriptor, instance and vim
-    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 K8s Cluster   ${k8scluster_name}
+    [Documentation]   Test Suit Cleanup: Deleting Descriptor, instance and vim
+    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}