X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fvnf_create%2Fcreate_vnf_identifier.py;h=593248ddb218670ccea2fd0514152ab432bea008;hb=c4390ea3f4fc000058e3a1d24e38a4143671ba97;hp=6d5fb00c4399ab24725d438aef0be323ca8c47b7;hpb=e40cec8af30d75e8c4c39f81a3d98e654aa2fa1f;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 6d5fb00c..593248dd 100644
--- a/lcm/lcm/nf/vnfs/vnf_create/create_vnf_identifier.py
+++ b/lcm/lcm/nf/vnfs/vnf_create/create_vnf_identifier.py
@@ -11,15 +11,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import json
+
 import logging
 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.gvnfmdriver import get_packageinfo_by_vnfdid
-from lcm.pub.utils import toscautil
+from lcm.pub.msapi.sdc_run_catalog import query_vnfpackage_by_id
 from lcm.pub.utils.timeutil import now_time
 from lcm.pub.utils.values import ignore_case_get
 
@@ -33,48 +31,60 @@ class CreateVnf:
         self.vnf_instance_mame = ignore_case_get(self.data, "vnfInstanceName")
         self.description = ignore_case_get(self.data, "vnfInstanceDescription")
         self.vnfd = None
-        self.package_info = ''
-        self.package_id = ''
-        self.csar_id = ''
+        self.csar_id = self.vnfd_id
 
     def do_biz(self):
-        logger.debug("CreateVnfIdentifier--CreateVnf::> %s" % self.data)
-        is_exist = NfInstModel.objects.filter(nf_name=self.vnf_instance_mame).exists()
-        logger.debug("check_inst_name_exist::is_exist=%s" % is_exist)
-        if is_exist:
-            raise NFLCMException('VNF is already exist.')
-
-        nf_inst_id = str(uuid.uuid4())
+        self.nf_inst_id = str(uuid.uuid4())
         try:
-            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
-
-            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
-            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())
+            self.check_valid()
+            self.save_db()
+        except NFLCMException as e:
+            logger.debug('Create VNF instance[%s]: %s', self.nf_inst_id, e.message)
+            raise NFLCMException(e.message)
         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())
+            NfInstModel.objects.create(nfinstid=self.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())
 
-        vnf_inst = NfInstModel.objects.get(nfinstid=nf_inst_id)
+        vnf_inst = NfInstModel.objects.get(nfinstid=self.nf_inst_id)
         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
+        return self.nf_inst_id
+
+    def check_valid(self):
+        logger.debug("CreateVnf--check_valid::> %s" % self.data)
+        is_exist = NfInstModel.objects.filter(nf_name=self.vnf_instance_mame).exists()
+        logger.debug("check_valid::is_exist=%s" % is_exist)
+        if is_exist:
+            raise NFLCMException('VNF is already exist.')
+        self.vnfdModel = query_vnfpackage_by_id(self.csar_id)
+
+    def save_db(self):
+        metadata = ignore_case_get(self.vnfdModel, "metadata")
+        version = ignore_case_get(metadata, "vnfdVersion")
+        vendor = ignore_case_get(metadata, "vendor")
+        netype = ignore_case_get(metadata, "type")
+        vnfsoftwareversion = ignore_case_get(metadata, "version")
+        NfInstModel.objects.create(nfinstid=self.nf_inst_id,
+                                   nf_name=self.vnf_instance_mame,
+                                   package_id=self.csar_id,
+                                   version=version,
+                                   vendor=vendor,
+                                   netype=netype,
+                                   vnfd_model=self.vnfdModel,
+                                   status='NOT_INSTANTIATED',
+                                   nf_desc=self.description,
+                                   vnfdid=self.vnfd_id,
+                                   vnfSoftwareVersion=vnfsoftwareversion,
+                                   create_time=now_time())