From 1e70ea4c28337e3297976dc08ec89dff8d25be26 Mon Sep 17 00:00:00 2001 From: Matteo Pergolesi Date: Sun, 31 May 2020 22:44:19 +0200 Subject: [PATCH] Fix osm-driver to include all additionalParamsForNs. --- adaptation_layer/driver/osm.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/adaptation_layer/driver/osm.py b/adaptation_layer/driver/osm.py index a02083e..5825b40 100644 --- a/adaptation_layer/driver/osm.py +++ b/adaptation_layer/driver/osm.py @@ -283,20 +283,15 @@ def instantiate_ns(self, nsId: str, args=None) -> Tuple[None, Headers]: args_payload = args['payload'] if 'additionalParamsForNs' in args_payload: - additional_params = args_payload['additionalParamsForNs'] - if 'vnf' in additional_params: + instantiate_payload.update(args_payload['additionalParamsForNs']) + if 'vnf' in instantiate_payload: mapping = {v: str(i+1) for i, v in enumerate(ns_res['constituent-vnfr-ref'])} - - for vnf in additional_params['vnf']: + for vnf in instantiate_payload['vnf']: if vnf.get('vnfInstanceId'): vnf['member-vnf-index'] = mapping[vnf.pop( 'vnfInstanceId')] - if len(additional_params['vnf']) > 0: - instantiate_payload['vnf'] = additional_params['vnf'] - if 'wim_account' in additional_params: - instantiate_payload['wimAccountId'] = additional_params['wim_account'] - else: + if 'wim_account' not in instantiate_payload: instantiate_payload['wimAccountId'] = False try: