vfclcm upgrade from python2 to python3

[vfc/gvnfm/vnflcm.git] / lcm / lcm / nf / tests / test_heal_vnf.py

diff --git a/lcm/lcm/nf/tests/test_heal_vnf.py b/lcm/lcm/nf/tests/test_heal_vnf.py
index bde15e1..1bdcd9f 100644 (file)
--- a/lcm/lcm/nf/tests/test_heal_vnf.py
+++ b/lcm/lcm/nf/tests/test_heal_vnf.py
@@ -52,7 +52,7 @@ class TestNFInstantiate(TestCase):
     def test_heal_vnf_not_found(self):\r
         req_data = {}\r
         response = self.client.post("/api/vnflcm/v1/vnf_instances/12/heal", data=req_data, format='json')\r
-        self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code)\r
+        self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code)\r
 \r
     def test_heal_vnf_conflict(self):\r
         req_data = {}\r
@@ -61,9 +61,27 @@ class TestNFInstantiate(TestCase):
             nf_name='VNF1',\r
             status='NOT_INSTANTIATED').save()\r
         response = self.client.post("/api/vnflcm/v1/vnf_instances/1267/heal", data=req_data, format='json')\r
-        self.failUnlessEqual(status.HTTP_409_CONFLICT, response.status_code)\r
+        self.assertEqual(status.HTTP_409_CONFLICT, response.status_code)\r
         NfInstModel.objects.filter(nfinstid='1267').delete()\r
 \r
+    def test_heal_vnf_badreq(self):\r
+        NfInstModel(nfinstid='345',\r
+                    nf_name='VNF1',\r
+                    nf_desc="VNF DESC",\r
+                    vnfdid="1",\r
+                    netype="XGW",\r
+                    vendor="ZTE",\r
+                    vnfSoftwareVersion="V1",\r
+                    version="V1",\r
+                    package_id="2",\r
+                    status='INSTANTIATED').save()\r
+        url = "/api/vnflcm/v1/vnf_instances/345/heal"\r
+        response = self.client.post(url,\r
+                                    data={"additionalParams": "1"},\r
+                                    format='json')\r
+        NfInstModel.objects.filter(nfinstid='345').delete()\r
+        self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code)\r
+\r
     @mock.patch.object(HealVnf, 'run')\r
     def test_heal_vnf_success(self, mock_run):\r
         req_data = {}\r
@@ -79,7 +97,7 @@ class TestNFInstantiate(TestCase):
                     status='INSTANTIATED').save()\r
         response = self.client.post("/api/vnflcm/v1/vnf_instances/12/heal", data=req_data, format='json')\r
         mock_run.re.return_value = None\r
-        self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code)\r
+        self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code)\r
         NfInstModel(nfinstid='12').delete()\r
 \r
     @mock.patch.object(restcall, 'call_req')\r