X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=osm_lcm%2Fnetslice.py;h=47e3f19ccba35ba3ebf416a396b1139b2fe17d4d;hb=4d209f039b05c39750dd192095cffba9e3a80925;hp=3a8002ce24bbf78c7349757ff5cabbb7f9592b89;hpb=5697b8b03a3acd17827ce536cb8aff15df8776ad;p=osm%2FLCM.git

diff --git a/osm_lcm/netslice.py b/osm_lcm/netslice.py
index 3a8002c..47e3f19 100644
--- a/osm_lcm/netslice.py
+++ b/osm_lcm/netslice.py
@@ -34,9 +34,6 @@ __author__ = "Felipe Vicens, Pol Alemany, Alfonso Tierno"
 
 
 class NetsliceLcm(LcmBase):
-
-    timeout_nsi_deploy = 2 * 3600  # default global timeout for deployment a nsi
-
     def __init__(self, msg, lcm_tasks, config, loop, ns):
         """
         Init, Connect to database, filesystem storage, and messaging
@@ -48,7 +45,7 @@ class NetsliceLcm(LcmBase):
         self.loop = loop
         self.lcm_tasks = lcm_tasks
         self.ns = ns
-        self.ro_config = config["ro_config"]
+        self.ro_config = config["RO"]
         self.timeout = config["timeout"]
 
         super().__init__(msg, self.logger)
@@ -78,7 +75,6 @@ class NetsliceLcm(LcmBase):
                 )
 
     async def instantiate(self, nsir_id, nsilcmop_id):
-
         # Try to lock HA task here
         task_is_locked_by_me = self.lcm_tasks.lock_HA("nsi", "nsilcmops", nsilcmop_id)
         if not task_is_locked_by_me:
@@ -392,9 +388,7 @@ class NetsliceLcm(LcmBase):
             if nsi_params and nsi_params.get("timeout_nsi_deploy"):
                 timeout_nsi_deploy = nsi_params["timeout_nsi_deploy"]
             else:
-                timeout_nsi_deploy = self.timeout.get(
-                    "nsi_deploy", self.timeout_nsi_deploy
-                )
+                timeout_nsi_deploy = self.timeout.get("nsi_deploy")
 
             # Empty list to keep track of network service records status in the netslice
             nsir_admin = db_nsir_admin = db_nsir.get("_admin")
@@ -577,7 +571,6 @@ class NetsliceLcm(LcmBase):
             self.lcm_tasks.remove("nsi", nsir_id, nsilcmop_id, "nsi_instantiate")
 
     async def terminate(self, nsir_id, nsilcmop_id):
-
         # Try to lock HA task here
         task_is_locked_by_me = self.lcm_tasks.lock_HA("nsi", "nsilcmops", nsilcmop_id)
         if not task_is_locked_by_me: