X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fk8s_03-simple_k8s.robot;h=94ad3a2bcc56e68b46328f02ee708acd5b9cdde5;hb=8ceaee06848023c31ec4a18becff9ab8ff5d517f;hp=e308d1682ec0e9f84024fd828bcfbae35cd56feb;hpb=b4697d33398409acad5640cf0f616fe8b8912e48;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 e308d16..94ad3a2 100644
--- a/robot-systest/testsuite/k8s_03-simple_k8s.robot
+++ b/robot-systest/testsuite/k8s_03-simple_k8s.robot
@@ -13,7 +13,7 @@
 #   limitations under the License.
 
 *** Settings ***
-Documentation     [K8s-03] Simple K8s.
+Documentation   [K8s-03] Simple K8s.
 
 Library   OperatingSystem
 Library   String
@@ -34,10 +34,6 @@ 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_charm_vnf
 ${vnfd_name}   native_k8s_charm-vnf
@@ -63,27 +59,20 @@ Create Simple K8s VNF Descriptor
 Create Simple K8s 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}
 
 Execute Day 2 Operations
-    [Documentation]     Performs one Day 2 operation per VNF that creates a new file.
+    [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}
+    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]   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}
@@ -100,8 +89,7 @@ Delete VNF NS Packages
 
 *** 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}