vnflcm upgrade from python2 to python3

[vfc/gvnfm/vnflcm.git] / lcm / lcm / pub / utils / notificationsutil.py

diff --git a/lcm/lcm/pub/utils/notificationsutil.py b/lcm/lcm/pub/utils/notificationsutil.py
index 444e807..2eb820f 100644 (file)
--- a/lcm/lcm/pub/utils/notificationsutil.py
+++ b/lcm/lcm/pub/utils/notificationsutil.py
@@ -46,7 +46,7 @@ class NotificationsUtil(object):
             "operationState": "operation_states",
             "operation": "operation_types"
         }
-        subscriptions_filter = {v + "__contains": notification[k] for k, v in filters.iteritems()}
+        subscriptions_filter = {v + "__contains": notification[k] for k, v in list(filters.items())}
 
         subscriptions = SubscriptionModel.objects.filter(**subscriptions_filter)
         if not subscriptions.exists():
@@ -56,25 +56,27 @@ class NotificationsUtil(object):
         for subscription in subscriptions:
             # set subscription id
             notification["subscriptionId"] = subscription.subscription_id
-            notification['_links']['subscription'] = {'href': '/api/vnflcm/v1/subscriptions/%s' % subscription.subscription_id}
+            notification['_links']['subscription'] = {
+                'href': '/api/vnflcm/v1/subscriptions/%s' % subscription.subscription_id
+            }
             callbackUri = subscription.callback_uri
             auth_info = json.loads(subscription.auth_info)
-            if auth_info["authType"] == const.OAUTH2_CLIENT_CREDENTIALS:
-                pass
-            try:
-                self.post_notification(callbackUri, auth_info, notification)
-            except Exception as e:
-                logger.error("Failed to post notification: %s", e.message)
+            if auth_info["authType"] != const.OAUTH2_CLIENT_CREDENTIALS:
+                try:
+                    self.post_notification(callbackUri, auth_info, notification)
+                except Exception as e:
+                    logger.error("Failed to post notification: %s", e.args[0])
 
     def post_notification(self, callbackUri, auth_info, notification):
         params = auth_info.get("paramsBasic", {})
         username = params.get("userName")
         password = params.get("password")
         logger.info("Sending notification to %s", callbackUri)
-        resp = requests.post(callbackUri, data=notification, auth=HTTPBasicAuth(username, password))
+        resp = requests.post(callbackUri,
+                             data=notification,
+                             auth=HTTPBasicAuth(username, password))
         if resp.status_code != status.HTTP_204_NO_CONTENT:
-            raise Exception("Unable to send the notification to %s, due to %s" % (callbackUri, resp.text))
-        return
+            raise Exception("Notify %s failed: %s" % (callbackUri, resp.text))
 
 
 def set_affected_vnfcs(affected_vnfcs, nfinstid, changetype):
@@ -134,7 +136,7 @@ def set_ext_connectivity(ext_connectivity, nfinstid):
             },
             'cpInstanceId': port.portid  # TODO: port.cpinstanceid is not initiated when create port resource.
         })
-    for network_id, ext_link_ports in ext_connectivity_map.items():
+    for network_id, ext_link_ports in list(ext_connectivity_map.items()):
         networks = NetworkInstModel.objects.filter(networkid=network_id)
         net_name = networks[0].name if networks else network_id
         network_resource = {
@@ -169,10 +171,9 @@ def set_affected_vss(affected_vss, nfinstid, changetype):
 
 
 def get_notification_status(operation_state):
-    notification_status = const.LCM_NOTIFICATION_STATUS.START
-    if operation_state in const.RESULT_RANGE:
-        notification_status = const.LCM_NOTIFICATION_STATUS.RESULT
-    return notification_status
+    if operation_state == const.OPERATION_STATE_TYPE.STARTING:
+        return const.LCM_NOTIFICATION_STATUS.START
+    return const.LCM_NOTIFICATION_STATUS.RESULT
 
 
 def prepare_notification(nfinstid, jobid, operation, operation_state):