X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fvnf_create%2Fcreate_vnf_identifier.py;h=41eeda43f18f350ceead18ddf6e45cce590484df;hb=062226977de3e506f31d2473f28f6409d5c81125;hp=14587375ef8d7da439c077bed0614bf9c13c2646;hpb=665ab553e8c09fa35c46a9fe3e5e773af5df7f43;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/vnfs/vnf_create/create_vnf_identifier.py b/lcm/lcm/nf/vnfs/vnf_create/create_vnf_identifier.py
index 14587375..41eeda43 100644
--- a/lcm/lcm/nf/vnfs/vnf_create/create_vnf_identifier.py
+++ b/lcm/lcm/nf/vnfs/vnf_create/create_vnf_identifier.py
@@ -18,7 +18,7 @@ import uuid
 from lcm.pub.database.models import NfInstModel
 from lcm.pub.exceptions import NFLCMException
 from lcm.pub.msapi.catalog import query_rawdata_from_catalog
-from lcm.pub.msapi.nfvolcm import vnfd_rawdata_get, get_packageinfo_by_vnfdid
+from lcm.pub.msapi.nfvolcm import get_packageinfo_by_vnfdid
 from lcm.pub.utils import toscautil
 from lcm.pub.utils.timeutil import now_time
 from lcm.pub.utils.values import ignore_case_get
@@ -43,29 +43,37 @@ class CreateVnf:
         if is_exist:
             raise NFLCMException('VNF is already exist.')
 
-        # get package_info from nslcm by vnfd_id
-        self.package_info = get_packageinfo_by_vnfdid(self.vnfd_id)
-        self.package_id = ignore_case_get(self.package_info, "package_id")
-        self.csar_id = ignore_case_get(self.package_info, "csar_id")
+        nf_inst_id = str(uuid.uuid4())
+        try:
+            # get package_info from nslcm by vnfd_id
+            self.package_info = get_packageinfo_by_vnfdid(self.vnfd_id)
+            for val in self.package_info:
+                if self.vnfd_id == ignore_case_get(val, "vnfd_id"):
+                    self.package_id = ignore_case_get(val, "csar_id")
+                    break
 
-        # get rawdata from catalog by csar_id
-        raw_data = query_rawdata_from_catalog(self.csar_id, self.data)
-        self.vnfd = toscautil.convert_vnfd_model(raw_data["rawData"])  # convert to inner json
-        self.vnfd = json.JSONDecoder().decode(self.vnfd)
+            # get rawdata from catalog by csar_id
+            raw_data = query_rawdata_from_catalog(self.package_id, self.data)
+            self.vnfd = toscautil.convert_vnfd_model(raw_data["rawData"])  # convert to inner json
+            self.vnfd = json.JSONDecoder().decode(self.vnfd)
 
-        metadata = ignore_case_get(self.vnfd, "metadata")
-        version = ignore_case_get(metadata, "vnfd_version")
-        vendor = ignore_case_get(metadata, "vendor")
-        netype = ignore_case_get(metadata, "vnf_type")
-        vnfsoftwareversion = ignore_case_get(metadata, "version")
-        vnfd_model = self.vnfd
+            metadata = ignore_case_get(self.vnfd, "metadata")
+            version = ignore_case_get(metadata, "vnfd_version")
+            vendor = ignore_case_get(metadata, "vendor")
+            netype = ignore_case_get(metadata, "vnf_type")
+            vnfsoftwareversion = ignore_case_get(metadata, "version")
+            vnfd_model = self.vnfd
+            NfInstModel.objects.create(nfinstid=nf_inst_id, nf_name=self.vnf_instance_mame, package_id=self.package_id,
+                                       version=version, vendor=vendor, netype=netype, vnfd_model=vnfd_model,
+                                       status='NOT_INSTANTIATED', nf_desc=self.description, vnfdid=self.vnfd_id,
+                                       vnfSoftwareVersion=vnfsoftwareversion, create_time=now_time())
+        except:
+            NfInstModel.objects.create(nfinstid=nf_inst_id, nf_name=self.vnf_instance_mame, package_id='',
+                                       version='', vendor='', netype='', vnfd_model='',
+                                       status='NOT_INSTANTIATED', nf_desc=self.description, vnfdid=self.vnfd_id,
+                                       vnfSoftwareVersion='', create_time=now_time())
 
-        nf_inst_id = str(uuid.uuid4())
-        NfInstModel.objects.create(nfinstid=nf_inst_id, nf_name=self.vnf_instance_mame, package_id=self.package_id,
-                                   version=version, vendor=vendor, netype=netype, vnfd_model=vnfd_model,
-                                   status='NOT_INSTANTIATED', nf_desc=self.description, vnfdid=self.vnfd_id,
-                                   vnfSoftwareVersion=vnfsoftwareversion, create_time=now_time())
         vnf_inst = NfInstModel.objects.get(nfinstid=nf_inst_id)
-        logger.debug('id is [%s],name is [%s],vnfd_id is [%s],description is [%s],create_time is [%s]' %
-                     (vnf_inst.nfinstid, vnf_inst.nf_name, vnf_inst.vnfdid, vnf_inst.nf_desc, vnf_inst.create_time))
+        logger.debug('id is [%s],name is [%s],vnfd_id is [%s],vnfd_model is [%s],description is [%s],create_time is [%s]' %
+                     (vnf_inst.nfinstid, vnf_inst.nf_name, vnf_inst.vnfdid, vnf_inst.vnfd_model, vnf_inst.nf_desc, vnf_inst.create_time))
         return nf_inst_id