vfclcm upgrade from python2 to python3

[vfc/gvnfm/vnflcm.git] / lcm / lcm / nf / biz / query_vnf_lcm_op_occ.py

diff --git a/lcm/lcm/nf/biz/query_vnf_lcm_op_occ.py b/lcm/lcm/nf/biz/query_vnf_lcm_op_occ.py
index 467dc4f..b352f5c 100644 (file)
--- a/lcm/lcm/nf/biz/query_vnf_lcm_op_occ.py
+++ b/lcm/lcm/nf/biz/query_vnf_lcm_op_occ.py
@@ -38,7 +38,7 @@ class QueryVnfLcmOpOcc:
     def query_multi_vnf_lcm_op_occ(self):
         query_data = {}
         logger.debug("QueryMultiVnfLcmOpOccs--get--biz::> 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 FILTERS:
                 query_data[FILTERS[query]] = value
         # Query the database with filters if the request has fields in request params, else fetch all records
@@ -59,9 +59,9 @@ class QueryVnfLcmOpOcc:
             'vnfInstanceId': lcm_op.vnf_instance_id,
             'grantId': None,
             'operation': lcm_op.operation,
-            'isAutomaticInvocation': lcm_op.is_automatic_invocation,
+            'isAutomaticInvocation': False if lcm_op.is_automatic_invocation == 'False' else True,
             'operationParams': json.loads(lcm_op.operation_params),
-            'isCancelPending': lcm_op.is_cancel_pending,
+            'isCancelPending': False if lcm_op.is_cancel_pending == 'False' else True,
             'cancelMode': lcm_op.cancel_mode,
             'error': None if not lcm_op.error else json.loads(lcm_op.error),
             'resourceChanges': None if not lcm_op.resource_changes else json.loads(lcm_op.resource_changes),
@@ -70,3 +70,10 @@ class QueryVnfLcmOpOcc:
             '_links': json.loads(lcm_op.links)
         }
         return resp_data
+
+    def query_single_vnf_lcm_op_occ(self):
+        lcm_op = VNFLcmOpOccModel.objects.filter(id=self.vnf_lcm_op_occ_id)
+        if not lcm_op.exists():
+            raise NFLCMException('LCM Operation Occurance does not exist')
+        resp_data = self.fill_resp_data(lcm_op[0])
+        return resp_data