From: David Garcia <david.garcia@canonical.com>
Date: Thu, 19 Nov 2020 12:06:54 +0000 (+0100)
Subject: Fix bug 1297
X-Git-Tag: release-v9.0-start~9
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F08%2F10008%2F3;p=osm%2FLCM.git

Fix bug 1297

Change-Id: I8e4b4be847dcd592bbb7c2e69d7065adc7336740
Signed-off-by: David Garcia <david.garcia@canonical.com>
---

diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py
index 7af42d9a..0f92f9d9 100644
--- a/osm_lcm/ns.py
+++ b/osm_lcm/ns.py
@@ -1498,6 +1498,7 @@ class NsLcm(LcmBase):
                                                                                               vdu_index))
                 # New generation RO stores information at "vim_info"
                 ng_ro_status = None
+                target_vim = None
                 if vdur.get("vim_info"):
                     target_vim = next(t for t in vdur["vim_info"])  # there should be only one key
                     ng_ro_status = vdur["vim_info"][target_vim].get("vim_status")
@@ -1506,7 +1507,10 @@ class NsLcm(LcmBase):
                     if not ip_address:
                         continue
                     target_vdu_id = vdur["vdu-id-ref"]
-                elif vdur.get("status") == "ERROR" or vdur["vim_info"][target_vim].get("vim_status") == "ERROR":
+                elif (
+                    vdur.get("status") == "ERROR" or
+                    vdur.get("vim_info", {}).get(target_vim, {}).get("vim_status") == "ERROR"
+                ):
                     raise LcmException("Cannot inject ssh-key because target VM is in error state")
 
             if not target_vdu_id:
@@ -1521,7 +1525,6 @@ class NsLcm(LcmBase):
                 try:
                     ro_vm_id = "{}-{}".format(db_vnfr["member-vnf-index-ref"], target_vdu_id)  # TODO add vdu_index
                     if self.ng_ro:
-                        self.logger.debug(logging_text + "ALF lanzando orden")
                         target = {"action": "inject_ssh_key", "key": pub_key, "user": user,
                                   "vnf": [{"_id": vnfr_id, "vdur": [{"id": vdur["id"]}]}],
                                   }