Revert "ns_lib: new env variable to set NS instantiation timeout for testing"

[osm/tests.git] / robot-systest / testsuite / k8s_03-simple_k8s.robot

diff --git a/robot-systest/testsuite/k8s_03-simple_k8s.robot b/robot-systest/testsuite/k8s_03-simple_k8s.robot
index 081219d..7d082c2 100644 (file)
--- a/robot-systest/testsuite/k8s_03-simple_k8s.robot
+++ b/robot-systest/testsuite/k8s_03-simple_k8s.robot
@@ -28,7 +28,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/k8s_03-simple_k8s_data.py
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
@@ -44,11 +44,11 @@ ${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
@@ -66,7 +66,6 @@ Execute Day 2 Operations
     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
     Delete NS   ${ns_name}
@@ -90,9 +89,9 @@ Delete VNF NS Packages
 
 
 *** 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}