X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fk8s_03-simple_k8s.robot;h=e308d1682ec0e9f84024fd828bcfbae35cd56feb;hb=12136271111872aef81e5473c5c25ae2b3599403;hp=081219d97f6352326b0e27f61b22b79f9e90c908;hpb=a07c2b3216f2cee90802e2cddc4eb06a7eae372c;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/k8s_03-simple_k8s.robot b/robot-systest/testsuite/k8s_03-simple_k8s.robot
index 081219d..e308d16 100644
--- a/robot-systest/testsuite/k8s_03-simple_k8s.robot
+++ b/robot-systest/testsuite/k8s_03-simple_k8s.robot
@@ -13,6 +13,8 @@
 #   limitations under the License.
 
 *** Settings ***
+Documentation     [K8s-03] Simple K8s.
+
 Library   OperatingSystem
 Library   String
 Library   Collections
@@ -26,14 +28,27 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/connectivity_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
 
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/k8s_03-simple_k8s_data.py
+Force Tags   k8s_03   cluster_k8s   daily   regression   sanity
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-${ns_id}   ${EMPTY}
+# 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_charm_vnf
+${vnfd_name}   native_k8s_charm-vnf
+${nsd_pkg}   charm-packages/native_k8s_charm_ns
+${nsd_name}   native_k8s_charm-ns
+
+# NS instance name and configuration
+${ns_name}   native-k8s
 ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+
+${ns_id}   ${EMPTY}
 ${publickey}   ${EMPTY}
 ${vnf_member_index}   native_k8s_charm-vnf
 ${action_name}   changecontent
@@ -43,56 +58,50 @@ ${customtitle}   Day 2 Action
 
 *** Test Cases ***
 Create Simple K8s VNF Descriptor
-    [Tags]   simple_k8s   charm   sanity   regression
-    Upload Package   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
+    Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 Create Simple K8s Descriptor
-    [Tags]   simple_k8s   charm   sanity   regression
-    Upload Package   '%{PACKAGES_FOLDER}/${nsd_pkg}'
+    Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 Add K8s Cluster To OSM
-    [Tags]   simple_k8s   charm   sanity   regression
     Create K8s Cluster  %{K8S_CREDENTIALS}  ${k8scluster_version}  %{VIM_TARGET}  %{VIM_MGMT_NET}  ${k8scluster_name}
 
 Network Service K8s Instance Test
-    [Tags]   simple_k8s   charm   sanity   regression
     ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}  ${publickey}
     Set Suite Variable   ${ns_id}   ${id}
 
 Execute Day 2 Operations
     [Documentation]     Performs one Day 2 operation per VNF that creates a new file.
-    [Tags]   simple_k8s   charm   sanity   regression
 
     Variable Should Exist  ${ns_id}  msg=Network service instance is not available
     ${ns_op_id}=  Execute NS K8s Action  ${ns_name}  ${action_name}  ${vnf_member_index}  ${kdu_name}  application-name=${application_name}  customtitle=${customtitle}
 
-
 Delete NS K8s Instance Test
-    [Tags]   simple_k8s   charm   sanity   regression   cleanup
+    [Tags]   cleanup
     Delete NS   ${ns_name}
 
 Remove K8s Cluster from OSM
-    [Tags]   simple_k8s   charm   sanity   regression
+    [Tags]   cleanup
     Delete K8s Cluster  ${k8scluster_name}
 
 Delete NS Descriptor Test
-    [Tags]   simple_k8s   charm   sanity   regression   cleanup
+    [Tags]   cleanup
     Delete NSD   ${nsd_name}
 
 Delete VNF Descriptor Test
-    [Tags]   simple_k8s   charm   sanity   regression   cleanup
+    [Tags]   cleanup
     Delete VNFD   ${vnfd_name}
 
 Delete VNF NS Packages
-    [Tags]   simple_k8s   charm   sanity   regression   cleanup
+    [Tags]   cleanup
     Delete Package   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
     Delete Package   '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
 *** Keywords ***
-Test Cleanup
+Suite Cleanup
     [Documentation]  Test Suit Cleanup: Deleting Descriptor, instance and vim
-    Run Keyword If Test Failed  Delete NS   ${ns_name}
-    Run Keyword If Test Failed  Delete NSD   ${nsd_name}
-    Run Keyword If Test Failed  Delete VNFD   ${vnfd_name}
-    Run Keyword If Test Failed  Delete K8s Cluster   ${k8scluster_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 VNFD   ${vnfd_name}
+    Run Keyword If Any Tests Failed  Delete K8s Cluster   ${k8scluster_name}