From: David Garcia Date: Tue, 4 May 2021 11:15:57 +0000 (+0200) Subject: Fix bug 1525 X-Git-Tag: release-v10.0-start~6 X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FLCM.git;a=commitdiff_plain;h=02ae5404cf6e5fed364fdc22505c9d0f11fa5398 Fix bug 1525 This patch adds **kwargs in the LCMHelmConn methods that are not used. The feature 10239 added the vca_id parameter for the LCM and N2VC communication for Juju related execution environments. The current patch will avoid having to add extra parameters that are not needed nor used in the LCMHelmmConn. Change-Id: I673a36c7c13891a53de1d7dc547f13c81616d373 Signed-off-by: David Garcia --- diff --git a/osm_lcm/lcm_helm_conn.py b/osm_lcm/lcm_helm_conn.py index a13824d..845a413 100644 --- a/osm_lcm/lcm_helm_conn.py +++ b/osm_lcm/lcm_helm_conn.py @@ -265,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 @@ -286,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. @@ -327,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