Fix basic 12 and add charm tag to basic 7

[osm/tests.git] / robot-systest / testsuite / basic_12-ns_primitives.robot

diff --git a/robot-systest/testsuite/basic_12-ns_primitives.robot b/robot-systest/testsuite/basic_12-ns_primitives.robot
index 0785467..f2df252 100644 (file)
--- a/robot-systest/testsuite/basic_12-ns_primitives.robot
+++ b/robot-systest/testsuite/basic_12-ns_primitives.robot
@@ -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