X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Flcm_utils.py;h=1854da7052a1a75666a1a57bc7669c61f0d6bd4e;hb=1b782761acbcbbe4666d667a0f04a44f136ef1a3;hp=235d48506fc286cc93c346469302e6baae1a1ac5;hpb=dffa6217777142746ed9b5c9a7eaab7c0d8716be;p=osm%2FLCM.git diff --git a/osm_lcm/lcm_utils.py b/osm_lcm/lcm_utils.py index 235d485..1854da7 100644 --- a/osm_lcm/lcm_utils.py +++ b/osm_lcm/lcm_utils.py @@ -118,7 +118,7 @@ def get_charm_artifact_path(base_folder, charm_name, charm_type, revision=str()) if base_folder.get("pkg-dir"): artifact_path = "{}/{}/{}/{}".format( - base_folder["folder"] + extension, + base_folder["folder"].split(":")[0] + extension, base_folder["pkg-dir"], "charms" if charm_type in ("native_charm", "lxc_proxy_charm", "k8s_proxy_charm") @@ -129,7 +129,7 @@ def get_charm_artifact_path(base_folder, charm_name, charm_type, revision=str()) else: # For SOL004 packages artifact_path = "{}/Scripts/{}/{}".format( - base_folder["folder"] + extension, + base_folder["folder"].split(":")[0] + extension, "charms" if charm_type in ("native_charm", "lxc_proxy_charm", "k8s_proxy_charm") else "helm-charts", @@ -169,8 +169,8 @@ class LcmBase: def update_db_2(self, item, _id, _desc): """ Updates database with _desc information. If success _desc is cleared - :param item: - :param _id: + :param item: collection + :param _id: the _id to use in the query filter :param _desc: dictionary with the content to update. Keys are dot separated keys for :return: None. Exception is raised on error """