Update python2 to python3

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

8 files changed, 43 insertions, 42 deletions

diff --git a/genericparser/packages/biz/nsdm_subscription.py b/genericparser/packages/biz/nsdm_subscription.py
index 9bfe5aa..dfcd2ec 100644
--- a/genericparser/packages/biz/nsdm_subscription.py
+++ b/genericparser/packages/biz/nsdm_subscription.py
@@ -73,7 +73,7 @@ class NsdmSubscription:
         query_data = {}
         logger.debug("Start QueryMultiSubscriptions get --> "
                      "Check for filters in query params" % self.params)
-        for query, value in self.params.iteritems():
+        for query, value in list(self.params.items()):
             if query in const.NSDM_NOTIFICATION_FILTERS and value:
                 query_data[query + '__icontains'] = json.dumps(list(set(value)))
         # Query the database with filters if the request
@@ -103,8 +103,9 @@ class NsdmSubscription:
     def fill_resp_data(self, subscription):
         subscription_filter = dict()
         for filter_type in const.NSDM_NOTIFICATION_FILTERS:
-            subscription_filter[filter_type] = \
-                ast.literal_eval(subscription.__dict__[filter_type])
+            if subscription.__dict__[filter_type]:
+                subscription_filter[filter_type] = \
+                    ast.literal_eval(subscription.__dict__[filter_type])
         resp_data = {
             'id': subscription.subscriptionid,
             'callbackUri': subscription.callback_uri,
@@ -156,17 +157,17 @@ class NsdmSubscription:
             raise NsdmBadRequestException('Auth type should '
                                           'be ' + const.OAUTH2_CLIENT_CREDENTIALS)
         if const.BASIC in self.authentication.get("authType", '') and \
-                "paramsBasic" in self.authentication.keys() and \
-                not is_filter_type_equal(PARAMSBASICKEYS,
-                                         self.authentication.get("paramsBasic").keys()):
+                "paramsBasic" in list(self.authentication.keys()) and \
+                not is_filter_type_equal(PARAMSBASICKEYS, list(
+                    self.authentication.get("paramsBasic").keys())):
             raise NsdmBadRequestException('userName and password needed '
                                           'for ' + const.BASIC)
         if const.OAUTH2_CLIENT_CREDENTIALS in \
                 self.authentication.get("authType", '') and \
                 "paramsOauth2ClientCredentials" in \
-                self.authentication.keys() and \
-                not is_filter_type_equal(PARAMSOAUTH2CLIENTCREDENTIALSKEYS,
-                                         self.authentication.get("paramsOauth2ClientCredentials").keys()):
+                list(self.authentication.keys()) and \
+                not is_filter_type_equal(PARAMSOAUTH2CLIENTCREDENTIALSKEYS, list(
+                    self.authentication.get("paramsOauth2ClientCredentials").keys())):
             raise NsdmBadRequestException('clientId, clientPassword and '
                                           'tokenEndpoint required '
                                           'for ' + const.OAUTH2_CLIENT_CREDENTIALS)
@@ -210,7 +211,8 @@ class NsdmSubscription:
             "links": json.dumps(links)
         }
         for filter_type in const.NSDM_NOTIFICATION_FILTERS:
-            subscription_save_db[filter_type] = json.dumps(
-                list(set(self.filter.get(filter_type, []))))
+            if self.filter:
+                subscription_save_db[filter_type] = json.dumps(
+                    list(set(self.filter.get(filter_type, []))))
         NsdmSubscriptionModel.objects.create(**subscription_save_db)
         logger.debug('Create Subscription[%s] success', self.subscription_id)
diff --git a/genericparser/packages/biz/pnf_descriptor.py b/genericparser/packages/biz/pnf_descriptor.py
index d29a2ad..561c8fa 100644
--- a/genericparser/packages/biz/pnf_descriptor.py
+++ b/genericparser/packages/biz/pnf_descriptor.py
@@ -221,8 +221,8 @@ class PnfDescriptor(object):
             csar_path = pnf_pkg[0].localFilePath
             ret = {"model": toscaparsers.parse_pnfd(csar_path, inputs)}
         except GenericparserException as e:
-            return [1, e.message]
+            return [1, e.args[0]]
         except Exception as e:
-            logger.error(e.message)
-            return [1, e.message]
+            logger.error(e.args[0])
+            return [1, e.args[0]]
         return [0, ret]
diff --git a/genericparser/packages/biz/sdc_ns_package.py b/genericparser/packages/biz/sdc_ns_package.py
index 42346ff..63a077f 100644
--- a/genericparser/packages/biz/sdc_ns_package.py
+++ b/genericparser/packages/biz/sdc_ns_package.py
@@ -43,7 +43,7 @@ def ns_on_distribute(csar_id):
         ret = NsPackage().on_distribute(csar_id)
     except GenericparserException as e:
         NsPackage().delete_csar(csar_id)
-        return fmt_ns_pkg_rsp(STATUS_FAILED, e.message)
+        return fmt_ns_pkg_rsp(STATUS_FAILED, e.args[0])
     except:
         logger.error(traceback.format_exc())
         NsPackage().delete_csar(csar_id)
@@ -58,7 +58,7 @@ def ns_delete_csar(csar_id):
     try:
         ret = NsPackage().delete_csar(csar_id)
     except GenericparserException as e:
-        return fmt_ns_pkg_rsp(STATUS_FAILED, e.message)
+        return fmt_ns_pkg_rsp(STATUS_FAILED, e.args[0])
     except:
         logger.error(traceback.format_exc())
         return fmt_ns_pkg_rsp(STATUS_FAILED, str(sys.exc_info()))
@@ -70,7 +70,7 @@ def ns_get_csars():
     try:
         ret = NsPackage().get_csars()
     except GenericparserException as e:
-        return [1, e.message]
+        return [1, e.args[0]]
     except:
         logger.error(traceback.format_exc())
         return [1, str(sys.exc_info())]
@@ -82,9 +82,9 @@ def ns_get_csar(csar_id):
     try:
         ret = NsPackage().get_csar(csar_id)
     except GenericparserException as e:
-        return [1, e.message]
+        return [1, e.args[0]]
     except Exception as e:
-        logger.error(e.message)
+        logger.error(e.args[0])
         logger.error(traceback.format_exc())
         return [1, str(sys.exc_info())]
     return ret
@@ -99,9 +99,9 @@ def parse_nsd(csar_id, inputs):
         csar_path = ns_pkg[0].localFilePath
         ret = {"model": toscaparsers.parse_nsd(csar_path, inputs)}
     except GenericparserException as e:
-        return [1, e.message]
+        return [1, e.args[0]]
     except Exception as e:
-        logger.error(e.message)
+        logger.error(e.args[0])
         logger.error(traceback.format_exc())
         return [1, str(sys.exc_info())]
     return [0, ret]
diff --git a/genericparser/packages/biz/sdc_service_package.py b/genericparser/packages/biz/sdc_service_package.py
index 0390b5c..281dd17 100644
--- a/genericparser/packages/biz/sdc_service_package.py
+++ b/genericparser/packages/biz/sdc_service_package.py
@@ -106,9 +106,9 @@ class ServicePackage(object):
             ret = {"model": toscaparsers.parse_sd(csar_path, inputs)}
             return ret
         except GenericparserException as e:
-            logger.error(e.message)
+            logger.error(e.args[0])
             raise e
         except Exception as e:
-            logger.error(e.message)
+            logger.error(e.args[0])
             logger.error(traceback.format_exc())
             raise e
diff --git a/genericparser/packages/biz/sdc_vnf_package.py b/genericparser/packages/biz/sdc_vnf_package.py
index 5028709..3a271b7 100644
--- a/genericparser/packages/biz/sdc_vnf_package.py
+++ b/genericparser/packages/biz/sdc_vnf_package.py
@@ -39,9 +39,9 @@ def nf_get_csars():
     try:
         ret = NfPackage().get_csars()
     except GenericparserException as e:
-        return [1, e.message]
+        return [1, e.args[0]]
     except Exception as e:
-        logger.error(e.message)
+        logger.error(e.args[0])
         logger.error(traceback.format_exc())
         return [1, str(sys.exc_info())]
     return ret
@@ -52,9 +52,9 @@ def nf_get_csar(csar_id):
     try:
         ret = NfPackage().get_csar(csar_id)
     except GenericparserException as e:
-        return [1, e.message]
+        return [1, e.args[0]]
     except Exception as e:
-        logger.error(e.message)
+        logger.error(e.args[0])
         logger.error(traceback.format_exc())
         return [1, str(sys.exc_info())]
     return ret
@@ -69,9 +69,9 @@ def parse_vnfd(csar_id, inputs):
         csar_path = nf_pkg[0].localFilePath
         ret = {"model": toscaparsers.parse_vnfd(csar_path, inputs)}
     except GenericparserException as e:
-        return [1, e.message]
+        return [1, e.args[0]]
     except Exception as e:
-        logger.error(e.message)
+        logger.error(e.args[0])
         logger.error(traceback.format_exc())
         return [1, str(sys.exc_info())]
     return [0, ret]
@@ -96,9 +96,9 @@ class NfDistributeThread(threading.Thread):
             self.on_distribute()
         except GenericparserException as e:
             self.rollback_distribute()
-            JobUtil.add_job_status(self.job_id, JOB_ERROR, e.message)
+            JobUtil.add_job_status(self.job_id, JOB_ERROR, e.args[0])
         except Exception as e:
-            logger.error(e.message)
+            logger.error(e.args[0])
             logger.error(traceback.format_exc())
             logger.error(str(sys.exc_info()))
             self.rollback_distribute()
@@ -162,7 +162,7 @@ class NfDistributeThread(threading.Thread):
             VnfPackageModel.objects.filter(vnfPackageId=self.csar_id).delete()
             fileutil.delete_dirs(self.csar_save_path)
         except Exception as e:
-            logger.error(e.message)
+            logger.error(e.args[0])
             logger.error(traceback.format_exc())
             logger.error(str(sys.exc_info()))
 
@@ -181,9 +181,9 @@ class NfPkgDeleteThread(threading.Thread):
         try:
             self.delete_csar()
         except GenericparserException as e:
-            JobUtil.add_job_status(self.job_id, JOB_ERROR, e.message)
+            JobUtil.add_job_status(self.job_id, JOB_ERROR, e.args[0])
         except Exception as e:
-            logger.error(e.message)
+            logger.error(e.args[0])
             logger.error(traceback.format_exc())
             logger.error(str(sys.exc_info()))
             JobUtil.add_job_status(self.job_id, JOB_ERROR, "Failed to delete CSAR(%s)" % self.csar_id)
diff --git a/genericparser/packages/biz/vnf_package.py b/genericparser/packages/biz/vnf_package.py
index 7186082..cf67a76 100644
--- a/genericparser/packages/biz/vnf_package.py
+++ b/genericparser/packages/biz/vnf_package.py
@@ -18,7 +18,7 @@ import os
 import sys
 import threading
 import traceback
-import urllib2
+import urllib
 import uuid
 
 from genericparser.packages.biz.common import parse_file_range, read, save
@@ -139,9 +139,9 @@ class VnfPkgUploadThread(threading.Thread):
             self.upload_vnf_pkg_from_uri()
             parse_vnfd_and_save(self.vnf_pkg_id, self.upload_file_name)
         except GenericparserException as e:
-            logger.error(e.message)
+            logger.error(e.args[0])
         except Exception as e:
-            logger.error(e.message)
+            logger.error(e.args[0])
             logger.error(traceback.format_exc())
             logger.error(str(sys.exc_info()))
 
@@ -154,14 +154,13 @@ class VnfPkgUploadThread(threading.Thread):
         vnf_pkg.update(onboardingState=PKG_STATUS.UPLOADING)
 
         uri = ignore_case_get(self.data, "addressInformation")
-        request = urllib2.Request(uri)
-        response = urllib2.urlopen(request)
+        response = urllib.request.urlopen(uri)
 
         local_file_dir = os.path.join(GENERICPARSER_ROOT_PATH, self.vnf_pkg_id)
         self.upload_file_name = os.path.join(local_file_dir, os.path.basename(uri))
         if not os.path.exists(local_file_dir):
             fileutil.make_dirs(local_file_dir)
-        with open(self.upload_file_name, "wb") as local_file:
+        with open(self.upload_file_name, "wt") as local_file:
             local_file.write(response.read())
         response.close()
         logger.info('VNF packge(%s) has been uploaded.' % self.vnf_pkg_id)
diff --git a/genericparser/packages/biz/vnf_pkg_artifacts.py b/genericparser/packages/biz/vnf_pkg_artifacts.py
index 3a54f02..0cec274 100644
--- a/genericparser/packages/biz/vnf_pkg_artifacts.py
+++ b/genericparser/packages/biz/vnf_pkg_artifacts.py
@@ -36,7 +36,7 @@ class FetchVnfPkgArtifact(object):
             artifact_path = fileutil.get_artifact_path(vnf_extract_path, artifactPath)
             if not artifact_path:
                 raise ArtifactNotFoundException("Couldn't artifact %s" % artifactPath)
-            with open(artifact_path, 'rb') as f:
+            with open(artifact_path, 'rt') as f:
                 file_content = f.read()
         else:
             raise ArtifactNotFoundException("NF Package format is not csar or zip")
diff --git a/genericparser/packages/biz/vnf_pkg_subscription.py b/genericparser/packages/biz/vnf_pkg_subscription.py
index 29f202f..8da82ad 100644
--- a/genericparser/packages/biz/vnf_pkg_subscription.py
+++ b/genericparser/packages/biz/vnf_pkg_subscription.py
@@ -152,7 +152,7 @@ class QuerySubscription(object):
         query_data = {}
         logger.debug("QuerySubscription--get--multi--subscriptions--biz::> Check "
                      "for filters in query params %s" % params)
-        for query, value in params.iteritems():
+        for query, value in list(params.items()):
             if query in ROOT_FILTERS:
                 query_data[ROOT_FILTERS[query] + '__icontains'] = value
         # Query the database with filters if the request has fields in request params, else fetch all records