X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_17-delete_vnf_package.robot;h=906ddd2bf0771e28ea0e10e2483d2b09d4409602;hb=61bbf92c1b2a4563f1636f053a4846b669161714;hp=d61e6824563e1d0ae1561ba9fcd6f57f84590423;hpb=4cf45d797499817b5f639bd6245c3f84e762de14;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 d61e682..906ddd2 100644
--- a/robot-systest/testsuite/basic_17-delete_vnf_package.robot
+++ b/robot-systest/testsuite/basic_17-delete_vnf_package.robot
@@ -11,7 +11,7 @@
 #   limitations under the License.
 
 *** Settings ***
-Documentation     [BASIC-17] Delete VNF Package Before NS Package.
+Documentation   [BASIC-17] Delete VNF Package Before NS Package.
 
 Library   OperatingSystem
 Library   String
@@ -22,13 +22,19 @@ 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
 
@@ -59,9 +65,9 @@ Delete VNF Package
 
 *** 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}