X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tutorials%2FvFWDT%2Fworkflow%2Fworkflow.py;h=dd15e81779e9ca913a3dfae37ad1655300a0d46d;hb=bba7ed02826fa1f33189eb1d2d43c74a0d45fe83;hp=605456954e47d703e60278733cef710fd86395e5;hpb=b8c5101a920275687fdab980048cb4dae5aa902d;p=demo.git diff --git a/tutorials/vFWDT/workflow/workflow.py b/tutorials/vFWDT/workflow/workflow.py index 60545695..dd15e817 100755 --- a/tutorials/vFWDT/workflow/workflow.py +++ b/tutorials/vFWDT/workflow/workflow.py @@ -159,7 +159,7 @@ def _get_aai_rel_link_data(data, related_to, search_key=None, match_dict=None): m_value = None rel_dict = data.get(rel_lst) if rel_dict: # check if data has relationship lists - for key, rel_list in rel_dict.items(): + for key, rel_list in rel_dict.items(): # pylint: disable=W0612 for rel in rel_list: if rel.get("related-to") == related_to: dval = None @@ -188,7 +188,7 @@ def _get_aai_rel_link_data(data, related_to, search_key=None, match_dict=None): response.append( {"link": link, "d_value": dval} ) - if len(response) == 0: + if response: response.append( {"link": None, "d_value": None} ) @@ -398,7 +398,7 @@ def _osdf_request(rancher_ip, onap_ip, aai_data, exclude, use_oof_cache): #print(json.dumps(template, indent=4)) with _no_ssl_verification(): - response = api.osdf.placement(body=template, params={}, headers={}) + response = api.osdf.placement(body=template, params={}, headers={}) # pylint: disable=W0612 #if response.body.get('error_message') is not None: # raise Exception(response.body['error_message']['explanation']) @@ -505,7 +505,7 @@ def _extract_has_appc_identifiers(has_result, demand, onap_ip): v_server['vserver-name'] = v_server['vserver-name'].replace("01", "02") hostname_cache.append(v_server['vserver-name']) - api = _init_python_aai_api(onap_ip) + api = _init_python_aai_api(onap_ip) # pylint: disable=W0612 vnfc_type = demand.lower() # with _no_ssl_verification(): # response = api.aai.vnfc(v_server['vserver-name'], body=None, params={}, headers={}) @@ -975,27 +975,27 @@ def _execute_lcm_requests(workflow, onap_ip, check_result): lcm_requests = workflow["requests"] print("WORKFLOW << {} >>".format(workflow["description"])) for i in range(len(lcm_requests)): - req = lcm_requests[i]["payload"] - #print(json.dumps(req, indent=4)) - print("APPC LCM << {} >> [{}]".format(req['input']['action'], lcm_requests[i]["description"])) - _set_appc_lcm_timestamp(req) - conf_result = False - result = appc_lcm_request(onap_ip, req) - print("Result {}".format(result)) - - if result == 100: - conf_result = confirm_appc_lcm_action(onap_ip, req, check_result) - #time.sleep(30) - elif result == 400: - conf_result = True - - if not conf_result: - if lcm_requests[i]["breakOnFailure"]: - raise Exception("APPC LCM << {} >> FAILED".format(req['input']['action'])) - elif "workflow" in lcm_requests[i]: - print("WORKFLOW << {} >> SKIP".format(lcm_requests[i]["workflow"]["description"])) - elif "workflow" in lcm_requests[i]: - _execute_lcm_requests(lcm_requests[i]["workflow"], onap_ip, check_result) + req = lcm_requests[i]["payload"] + #print(json.dumps(req, indent=4)) + print("APPC LCM << {} >> [{}]".format(req['input']['action'], lcm_requests[i]["description"])) + _set_appc_lcm_timestamp(req) + conf_result = False + result = appc_lcm_request(onap_ip, req) + print("Result {}".format(result)) + + if result == 100: + conf_result = confirm_appc_lcm_action(onap_ip, req, check_result) + #time.sleep(30) + elif result == 400: + conf_result = True + + if not conf_result: + if lcm_requests[i]["breakOnFailure"]: + raise Exception("APPC LCM << {} >> FAILED".format(req['input']['action'])) + elif "workflow" in lcm_requests[i]: + print("WORKFLOW << {} >> SKIP".format(lcm_requests[i]["workflow"]["description"])) + elif "workflow" in lcm_requests[i]: + _execute_lcm_requests(lcm_requests[i]["workflow"], onap_ip, check_result) def _generate_cdt_artifact_request(req_id, artifact, action, vnfc_type): @@ -1142,7 +1142,7 @@ def _generate_cdt_payloads_for_vnf(vnf_info, vnfc_type, actions): for action_artifact in artifacts[action]: artifact_list.append({'artifact-name': action_artifact['name'], 'artifact-type': action_artifact['type']}) if action != 'AllAction': - req = _generate_cdt_artifact_request(req_id, action_artifact, action, vnfc_type) + req = _generate_cdt_artifact_request(req_id, action_artifact, action, vnfc_type) # pylint: disable=W0612 #print(json.dumps(req, indent=4)) #print(json.dumps(action_info, indent=4))