Add testcase of delete vnf instance

Change-Id: I576560456d3c82d35bfdd009d0968c60387078ea
Issue-Id: GVNFM-13
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>

diff --git a/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py b/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py
index 650d17e..9c73bb6 100644 (file)
--- a/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py
+++ b/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py
@@ -10,4 +10,43 @@
 # 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.
\ No newline at end of file
+# limitations under the License.
+from django.test import TestCase, Client
+from rest_framework import status
+
+from lcm.pub.database.models import NfInstModel
+from lcm.pub.utils.timeutil import now_time
+
+
+class TestNFTerminate(TestCase):
+    def setUp(self):
+        self.client = Client()
+
+    def tearDown(self):
+        pass
+
+    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='',
+                                   vnfSoftwareVersion='', vnfConfigurableProperties='todo',
+                                   localizationLanguage='EN_US', create_time=now_time())
+        response = self.client.delete("/openoapi/vnflcm/v1/vnf_instances/1111")
+        self.failUnlessEqual(status.HTTP_204_NO_CONTENT, response.status_code)
+
+    def test_delete_vnf_identifier_when_vnf_not_exist(self):
+        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='',
+                                   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"])

diff --git a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
index e74250f..7f5bb48 100644 (file)
--- a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
+++ b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
@@ -26,7 +26,7 @@ from lcm.pub.utils import restcall
 from lcm.pub.utils.jobutil import JobUtil
 
 
-class TestNsInstantiate(TestCase):
+class TestNFInstantiate(TestCase):
     def setUp(self):
         self.client = Client()
         VmInstModel.objects.create(vmid="1", vimid="1", resouceid="11", insttype=0, instid="1", vmname="test_01",

diff --git a/lcm/lcm/nf/vnfs/vnf_cancel/delete_vnf_identifier.py b/lcm/lcm/nf/vnfs/vnf_cancel/delete_vnf_identifier.py
index b5e28ba..5cf3659 100644 (file)
--- a/lcm/lcm/nf/vnfs/vnf_cancel/delete_vnf_identifier.py
+++ b/lcm/lcm/nf/vnfs/vnf_cancel/delete_vnf_identifier.py
@@ -23,8 +23,8 @@ class DeleteVnf:
     def do_biz(self):
         sel_vnfs = NfInstModel.objects.filter(pk=self.nf_inst_id)
         if not sel_vnfs.exists():
-            raise NFLCMException('VnfInst(%s) does not exist.' % self.nf_inst_id)
+            raise NFLCMException('VnfInst(%s) does not exist' % self.nf_inst_id)
         sel_vnf = sel_vnfs[0]
         if sel_vnf.instantiationState != 'VNF_INSTANTIATED':
             raise NFLCMException("No instantiated vnf")
-        pass
\ No newline at end of file
+        pass