From e76b88289b7ee86fa8f79effae73499eb637fadf Mon Sep 17 00:00:00 2001 From: bravof Date: Fri, 26 Feb 2021 16:57:52 -0300 Subject: [PATCH] fix(query): new query to get VNFD using the session object. Bug 1390 Change-Id: I787f8715314b113f349c9b659b41aa4e0795250d Signed-off-by: bravof --- osm_nbi/instance_topics.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/osm_nbi/instance_topics.py b/osm_nbi/instance_topics.py index 5088b24..7b3e9ad 100644 --- 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()) - 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 = {} @@ -306,7 +306,7 @@ class NsrTopic(BaseTopic): 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) @@ -367,10 +367,7 @@ class NsrTopic(BaseTopic): "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 = {} -- 2.17.1