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 2feeb84..f2df252 100644 (file)
--- a/robot-systest/testsuite/basic_12-ns_primitives.robot
+++ b/robot-systest/testsuite/basic_12-ns_primitives.robot
@@ -42,15 +42,6 @@ Change Juju Password
     ${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}
-
-
 Upload Vnfds
 
     [Tags]   nsprimitives   charm   sanity   regression
@@ -62,7 +53,7 @@ Upload Nsd
 
     [Tags]   nsprimitives   charm   sanity   regression
 
-    Create NSD  '${ns_pkg}'
+    Create NSD  %{PACKAGES_FOLDER}/${nsd_pkg}/
 
 Instantiate NS