Fix bug 1525

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

diff --git a/osm_lcm/lcm_helm_conn.py b/osm_lcm/lcm_helm_conn.py
index 978b061..845a413 100644 (file)
--- a/osm_lcm/lcm_helm_conn.py
+++ b/osm_lcm/lcm_helm_conn.py
@@ -88,8 +88,6 @@ class LCMHelmConn(N2VCConnector, LcmBase):
     def __init__(self,
                  log: object = None,
                  loop: object = None,
-                 url: str = None,
-                 username: str = None,
                  vca_config: dict = None,
                  on_update_db=None, ):
         """
@@ -104,14 +102,12 @@ class LCMHelmConn(N2VCConnector, LcmBase):
             self,
             log=log,
             loop=loop,
-            url=url,
-            username=username,
-            vca_config=vca_config,
             on_update_db=on_update_db,
             db=self.db,
             fs=self.fs
         )
 
+        self.vca_config = vca_config
         self.log.debug("Initialize helm N2VC connector")
         self.log.debug("initial vca_config: {}".format(vca_config))
 
@@ -269,20 +265,11 @@ class LCMHelmConn(N2VCConnector, LcmBase):
         # nothing to do
         pass
 
-    async def install_configuration_sw(self,
-                                       ee_id: str,
-                                       artifact_path: str,
-                                       db_dict: dict,
-                                       progress_timeout: float = None,
-                                       total_timeout: float = None,
-                                       config: dict = None,
-                                       num_units: int = 1,
-                                       vca_type: str = None
-                                       ):
+    async def install_configuration_sw(self, *args, **kwargs):
         # nothing to do
         pass
 
-    async def add_relation(self, ee_id_1: str, ee_id_2: str, endpoint_1: str, endpoint_2: str):
+    async def add_relation(self, *args, **kwargs):
         # nothing to do
         pass
 
@@ -290,12 +277,18 @@ class LCMHelmConn(N2VCConnector, LcmBase):
         # nothing to to
         pass
 
-    async def get_status(self, namespace: str, yaml_format: bool = True):
+    async def get_status(self, *args, **kwargs):
         # not used for this connector
         pass
 
-    async def get_ee_ssh_public__key(self, ee_id: str, db_dict: dict, progress_timeout: float = None,
-                                     total_timeout: float = None) -> str:
+    async def get_ee_ssh_public__key(
+        self,
+        ee_id: str,
+        db_dict: dict,
+        progress_timeout: float = None,
+        total_timeout: float = None,
+        **kwargs,
+    ) -> str:
         """
         Obtains ssh-public key from ee executing GetSShKey method from the ee.
 
@@ -331,8 +324,16 @@ class LCMHelmConn(N2VCConnector, LcmBase):
             self.log.error("Error obtaining ee ssh_key: {}".format(e), exc_info=True)
             raise N2VCException("Error obtaining ee ssh_ke: {}".format(e))
 
-    async def exec_primitive(self, ee_id: str, primitive_name: str, params_dict: dict, db_dict: dict = None,
-                             progress_timeout: float = None, total_timeout: float = None) -> str:
+    async def exec_primitive(
+            self,
+            ee_id: str,
+            primitive_name: str,
+            params_dict: dict,
+            db_dict: dict = None,
+            progress_timeout: float = None,
+            total_timeout: float = None,
+            **kwargs,
+    ) -> str:
         """
         Execute a primitive in the execution environment
 
@@ -434,7 +435,13 @@ class LCMHelmConn(N2VCConnector, LcmBase):
         # nothing to be done
         pass
 
-    async def delete_execution_environment(self, ee_id: str, db_dict: dict = None, total_timeout: float = None):
+    async def delete_execution_environment(
+        self,
+        ee_id: str,
+        db_dict: dict = None,
+        total_timeout: float = None,
+        **kwargs,
+    ):
         """
         Delete an execution environment
         :param str ee_id: id of the execution environment to delete, included namespace.helm_id