feat(sol006): LCM migration to SOL006

[osm/LCM.git] / osm_lcm / vim_sdn.py

diff --git a/osm_lcm/vim_sdn.py b/osm_lcm/vim_sdn.py
index 0a21eaa..13b95c4 100644 (file)
--- a/osm_lcm/vim_sdn.py
+++ b/osm_lcm/vim_sdn.py
@@ -38,7 +38,7 @@ class VimLcm(LcmBase):
     vim_config_encrypted = {"1.1": ("admin_password", "nsx_password", "vcenter_password"),
                             "default": ("admin_password", "nsx_password", "vcenter_password", "vrops_password")}
 
-    def __init__(self, db, msg, fs, lcm_tasks, config, loop):
+    def __init__(self, msg, lcm_tasks, config, loop):
         """
         Init, Connect to database, filesystem storage, and messaging
         :param config: two level dictionary with configuration. Top level should contain 'database', 'storage',
@@ -50,7 +50,7 @@ class VimLcm(LcmBase):
         self.lcm_tasks = lcm_tasks
         self.ro_config = config["ro_config"]
 
-        super().__init__(db, msg, fs, self.logger)
+        super().__init__(msg, self.logger)
 
     async def create(self, vim_content, order_id):
 
@@ -379,7 +379,7 @@ class WimLcm(LcmBase):
     # values that are encrypted at wim config because they are passwords
     wim_config_encrypted = ()
 
-    def __init__(self, db, msg, fs, lcm_tasks, config, loop):
+    def __init__(self, msg, lcm_tasks, config, loop):
         """
         Init, Connect to database, filesystem storage, and messaging
         :param config: two level dictionary with configuration. Top level should contain 'database', 'storage',
@@ -391,7 +391,7 @@ class WimLcm(LcmBase):
         self.lcm_tasks = lcm_tasks
         self.ro_config = config["ro_config"]
 
-        super().__init__(db, msg, fs, self.logger)
+        super().__init__(msg, self.logger)
 
     async def create(self, wim_content, order_id):
 
@@ -674,7 +674,7 @@ class WimLcm(LcmBase):
 
 class SdnLcm(LcmBase):
 
-    def __init__(self, db, msg, fs, lcm_tasks, config, loop):
+    def __init__(self, msg, lcm_tasks, config, loop):
         """
         Init, Connect to database, filesystem storage, and messaging
         :param config: two level dictionary with configuration. Top level should contain 'database', 'storage',
@@ -686,7 +686,7 @@ class SdnLcm(LcmBase):
         self.lcm_tasks = lcm_tasks
         self.ro_config = config["ro_config"]
 
-        super().__init__(db, msg, fs, self.logger)
+        super().__init__(msg, self.logger)
 
     async def create(self, sdn_content, order_id):
 
@@ -899,7 +899,7 @@ class SdnLcm(LcmBase):
 class K8sClusterLcm(LcmBase):
     timeout_create = 300
 
-    def __init__(self, db, msg, fs, lcm_tasks, config, loop):
+    def __init__(self, msg, lcm_tasks, config, loop):
         """
         Init, Connect to database, filesystem storage, and messaging
         :param config: two level dictionary with configuration. Top level should contain 'database', 'storage',
@@ -910,16 +910,16 @@ class K8sClusterLcm(LcmBase):
         self.loop = loop
         self.lcm_tasks = lcm_tasks
         self.vca_config = config["VCA"]
-        self.fs = fs
-        self.db = db
+
+        super().__init__(msg, self.logger)
 
         self.helm2_k8scluster = K8sHelmConnector(
             kubectl_command=self.vca_config.get("kubectlpath"),
             helm_command=self.vca_config.get("helmpath"),
-            fs=self.fs,
             log=self.logger,
+            on_update_db=None,
             db=self.db,
-            on_update_db=None
+            fs=self.fs
         )
 
         self.helm3_k8scluster = K8sHelm3Connector(
@@ -934,21 +934,20 @@ class K8sClusterLcm(LcmBase):
         self.juju_k8scluster = K8sJujuConnector(
             kubectl_command=self.vca_config.get("kubectlpath"),
             juju_command=self.vca_config.get("jujupath"),
-            fs=self.fs,
             log=self.logger,
-            db=self.db,
             loop=self.loop,
             on_update_db=None,
             vca_config=self.vca_config,
+            db=self.db,
+            fs=self.fs
         )
+
         self.k8s_map = {
             "helm-chart": self.helm2_k8scluster,
             "helm-chart-v3": self.helm3_k8scluster,
             "juju-bundle": self.juju_k8scluster,
         }
 
-        super().__init__(db, msg, fs, self.logger)
-
     async def create(self, k8scluster_content, order_id):
 
         op_id = k8scluster_content.pop('op_id', None)
@@ -1156,7 +1155,7 @@ class K8sClusterLcm(LcmBase):
 
 class K8sRepoLcm(LcmBase):
 
-    def __init__(self, db, msg, fs, lcm_tasks, config, loop):
+    def __init__(self, msg, lcm_tasks, config, loop):
         """
         Init, Connect to database, filesystem storage, and messaging
         :param config: two level dictionary with configuration. Top level should contain 'database', 'storage',
@@ -1167,10 +1166,17 @@ class K8sRepoLcm(LcmBase):
         self.loop = loop
         self.lcm_tasks = lcm_tasks
         self.vca_config = config["VCA"]
-        self.fs = fs
-        self.db = db
 
-        super().__init__(db, msg, fs, self.logger)
+        super().__init__(msg, self.logger)
+
+        self.k8srepo = K8sHelmConnector(
+            kubectl_command=self.vca_config.get("kubectlpath"),
+            helm_command=self.vca_config.get("helmpath"),
+            fs=self.fs,
+            log=self.logger,
+            db=self.db,
+            on_update_db=None
+        )
 
     async def create(self, k8srepo_content, order_id):