-# Copyright 2017 ZTE Corporation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
+# # Copyright 2017 ZTE Corporation.
+# #
+# # Licensed under the Apache License, Version 2.0 (the "License");
+# # you may not use this file except in compliance with the License.
+# # You may obtain a copy of the License at
+# #
+# # http://www.apache.org/licenses/LICENSE-2.0
+# #
+# # Unless required by applicable law or agreed to in writing, software
+# # distributed under the License is distributed on an "AS IS" BASIS,
+# # 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 uuid
import mock
from lcm.nf.vnfs.vnf_cancel.term_vnf import TermVnf
from lcm.pub.database.models import NfInstModel, JobStatusModel, VmInstModel, NetworkInstModel, SubNetworkInstModel, \
- PortInstModel
+ PortInstModel, NfvoRegInfoModel
from lcm.pub.utils.jobutil import JobUtil
from lcm.pub.utils.timeutil import now_time
self.assertEqual(1, len(jobs))
def test_delete_vnf_identifier(self):
- NfInstModel.objects.create(nfinstid='1111', mnfinstid='1111', nf_name='2222',
- package_id='todo', vnfm_inst_id='todo', version='', vendor='',
- producttype='', netype='', vnfd_model='',
- instantiationState='VNF_INSTANTIATED', nf_desc='', vnfdid='',
+ NfInstModel.objects.create(nfinstid='1111', nf_name='2222', package_id='todo', version='', vendor='',
+ netype='', vnfd_model='', status='VNF_INSTANTIATED', nf_desc='', vnfdid='',
vnfSoftwareVersion='', vnfConfigurableProperties='todo',
localizationLanguage='EN_US', create_time=now_time())
response = self.client.delete("/openoapi/vnflcm/v1/vnf_instances/1111")
self.failUnlessEqual(status.HTTP_500_INTERNAL_SERVER_ERROR, response.status_code)
self.assertEqual("VnfInst(1111) does not exist", response.data["error"])
- def test_delete_vnf_identifier_when_instantiationState_check_failed(self):
- NfInstModel.objects.create(nfinstid='1111', mnfinstid='1111', nf_name='2222',
- package_id='todo', vnfm_inst_id='todo', version='', vendor='',
- producttype='', netype='', vnfd_model='',
- instantiationState='NOT_INSTANTIATED', nf_desc='', vnfdid='',
+ def test_delete_vnf_identifier_when_status_check_failed(self):
+ NfInstModel.objects.create(nfinstid='1111', nf_name='2222', package_id='todo', version='', vendor='',
+ netype='', vnfd_model='', status='NOT_INSTANTIATED', nf_desc='', vnfdid='',
vnfSoftwareVersion='', vnfConfigurableProperties='todo',
localizationLanguage='EN_US', create_time=now_time())
response = self.client.delete("/openoapi/vnflcm/v1/vnf_instances/1111")
self.failUnlessEqual(status.HTTP_500_INTERNAL_SERVER_ERROR, response.status_code)
- self.assertEqual("No instantiated vnf", response.data["error"])
+ self.assertEqual("Don't allow to delete vnf(status:[NOT_INSTANTIATED])", response.data["error"])
@mock.patch.object(TermVnf, 'run')
def test_terminate_vnf(self, mock_run):
TermVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
self.assert_job_result(self.job_id, 255, "VnfInst(%s) does not exist" % self.nf_inst_id)
+
+
def test_terminate_vnf_success(self):
- NfInstModel.objects.create(nfinstid='1111', mnfinstid='1111', nf_name='2222',
- package_id='todo', vnfm_inst_id='todo', version='', vendor='',
- producttype='', netype='', vnfd_model='',
- instantiationState='VNF_INSTANTIATED', nf_desc='', vnfdid='',
+ NfInstModel.objects.create(nfinstid='1111', nf_name='2222', package_id='todo', version='', vendor='',
+ netype='', vnfd_model='', status='VNF_INSTANTIATED', nf_desc='', vnfdid='',
vnfSoftwareVersion='', vnfConfigurableProperties='todo',
localizationLanguage='EN_US', create_time=now_time())
data = {"terminationType": "FORCEFUL",