X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fcli%2FTS07__Hackfest_EPA_NS.robot;h=53165985fea614e8026c5fb2187e249755bba531;hb=50d786e60c1399ab4b1d9141b20f59e7d394ad9a;hp=4d7f12de0ed607dadf6fc0feb1967382f17c0b2c;hpb=3f7f46ab7bf67ceb7d3c9a7f2c2aef5c2dea409d;p=osm%2Fdevops.git

diff --git a/robot-systest/testsuite/cli/TS07__Hackfest_EPA_NS.robot b/robot-systest/testsuite/cli/TS07__Hackfest_EPA_NS.robot
index 4d7f12de..53165985 100644
--- a/robot-systest/testsuite/cli/TS07__Hackfest_EPA_NS.robot
+++ b/robot-systest/testsuite/cli/TS07__Hackfest_EPA_NS.robot
@@ -65,12 +65,18 @@ Create Hackfest EPA NS Descriptor
 Network Service Instance Test
     [Documentation]  Launch and terminate network services
     [Tags]    hackfest_epa
-    [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]    hackfest_epa
+
+    :FOR    ${ns}  IN   @{ns_ids}
+    \   Delete NS   ${ns}
+
+
 Delete NS Descriptor Test
     [Tags]    hackfest_epa
 
@@ -87,17 +93,16 @@ Delete VNF Descriptor Test
 
 *** Keywords ***
 Test Cleanup
-    [Documentation]  Test Suit Cleanup: Forcefully delete NSD and VNFD
+    [Documentation]  Test Suit Cleanup: Deliting Descriptor, instance and vim
 
-    :FOR    ${nsd}  IN   @{nsd_ids}
-    \   Force Delete NSD      ${nsd_id}
-
-    :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}