vfclcm upgrade from python2 to python3

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

diff --git a/lcm/lcm/nf/tests/test_instantiate_vnf.py b/lcm/lcm/nf/tests/test_instantiate_vnf.py
index 76fd83b..16351f9 100644 (file)
--- a/lcm/lcm/nf/tests/test_instantiate_vnf.py
+++ b/lcm/lcm/nf/tests/test_instantiate_vnf.py
@@ -42,6 +42,7 @@ from lcm.pub.utils.jobutil import JobUtil
 from lcm.pub.utils.timeutil import now_time\r
 from lcm.pub.utils.notificationsutil import NotificationsUtil\r
 from lcm.pub.vimapi import api\r
+from lcm.pub.exceptions import NFLCMException\r
 \r
 from lcm.nf.biz.instantiate_vnf import InstantiateVnf\r
 \r
@@ -75,7 +76,7 @@ class TestNFInstantiate(TestCase):
             data=inst_req_data,\r
             format='json'\r
         )\r
-        self.failUnlessEqual(\r
+        self.assertEqual(\r
             status.HTTP_202_ACCEPTED,\r
             response.status_code\r
         )\r
@@ -88,7 +89,7 @@ class TestNFInstantiate(TestCase):
             data=inst_req_data,\r
             format='json'\r
         )\r
-        self.failUnlessEqual(\r
+        self.assertEqual(\r
             status.HTTP_404_NOT_FOUND,\r
             response.status_code,\r
             response.content\r
@@ -107,7 +108,7 @@ class TestNFInstantiate(TestCase):
             data=inst_req_data,\r
             format='json'\r
         )\r
-        self.failUnlessEqual(\r
+        self.assertEqual(\r
             status.HTTP_409_CONFLICT,\r
             response.status_code,\r
             response.content\r
@@ -389,3 +390,33 @@ class TestNFInstantiate(TestCase):
             nf_inst_id=self.nf_inst_id,\r
             job_id=self.job_id\r
         ).run()\r
+\r
+    @mock.patch.object(JobUtil, 'create_job')\r
+    def test_instantiate_inner_error(self, mock_run):\r
+        NfInstModel(\r
+            nfinstid='144',\r
+            nf_name='VNF1',\r
+            status='NOT_INSTANTIATED'\r
+        ).save()\r
+        mock_run.return_value = NFLCMException('Boom!')\r
+        response = self.client.post(\r
+            '/api/vnflcm/v1/vnf_instances/144/instantiate',\r
+            data=inst_req_data,\r
+            format='json'\r
+        )\r
+        NfInstModel.objects.filter(nfinstid='144').delete()\r
+        self.assertEqual(status.HTTP_500_INTERNAL_SERVER_ERROR, response.status_code)\r
+\r
+    def test_instantiate_badreq(self):\r
+        NfInstModel(\r
+            nfinstid='144',\r
+            nf_name='VNF1',\r
+            status='NOT_INSTANTIATED'\r
+        ).save()\r
+        response = self.client.post(\r
+            '/api/vnflcm/v1/vnf_instances/144/instantiate',\r
+            data={},\r
+            format='json'\r
+        )\r
+        NfInstModel.objects.filter(nfinstid='144').delete()\r
+        self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code)\r