Add vfc-vnflcm create vnf unitest

[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 0eb4474..593248d 100644 (file)
--- a/lcm/lcm/nf/vnfs/vnf_create/create_vnf_identifier.py
+++ b/lcm/lcm/nf/vnfs/vnf_create/create_vnf_identifier.py
@@ -11,55 +11,80 @@
 # 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.utils.restcall import req_by_msb
+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
 
 logger = logging.getLogger(__name__)
-# Query vnfd_rawdata by vnfdid
-def vnfd_rawdata_get(vnfdid):
-    ret = req_by_msb("openoapi/nslcm/v1/vnfpackage/%s" % vnfdid, "GET")
-    return ret
+
 
 class CreateVnf:
     def __init__(self, data):
         self.data = data
-
-    def do_biz(self):
-        logger.debug("CreateVnfIdentifier--CreateVnf::> %s" % self.data)
         self.vnfd_id = ignore_case_get(self.data, "vnfdId")
         self.vnf_instance_mame = ignore_case_get(self.data, "vnfInstanceName")
         self.description = ignore_case_get(self.data, "vnfInstanceDescription")
+        self.vnfd = None
+        self.csar_id = self.vnfd_id
+
+    def do_biz(self):
+        self.nf_inst_id = str(uuid.uuid4())
+        try:
+            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=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=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 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_ns_inst_name_exist::is_exist=%s" % is_exist)
+        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)
 
-        #get rawdata by vnfd_id
-        ret = vnfd_rawdata_get(self.vnfd_id)
-        if ret[0] != 0:
-            raise NFLCMException('Get vnfd_raw_data failed.')
-        dst_plan = json.JSONDecoder().decode(ret[1])
-        self.vnfd_version = dst_plan['metadata']['vnfd_version']
-        self.vendor = dst_plan['metadata']['vendor']
-        self.producttype = dst_plan['metadata']['domain_type']
-        self.netype = dst_plan['metadata']['vnf_type']
-        self.vnfd_model = dst_plan
-        self.vnfSoftwareVersion = dst_plan['metadata']['version']
-
-        self.nf_inst_id = str(uuid.uuid4())
-        NfInstModel.objects.create(nfinstid=self.nf_inst_id, mnfinstid=self.nf_inst_id, nf_name=self.vnf_instance_mame,
-                                   package_id='todo', vnfm_inst_id='todo', version=self.vnfd_version, vendor=self.vendor,
-                                   producttype=self.producttype,netype=self.netype, vnfd_model=self.vnfd_model,
-                                   instantiationState='NOT_INSTANTIATED', nf_desc=self.description, vnfdid=self.vnfd_id,
-                                   vnfSoftwareVersion=self.vnfSoftwareVersion, vnfConfigurableProperties='todo',
-                                   localizationLanguage='EN_US',create_time=now_time())
-        is_exist = NfInstModel.objects.filter(nf_name=self.vnf_instance_mame).exists()
-        logger.debug("check_ns_inst_name_exist::is_exist=%s" % is_exist)
-        return self.nf_inst_id
\ No newline at end of file
+    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())