Update python2 to python3

Issue-ID: VFC-1429
Signed-off-by: Olivia.Zhan <zhan.jie1@zte.com.cn>
Change-Id: I9ec0ccfa5ba200c690a85d582cee41009dfdc0f0

6 files changed, 41 insertions, 39 deletions

diff --git a/genericparser/packages/tests/test_ns_descriptor.py b/genericparser/packages/tests/test_ns_descriptor.py
index 743e181..36933ac 100644
--- a/genericparser/packages/tests/test_ns_descriptor.py
+++ b/genericparser/packages/tests/test_ns_descriptor.py
@@ -177,9 +177,9 @@ class TestNsDescriptor(TestCase):
             userDefinedData=user_defined_data_json,
         ).save()
 
-        with open('nsd_content.txt', 'wb') as fp:
+        with open('nsd_content.txt', 'wt') as fp:
             fp.write('test')
-        with open('nsd_content.txt', 'rb') as fp:
+        with open('nsd_content.txt', 'rt') as fp:
             resp = self.client.put(
                 "/api/nsd/v1/ns_descriptors/22/nsd_content",
                 {'file': fp},
@@ -197,9 +197,9 @@ class TestNsDescriptor(TestCase):
         os.remove('nsd_content.txt')
 
     def test_nsd_content_upload_failure(self):
-        with open('nsd_content.txt', 'wb') as fp:
+        with open('nsd_content.txt', 'wt') as fp:
             fp.write('test')
-        with open('nsd_content.txt', 'rb') as fp:
+        with open('nsd_content.txt', 'rt') as fp:
             response = self.client.put(
                 "/api/nsd/v1/ns_descriptors/22/nsd_content",
                 {'file': fp},
@@ -207,7 +207,7 @@ class TestNsDescriptor(TestCase):
         self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
 
     def test_nsd_content_download_normal(self):
-        with open('nsd_content.txt', 'wb') as fp:
+        with open('nsd_content.txt', 'wt') as fp:
             fp.writelines('test1')
             fp.writelines('test2')
         NSPackageModel.objects.create(
@@ -222,7 +222,7 @@ class TestNsDescriptor(TestCase):
         for data in response.streaming_content:
             file_content = '%s%s' % (file_content, data)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual('test1test2', file_content)
+        self.assertEqual("b'test1test2'", file_content)
         os.remove('nsd_content.txt')
 
     def test_nsd_content_download_when_ns_not_exist(self):
@@ -239,7 +239,7 @@ class TestNsDescriptor(TestCase):
         self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
 
     def test_nsd_content_partial_download_normal(self):
-        with open('nsd_content.txt', 'wb') as fp:
+        with open('nsd_content.txt', 'wt') as fp:
             fp.writelines('test1')
             fp.writelines('test2')
         NSPackageModel(
@@ -257,7 +257,7 @@ class TestNsDescriptor(TestCase):
         for data in response.streaming_content:
             partial_file_content = '%s%s' % (partial_file_content, data)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual('test2', partial_file_content)
+        self.assertEqual("b'test2'", partial_file_content)
         os.remove('nsd_content.txt')
 
     @mock.patch.object(NsDescriptor, 'create')
@@ -288,9 +288,9 @@ class TestNsDescriptor(TestCase):
     @mock.patch.object(NsDescriptor, 'upload')
     def test_upload_when_catch_exception(self, mock_upload):
         mock_upload.side_effect = TypeError("integer type")
-        with open('nsd_content.txt', 'wb') as fp:
+        with open('nsd_content.txt', 'wt') as fp:
             fp.write('test')
-        with open('nsd_content.txt', 'rb') as fp:
+        with open('nsd_content.txt', 'rt') as fp:
             response = self.client.put("/api/nsd/v1/ns_descriptors/22/nsd_content", {'file': fp})
         self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
         os.remove('nsd_content.txt')
diff --git a/genericparser/packages/tests/test_nsdm_subscription.py b/genericparser/packages/tests/test_nsdm_subscription.py
index 151e8af..c6c194e 100644
--- a/genericparser/packages/tests/test_nsdm_subscription.py
+++ b/genericparser/packages/tests/test_nsdm_subscription.py
@@ -30,7 +30,6 @@ class TestNsdmSubscription(TestCase):
         NsdmSubscriptionModel.objects.all().delete()
         self.subscription_id = str(uuid.uuid4())
         self.subscription = {
-            "filter": {},
             "callbackUri": "http://callbackuri.com",
             "authentication": {
                 "authType": ["BASIC"],
@@ -38,6 +37,9 @@ class TestNsdmSubscription(TestCase):
                     "userName": "username",
                     "password": "password"
                 }
+            },
+            "filter": {
+                "nsdId": ["b632bddc-abcd-4180-bd8d-4e8a9578eff7"],
             }
         }
         self.links = {
diff --git a/genericparser/packages/tests/test_pnf_descriptor.py b/genericparser/packages/tests/test_pnf_descriptor.py
index 13645e8..770d74b 100644
--- a/genericparser/packages/tests/test_pnf_descriptor.py
+++ b/genericparser/packages/tests/test_pnf_descriptor.py
@@ -150,10 +150,10 @@ class TestPnfDescriptor(TestCase):
             userDefinedData=user_defined_data_json,
         ).save()
         mock_parse_pnfd.return_value = json.JSONEncoder().encode(pnfd_data)
-        with open('pnfd_content.txt', 'wb') as fp:
+        with open('pnfd_content.txt', 'wt') as fp:
             fp.write('test')
 
-        with open('pnfd_content.txt', 'rb') as fp:
+        with open('pnfd_content.txt', 'rt') as fp:
             resp = self.client.put(
                 "/api/nsd/v1/pnf_descriptors/22/pnfd_content",
                 {'file': fp},
@@ -166,10 +166,10 @@ class TestPnfDescriptor(TestCase):
         os.remove('pnfd_content.txt')
 
     def test_pnfd_content_upload_when_pnf_not_exist(self):
-        with open('pnfd_content.txt', 'wb') as fp:
+        with open('pnfd_content.txt', 'wt') as fp:
             fp.write('test')
 
-        with open('pnfd_content.txt', 'rb') as fp:
+        with open('pnfd_content.txt', 'rt') as fp:
             resp = self.client.put(
                 "/api/nsd/v1/pnf_descriptors/22/pnfd_content",
                 {'file': fp},
@@ -178,7 +178,7 @@ class TestPnfDescriptor(TestCase):
 
     @mock.patch.object(toscaparsers, "parse_pnfd")
     def test_pnfd_content_upload_when_pnfd_exist(self, mock_parse_pnfd):
-        with open('pnfd_content.txt', 'wb') as fp:
+        with open('pnfd_content.txt', 'wt') as fp:
             fp.write('test')
         PnfPackageModel(
             pnfPackageId='22',
@@ -191,7 +191,7 @@ class TestPnfDescriptor(TestCase):
             pnfdId="zte-1.0"
         ).save()
         mock_parse_pnfd.return_value = json.JSONEncoder().encode(pnfd_data)
-        with open('pnfd_content.txt', 'rb') as fp:
+        with open('pnfd_content.txt', 'rt') as fp:
             resp = self.client.put(
                 "/api/nsd/v1/pnf_descriptors/22/pnfd_content",
                 {'file': fp},
@@ -199,7 +199,7 @@ class TestPnfDescriptor(TestCase):
         self.assertEqual(resp.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
 
     def test_pnfd_download_normal(self):
-        with open('pnfd_content.txt', 'wb') as fp:
+        with open('pnfd_content.txt', 'wt') as fp:
             fp.writelines('test1')
             fp.writelines('test2')
         user_defined_data = json.JSONEncoder().encode(self.user_defined_data)
@@ -216,7 +216,7 @@ class TestPnfDescriptor(TestCase):
         for data in resp.streaming_content:
             file_content = '%s%s' % (file_content, data)
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
-        self.assertEqual('test1test2', file_content)
+        self.assertEqual("b'test1test2'", file_content)
         os.remove('pnfd_content.txt')
 
     def test_pnfd_download_failed(self):
@@ -224,7 +224,7 @@ class TestPnfDescriptor(TestCase):
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
 
     def test_pnfd_download_when_not_on_boarded(self):
-        with open('pnfd_content.txt', 'wb') as fp:
+        with open('pnfd_content.txt', 'wt') as fp:
             fp.writelines('test1')
             fp.writelines('test2')
         user_defined_data = json.JSONEncoder().encode(self.user_defined_data)
diff --git a/genericparser/packages/tests/test_service_descriptor.py b/genericparser/packages/tests/test_service_descriptor.py
index 0734577..59bffa8 100644
--- a/genericparser/packages/tests/test_service_descriptor.py
+++ b/genericparser/packages/tests/test_service_descriptor.py
@@ -92,4 +92,4 @@ class TestServiceDescription(TestCase):
             ServiceDescriptor().delete_single(csar_id)
         except Exception as e:
             self.assertTrue(isinstance(e, PackageNotFoundException))
-            self.assertEqual("Service package[8000] not Found.", e.message)
+            self.assertEqual("Service package[8000] not Found.", e.args[0])
diff --git a/genericparser/packages/tests/test_servicepackage.py b/genericparser/packages/tests/test_servicepackage.py
index 28fdcdb..f7ac8a5 100644
--- a/genericparser/packages/tests/test_servicepackage.py
+++ b/genericparser/packages/tests/test_servicepackage.py
@@ -261,7 +261,7 @@ class TestServicePackage(TestCase):
         try:
             ServicePackage().on_distribute(csar_id)
         except PackageHasExistsException as e:
-            self.assertEqual("Service CSAR(1) already exists.", e.message)
+            self.assertEqual("Service CSAR(1) already exists.", e.args[0])
 
     @mock.patch.object(sdc, 'get_artifact')
     def test_service_pkg_distribute_when_fail_get_artifacts(self, mock_get_artifact):
@@ -271,7 +271,7 @@ class TestServicePackage(TestCase):
             ServicePackage().on_distribute(csar_id)
         except Exception as e:
             self.assertTrue(isinstance(e, GenericparserException))
-            self.assertEqual("Failed to query artifact(services,1) from sdc.", e.message)
+            self.assertEqual("Failed to query artifact(services,1) from sdc.", e.args[0])
 
     @mock.patch.object(sdc, 'get_artifact')
     @mock.patch.object(sdc, 'download_artifacts')
@@ -295,7 +295,7 @@ class TestServicePackage(TestCase):
             ServicePackage().on_distribute(csar_id)
         except Exception as e:
             self.assertTrue(isinstance(e, GenericparserException))
-            self.assertEqual("Failed to download 1 from sdc.", e.message)
+            self.assertEqual("Failed to download 1 from sdc.", e.args[0])
 
     @mock.patch.object(sdc, 'get_artifact')
     @mock.patch.object(sdc, 'download_artifacts')
@@ -389,7 +389,7 @@ class TestServicePackage(TestCase):
         try:
             ServicePackage().get_csar(1000)
         except PackageNotFoundException as e:
-            self.assertEqual("Service package[1000] not Found.", e.message)
+            self.assertEqual("Service package[1000] not Found.", e.args[0])
 
     def test_api_service_pkg_get_one(self):
         ServicePackageModel(
@@ -423,7 +423,7 @@ class TestServicePackage(TestCase):
         try:
             ServicePackage().delete_csar("8000")
         except PackageNotFoundException as e:
-            self.assertEqual("Service package[8000] not Found.", e.message)
+            self.assertEqual("Service package[8000] not Found.", e.args[0])
 
     def test_api_service_pkg_normal_delete(self):
         ServicePackageModel(servicePackageId="8", servicedId="2").save()
@@ -447,7 +447,7 @@ class TestServicePackage(TestCase):
             inputs = []
             ServicePackage().parse_serviced(csar_id, inputs)
         except PackageNotFoundException as e:
-            self.assertEqual("Service CSAR(8000) does not exist.", e.message)
+            self.assertEqual("Service CSAR(8000) does not exist.", e.args[0])
 
     def test_api_service_pkg_parser_not_found(self):
         query_data = {
diff --git a/genericparser/packages/tests/test_vnf_package.py b/genericparser/packages/tests/test_vnf_package.py
index 99bdd5e..9b8d7fe 100644
--- a/genericparser/packages/tests/test_vnf_package.py
+++ b/genericparser/packages/tests/test_vnf_package.py
@@ -14,7 +14,7 @@
 
 import json
 import os
-import urllib2
+import urllib
 import mock
 import shutil
 
@@ -49,7 +49,7 @@ class TestVnfPackage(TestCase):
 
     @mock.patch.object(toscaparsers, 'parse_vnfd')
     def test_upload_vnf_pkg(self, mock_parse_vnfd):
-        data = {'file': open(os.path.join(GENERICPARSER_ROOT_PATH, "empty.txt"), "rb")}
+        data = {'file': open(os.path.join(GENERICPARSER_ROOT_PATH, "empty.txt"), "rt")}
         VnfPackageModel.objects.create(
             vnfPackageId="222",
             onboardingState="CREATED"
@@ -70,7 +70,7 @@ class TestVnfPackage(TestCase):
         self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
 
     @mock.patch.object(toscaparsers, 'parse_vnfd')
-    @mock.patch.object(urllib2, 'urlopen')
+    @mock.patch.object(urllib.request, 'urlopen')
     def test_upload_nf_pkg_from_uri(self, mock_urlopen, mock_parse_vnfd):
         vnf_pkg = VnfPackageModel.objects.create(
             vnfPackageId="222",
@@ -239,7 +239,7 @@ class TestVnfPackage(TestCase):
         self.assertEqual(response.data, None)
 
     def test_fetch_vnf_pkg(self):
-        with open("vnfPackage.csar", "wb") as fp:
+        with open("vnfPackage.csar", "wt") as fp:
             fp.writelines("AAAABBBBCCCCDDDD")
         VnfPackageModel.objects.create(
             vnfPackageId="222",
@@ -249,13 +249,13 @@ class TestVnfPackage(TestCase):
         response = self.client.get("/api/vnfpkgm/v1/vnf_packages/222/package_content")
         file_content = ''
         for data in response.streaming_content:
-            file_content = file_content + data
+            file_content = file_content + data.decode()
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual('AAAABBBBCCCCDDDD', file_content)
         os.remove("vnfPackage.csar")
 
     def test_fetch_partical_vnf_pkg(self):
-        with open("vnfPackage.csar", "wb") as fp:
+        with open("vnfPackage.csar", "wt") as fp:
             fp.writelines("AAAABBBBCCCCDDDD")
         VnfPackageModel.objects.create(
             vnfPackageId="222",
@@ -265,13 +265,13 @@ class TestVnfPackage(TestCase):
         response = self.client.get("/api/vnfpkgm/v1/vnf_packages/222/package_content", HTTP_RANGE="4-7")
         partial_file_content = ''
         for data in response.streaming_content:
-            partial_file_content = partial_file_content + data
+            partial_file_content = partial_file_content.encode() + data
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual('BBB', partial_file_content)
+        self.assertEqual(b'BBB', partial_file_content)
         os.remove("vnfPackage.csar")
 
     def test_fetch_last_partical_vnf_pkg(self):
-        with open("vnfPackage.csar", "wb") as fp:
+        with open("vnfPackage.csar", "wt") as fp:
             fp.writelines("AAAABBBBCCCCDDDD")
         VnfPackageModel.objects.create(
             vnfPackageId="222",
@@ -281,9 +281,9 @@ class TestVnfPackage(TestCase):
         response = self.client.get("/api/vnfpkgm/v1/vnf_packages/222/package_content", HTTP_RANGE=" 4-")
         partial_file_content = ''
         for data in response.streaming_content:
-            partial_file_content = partial_file_content + data
+            partial_file_content = partial_file_content.encode() + data
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual('BBBBCCCCDDDD', partial_file_content)
+        self.assertEqual(b'BBBBCCCCDDDD', partial_file_content)
         os.remove("vnfPackage.csar")
 
     def test_fetch_vnf_pkg_when_pkg_not_exist(self):
@@ -362,7 +362,7 @@ class TestVnfPackage(TestCase):
         self.assertEqual(response.status_code, status.HTTP_202_ACCEPTED)
         response = self.client.get("/api/vnfpkgm/v1/vnf_packages/222/artifacts/image")
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response.getvalue(), "ubuntu_16.04\n")
+        self.assertEqual(response.getvalue(), b"ubuntu_16.04\n")
 
     @mock.patch.object(toscaparsers, 'parse_vnfd')
     def test_fetch_vnf_artifact_not_exists(self, mock_parse_vnfd):