Fix 1472 - Error executing upgrade action over K8S NS 41/10541/1
authorlimon <alimonj@indra.es>
Wed, 17 Mar 2021 12:24:00 +0000 (13:24 +0100)
committerlimon <alimonj@indra.es>
Thu, 25 Mar 2021 09:55:26 +0000 (10:55 +0100)
Change-Id: Ibc9cb5e12d90f5582f49d99bcee002e2813dd9eb
Signed-off-by: limon <alimonj@indra.es>
(cherry picked from commit 9b33fa825aaf935e4f467b1a01f65c85d1b9b694)

osm_nbi/instance_topics.py

index 5088b24..de49738 100644 (file)
@@ -764,18 +764,20 @@ class NsLcmOpTopic(BaseTopic):
                 descriptor_configuration = utils.find_in_list(
                     configs,
                     lambda config: config["id"] == indata["vdu_id"]
-                ).get("config-primitive")
+                )
             elif indata.get("kdu_name"):
                 self._check_valid_kdu(vnfd, indata["kdu_name"])
                 descriptor_configuration = utils.find_in_list(
                     configs,
                     lambda config: config["id"] == indata.get("kdu_name")
-                ).get("config-primitive")
+                )
             else:
                 descriptor_configuration = utils.find_in_list(
                     configs,
                     lambda config: config["id"] == vnfd["id"]
-                ).get("config-primitive")
+                )
+            if descriptor_configuration is not None:
+                descriptor_configuration = descriptor_configuration.get("config-primitive")
         else:  # use a NSD
             descriptor_configuration = nsd.get("ns-configuration", {}).get("config-primitive")