# 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 traceback
from threading import Thread
from lcm.nf.vnfs.const import VNF_STATUS
from lcm.pub.database.models import NfInstModel, VmInstModel, NetworkInstModel, StorageInstModel, \
- FlavourInstModel, PortInstModel, SubNetworkInstModel, VNFCInstModel
+ FlavourInstModel, PortInstModel, SubNetworkInstModel, VNFCInstModel, NfvoRegInfoModel
from lcm.pub.exceptions import NFLCMException
from lcm.pub.msapi.gvnfmdriver import apply_grant_to_nfvo, notify_lcm_to_nfvo
from lcm.pub.utils.jobutil import JobUtil
if not vnf_insts.exists():
raise NFLCMException('VnfInst(%s) does not exist' % self.nf_inst_id)
sel_vnf = vnf_insts[0]
- if sel_vnf.status != 'VNF_INSTANTIATED':
- raise NFLCMException("Don't allow to terminate vnf(status:[%s])" % sel_vnf.status)
+ #if sel_vnf.status != 'VNF_INSTANTIATED':
+ # raise NFLCMException("Don't allow to terminate vnf(status:[%s])" % sel_vnf.status)
if self.terminationType == 'GRACEFUL' and not self.gracefulTerminationTimeout:
raise NFLCMException("Graceful termination must set timeout")
def grant_resource(self):
logger.info("nf_cancel_task grant_resource begin")
content_args = {'vnfInstanceId': self.nf_inst_id, 'vnfDescriptorId': '',
- 'lifecycleOperation': 'Instantiate', 'jobId': self.job_id,
+ 'lifecycleOperation': 'Terminate', 'jobId': self.job_id,
'addResource': [], 'removeResource': [],
'placementConstraint': [], 'additionalParam': {}}
content_args['removeResource'].append(res_def)
res_index += 1
+ vnfmInfo = NfvoRegInfoModel.objects.filter(nfvoid=self.nf_inst_id)
+ if len(vnfmInfo) == 0:
+ raise NFLCMException('nf_inst_id(%s) does not exist in NfvoRegInfoModel' % self.nf_inst_id)
+ content_args['additionalParam']['vnfmid'] = vnfmInfo[0].vnfminstid
+ content_args['additionalParam']['vimid'] = vnfmInfo[0].apiurl
logger.info('content_args=%s' % content_args)
- self.apply_result = apply_grant_to_nfvo(content_args)
+ self.apply_result = apply_grant_to_nfvo(json.dumps(content_args))
logger.info("nf_cancel_task grant_resource end")
JobUtil.add_job_status(self.job_id, 20, 'Nf terminating grant_resource finish')
def query_inst_resource(self):
logger.info('[query_resource begin]:inst_id=%s' % self.nf_inst_id)
- vol_list = StorageInstModel.objects.filter(instid=self.nf_inst_id, is_predefined=1)
+ vol_list = StorageInstModel.objects.filter(instid=self.nf_inst_id)
for vol in vol_list:
vol_info = {}
if not vol.resouceid:
vol_info["vim_id"] = vol.vimid
vol_info["tenant_id"] = vol.tenant
vol_info["res_id"] = vol.resouceid
+ vol_info["is_predefined"] = vol.is_predefined
self.inst_resource['volumn'].append(vol_info)
logger.info('[query_volumn_resource]:ret_volumns=%s' % self.inst_resource['volumn'])
- network_list = NetworkInstModel.objects.filter(instid=self.nf_inst_id, is_predefined=1)
+ network_list = NetworkInstModel.objects.filter(instid=self.nf_inst_id)
for network in network_list:
network_info = {}
if not network.resouceid:
network_info["vim_id"] = network.vimid
network_info["tenant_id"] = network.tenant
network_info["res_id"] = network.resouceid
+ network_info["is_predefined"] = network.is_predefined
self.inst_resource['network'].append(network_info)
logger.info('[query_network_resource]:ret_networks=%s' % self.inst_resource['network'])
- subnetwork_list = SubNetworkInstModel.objects.filter(instid=self.nf_inst_id, is_predefined=1)
+ subnetwork_list = SubNetworkInstModel.objects.filter(instid=self.nf_inst_id)
for subnetwork in subnetwork_list:
subnetwork_info = {}
if not subnetwork.resouceid:
subnetwork_info["vim_id"] = subnetwork.vimid
subnetwork_info["tenant_id"] = subnetwork.tenant
subnetwork_info["res_id"] = subnetwork.resouceid
+ subnetwork_info["is_predefined"] = subnetwork.is_predefined
self.inst_resource['subnet'].append(subnetwork_info)
logger.info('[query_subnetwork_resource]:ret_networks=%s' % self.inst_resource['subnet'])
- port_list = PortInstModel.objects.filter(instid=self.nf_inst_id, is_predefined=1)
+ port_list = PortInstModel.objects.filter(instid=self.nf_inst_id)
for port in port_list:
port_info = {}
if not port.resouceid:
port_info["vim_id"] = port.vimid
port_info["tenant_id"] = port.tenant
port_info["res_id"] = port.resouceid
+ port_info["is_predefined"] = port.is_predefined
self.inst_resource['port'].append(port_info)
logger.info('[query_port_resource]:ret_networks=%s' % self.inst_resource['port'])
- flavor_list = FlavourInstModel.objects.filter(instid=self.nf_inst_id, is_predefined=1)
+ flavor_list = FlavourInstModel.objects.filter(instid=self.nf_inst_id)
for flavor in flavor_list:
flavor_info = {}
if not flavor.resouceid:
flavor_info["vim_id"] = flavor.vimid
flavor_info["tenant_id"] = flavor.tenant
flavor_info["res_id"] = flavor.resouceid
+ flavor_info["is_predefined"] = flavor.is_predefined
self.inst_resource['flavor'].append(flavor_info)
logger.info('[query_flavor_resource]:ret_networks=%s' % self.inst_resource['flavor'])
- vm_list = VmInstModel.objects.filter(instid=self.nf_inst_id, is_predefined=1)
+ vm_list = VmInstModel.objects.filter(instid=self.nf_inst_id)
for vm in vm_list:
vm_info = {}
if not vm.resouceid:
vm_info["vim_id"] = vm.vimid
vm_info["tenant_id"] = vm.tenant
vm_info["res_id"] = vm.resouceid
+ vm_info["is_predefined"] = vm.is_predefined
self.inst_resource['vm'].append(vm_info)
logger.info('[query_vm_resource]:ret_vms=%s' % self.inst_resource['vm'])
def query_notify_data(self):
- logger.info('[NF instantiation] send notify request to nfvo start')
+ logger.info('[NF terminate] send notify request to nfvo start')
affected_vnfc = []
vnfcs = VNFCInstModel.objects.filter(instid=self.nf_inst_id)
for vnfc in vnfcs:
'resourceName': vs.name, 'resourceType': 'volume'}})
self.notify_data = {
"status": 'result',
- "nfInstanceId": self.nf_inst_id,
+ "vnfInstanceId": self.nf_inst_id,
"operation": 'Terminal',
"jobId": self.job_id,
'affectedVnfc': affected_vnfc,
'affectedVirtualStorage': affected_vs,
'affectedCp': affected_cp
}
+ vnfmInfo = NfvoRegInfoModel.objects.filter(nfvoid=self.nf_inst_id)
+ if len(vnfmInfo) == 0:
+ raise NFLCMException('nf_inst_id(%s) does not exist in NfvoRegInfoModel' % self.nf_inst_id)
+ self.notify_data['VNFMID'] = vnfmInfo[0].vnfminstid
logger.info('content_args=%s' % self.notify_data)
def delete_resource(self):
- logger.error('rollback resource begin')
+ logger.info('rollback resource begin')
adaptor.delete_vim_res(self.inst_resource, self.do_notify_delete)
- logger.error('rollback resource complete')
+ logger.info('rollback resource complete')
def do_notify_delete(self, res_type, res_id):
logger.error('Deleting [%s] resource:resourceid [%s]' % (res_type, res_id))
Code Review / vfc / gvnfm / vnflcm.git / blobdiff