X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_12-ns_primitives.robot;h=f2df25239b78381e0ea73182521beca91642df3a;hb=930c39db6770b15c44fc4d77a812346184d85d56;hp=7dcc7190258f2770558c1a5bfe43cd234d78d482;hpb=a352a93af7e73cd73831ba7601df7d916abc8bfc;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/basic_12-ns_primitives.robot b/robot-systest/testsuite/basic_12-ns_primitives.robot
index 7dcc719..f2df252 100644
--- a/robot-systest/testsuite/basic_12-ns_primitives.robot
+++ b/robot-systest/testsuite/basic_12-ns_primitives.robot
@@ -24,7 +24,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/packages_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_12-ns_primitives_data.py
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
@@ -38,31 +38,22 @@ Change Juju Password
 
     [Tags]   nsprimitives   charm   sanity   regression
 
-    ${nsd_yaml}=   Get File  %{PACKAGES_FOLDER}${nsd_pkg}/${nsd_file}
+    ${nsd_yaml}=   Get File  %{PACKAGES_FOLDER}/${nsd_pkg}/${nsd_file}
     ${changed_nsd_yaml}=   Replace String  ${nsd_yaml}  ${old_juju_password}  %{JUJU_PASSWORD}
-    Create File  %{PACKAGES_FOLDER}${nsd_pkg}/${nsd_file}  ${changed_nsd_yaml}
-
-Create NS Package
-
-    [Tags]   nsprimitives   charm   sanity   regression
-
-    ${pkg}=  Package Build  '%{PACKAGES_FOLDER}${nsd_pkg}'
-    Log   ${pkg}
-    Set Suite Variable  ${ns_pkg}  ${pkg}
-
+    Create File  %{PACKAGES_FOLDER}/${nsd_pkg}/${nsd_file}  ${changed_nsd_yaml}
 
 Upload Vnfds
 
     [Tags]   nsprimitives   charm   sanity   regression
 
-    Create VNFD   '%{PACKAGES_FOLDER}${vnfd_pkg1}'
-    Create VNFD   '%{PACKAGES_FOLDER}${vnfd_pkg2}'
+    Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg1}'
+    Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg2}'
 
 Upload Nsd
 
     [Tags]   nsprimitives   charm   sanity   regression
 
-    Create NSD  '${ns_pkg}'
+    Create NSD  %{PACKAGES_FOLDER}/${nsd_pkg}/
 
 Instantiate NS
 
@@ -94,10 +85,10 @@ Delete VNF Descriptors
 
 
 *** Keywords ***
-Test Cleanup
+Suite Cleanup
     [Documentation]  Test Suit Cleanup: Deleting Descriptor and instance
 
-    Run Keyword If Test Failed  Delete NS   ${ns_name}
-    Run Keyword If Test Failed  Delete NSD   ${nsd_name}
-    Run Keyword If Test Failed  Delete VNFD   ${vnfd_name1}
-    Run Keyword If Test Failed  Delete VNFD   ${vnfd_name2}
+    Run Keyword If Any Tests Failed  Delete NS   ${ns_name}
+    Run Keyword If Any Tests Failed  Delete NSD   ${nsd_name}
+    Run Keyword If Any Tests Failed  Delete VNFD   ${vnfd_name1}
+    Run Keyword If Any Tests Failed  Delete VNFD   ${vnfd_name2}