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.catalog import query_rawdata_from_catalog
+from lcm.pub.msapi.nfvolcm import vnfd_rawdata_get, 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
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.package_info = ''
+ self.package_id = ''
+ self.csar_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_ns_inst_name_exist::is_exist=%s" % is_exist)
+ logger.debug("check_inst_name_exist::is_exist=%s" % is_exist)
if is_exist:
raise NFLCMException('VNF is already exist.')
- #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']
+ # 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")
- 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
+ # 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)
+
+ vnfd_info = raw_data
+ metadata = ignore_case_get(vnfd_info, "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 = vnfd_info
+
+ 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))
+ return nf_inst_id