Update python2 to python3

[vfc/nfvo/lcm.git] / lcm / ns / tests / tests_ns_terminate.py

diff --git a/lcm/ns/tests/tests_ns_terminate.py b/lcm/ns/tests/tests_ns_terminate.py
index a39cb6e..feaa4d5 100644 (file)
--- a/lcm/ns/tests/tests_ns_terminate.py
+++ b/lcm/ns/tests/tests_ns_terminate.py
@@ -18,11 +18,11 @@ import mock
 from django.test import TestCase, Client
 from rest_framework import status
 
+from lcm.ns.biz.ns_terminate import TerminateNsService
 from lcm.pub.database.models import NfInstModel, NSInstModel
 from lcm.pub.utils import restcall
-from lcm.pub.utils.jobutil import JOB_MODEL_STATUS
-from lcm.ns.ns_terminate import TerminateNsService
-from lcm.pub.utils.jobutil import JobUtil, JOB_TYPE
+from lcm.pub.enum import JOB_MODEL_STATUS, JOB_TYPE
+from lcm.pub.utils.jobutil import JobUtil
 
 
 class TestTerminateNsViews(TestCase):
@@ -51,28 +51,28 @@ class TestTerminateNsViews(TestCase):
 
     @mock.patch.object(TerminateNsService, 'run')
     def test_terminate_vnf_url(self, mock_run):
-        mock_run.re.return_value = None
+        mock_run.re.return_value = "1"
         req_data = {
             "terminationType": "forceful",
             "gracefulTerminationTimeout": "600"}
         response = self.client.post("/api/nslcm/v1/ns/%s/terminate" % self.ns_inst_id, data=req_data)
-        self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code)
+        self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code, response.data)
 
         response = self.client.delete("/api/nslcm/v1/ns/%s" % self.ns_inst_id)
-        self.failUnlessEqual(status.HTTP_204_NO_CONTENT, response.status_code)
+        self.assertEqual(status.HTTP_204_NO_CONTENT, response.status_code)
 
     @mock.patch.object(restcall, 'call_req')
     def test_terminate_vnf(self, mock_call_req):
         job_id = JobUtil.create_job("VNF", JOB_TYPE.TERMINATE_VNF, self.nf_inst_id)
 
         mock_vals = {
-            "/api/nslcm/v1/ns/vls/1":
+            "/api/nslcm/v1/ns/ns_vls/1":
                 [0, json.JSONEncoder().encode({"jobId": self.job_id}), '200'],
-            "/api/nslcm/v1/ns/sfcs/1":
+            "/api/nslcm/v1/ns/ns_sfcs/1":
                 [0, json.JSONEncoder().encode({"jobId": self.job_id}), '200'],
-            "/api/nslcm/v1/ns/vnfs/1":
+            "/api/nslcm/v1/ns/ns_vnfs/1":
                 [0, json.JSONEncoder().encode({}), '200'],
-            "/api/ztevmanagerdriver/v1/jobs/" + self.job_id + "&responseId=0":
+            "/api/ztevnfmdriver/v1/jobs/" + self.job_id + "&responseId=0":
                 [0, json.JSONEncoder().encode({"jobid": self.job_id,
                                                "responsedescriptor": {"progress": "100",
                                                                       "status": JOB_MODEL_STATUS.FINISHED,
@@ -90,8 +90,10 @@ class TestTerminateNsViews(TestCase):
             return mock_vals[args[4]]
 
         mock_call_req.side_effect = side_effect
-
-        TerminateNsService(self.nf_inst_id, "forceful", "600", job_id).run()
+        req_data = {
+            "terminationType": "FORCEFUL",
+            "gracefulTerminationTimeout": "600"}
+        TerminateNsService(self.nf_inst_id, job_id, req_data).run()
         nsinst = NSInstModel.objects.get(id=self.ns_inst_id)
         if nsinst:
             self.assertTrue(1, 0)
@@ -100,14 +102,11 @@ class TestTerminateNsViews(TestCase):
 
     @mock.patch.object(TerminateNsService, 'run')
     def test_terminate_non_existing_ns_inst_id(self, mock_run):
-        mock_run.re.return_value = None
-
+        mock_run.re.return_value = "1"
         ns_inst_id = '100'
-
         req_data = {
             "terminationType": "forceful",
             "gracefulTerminationTimeout": "600"}
         response = self.client.post("/api/nslcm/v1/ns/%s/terminate" % ns_inst_id, data=req_data)
-        self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code)
-
+        self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code, response.data)
         self.assertRaises(NSInstModel.DoesNotExist, NSInstModel.objects.get, id=ns_inst_id)