X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Ftests%2Ftest_heal_vnf.py;h=1bdcd9fcede058870c399e64138eeb7f334ac515;hb=46ad7c172411214c5432ed93fda4271288077447;hp=27cce0937709c1aee6eb287acc9a761957e8c888;hpb=49b87c030e4ae60b141268f9c2f89b8010acd050;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/tests/test_heal_vnf.py b/lcm/lcm/nf/tests/test_heal_vnf.py
index 27cce093..1bdcd9fc 100644
--- a/lcm/lcm/nf/tests/test_heal_vnf.py
+++ b/lcm/lcm/nf/tests/test_heal_vnf.py
@@ -20,7 +20,7 @@ from rest_framework import status
 from rest_framework.test import APIClient
 
 from lcm.nf.biz.heal_vnf import HealVnf
-from lcm.nf.const import c1_data_get_tenant_id_1, c9_data_create_vm, c10_data_get_vm, vnfd_model_dict
+from .const import c1_data_get_tenant_id_1, c9_data_create_vm, c10_data_get_vm, vnfd_model_dict
 from lcm.pub.database.models import NfInstModel, JobStatusModel, VmInstModel
 from lcm.pub.utils import restcall
 from lcm.pub.utils.jobutil import JobUtil
@@ -52,23 +52,53 @@ class TestNFInstantiate(TestCase):
     def test_heal_vnf_not_found(self):
         req_data = {}
         response = self.client.post("/api/vnflcm/v1/vnf_instances/12/heal", data=req_data, format='json')
-        self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code)
+        self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code)
 
     def test_heal_vnf_conflict(self):
         req_data = {}
-        NfInstModel(nfinstid='12', nf_name='VNF1', status='NOT_INSTANTIATED').save()
-        response = self.client.post("/api/vnflcm/v1/vnf_instances/12/heal", data=req_data, format='json')
-        self.failUnlessEqual(status.HTTP_409_CONFLICT, response.status_code)
-        NfInstModel(nfinstid='12', nf_name='VNF1', status='NOT_INSTANTIATED').delete()
+        NfInstModel(
+            nfinstid='1267',
+            nf_name='VNF1',
+            status='NOT_INSTANTIATED').save()
+        response = self.client.post("/api/vnflcm/v1/vnf_instances/1267/heal", data=req_data, format='json')
+        self.assertEqual(status.HTTP_409_CONFLICT, response.status_code)
+        NfInstModel.objects.filter(nfinstid='1267').delete()
+
+    def test_heal_vnf_badreq(self):
+        NfInstModel(nfinstid='345',
+                    nf_name='VNF1',
+                    nf_desc="VNF DESC",
+                    vnfdid="1",
+                    netype="XGW",
+                    vendor="ZTE",
+                    vnfSoftwareVersion="V1",
+                    version="V1",
+                    package_id="2",
+                    status='INSTANTIATED').save()
+        url = "/api/vnflcm/v1/vnf_instances/345/heal"
+        response = self.client.post(url,
+                                    data={"additionalParams": "1"},
+                                    format='json')
+        NfInstModel.objects.filter(nfinstid='345').delete()
+        self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code)
 
     @mock.patch.object(HealVnf, 'run')
     def test_heal_vnf_success(self, mock_run):
         req_data = {}
-        NfInstModel(nfinstid='12', nf_name='VNF1', status='INSTANTIATED').save()
+        NfInstModel(nfinstid='12',
+                    nf_name='VNF1',
+                    nf_desc="VNF DESC",
+                    vnfdid="1",
+                    netype="XGW",
+                    vendor="ZTE",
+                    vnfSoftwareVersion="V1",
+                    version="V1",
+                    package_id="2",
+                    status='INSTANTIATED').save()
         response = self.client.post("/api/vnflcm/v1/vnf_instances/12/heal", data=req_data, format='json')
         mock_run.re.return_value = None
-        self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code)
-        NfInstModel(nfinstid='12', nf_name='VNF1', status='INSTANTIATED').delete()
+        self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code)
+        NfInstModel(nfinstid='12').delete()
 
     @mock.patch.object(restcall, 'call_req')
     @mock.patch.object(api, 'call')
@@ -96,7 +126,7 @@ class TestNFInstantiate(TestCase):
 
         VmInstModel.objects.create(vmid="1",
                                    vimid="vimid_1",
-                                   resourceid="11",
+                                   resourceid="1",
                                    insttype=0,
                                    instid="1111",
                                    vmname="vduinstname",