From: ying.yunlong <ying.yunlong@zte.com.cn>
Date: Tue, 21 Feb 2017 06:35:00 +0000 (+0800)
Subject: Modify code of Create VNF Identifier
X-Git-Tag: release/mercury~56
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=vfc%2Fgvnfm%2Fvnflcm.git;a=commitdiff_plain;h=b6987c5ad68ba3211b65967ca727d2f7e144fff1

Modify code of Create VNF Identifier

Change-Id: Ib96ec86612e33adf9018f6b99affaff03365abab
Issue-Id: GVNFM-12
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
---

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 580c531b..ceda2249 100644
--- a/lcm/lcm/nf/vnfs/vnf_create/create_vnf_identifier.py
+++ b/lcm/lcm/nf/vnfs/vnf_create/create_vnf_identifier.py
@@ -43,29 +43,35 @@ 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)
+            self.package_id = ignore_case_get(self.package_info, "package_id")
+            self.csar_id = ignore_case_get(self.package_info, "csar_id")
 
-        # 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.csar_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