Update python2 to python3

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

diff --git a/lcm/ns/tests/test_sol_ns_instances_api.py b/lcm/ns/tests/test_sol_ns_instances_api.py
index 930838a..7d6b1f6 100644 (file)
--- a/lcm/ns/tests/test_sol_ns_instances_api.py
+++ b/lcm/ns/tests/test_sol_ns_instances_api.py
@@ -43,7 +43,7 @@ class TestNsInstanceApi(TestCase):
         r2_create_ns_to_aai = [0, json.JSONEncoder().encode({}), '201']
         mock_call_req.side_effect = [r1_query_nspackage_from_catalog, r2_create_ns_to_aai]
         response = self.apiClient.post(self.ns_instances_url, data=SOL_CREATE_NS_DICT, format=self.format, **SOL_REST_HEADER_DICT)
-        self.failUnlessEqual(status.HTTP_201_CREATED, response.status_code)
+        self.assertEqual(status.HTTP_201_CREATED, response.status_code)
         return response.data['id']
 
     @mock.patch.object(restcall, 'call_req')
@@ -52,7 +52,7 @@ class TestNsInstanceApi(TestCase):
         r2_create_ns_to_aai = [0, json.JSONEncoder().encode({}), '201']
         mock_call_req.side_effect = [r1_query_nspackage_from_catalog, r2_create_ns_to_aai]
         response = self.apiClient.post(self.ns_instances_url, data=SOL_CREATE_NS_DICT, format=self.format, **SOL_REST_HEADER_DICT)
-        self.failUnlessEqual(status.HTTP_201_CREATED, response.status_code)
+        self.assertEqual(status.HTTP_201_CREATED, response.status_code)
 
     @mock.patch.object(restcall, 'call_req')
     def test_create_ns_when_ns_name_exist(self, mock_call_req):
@@ -89,42 +89,42 @@ class TestNsInstanceApi(TestCase):
 
     def test_ns_instances_method_not_allowed(self):
         response = self.apiClient.delete(self.ns_instances_url, data=SOL_CREATE_NS_DICT, format=self.format, **SOL_REST_HEADER_DICT)
-        self.failUnlessEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
+        self.assertEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
         response = self.apiClient.put(self.ns_instances_url, data=SOL_CREATE_NS_DICT, format=self.format, **SOL_REST_HEADER_DICT)
-        self.failUnlessEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
+        self.assertEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
         response = self.apiClient.patch(self.ns_instances_url, data=SOL_CREATE_NS_DICT, format=self.format, **SOL_REST_HEADER_DICT)
-        self.failUnlessEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
+        self.assertEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
 
     def test_invidual_ns_instance_method_not_allowed(self):
         url = self.ns_instances_url + '/1'
         response = self.apiClient.post(url, data=SOL_CREATE_NS_DICT, format=self.format, **SOL_REST_HEADER_DICT)
-        self.failUnlessEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
+        self.assertEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
         response = self.apiClient.put(url, data=SOL_CREATE_NS_DICT, format=self.format, **SOL_REST_HEADER_DICT)
-        self.failUnlessEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
+        self.assertEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
         response = self.apiClient.patch(url, data=SOL_CREATE_NS_DICT, format=self.format, **SOL_REST_HEADER_DICT)
-        self.failUnlessEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
+        self.assertEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
 
     def test_query_ns(self):
         NSInstModel.objects.all().delete()
         self.test_create_ns()
         response = self.apiClient.get(self.ns_instances_url)
-        self.failUnlessEqual(status.HTTP_200_OK, response.status_code, response.data)
+        self.assertEqual(status.HTTP_200_OK, response.status_code, response.data)
         self.assertIsNotNone(response.data)
         self.assertEqual(1, len(response.data))
-        self.assertEquals(self.nsd_id, response.data[0]['nsdId'])
-        self.assertEquals('ns', response.data[0]['nsInstanceName'])
-        self.assertEquals('NOT_INSTANTIATED', response.data[0]['nsState'])
+        self.assertEqual(self.nsd_id, response.data[0]['nsdId'])
+        self.assertEqual('ns', response.data[0]['nsInstanceName'])
+        self.assertEqual('NOT_INSTANTIATED', response.data[0]['nsState'])
 
     def test_query_one_ns(self):
         NSInstModel.objects.all().delete()
         id = self.test_create_ns()
         url = self.ns_instances_url + '/' + id
         response = self.apiClient.get(url)
-        self.failUnlessEqual(status.HTTP_200_OK, response.status_code, response.data)
+        self.assertEqual(status.HTTP_200_OK, response.status_code, response.data)
         self.assertIsNotNone(response.data)
-        self.assertEquals(self.nsd_id, response.data['nsdId'])
-        self.assertEquals('ns', response.data['nsInstanceName'])
-        self.assertEquals('NOT_INSTANTIATED', response.data['nsState'])
+        self.assertEqual(self.nsd_id, response.data['nsdId'])
+        self.assertEqual('ns', response.data['nsInstanceName'])
+        self.assertEqual('NOT_INSTANTIATED', response.data['nsState'])
 
     @mock.patch.object(restcall, 'call_req')
     def test_delete_ns(self, mock_call_req):
@@ -134,4 +134,4 @@ class TestNsInstanceApi(TestCase):
         mock_call_req.side_effect = [r1_query_ns_to_aai, r2_delete_ns_to_aai]
         url = self.ns_instances_url + '/1'
         response = self.apiClient.delete(url)
-        self.failUnlessEqual(status.HTTP_204_NO_CONTENT, response.status_code)
+        self.assertEqual(status.HTTP_204_NO_CONTENT, response.status_code)