projects
/
osm
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix basic 12 and add charm tag to basic 7
[osm/tests.git]
/
robot-systest
/
resources
/
basic_12-ns_primitives_data.py
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
# 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 = '
ns
charm_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 and VNFD names in OSM
vnfd_name1 = 'nscharm-policy-vnf'
vnfd_name2 = 'nscharm-user-vnf'
nsd_name = 'nscharm-ns'
# NS Descriptor file
-nsd_file = 'n
ative_
charm_nsd.yaml'
+nsd_file = 'n
s
charm_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
# 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
'