From c458bf58d07be523b7198fe484c31b8fc96478b3 Mon Sep 17 00:00:00 2001 From: aktas Date: Fri, 26 Feb 2021 15:41:45 +0300 Subject: [PATCH] Fix 1462 asyncio.sleep is not needed with the changes on https://osm.etsi.org/gerrit/c/osm/N2VC/+/10399. Change-Id: Ie7179140011c0c13d4957b8b7824125ac0cac4dd Signed-off-by: aktas --- osm_lcm/ns.py | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py index 0f5c6ab..dc69449 100644 --- a/osm_lcm/ns.py +++ b/osm_lcm/ns.py @@ -4126,8 +4126,6 @@ class NsLcm(LcmBase): timeout=self.timeout_charm_delete ) ) - # wait before next removal - await asyncio.sleep(30) tasks_dict_info[task] = "Terminating VCA {}".format(vca.get("ee_id")) del vca_update[vca_index] del config_update[vca_index] @@ -4240,37 +4238,6 @@ class NsLcm(LcmBase): task_instantiation_info=tasks_dict_info, stage=stage ) - # TODO: scaling for kdu is not implemented yet. - kdu_name = vdu_info["osm_vdu_id"] - descriptor_config = get_configuration(db_vnfd, kdu_name) - if descriptor_config: - vdu_id = None - vdu_index = vdu_index - vdu_name = None - kdur = next(x for x in db_vnfr["kdur"] if x["kdu-name"] == kdu_name) - deploy_params_kdu = {"OSM": get_osm_params(db_vnfr)} - if kdur.get("additionalParams"): - deploy_params_kdu = parse_yaml_strings(kdur["additionalParams"]) - - self._deploy_n2vc( - logging_text=logging_text, - db_nsr=db_nsr, - db_vnfr=db_vnfr, - nslcmop_id=nslcmop_id, - nsr_id=nsr_id, - nsi_id=nsi_id, - vnfd_id=vnfd_id, - vdu_id=vdu_id, - kdu_name=kdu_name, - member_vnf_index=member_vnf_index, - vdu_index=vdu_index, - vdu_name=vdu_name, - deploy_params=deploy_params_kdu, - descriptor_config=descriptor_config, - base_folder=base_folder, - task_instantiation_info=tasks_dict_info, - stage=stage - ) # SCALE-UP VCA - END scale_process = None -- 2.25.1