X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Fns.py;h=d7277e7f1b5e125e1834e5118cf12cc9d6d6474d;hb=12650ecdd976edea3b425603398fa1661a455a24;hp=83e7147234c66cb348f1c78877fd602781b1b987;hpb=a009e55ba79a19ce8c9b04fac4e5554550d94975;p=osm%2FLCM.git

diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py
index 83e7147..d7277e7 100644
--- a/osm_lcm/ns.py
+++ b/osm_lcm/ns.py
@@ -69,9 +69,9 @@ def populate_dict(target_dict, key_list, value):
 
 class NsLcm(LcmBase):
     timeout_vca_on_error = 5 * 60   # Time for charm from first time at blocked,error status to mark as failed
-    total_deploy_timeout = 2 * 3600   # global timeout for deployment
-    timeout_charm_delete = 10 * 60
-    timeout_primitive = 10 * 60  # timeout for primitive execution
+    total_deploy_timeout = 30 * 60   # global timeout for deployment
+    timeout_charm_delete = 5 * 60
+    timeout_primitive = 5 * 60  # timeout for primitive execution
 
     def __init__(self, db, msg, fs, lcm_tasks, ro_config, vca_config, loop):
         """
@@ -801,7 +801,7 @@ class NsLcm(LcmBase):
             while time() <= start_deploy + self.total_deploy_timeout:
                 desc = await RO.show("ns", RO_nsr_id)
                 ns_status, ns_status_info = RO.check_ns_status(desc)
-                db_nsr_update["admin.deployed.RO.nsr_status"] = ns_status
+                db_nsr_update["_admin.deployed.RO.nsr_status"] = ns_status
                 if ns_status == "ERROR":
                     raise ROclient.ROClientException(ns_status_info)
                 elif ns_status == "BUILD":