Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[odl-sfc] Fix bug when getting the params for create_vnf
[functest.git]
/
functest
/
utils
/
openstack_tacker.py
diff --git
a/functest/utils/openstack_tacker.py
b/functest/utils/openstack_tacker.py
index
c7ac89a
..
68ff320
100644
(file)
--- a/
functest/utils/openstack_tacker.py
+++ b/
functest/utils/openstack_tacker.py
@@
-108,7
+108,8
@@
def list_vnfs(tacker_client, verbose=False):
return None
return None
-def create_vnf(tacker_client, vnf_name, vnfd_id=None, vnfd_name=None):
+def create_vnf(tacker_client, vnf_name, vnfd_id=None,
+ vnfd_name=None, param_file=None):
try:
vnf_body = {
'vnf': {
try:
vnf_body = {
'vnf': {
@@
-116,6
+117,11
@@
def create_vnf(tacker_client, vnf_name, vnfd_id=None, vnfd_name=None):
'name': vnf_name
}
}
'name': vnf_name
}
}
+ if param_file is not None:
+ params = None
+ with open(param_file) as f:
+ params = f.read()
+ vnf_body['vnf']['attributes']['param_values'] = params
if vnfd_id is not None:
vnf_body['vnf']['vnfd_id'] = vnfd_id
else:
if vnfd_id is not None:
vnf_body['vnf']['vnfd_id'] = vnfd_id
else: