X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Fnetslice.py;h=8fe291b5dcc65b82abc5defbd82c967c102f3554;hb=879483e1764b729ddc445668f5326346df516d98;hp=47e3f19ccba35ba3ebf416a396b1139b2fe17d4d;hpb=4d209f039b05c39750dd192095cffba9e3a80925;p=osm%2FLCM.git diff --git a/osm_lcm/netslice.py b/osm_lcm/netslice.py index 47e3f19..8fe291b 100644 --- a/osm_lcm/netslice.py +++ b/osm_lcm/netslice.py @@ -34,7 +34,7 @@ __author__ = "Felipe Vicens, Pol Alemany, Alfonso Tierno" class NetsliceLcm(LcmBase): - def __init__(self, msg, lcm_tasks, config, loop, ns): + def __init__(self, msg, lcm_tasks, config, ns): """ Init, Connect to database, filesystem storage, and messaging :param config: two level dictionary with configuration. Top level should contain 'database', 'storage', @@ -42,7 +42,6 @@ class NetsliceLcm(LcmBase): """ # logging self.logger = logging.getLogger("lcm.netslice") - self.loop = loop self.lcm_tasks = lcm_tasks self.ns = ns self.ro_config = config["RO"] @@ -90,7 +89,7 @@ class NetsliceLcm(LcmBase): db_nsilcmop_update = {} nsilcmop_operation_state = None vim_2_RO = {} - RO = ROclient.ROClient(self.loop, **self.ro_config) + RO = ROclient.ROClient(**self.ro_config) nsi_vld_instantiationi_params = {} def ip_profile_2_RO(ip_profile): @@ -498,7 +497,7 @@ class NetsliceLcm(LcmBase): break # TODO: future improvement due to synchronism -> await asyncio.wait(vca_task_list, timeout=300) - await asyncio.sleep(5, loop=self.loop) + await asyncio.sleep(5) else: # timeout_nsi_deploy reached: raise LcmException("Timeout waiting nsi to be ready.") @@ -583,7 +582,7 @@ class NetsliceLcm(LcmBase): db_nsilcmop = None db_nsir_update = {"_admin.nsilcmop": nsilcmop_id} db_nsilcmop_update = {} - RO = ROclient.ROClient(self.loop, **self.ro_config) + RO = ROclient.ROClient(**self.ro_config) nsir_deployed = None failed_detail = [] # annotates all failed error messages nsilcmop_operation_state = None @@ -724,7 +723,7 @@ class NetsliceLcm(LcmBase): ) break - await asyncio.sleep(5, loop=self.loop) + await asyncio.sleep(5) termination_timeout -= 5 if termination_timeout <= 0: @@ -857,7 +856,6 @@ class NetsliceLcm(LcmBase): "operationState": nsilcmop_operation_state, "autoremove": autoremove, }, - loop=self.loop, ) except Exception as e: self.logger.error(