X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Fvim_sdn.py;h=d95df9486885e8c0b138ccc56e74efbb3cb1cf6d;hb=refs%2Fchanges%2F34%2F12834%2F8;hp=c81969abd306ede66c2ab035a9cf09544eb2b924;hpb=1b2b840cfdc739e2c7dcd49dafd38577124c58b2;p=osm%2FLCM.git

diff --git a/osm_lcm/vim_sdn.py b/osm_lcm/vim_sdn.py
index c81969a..d95df94 100644
--- a/osm_lcm/vim_sdn.py
+++ b/osm_lcm/vim_sdn.py
@@ -56,7 +56,7 @@ class VimLcm(LcmBase):
         self.logger = logging.getLogger("lcm.vim")
         self.loop = loop
         self.lcm_tasks = lcm_tasks
-        self.ro_config = config["ro_config"]
+        self.ro_config = config["RO"]
 
         super().__init__(msg, self.logger)
 
@@ -478,7 +478,7 @@ class WimLcm(LcmBase):
         self.logger = logging.getLogger("lcm.vim")
         self.loop = loop
         self.lcm_tasks = lcm_tasks
-        self.ro_config = config["ro_config"]
+        self.ro_config = config["RO"]
 
         super().__init__(msg, self.logger)
 
@@ -826,7 +826,7 @@ class SdnLcm(LcmBase):
         self.logger = logging.getLogger("lcm.sdn")
         self.loop = loop
         self.lcm_tasks = lcm_tasks
-        self.ro_config = config["ro_config"]
+        self.ro_config = config["RO"]
 
         super().__init__(msg, self.logger)
 
@@ -1006,7 +1006,7 @@ class SdnLcm(LcmBase):
         logging_text = "Task sdn_delete={} ".format(sdn_id)
         self.logger.debug(logging_text + "Enter")
 
-        db_sdn = None
+        db_sdn = {}
         db_sdn_update = {}
         exc = None
         step = "Getting sdn from db"
@@ -1039,7 +1039,7 @@ class SdnLcm(LcmBase):
                     logging_text + "Skipping. There is not RO information at database"
                 )
             self.db.del_one("sdns", {"_id": sdn_id})
-            db_sdn = None
+            db_sdn = {}
             self.logger.debug("sdn_delete task sdn_id={} Exit Ok".format(sdn_id))
             return
 
@@ -1159,7 +1159,11 @@ class K8sClusterLcm(LcmBase):
             k8s_deploy_methods = db_k8scluster.get("deployment_methods", {})
             # for backwards compatibility and all-false case
             if not any(k8s_deploy_methods.values()):
-                k8s_deploy_methods = {"helm-chart": True, "juju-bundle": True, "helm-chart-v3": True}
+                k8s_deploy_methods = {
+                    "helm-chart": True,
+                    "juju-bundle": True,
+                    "helm-chart-v3": True,
+                }
             deploy_methods = tuple(filter(k8s_deploy_methods.get, k8s_deploy_methods))
 
             for task_name in deploy_methods:
@@ -1470,9 +1474,10 @@ class VcaLcm(LcmBase):
         vca_id = vca_content["_id"]
         self.logger.debug("Task vca_create={} {}".format(vca_id, "Enter"))
 
-        db_vca = None
         db_vca_update = {}
 
+        operation_state = "FAILED"
+        operation_details = ""
         try:
             self.logger.debug(
                 "Task vca_create={} {}".format(vca_id, "Getting vca from db")
@@ -1510,7 +1515,6 @@ class VcaLcm(LcmBase):
             self.logger.error("Task vca_create={} {}".format(vca_id, error_msg))
             db_vca_update["_admin.operationalState"] = "ERROR"
             db_vca_update["_admin.detailed-status"] = error_msg
-            operation_state = "FAILED"
             operation_details = error_msg
         finally:
             try:
@@ -1545,6 +1549,9 @@ class VcaLcm(LcmBase):
         db_vca_update = {}
         vca_id = vca_content["_id"]
 
+        operation_state = "FAILED"
+        operation_details = ""
+
         try:
             self.logger.debug(
                 "Task vca_delete={} {}".format(vca_id, "Deleting vca from db")
@@ -1564,7 +1571,6 @@ class VcaLcm(LcmBase):
             self.logger.error("Task vca_delete={} {}".format(vca_id, error_msg))
             db_vca_update["_admin.operationalState"] = "ERROR"
             db_vca_update["_admin.detailed-status"] = error_msg
-            operation_state = "FAILED"
             operation_details = error_msg
         finally:
             try: