Bug 873: Robot Automation Improvement
1. Create a separate test to delete NS instance, extracted from NS launch test
2. Include test suite to test network slicing using NST
3. Include Platform Recovery & Resiliency Test
4. Include RBAC for platform test which require to update nbi docker service that is govern by stage-3 pipeline jobs under robot test

Change-Id: I5cd6f4fca78ad2d514b3e01aae630c083fbaf4e2
Signed-off-by: yadavmr <my00514913@techmahindra.com>
diff --git a/robot-systest/testsuite/cli/TS01__Test_VNF.robot b/robot-systest/testsuite/cli/TS01__Test_VNF.robot
index 4059cff..84e1f92 100644
--- a/robot-systest/testsuite/cli/TS01__Test_VNF.robot
+++ b/robot-systest/testsuite/cli/TS01__Test_VNF.robot
@@ -64,12 +64,18 @@
 Network Service Instance Test
     [Documentation]  Launch and terminate network services
     [Tags]    sanity
-    [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]    sanity
+
+    :FOR    ${ns}  IN   @{ns_ids}
+    \   Delete NS   ${ns}
+
+
 Delete NS Descriptor Test
     [Tags]    sanity     smoke
 
@@ -86,17 +92,16 @@
 
 *** Keywords ***
 Test Cleanup
-    [Documentation]  Test Suit Cleanup: Forcefully delete NSD and VNFD
-
-    :FOR    ${nsd}  IN   @{nsd_ids}
-    \   Force Delete NSD      ${nsd}
-
-    :FOR    ${vnfd}  IN   @{vnfd_ids}
-    \   Force Delete VNFD     ${vnfd}
-
-
-Network Service Instance Cleanup
-    [Documentation]  Forcefully delete created network service instances and vim account
+    [Documentation]  Test Suit Cleanup: Deliting Descriptor, instance and vim
 
     :FOR    ${ns}  IN   @{ns_ids}
-    \   Force Delete NS   ${ns}
+    \   Delete NS   ${ns}
+
+    :FOR    ${nsd}  IN   @{nsd_ids}
+    \   Delete NSD      ${nsd}
+
+    :FOR    ${vnfd}  IN   @{vnfd_ids}
+    \   Delete VNFD     ${vnfd}
+
+#    :FOR    ${vim_id}  IN   @{vim}
+#    \   Delete Vim Account    ${vim_id}