Revert "Add robot test basic22 for feature 10887"

[osm/tests.git] / robot-systest / testsuite / basic_17-delete_vnf_package.robot

diff --git a/robot-systest/testsuite/basic_17-delete_vnf_package.robot b/robot-systest/testsuite/basic_17-delete_vnf_package.robot
index 0cd13f8..b6ce774 100644 (file)
--- a/robot-systest/testsuite/basic_17-delete_vnf_package.robot
+++ b/robot-systest/testsuite/basic_17-delete_vnf_package.robot
@@ -11,6 +11,8 @@
 #   limitations under the License.
 
 *** Settings ***
+Documentation     [BASIC-17] Delete VNF Package Before NS Package.
+
 Library   OperatingSystem
 Library   String
 Library   Collections
@@ -20,38 +22,43 @@ Library   SSHLibrary
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/vnfd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_17-delete_vnf_package_data.py
+Force Tags   basic_17   cluster_main   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
+*** Variables ***
+# NS and VNF descriptor package folder and ids
+${vnfd_pkg}   hackfest_basic_vnf
+${vnfd_name}   hackfest_basic-vnf
+${nsd_pkg}   hackfest_basic_ns
+${nsd_name}   hackfest_basic-ns
+
+
 *** Test Cases ***
 Create VNF Package
-    [Tags]   hackfest_basic   sanity   regression
 
     Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 
 Create NS Package
-    [Tags]   hackfest_basic   sanity   regression
 
     Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
 Cannot Delete VNF Package
-    [Tags]   hackfest_basic   sanity   regression   cleanup
 
     Assert Failure Delete VNFD   ${vnfd_name}
 
 
 Delete NS Package
-    [Tags]   hackfest_basic   sanity   regression   cleanup
+    [Tags]   cleanup
 
     Delete NSD   ${nsd_name}
 
 
 Delete VNF Package
-    [Tags]   hackfest_basic   sanity   regression   cleanup
+    [Tags]   cleanup
 
     Delete VNFD   ${vnfd_name}