From 9c11d59035ff1741c5e6d935aa7c2ed23d15f485 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Thu, 14 Sep 2017 18:56:18 +0200 Subject: Create vnffg providing the neutron_port JIRA: SFC-107 We are submitting the vnffgd with a variable for the neutron_port. Before creating the vnffg, we must provide a file with the neutron_port value Change-Id: I9994e2baa53f323df17434448d372598c0d94c72 Signed-off-by: Manuel Buil --- sfc/lib/openstack_tacker.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'sfc/lib/openstack_tacker.py') diff --git a/sfc/lib/openstack_tacker.py b/sfc/lib/openstack_tacker.py index 93649e32..a4077744 100644 --- a/sfc/lib/openstack_tacker.py +++ b/sfc/lib/openstack_tacker.py @@ -241,7 +241,7 @@ def create_vnffgd(tacker_client, tosca_file=None, vnffgd_name=None): vnffgd_body = {} if tosca_file is not None: with open(tosca_file) as tosca_fd: - vnffgd_body = yaml.load(tosca_fd) + vnffgd_body = yaml.safe_load(tosca_fd) logger.info('VNFFGD template:\n{0}'.format(vnffgd_body)) return tacker_client.create_vnffgd( body={'vnffgd': {'name': vnffgd_name, @@ -253,10 +253,9 @@ def create_vnffgd(tacker_client, tosca_file=None, vnffgd_name=None): def create_vnffg(tacker_client, vnffg_name=None, vnffgd_id=None, - vnffgd_name=None): + vnffgd_name=None, param_file=None): ''' - Tacker doesn't support Symmetrical chain and parameter file - in Openstack/Ocata + Creates the vnffg which will provide the RSP and the classifier ''' try: vnffg_body = { @@ -265,6 +264,12 @@ def create_vnffg(tacker_client, vnffg_name=None, vnffgd_id=None, 'name': vnffg_name } } + if param_file is not None: + params = None + with open(param_file) as f: + params = f.read() + params_dict = yaml.safe_load(params) + vnffg_body['vnffg']['attributes']['param_values'] = params_dict if vnffgd_id is not None: vnffg_body['vnffg']['vnffgd_id'] = vnffgd_id else: -- cgit 1.2.3-korg