From 843adbc77237767f62b198e9cbb5ffb4c7caf17d Mon Sep 17 00:00:00 2001 From: lloretgalleg Date: Thu, 16 Jul 2020 10:22:09 +0000 Subject: [PATCH] Bug 1152, error if system cluster not properly initialized Change-Id: Ia30aa0805d57fd4e20fd5b56b00ddd773968213a Signed-off-by: lloretgalleg --- osm_lcm/lcm_helm_conn.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/osm_lcm/lcm_helm_conn.py b/osm_lcm/lcm_helm_conn.py index c18405b..555613e 100644 --- a/osm_lcm/lcm_helm_conn.py +++ b/osm_lcm/lcm_helm_conn.py @@ -194,6 +194,8 @@ class LCMHelmConn(N2VCConnector): ee_id = "{}.{}".format(self._KUBECTL_OSM_NAMESPACE, helm_id) return ee_id, None + except N2VCException: + raise except Exception as e: self.log.error("Error deploying chart ee: {}".format(e), exc_info=True) raise N2VCException("Error deploying chart ee: {}".format(e)) @@ -399,6 +401,8 @@ class LCMHelmConn(N2VCConnector): # Uninstall chart await self._k8sclusterhelm.uninstall(system_cluster_uuid, helm_id) self.log.info("ee_id: {} deleted".format(ee_id)) + except N2VCException: + raise except Exception as e: self.log.error("Error deleting ee id: {}: {}".format(ee_id, e), exc_info=True) raise N2VCException("Error deleting ee id {}: {}".format(ee_id, e)) @@ -486,6 +490,10 @@ class LCMHelmConn(N2VCConnector): if not self._system_cluster_id: db_k8cluster = self.db.get_one("k8sclusters", {"name": self._KUBECTL_OSM_CLUSTER_NAME}) k8s_hc_id = deep_get(db_k8cluster, ("_admin", "helm-chart", "id")) + if not k8s_hc_id: + self.log.error("osm system cluster has not been properly initialized for helm connector, " + "helm-chart id is not defined") + raise N2VCException("osm system cluster has not been properly initialized for helm connector") self._system_cluster_id = k8s_hc_id return self._system_cluster_id -- 2.17.1