Update python2 to python3

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

diff --git a/lcm/ns/tests/test_sol_ns_terminate_api.py b/lcm/ns/tests/test_sol_ns_terminate_api.py
index 3aa9dc6..75fdfef 100644 (file)
--- a/lcm/ns/tests/test_sol_ns_terminate_api.py
+++ b/lcm/ns/tests/test_sol_ns_terminate_api.py
@@ -11,14 +11,14 @@
 # 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.
+import json
 import uuid
-
 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.ns.tests import VNFD_MODEL_DICT
 
 
 class TestTerminateNsApi(TestCase):
@@ -32,24 +32,25 @@ class TestTerminateNsApi(TestCase):
         self.job_id = str(uuid.uuid4())
         self.nf_uuid = '1-1-1'
         self.tenant = "tenantname"
-        model = {"metadata": {
-            "vnfdId": "1",
-            "vnfdName": "PGW001",
-            "vnfProvider": "zte",
-            "vnfdVersion": "V00001",
-            "vnfVersion": "V5.10.20",
-            "productType": "CN",
-            "vnfType": "PGW",
-            "description": "PGW VNFD description",
-            "isShared": True,
-            "vnfExtendType": "driver"
-        }}
-        NSInstModel(id=self.ns_inst_id, name="ns_name", status='null').save()
-        NfInstModel.objects.create(nfinstid=self.nf_inst_id, nf_name='name_1', vnf_id='1',
-                                   vnfm_inst_id='1', ns_inst_id='1-1-1,2-2-2',
-                                   max_cpu='14', max_ram='12296', max_hd='101', max_shd="20", max_net=10,
-                                   status='null', mnfinstid=self.nf_uuid, package_id='pkg1',
-                                   vnfd_model=str(model))
+        NSInstModel(
+            id=self.ns_inst_id,
+            name="ns_name",
+            status='null').save()
+        NfInstModel.objects.create(
+            nfinstid=self.nf_inst_id,
+            nf_name='name_1',
+            vnf_id='1',
+            vnfm_inst_id='1',
+            ns_inst_id='1-1-1,2-2-2',
+            max_cpu='14',
+            max_ram='12296',
+            max_hd='101',
+            max_shd="20",
+            max_net=10,
+            status='null',
+            mnfinstid=self.nf_uuid,
+            package_id='pkg1',
+            vnfd_model=json.dumps(VNFD_MODEL_DICT))
 
     def tearDown(self):
         NSInstModel.objects.all().delete()
@@ -60,17 +61,17 @@ class TestTerminateNsApi(TestCase):
         mock_run.re.return_value = "1"
         req_data = {"terminationTime": "2019-03-25T09:10:35.610"}
         response = self.client.post(self.url % 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)
         self.assertIsNotNone(response['Location'])
         response = self.client.get(response['Location'], format='json')
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
     def test_method_not_allowed(self):
         response = self.client.put(self.url % '1', data={}, format='json')
-        self.failUnlessEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
+        self.assertEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
         response = self.client.patch(self.url % '1', data={}, format='json')
-        self.failUnlessEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
+        self.assertEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
         response = self.client.delete(self.url % '1', data={}, format='json')
-        self.failUnlessEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
+        self.assertEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
         response = self.client.get(self.url % '1', data={}, format='json')
-        self.failUnlessEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
+        self.assertEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)