X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_17-delete_vnf_package.robot;h=906ddd2bf0771e28ea0e10e2483d2b09d4409602;hb=f4ebaa88025189ede4f073ab8a1f27c95efff867;hp=0cd13f81d099cb7f4289911ac82d1b535d29147f;hpb=499c86752f877c0007a0e4dde69c213d828047d0;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/basic_17-delete_vnf_package.robot b/robot-systest/testsuite/basic_17-delete_vnf_package.robot
index 0cd13f8..906ddd2 100644
--- 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,47 +22,52 @@ 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}
 
 
 *** Keywords ***
 Suite Cleanup
-    [Documentation]  Test Suit Cleanup: Deleting NS and VNF packages
+    [Documentation]   Test Suit Cleanup: Deleting NS and VNF packages
 
-    Run Keyword If Any Tests Failed  Delete NSD   ${nsd_name}
-    Run Keyword If Any Tests Failed  Delete VNFD   ${vnfd_name}
+    Run Keyword If Any Tests Failed   Delete NSD   ${nsd_name}
+    Run Keyword If Any Tests Failed   Delete VNFD   ${vnfd_name}