Fix vfc vnflcm vnf operations unit tests

[vfc/gvnfm/vnflcm.git] / lcm / lcm / nf / vnfs / vnf_create / create_vnf_identifier.py

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 b1b87c4..495be6e 100644 (file)
--- 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.aai import create_vnf
+from lcm.pub.msapi.aai import create_vnf_aai
 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
@@ -46,7 +46,7 @@ class CreateVnf:
         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 ignore_case_get(self.package_info, "csars"):
@@ -64,29 +64,39 @@ class CreateVnf:
             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,
+            NfInstModel.objects.create(nfinstid=self.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())
-            data = {
-                "vnf-id": nf_inst_id,
-                "vnf-name": self.vnf_instance_mame,
-                "vnf-type": "INFRA",
-                "in-maint": "true",
-                "is-closed-loop-disabled": "false"
-            }
-            create_vnf(nf_inst_id, data)
+
+            self.create_vnf_in_aai()
         except NFLCMException as e:
-            logger.debug('Create VNF instance[%s] to AAI failed' % nf_inst_id)
+            logger.debug('Create VNF instance[%s] to AAI failed' % self.nf_inst_id)
         except:
-            NfInstModel.objects.create(nfinstid=nf_inst_id, nf_name=self.vnf_instance_mame, package_id='',
+            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 create_vnf_in_aai(self):
+        logger.debug("CreateVnf::create_vnf_in_aai::report vnf instance[%s] to aai." % self.nf_inst_id)
+        data = {
+            "vnf-id": self.nf_inst_id,
+            "vnf-name": self.vnf_instance_mame,
+            "vnf-type": "INFRA",
+            "in-maint": True,
+            "is-closed-loop-disabled": False
+        }
+        resp_data, resp_status = create_vnf_aai(self.nf_inst_id, data)
+        if resp_data:
+            logger.debug("Fail to create vnf instance[%s] to aai, resp_status: [%s]." % (self.nf_inst_id, resp_status))
+        else:
+            logger.debug("Success to create vnf instance[%s] to aai, resp_status: [%s]." % (self.nf_inst_id, resp_status))
+