- config_descriptor = get_configuration(db_vnfd, db_vnfd["id"])
- operation_params = db_nslcmop.get("operationParams") or {}
- exec_terminate_primitives = (not operation_params.get("skip_terminate_primitives") and
- vca.get("needed_terminate"))
- task = asyncio.ensure_future(asyncio.wait_for(
- self.destroy_N2VC(logging_text, db_nslcmop, vca, config_descriptor,
- vca_index, destroy_ee=True,
- exec_primitives=exec_terminate_primitives,
- scaling_in=True), timeout=self.timeout_charm_delete))
- # wait before next removal
- await asyncio.sleep(30)
- tasks_dict_info[task] = "Terminating VCA {}".format(vca.get("ee_id"))
+ config_descriptor = get_configuration(
+ db_vnfd, db_vnfd["id"]
+ )
+ operation_params = (
+ db_nslcmop.get("operationParams") or {}
+ )
+ exec_terminate_primitives = not operation_params.get(
+ "skip_terminate_primitives"
+ ) and vca.get("needed_terminate")
+ task = asyncio.ensure_future(
+ asyncio.wait_for(
+ self.destroy_N2VC(
+ logging_text,
+ db_nslcmop,
+ vca,
+ config_descriptor,
+ vca_index,
+ destroy_ee=True,
+ exec_primitives=exec_terminate_primitives,
+ scaling_in=True,
+ vca_id=vca_id,
+ ),
+ timeout=self.timeout_charm_delete,
+ )
+ )
+ tasks_dict_info[task] = "Terminating VCA {}".format(
+ vca.get("ee_id")
+ )