Fix basic 12 and add charm tag to basic 7

- Fixes bug 1207

Change-Id: I8b1ed474293481972fc056b1495ac138afba8ee9
Signed-off-by: David Garcia <david.garcia@canonical.com>

diff --git a/robot-systest/resources/basic_12-ns_primitives_data.py b/robot-systest/resources/basic_12-ns_primitives_data.py
index 34d09f4..7a91f2e 100644 (file)
--- a/robot-systest/resources/basic_12-ns_primitives_data.py
+++ b/robot-systest/resources/basic_12-ns_primitives_data.py
@@ -17,19 +17,19 @@ from pathlib import Path
 # Get ${HOME} from local machine
 home = str(Path.home())
 # NS and VNF descriptor package files
-vnfd_pkg1 = 'charm-packages/nscharm_policy_vnf'
-vnfd_pkg2 = 'charm-packages/nscharm_user_vnf'
-nsd_pkg = 'charm-packages/native_charm_ns'
+vnfd_pkg1 = 'nscharm_policy_vnf'
+vnfd_pkg2 = 'nscharm_user_vnf'
+nsd_pkg = 'nscharm_ns'
 # NSD and VNFD names in OSM
 vnfd_name1 = 'nscharm-policy-vnf'
 vnfd_name2 = 'nscharm-user-vnf'
 nsd_name = 'nscharm-ns'
 # NS Descriptor file
-nsd_file = 'native_charm_nsd.yaml'
+nsd_file = 'nscharm_nsd.yaml'
 # NS instance name
 ns_name = 'test_nscharm'
 # SSH keys to be used
 publickey = home + '/.ssh/id_rsa.pub'
 privatekey = home + '/.ssh/id_rsa'
 # Juju variables
-old_juju_password = 'd55ce8ab4efa59e7f1b865bce53f55ed'
+old_juju_password = 'a5611fc6452349cc6e45705d34c501d4'

diff --git a/robot-systest/testsuite/basic_07-secure_key_management.robot b/robot-systest/testsuite/basic_07-secure_key_management.robot
index 7a80462..23698d7 100644 (file)
--- a/robot-systest/testsuite/basic_07-secure_key_management.robot
+++ b/robot-systest/testsuite/basic_07-secure_key_management.robot
@@ -39,26 +39,26 @@ ${ns_timeout}   15min
 
 *** Test Cases ***
 Create Nopasswd Charm VNF Descriptor
-    [Tags]   nopasswd   sanity   regression
+    [Tags]   nopasswd   charm   sanity   regression
 
     Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 
 Create Nopasswd Charm NS Descriptor
-    [Tags]   nopasswd   sanity   regression
+    [Tags]   nopasswd   charm   sanity   regression
 
     Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
 Instantiate Nopasswd Charm Network Service
-    [Tags]   nopasswd   sanity   regression
+    [Tags]   nopasswd   charm   sanity   regression
 
     ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${EMPTY}  ${ns_timeout}
     Set Suite Variable  ${ns_id}  ${id}
 
 
 Get Management Ip Addresses
-    [Tags]   nopasswd   sanity   regression
+    [Tags]   nopasswd   charm   sanity   regression
 
     ${ip_addr}  Get Vnf Management Ip Address  ${ns_id}  ${vnf_member_index}
     log  ${ip_addr}
@@ -66,7 +66,7 @@ Get Management Ip Addresses
 
 
 Test SSH Access
-    [Tags]   nopasswd   sanity   regression
+    [Tags]   nopasswd   charm   sanity   regression
 
     Variable Should Exist  ${vnf_ip_addr}  msg=IP address of the management VNF is not available
     Sleep  30s  Waiting ssh daemon to be up
@@ -76,14 +76,14 @@ Test SSH Access
 Check Remote Files Created Via Day 1 Operations
     [Documentation]     The Nopasswd VNF has a Day 1 operation that creates a file named ${day_1_file_name} and performs it without password.
     ...                 This test checks whether that files have been created or not.
-    [Tags]   nopasswd   sanity   regression
+    [Tags]   nopasswd   charm   sanity   regression
 
     Check If remote File Exists  ${vnf_ip_addr}  ${username}  ${password}  ${EMPTY}  ${day_1_file_name}
 
 
 Execute Day 2 Operations
     [Documentation]     Performs one Day 2 operation that creates a new file, this action is executed without password too.
-    [Tags]   nopasswd   sanity   regression
+    [Tags]   nopasswd   charm   sanity   regression
 
     Variable Should Exist  ${ns_id}  msg=Network service instance is not available
     ${ns_op_id}=  Execute NS Action  ${ns_name}  ${action_name}  ${vnf_member_index}  filename=${day_2_file_name}
@@ -91,25 +91,25 @@ Execute Day 2 Operations
 
 Check Remote Files Created Via Day 2 Operations
     [Documentation]     Check whether the file created in the previous test via Day 2 operation exists or not.
-    [Tags]   nopasswd   sanity   regression
+    [Tags]   nopasswd   charm   sanity   regression
 
     Check If remote File Exists  ${vnf_ip_addr}  ${username}  ${password}  ${EMPTY}  ${day_2_file_name}
 
 
 Delete NS Instance
-    [Tags]   nopasswd   sanity   regression  cleanup
+    [Tags]   nopasswd   charm   sanity   regression  cleanup
 
     Delete NS  ${ns_name}
 
 
 Delete NS Descriptor
-    [Tags]   nopasswd   sanity   regression  cleanup
+    [Tags]   nopasswd   charm   sanity   regression  cleanup
 
     Delete NSD  ${nsd_name}
 
 
 Delete VNF Descriptor
-    [Tags]   nopasswd   sanity   regression  cleanup
+    [Tags]   nopasswd   charm   sanity   regression  cleanup
 
     Delete VNFD  ${vnfd_name}
 

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