From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Fri, 2 Oct 2020 20:50:49 +0000 (+0000)
Subject: Improved cleanup of slice_01 and slice_02 tests
X-Git-Tag: release-v9.0-start~15
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=1508145b35a553b357abfbfac57e58bc00d6d9e0;p=osm%2Ftests.git

Improved cleanup of slice_01 and slice_02 tests

Change-Id: Ib5c6b0493021b08a0f7ca3681ff58a1f65c3422a
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/robot-systest/testsuite/slice_01-network_slicing.robot b/robot-systest/testsuite/slice_01-network_slicing.robot
index 5dac832..09c7929 100644
--- a/robot-systest/testsuite/slice_01-network_slicing.robot
+++ b/robot-systest/testsuite/slice_01-network_slicing.robot
@@ -137,7 +137,7 @@ Test Slice Connectivity
     Ping Many   ${mgmt_vnf_ip}  ${username}  ${password}  ${privatekey}   @{slice_vnfs_ips}
 
 
-Stop Slice Instance
+Delete Slice Instance
     [Documentation]   Stops the slice instance (slice_name)
 
     [Tags]   basic_network_slicing   SLICING-01   sanity   regression   cleanup
@@ -175,6 +175,8 @@ Delete VNF Descriptors
 Suite Cleanup
     [Documentation]  Test Suit Cleanup: Deleting Descriptors, instance and template
 
+    Run Keyword If Any Tests Failed  Delete NSI   ${slice_name}
+
     Run Keyword If Any Tests Failed  Delete NST   ${nst_name}
 
     Run Keyword If Any Tests Failed  Delete NSD   ${nsd1_name}
diff --git a/robot-systest/testsuite/slice_02-shared_network_slicing.robot b/robot-systest/testsuite/slice_02-shared_network_slicing.robot
index bd350a2..79010ad 100644
--- a/robot-systest/testsuite/slice_02-shared_network_slicing.robot
+++ b/robot-systest/testsuite/slice_02-shared_network_slicing.robot
@@ -150,7 +150,7 @@ Test First Slice Connectivity
     Ping Many   ${mgmt_vnf_ip}  ${username}  ${password}  ${privatekey}   @{slice1_vnfs_ips}
 
 
-Stop Slice One Instance
+Delete Slice One Instance
     [Documentation]   Stops the slice instance (slice_name)
 
     [Tags]   shared_network_slicing   SLICING-02   sanity   regression   cleanup
@@ -188,7 +188,7 @@ Test Second Slice Connectivity
     Ping Many   ${mgmt_vnf_ip}  ${username}  ${password}  ${privatekey}   @{slice2_vnfs_ips}
 
 
-Stop Slice Two Instance
+Delete Slice Two Instance
     [Documentation]   Stops the slice instance (slice2_name)
 
     [Tags]   shared_network_slicing   SLICING-02   sanity   regression   cleanup
@@ -234,6 +234,9 @@ Delete VNF Descriptors
 Suite Cleanup
     [Documentation]  Test Suit Cleanup: Deleting Descriptors, instance and templates
 
+    Run Keyword If Any Tests Failed  Delete NSI   ${slice_name}
+    Run Keyword If Any Tests Failed  Delete NSI   ${slice2_name}
+
     Run Keyword If Any Tests Failed  Delete NST   ${nst_name}
     Run Keyword If Any Tests Failed  Delete NST   ${nst2_name}