Fix 1472 - Error executing upgrade action over K8S NS

[osm/NBI.git] / osm_nbi / instance_topics.py

diff --git a/osm_nbi/instance_topics.py b/osm_nbi/instance_topics.py
index 5088b24..bf0e3a9 100644 (file)
--- a/osm_nbi/instance_topics.py
+++ b/osm_nbi/instance_topics.py
@@ -233,7 +233,7 @@ class NsrTopic(BaseTopic):
 
             step = "filling nsr from input data"
             nsr_id = str(uuid4())
 
             step = "filling nsr from input data"
             nsr_id = str(uuid4())

-            nsr_descriptor = self._create_nsr_descriptor_from_nsd(nsd, ns_request, nsr_id)
+            nsr_descriptor = self._create_nsr_descriptor_from_nsd(nsd, ns_request, nsr_id, session)

 
             # Create VNFRs
             needed_vnfds = {}
 
             # Create VNFRs
             needed_vnfds = {}


@@ -306,7 +306,7 @@ class NsrTopic(BaseTopic):
 
         return ns_k8s_namespace
 
 
         return ns_k8s_namespace
 

-    def _create_nsr_descriptor_from_nsd(self, nsd, ns_request, nsr_id):
+    def _create_nsr_descriptor_from_nsd(self, nsd, ns_request, nsr_id, session):

         now = time()
         additional_params, _ = self._format_additional_params(ns_request, descriptor=nsd)
 
         now = time()
         additional_params, _ = self._format_additional_params(ns_request, descriptor=nsd)
 


@@ -367,10 +367,7 @@ class NsrTopic(BaseTopic):
                             "vnfd-id-ref": vnf_profile.get("vnfd-id")
                         })
 
                             "vnfd-id-ref": vnf_profile.get("vnfd-id")
                         })
 

-                vnfd = self.db.get_one("vnfds",
-                                       {"id": vnf_profile.get("vnfd-id")},
-                                       fail_on_empty=True,
-                                       fail_on_more=True)
+                vnfd = self._get_vnfd_from_db(vnf_profile.get("vnfd-id"), session)

 
                 for vdu in vnfd.get("vdu", ()):
                     flavor_data = {}
 
                 for vdu in vnfd.get("vdu", ()):
                     flavor_data = {}


@@ -589,12 +586,6 @@ class NsrTopic(BaseTopic):
                     "name": icp.get("id"),
                 }
 
                     "name": icp.get("id"),
                 }
 

-                if "port-security-enabled" in icp:
-                    vdu_icp["port-security-enabled"] = icp["port-security-enabled"]
-
-                if "port-security-disable-strategy" in icp:
-                    vdu_icp["port-security-disable-strategy"] = icp["port-security-disable-strategy"]
-

                 vdur["internal-connection-point"].append(vdu_icp)
 
                 for iface in icp.get("virtual-network-interface-requirement", ()):
                 vdur["internal-connection-point"].append(vdu_icp)
 
                 for iface in icp.get("virtual-network-interface-requirement", ()):


@@ -602,6 +593,12 @@ class NsrTopic(BaseTopic):
                     vdu_iface = {x: iface[x] for x in iface_fields if iface.get(x) is not None}
 
                     vdu_iface["internal-connection-point-ref"] = vdu_icp["id"]
                     vdu_iface = {x: iface[x] for x in iface_fields if iface.get(x) is not None}
 
                     vdu_iface["internal-connection-point-ref"] = vdu_icp["id"]

+                    if "port-security-enabled" in icp:
+                        vdu_iface["port-security-enabled"] = icp["port-security-enabled"]
+
+                    if "port-security-disable-strategy" in icp:
+                        vdu_iface["port-security-disable-strategy"] = icp["port-security-disable-strategy"]
+

                     for ext_cp in vnfd.get("ext-cpd", ()):
                         if not ext_cp.get("int-cpd"):
                             continue
                     for ext_cp in vnfd.get("ext-cpd", ()):
                         if not ext_cp.get("int-cpd"):
                             continue


@@ -609,6 +606,17 @@ class NsrTopic(BaseTopic):
                             continue
                         if icp["id"] == ext_cp["int-cpd"].get("cpd"):
                             vdu_iface["external-connection-point-ref"] = ext_cp.get("id")
                             continue
                         if icp["id"] == ext_cp["int-cpd"].get("cpd"):
                             vdu_iface["external-connection-point-ref"] = ext_cp.get("id")

+
+                            if "port-security-enabled" in ext_cp:
+                                vdu_iface["port-security-enabled"] = (
+                                    ext_cp["port-security-enabled"]
+                                )
+
+                            if "port-security-disable-strategy" in ext_cp:
+                                vdu_iface["port-security-disable-strategy"] = (
+                                    ext_cp["port-security-disable-strategy"]
+                                )
+

                             break
 
                     if vnfd_mgmt_cp and vdu_iface.get("external-connection-point-ref") == vnfd_mgmt_cp:
                             break
 
                     if vnfd_mgmt_cp and vdu_iface.get("external-connection-point-ref") == vnfd_mgmt_cp:


@@ -764,18 +772,20 @@ class NsLcmOpTopic(BaseTopic):
                 descriptor_configuration = utils.find_in_list(
                     configs,
                     lambda config: config["id"] == indata["vdu_id"]
                 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")
             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"]
             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")
 
         else:  # use a NSD
             descriptor_configuration = nsd.get("ns-configuration", {}).get("config-primitive")