Merge "Change in Instantiate"

diff --combined lcm/lcm/nf/biz/instantiate_vnf.py
index e0975e5,9b89c26..753b955
--- 1/lcm/lcm/nf/biz/instantiate_vnf.py
--- 2/lcm/lcm/nf/biz/instantiate_vnf.py
+++ b/lcm/lcm/nf/biz/instantiate_vnf.py
@@@ -21,12 -21,13 +21,13 @@@ from threading import Threa
  from lcm.pub.database.models import NfInstModel, VmInstModel, NetworkInstModel, \
      SubNetworkInstModel, PortInstModel, StorageInstModel, FlavourInstModel, VNFCInstModel
  from lcm.pub.exceptions import NFLCMException
- from lcm.pub.msapi.gvnfmdriver import apply_grant_to_nfvo, notify_lcm_to_nfvo
+ from lcm.pub.msapi.gvnfmdriver import notify_lcm_to_nfvo
  from lcm.pub.msapi.sdc_run_catalog import query_vnfpackage_by_id
  from lcm.pub.utils.jobutil import JobUtil
  from lcm.pub.utils.timeutil import now_time
  from lcm.pub.utils.values import ignore_case_get, get_none, get_boolean, get_integer
  from lcm.pub.vimapi import adaptor
+ from lcm.nf.biz.grant_vnf import grant_resource
  
  logger = logging.getLogger(__name__)
  
@@@ -38,6 -39,7 +39,7 @@@ class InstantiateVnf(Thread)
          self.nf_inst_id = nf_inst_id
          self.job_id = job_id
          self.vim_id = ignore_case_get(ignore_case_get(self.data, "additionalParams"), "vimId")
+         self.grant_type = "Instantiate"
  
      def run(self):
          try:
@@@ -108,41 -110,9 +110,9 @@@
          logger.info("Nf instancing pre-check finish")
  
      def apply_grant(self):
-         logger.info('Send resource grand request to nfvo')
-         content_args = {
-             'vnfInstanceId': self.nf_inst_id,
-             'vnfDescriptorId': '',
-             'lifecycleOperation': 'Instantiate',
-             'jobId': self.job_id,
-             'addResource': [],
-             'removeResource': [],
-             'placementConstraint': [],
-             'additionalParam': {}
-         }
- 
          vdus = ignore_case_get(self.vnfd_info, "vdus")
-         res_index = 1
-         for vdu in vdus:
-             res_def = {
-                 'type': 'VDU',
-                 'resDefId': str(res_index),
-                 'resDesId': ignore_case_get(vdu, "vdu_id")
-             }
-             content_args['addResource'].append(res_def)
-             res_index += 1
- 
-         logger.debug("VnfInst = %s", self.nf_inst_id)
-         '''
-         vnfmInfo = NfvoRegInfoModel.objects.filter(nfvoid=self.nf_inst_id)
-         if len(vnfmInfo) == 0:
-             raise NFLCMException('VnfInst(%s) does not exist' % self.nf_inst_id)
-         '''
-         nfInsts = NfInstModel.objects.filter(nfinstid=self.nf_inst_id)
-         content_args['additionalParam']['vnfmid'] = nfInsts[0].vnfminstid
-         content_args['additionalParam']['vimid'] = self.vim_id
-         logger.info('Grant request data = %s', content_args)
- 
-         apply_result = apply_grant_to_nfvo(json.dumps(content_args))
+         apply_result = grant_resource(data=self.data, nf_inst_id=self.nf_inst_id, job_id=self.job_id,
+                                       grant_type=self.grant_type, vdus=vdus)
          self.set_location(apply_result)
  
          logger.info('VnfdInfo = %s' % self.vnfd_info)
@@@ -165,35 -135,25 +135,35 @@@
              if vnfc.vmid:
                  vm = VmInstModel.objects.filter(vmid=vnfc.vmid)
                  if vm:
 -                    vm_resource = {'vimId': vm[0].vimConnectionId, 'resourceId': vm[0].resouceid,
 -                                   'resourceProviderId': vm[0].vmname, 'vimLevelResourceType': 'vm'}
 +                    vm_resource = {
 +                        'vimId': vm[0].vimConnectionId,
 +                        'resourceId': vm[0].resouceid,
 +                        'resourceProviderId': vm[0].vmname,
 +                        'vimLevelResourceType': 'vm'
 +                    }
                      # TODO: is resourceName mapped to resourceProviderId?
 -            affected_vnfcs.append(
 -                {'id': vnfc.vnfcinstanceid,
 -                 'vduId': vnfc.vduid,
 -                 'changeType': 'ADDED',
 -                 'computeResource': vm_resource})
 +            affected_vnfcs.append({
 +                'id': vnfc.vnfcinstanceid,
 +                'vduId': vnfc.vduid,
 +                'changeType': 'ADDED',
 +                'computeResource': vm_resource
 +            })
          affected_vls = []
          networks = NetworkInstModel.objects.filter(instid=self.nf_inst_id)
          for network in networks:
 -            network_resource = {'vimConnectionId': network.vimid, 'resourceId': network.resouceid,
 -                                'resourceProviderId': network.name, 'vimLevelResourceType': 'network'}
 +            network_resource = {
 +                'vimConnectionId': network.vimid,
 +                'resourceId': network.resouceid,
 +                'resourceProviderId': network.name,
 +                'vimLevelResourceType': 'network'
 +            }
              # TODO: is resourceName mapped to resourceProviderId?
 -            affected_vls.append(
 -                {'id': network.networkid,
 -                 'virtualLinkDescId': network.nodeId,
 -                 'changeType': 'ADDED',
 -                 'networkResource': network_resource})
 +            affected_vls.append({
 +                'id': network.networkid,
 +                'virtualLinkDescId': network.nodeId,
 +                'changeType': 'ADDED',
 +                'networkResource': network_resource
 +            })
          ext_link_ports = []
          ports = PortInstModel.objects.filter(instid=self.nf_inst_id)
          for port in ports:
@@@ -225,7 -185,7 +195,7 @@@
              # TODO: is resourceName mapped to resourceProviderId?
          content_args = {
              "notificationType": 'VnfLcmOperationOccurrenceNotification',
 -            "notificationStatus": 'Result',
 +            "notificationStatus": 'RESULT',
              "vnfInstanceId": self.nf_inst_id,
              "operation": 'INSTANTIATE',
              "vnfLcmOpOccId": self.job_id,