X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fcli%2FTS04__Hackfest_Simplecharm_NS.robot;h=2a2247880301328bab2aea5c2f0edfd5e00e7e1e;hb=50d786e60c1399ab4b1d9141b20f59e7d394ad9a;hp=6534debafbbda7dcf69b0e33e09ceb60b8bb0832;hpb=3f7f46ab7bf67ceb7d3c9a7f2c2aef5c2dea409d;p=osm%2Fdevops.git

diff --git a/robot-systest/testsuite/cli/TS04__Hackfest_Simplecharm_NS.robot b/robot-systest/testsuite/cli/TS04__Hackfest_Simplecharm_NS.robot
index 6534deba..2a224788 100644
--- a/robot-systest/testsuite/cli/TS04__Hackfest_Simplecharm_NS.robot
+++ b/robot-systest/testsuite/cli/TS04__Hackfest_Simplecharm_NS.robot
@@ -70,12 +70,18 @@ Create Hackfest Simple Charm NS Descriptor
 Network Service Instance Test
     [Documentation]  Launch and terminate network services
     [Tags]   hackfest_simplecharm    comprehensive
-    [Teardown]  Run Keyword And Ignore Error    Network Service Instance Cleanup
 
     :FOR    ${vim_name}    IN    @{vim}
     \    Launch Network Services and Return    ${vim_name}
 
 
+Delete NS Instance Test
+    [Tags]    comprehensive   hackfest_simplecharm
+
+    :FOR    ${ns}  IN   @{ns_ids}
+    \   Delete NS   ${ns}
+
+
 Delete NS Descriptor Test
     [Tags]   hackfest_simplecharm    comprehensive
 
@@ -92,17 +98,16 @@ Delete VNF Descriptor Test
 
 *** Keywords ***
 Test Cleanup
-    [Documentation]  Test Suit Cleanup: Forcefully delete NSD and VNFD
-
-    :FOR    ${nsd}  IN   @{nsd_ids}
-    \   Force Delete NSD      ${nsd_id}
+    [Documentation]  Test Suit Cleanup: Deliting Descriptor, instance and vim
 
-    :FOR    ${vnfd_id}  IN   @{vnfd_ids}
-    \   Force Delete VNFD     ${vnfd_id}
+    :FOR    ${ns}  IN   @{ns_ids}
+    \   Delete NS   ${ns}
 
+    :FOR    ${nsd}  IN   @{nsd_ids}
+    \   Delete NSD      ${nsd}
 
-Network Service Instance Cleanup
-    [Documentation]  Forcefully delete created network service instances and vim account
+    :FOR    ${vnfd}  IN   @{vnfd_ids}
+    \   Delete VNFD     ${vnfd}
 
-    :FOR    ${ns_id}  IN   @{ns_ids}
-    \   Force Delete NS   ${ns_id}
+#    :FOR    ${vim_id}  IN   @{vim}
+#    \   Delete Vim Account    ${vim_id}