X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Fosm_vnfm%2Fvnf_instance_actions.py;h=b34d2030657f86a7aebbeb1753fb6e0a332e93a4;hb=ea3a2c2766d6d6c652c758b8b5c3a90b004f157a;hp=908f6338f66e44ae022dbbafb8ca92d9fb99f9a3;hpb=e24f2c187c96a3cd9b4ab7fa50687c36c4614583;p=osm%2FNBI.git

diff --git a/osm_nbi/osm_vnfm/vnf_instance_actions.py b/osm_nbi/osm_vnfm/vnf_instance_actions.py
index 908f6338..b34d2030 100644
--- a/osm_nbi/osm_vnfm/vnf_instance_actions.py
+++ b/osm_nbi/osm_vnfm/vnf_instance_actions.py
@@ -21,7 +21,6 @@ from .base_methods import BaseMethod
 
 
 class VnfLcmOp2NsLcmOp:
-
     def __init__(self, db, fs, msg, auth):
         """
         Constructor of Vnf lcm op to Ns lcm op
@@ -66,7 +65,6 @@ class VnfLcmOp2NsLcmOp:
 
 
 class NewVnfLcmOp(BaseMethod):
-
     def __init__(self, db, fs, msg, auth):
         """
         Constructor of new Vnf Lcm Op
@@ -85,7 +83,7 @@ class NewVnfLcmOp(BaseMethod):
         :return: id of nsd id
         """
         nsr = self.nsrtopic.show(session, vnf_instance_id)
-        return nsr['nsd']['_id']
+        return nsr["nsd"]["_id"]
 
     def __get_formatted_indata(self, session, indata):
         """
@@ -100,16 +98,15 @@ class NewVnfLcmOp(BaseMethod):
                 "nsName": indata["vnfName"],
                 "nsDescription": indata["vnfDescription"],
                 "nsdId": self.__get_nsdid(session, indata["vnfInstanceId"]),
-                "vimAccountId": indata.get("vimAccountId"),
-                "paasAccountId": indata.get("paasAccountId"),
+                "vimAccountId": indata["vimAccountId"],
                 "nsr_id": indata["vnfInstanceId"],
                 "lcmOperationType": indata["lcmOperationType"],
-                "nsInstanceId": indata["vnfInstanceId"]
+                "nsInstanceId": indata["vnfInstanceId"],
             }
         elif indata["lcmOperationType"] == "terminate":
             formatted_indata = {
                 "lcmOperationType": indata["lcmOperationType"],
-                "nsInstanceId": indata["vnfInstanceId"]
+                "nsInstanceId": indata["vnfInstanceId"],
             }
         elif indata["lcmOperationType"] == "scale":
             formatted_indata = {
@@ -120,9 +117,11 @@ class NewVnfLcmOp(BaseMethod):
                     "scaleVnfType": indata["type"],
                     "scaleByStepData": {
                         "scaling-group-descriptor": indata["aspectId"],
-                        "member-vnf-index": indata["additionalParams"]["member-vnf-index"]
-                    }
-                }
+                        "member-vnf-index": indata["additionalParams"][
+                            "member-vnf-index"
+                        ],
+                    },
+                },
             }
         elif indata["lcmOperationType"] == "action":
             formatted_indata = {
@@ -130,7 +129,7 @@ class NewVnfLcmOp(BaseMethod):
                 "nsInstanceId": indata["vnfInstanceId"],
                 "member_vnf_index": indata["member_vnf_index"],
                 "primitive": indata["primitive"],
-                "primitive_params": indata["primitive_params"]
+                "primitive_params": indata["primitive_params"],
             }
         return formatted_indata
 
@@ -148,14 +147,17 @@ class NewVnfLcmOp(BaseMethod):
         nslcmop_rec = self.nslcmoptopic.show(session, op_id)
         operation_status = nslcmop_rec["operationState"]
         vnfr = self.vnfrtopic.show(session, vnfInstanceId)
-        links = {"self": "/osm/vnflcm/v1/vnf_lcm_op_occs/" + op_id,
-                 "vnfInstance": "/osm/vnflcm/v1/vnf_instances/" + vnfInstanceId}
-        params = {"vnfdId": vnfr["vnfd-ref"],
-                  "vnfInstanceId": vnfInstanceId,
-                  "operationState": operation_status,
-                  "vnfLcmOpOccId": op_id,
-                  "_links": links
-                  }
+        links = {
+            "self": "/osm/vnflcm/v1/vnf_lcm_op_occs/" + op_id,
+            "vnfInstance": "/osm/vnflcm/v1/vnf_instances/" + vnfInstanceId,
+        }
+        params = {
+            "vnfdId": vnfr["vnfd-ref"],
+            "vnfInstanceId": vnfInstanceId,
+            "operationState": operation_status,
+            "vnfLcmOpOccId": op_id,
+            "_links": links,
+        }
         self.msg.write("vnf", operation, params)
         return None
 
@@ -180,7 +182,6 @@ class NewVnfLcmOp(BaseMethod):
 
 
 class ListVnfLcmOp(BaseMethod):
-
     def __init__(self, db, fs, msg, auth):
         """
         Constructor call for listing vnf lcm operations
@@ -202,14 +203,13 @@ class ListVnfLcmOp(BaseMethod):
         for record in records:
             ns_id = record.get("nsInstanceId")
             nsr = self.nsrtopic.show(session, ns_id)
-            vnfInstance_id = nsr['constituent-vnfr-ref'][0]
+            vnfInstance_id = nsr["constituent-vnfr-ref"][0]
             outdata = sol003_projection(record, vnfInstance_id)
             list.append(outdata)
         return list
 
 
 class ShowVnfLcmOp(BaseMethod):
-
     def __init__(self, db, fs, msg, auth):
         """
         Constructor call for showing vnf lcm operation
@@ -229,7 +229,7 @@ class ShowVnfLcmOp(BaseMethod):
         record = self.nslcmoptopic.show(session, _id, api_req)
         ns_id = record.get("nsInstanceId")
         nsr = self.nsrtopic.show(session, ns_id)
-        vnfinstance_id = nsr['constituent-vnfr-ref'][0]
+        vnfinstance_id = nsr["constituent-vnfr-ref"][0]
         outdata = sol003_projection(record, vnfinstance_id)
         return outdata