X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fk8s_03-simple_k8s.robot;h=94ad3a2bcc56e68b46328f02ee708acd5b9cdde5;hb=refs%2Fchanges%2F73%2F12773%2F1;hp=6fd6551d2b46bea8f91079847e86312868302946;hpb=f96bb45c0a03f2188688d90d67ea718851cec2de;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 6fd6551..94ad3a2 100644
--- a/robot-systest/testsuite/k8s_03-simple_k8s.robot
+++ b/robot-systest/testsuite/k8s_03-simple_k8s.robot
@@ -1,3 +1,5 @@
+#   Copyright 2020 Canonical Ltd.
+#
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 #   You may obtain a copy of the License at
@@ -11,6 +13,8 @@
 #   limitations under the License.
 
 *** Settings ***
+Documentation   [K8s-03] Simple K8s.
+
 Library   OperatingSystem
 Library   String
 Library   Collections
@@ -19,60 +23,73 @@ Library   Process
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/vnfd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
+Resource   %{ROBOT_DEVOPS_FOLDER}/lib/package_lib.robot
 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}
+# 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
+${kdu_name}   native-kdu
+${application_name}   nginx
+${customtitle}   Day 2 Action
 
 *** Test Cases ***
 Create Simple K8s VNF Descriptor
-    [Tags]   simple_k8s
     Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 Create Simple K8s Descriptor
-    [Tags]   simple_k8s
     Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
-Add K8s Cluster To OSM
-    [Tags]   k8scluster
-    Create K8s Cluster  %{K8S_CREDENTIALS}  ${k8scluster_version}  %{VIM_TARGET}  %{VIM_MGMT_NET}  ${k8scluster_name}
-
 Network Service K8s Instance Test
-    [Tags]   simple_k8s
-    ${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}
 
+Execute Day 2 Operations
+    [Documentation]   Performs one Day 2 operation per VNF that creates a new file.
+
+    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   cleanup
+    [Tags]   cleanup
     Delete NS   ${ns_name}
 
-Remove K8s Cluster from OSM
-    [Tags]   k8scluster
-    Delete K8s Cluster  ${k8scluster_name}
-
 Delete NS Descriptor Test
-    [Tags]   simple_k8s   cleanup
+    [Tags]   cleanup
     Delete NSD   ${nsd_name}
 
 Delete VNF Descriptor Test
-    [Tags]   simple_k8s   cleanup
+    [Tags]   cleanup
     Delete VNFD   ${vnfd_name}
 
-
-*** Keywords ***
-Test 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}
+Delete VNF NS Packages
+    [Tags]   cleanup
+    Delete Package   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
+    Delete Package   '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
+*** 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}