From a8bbe67b84f4ef37107d882f0e7fab6ff6a1fc7e Mon Sep 17 00:00:00 2001 From: David Garcia Date: Thu, 19 Nov 2020 13:06:54 +0100 Subject: [PATCH] Fix bug 1297 Change-Id: I8e4b4be847dcd592bbb7c2e69d7065adc7336740 Signed-off-by: David Garcia --- osm_lcm/ns.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py index 7af42d9..0f92f9d 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"]}]}], } -- 2.17.1