X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fvnf_create%2Fcreate_vnf_identifier.py;h=495be6e22344421c17142e48dbbe1cc61763a477;hb=82496ee6dec372f57798df6e75e207738c733066;hp=580c531b42b7deaf7062561637a847d011c4ce90;hpb=3d218035bcab52858d52c52fdb69d511759e76ff;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 580c531b..495be6e2 100644 --- a/lcm/lcm/nf/vnfs/vnf_create/create_vnf_identifier.py +++ b/lcm/lcm/nf/vnfs/vnf_create/create_vnf_identifier.py @@ -11,14 +11,16 @@ # 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.aai import create_vnf_aai from lcm.pub.msapi.catalog import query_rawdata_from_catalog -from lcm.pub.msapi.nfvolcm import get_packageinfo_by_vnfdid +from lcm.pub.msapi.gvnfmdriver import 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 @@ -32,6 +34,7 @@ class CreateVnf: 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.package_info = '' self.package_id = '' self.csar_id = '' @@ -43,29 +46,57 @@ 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") + 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"): + if self.vnfd_id == ignore_case_get(val, "vnfdId"): + self.package_id = ignore_case_get(val, "csarId") + break + + raw_data = query_rawdata_from_catalog(self.package_id) + 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=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()) + + self.create_vnf_in_aai() + except NFLCMException as e: + logger.debug('Create VNF instance[%s] to AAI failed' % self.nf_inst_id) + 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()) - # 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) + 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 - 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 + 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)) - 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