Merge "Remove unwanted code from E2E deletion"

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteCustomE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteCustomE2EServiceInstance.groovy
index d4b8531..d218adc 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteCustomE2EServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteCustomE2EServiceInstance.groovy
@@ -81,36 +81,23 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
                                msg = "Input serviceInstanceId' is null"\r
                                exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)\r
                        }\r
-               \r
-                       //String xmlRequestDetails = vidUtils.getJsonRequestDetailstoXml(siRequest)\r
-                       //execution.setVariable("requestDetails", xmlRequestDetails)\r
-                       \r
-                       //modelInfo\r
-                       String serviceModelInfo = jsonUtil.getJsonValue(siRequest, "requestDetails.modelInfo")\r
-                       if (isBlank(serviceModelInfo)) {\r
-                               msg = "Input serviceModelInfo is null"\r
-                               utils.log("DEBUG", msg, isDebugEnabled)\r
-                       } else\r
-                       {\r
-                               execution.setVariable("serviceModelInfo", serviceModelInfo)\r
-                               //utils.log("DEBUG", "modelInfo" + serviceModelInfo,  isDebugEnabled)\r
-                       }\r
+\r
                        \r
                        //requestInfo\r
-                       String productFamilyId = jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.productFamilyId")\r
-                       if (isBlank(productFamilyId))\r
-                       {\r
-                               msg = "Input productFamilyId is null"\r
-                               utils.log("INFO", msg, isDebugEnabled)\r
-                               //exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)\r
-                       } else {\r
-                               execution.setVariable("productFamilyId", productFamilyId)\r
-                       }\r
-                       String source = jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.source")\r
+//                     String productFamilyId = jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.productFamilyId")\r
+//                     if (isBlank(productFamilyId))\r
+//                     {\r
+//                             msg = "Input productFamilyId is null"\r
+//                             utils.log("INFO", msg, isDebugEnabled)\r
+//                             //exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)\r
+//                     } else {\r
+//                             execution.setVariable("productFamilyId", productFamilyId)\r
+//                     }\r
+                       String source = jsonUtil.getJsonValue(siRequest, "source")\r
                        execution.setVariable("source", source)\r
                        \r
                        //subscriberInfo\r
-                       String globalSubscriberId = jsonUtil.getJsonValue(siRequest, "requestDetails.subscriberInfo.globalSubscriberId")\r
+                       String globalSubscriberId = jsonUtil.getJsonValue(siRequest, "globalSubscriberId")\r
                        if (isBlank(globalSubscriberId)) {\r
                                msg = "Input globalSubscriberId' is null"\r
                                utils.log("INFO", msg, isDebugEnabled)\r
@@ -119,7 +106,7 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
                        }\r
                        \r
                        //requestParameters\r
-                       String subscriptionServiceType = jsonUtil.getJsonValue(siRequest, "requestDetails.requestParameters.subscriptionServiceType")\r
+                       String subscriptionServiceType = jsonUtil.getJsonValue(siRequest, "serviceType")\r
                        if (isBlank(subscriptionServiceType)) {\r
                                msg = "Input subscriptionServiceType is null"\r
                                utils.log("DEBUG", msg, isDebugEnabled)\r
@@ -127,29 +114,8 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
                        } else {\r
                                execution.setVariable("subscriptionServiceType", subscriptionServiceType)\r
                        }\r
-                       \r
-                       /*\r
-                        * Extracting User Parameters from incoming Request and converting into a Map\r
-                        */\r
-                       def jsonSlurper = new JsonSlurper()\r
-                       def jsonOutput = new JsonOutput()\r
-\r
-                       Map reqMap = jsonSlurper.parseText(siRequest)\r
-\r
-                       //InputParams\r
-                       def userParams = reqMap.requestDetails?.requestParameters?.userParams\r
-\r
-                       Map<String, String> inputMap = [:]\r
-                       if (userParams) {\r
-                               userParams.each {\r
-                                       userParam -> inputMap.put(userParam.name, userParam.value.toString())\r
-                               }\r
-                       }\r
-                       execution.setVariable("operationType", "DELETE") \r
-                       \r
-                       utils.log("DEBUG", "User Input Parameters map: " + userParams.toString(), isDebugEnabled)\r
-                       execution.setVariable("serviceInputParams", inputMap)\r
 \r
+                       execution.setVariable("operationType", "DELETE")\r
                } catch (BpmnError e) {\r
                        throw e;\r
                } catch (Exception ex){\r