From: gatici <gulsumatici@gmail.com>
Date: Wed, 8 Sep 2021 07:35:18 +0000 (+0000)
Subject: Bug 1651 fix
X-Git-Tag: release-v11.0-start~4
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=commitdiff_plain;h=a39cca06ba7b8c3e9924f7e00d8bf63b96f97947;hp=76ed75796553cb3e6bd93a20140d28c21894d8ee

Bug 1651 fix

This fix is required to fix VCA metric collection for SOL006 compatible descriptors.

Related bug: https://osm.etsi.org/bugzilla/show_bug.cgi?id=1651

Change-Id: I5a25c97b48692c23b5520cf72becb7b5bbcf327a
Signed-off-by: gatici <gulsumatici@gmail.com>
---

diff --git a/n2vc/vca/connection.py b/n2vc/vca/connection.py
index 98de0ff..0b4e75b 100644
--- a/n2vc/vca/connection.py
+++ b/n2vc/vca/connection.py
@@ -73,11 +73,11 @@ class Connection:
                 "user": envs["user"],
                 "secret": envs["secret"],
                 "cacert": envs["cacert"],
-                "pubkey": envs["pubkey"],
-                "lxd-cloud": envs["cloud"],
-                "lxd-credentials": envs.get("credentials", envs["cloud"]),
-                "k8s-cloud": envs["k8s_cloud"],
-                "k8s-credentials": envs.get("k8s_credentials", envs["k8s_cloud"]),
+                "pubkey": envs.get("pubkey"),
+                "lxd-cloud": envs.get("cloud"),
+                "lxd-credentials": envs.get("credentials", envs.get("cloud")),
+                "k8s-cloud": envs.get("k8s_cloud"),
+                "k8s-credentials": envs.get("k8s_credentials", envs.get("k8s_cloud")),
                 "model-config": ModelConfig(envs),
                 "api-proxy": envs.get("api_proxy", None),
             }