Add preprocess for NS Create

Pre deal the parameters for NS create

Change-Id: I43afdbceb262d881e6a501c41ee2cf6e50173ad6
Issue-ID:SO-57
Signed-off-by: c00149107 <chenchuanyu@huawei.com>

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy
index 2029d15..d5c6a88 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy
@@ -58,55 +58,27 @@ public class CreateGenericE2EServiceInstance extends AbstractServiceTaskProcesso
      * generate the operation id\r
      */\r
     public void preProcessRequest (Execution execution) {\r
-         /* def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
+          def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
        String msg = ""\r
        utils.log("DEBUG", " *** preProcessRequest() *** ", isDebugEnabled)\r
-       try {\r
-\r
-           String siRequest = execution.getVariable("bpmnRequest")\r
-           utils.logAudit(siRequest)\r
-\r
-           String requestId = execution.getVariable("mso-request-id")\r
-           execution.setVariable("msoRequestId", requestId)\r
-           utils.log("DEBUG", "Input Request:" + siRequest + " reqId:" + requestId, isDebugEnabled)\r
-\r
-           String serviceInstanceId = execution.getVariable("serviceInstanceId")\r
-           if (isBlank(serviceInstanceId)) {\r
-               serviceInstanceId = UUID.randomUUID().toString()\r
-           }\r
-           utils.log("DEBUG", "Generated new Service Instance:" + serviceInstanceId, isDebugEnabled)\r
-           serviceInstanceId = UriUtils.encode(serviceInstanceId,"UTF-8")\r
-           execution.setVariable("serviceInstanceId", serviceInstanceId)\r
-           \r
+       try {                    \r
+           String globalSubscriberId = execution.getVariable("globalSubscriberId")\r
+           utils.log("DEBUG", "globalSubscriberId:" + globalSubscriberId, isDebugEnabled)\r
+           String serviceType = execution.getVariable("serviceType")\r
+           utils.log("DEBUG", "serviceType:" + serviceType, isDebugEnabled)\r
+           String serviceId = execution.getVariable("serviceId")\r
+           utils.log("DEBUG", "serviceId:" + serviceId, isDebugEnabled)\r
            String operationId = execution.getVariable("operationId")\r
-           if (isBlank(operationId)) {\r
-               operationId = UUID.randomUUID().toString()\r
-           }\r
-           utils.log("DEBUG", "Generated new Service Instance Operation:" + operationId, isDebugEnabled)\r
-           serviceInstanceId = UriUtils.encode(operationId,"UTF-8")\r
-           execution.setVariable("operationId", operationId)\r
-           //subscriberInfo, TBD , there is no globalSubscriberId in R1 for E2E Service.\r
-           //requestInfo TBD , there is no requestDetails for R1 E2E service\r
-\r
-           //TBD need to insert operationInfo to RequestDb\r
-           \r
-           //set service Instance Name\r
-           execution.setVariable("serviceInstanceName", jsonUtil.getJsonValue(siRequest, "service.name"))\r
-           execution.setVariable("serviceDescription", jsonUtil.getJsonValue(siRequest, "service.description"))\r
-           execution.setVariable("templateId", jsonUtil.getJsonValue(siRequest, "service.templateId"))\r
-     \r
-           //serviceParamters\r
-           String serviceParamters = jsonUtil.getJsonValue(siRequest, "service.parameters")\r
-           if (isBlank(serviceParamters)) {\r
-               msg = "Input service paramters is null"\r
-               utils.log("DEBUG", msg, isDebugEnabled)\r
-               exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)\r
-           } else\r
-           {\r
-               execution.setVariable("serviceParamters", serviceParamters)\r
-           }\r
-\r
-           utils.log("DEBUG", "service parameters:" + serviceParamters,  isDebugEnabled)\r
+           utils.log("DEBUG", "serviceType:" + serviceType, isDebugEnabled)\r
+           String nodeTemplateUUID = execution.getVariable("nodeTemplateUUID")\r
+           utils.log("DEBUG", "globalSubscriberId:" + globalSubscriberId, isDebugEnabled)\r
+           String siRequest = execution.getVariable("nodeParamters")\r
+           utils.log("DEBUG", "Input Request:" + siRequest, isDebugEnabled)\r
+           String nsOperationKey = "{\"globalSubscriberId\":" + globalSubscriberId + ",\"serviceType:\""\r
+                 + serviceType + ",\"serviceId\":" + serviceId + ",\"operationId\":" + operationId\r
+                 +",\"nodeTemplateUUID\":" + nodeTemplateUUID + "}";\r
+           execution.setVariable("nsOperationKey", nsOperationKey);\r
+\r
        } catch (BpmnError e) {\r
            throw e;\r
        } catch (Exception ex){\r
@@ -114,7 +86,7 @@ public class CreateGenericE2EServiceInstance extends AbstractServiceTaskProcesso
            utils.log("DEBUG", msg, isDebugEnabled)\r
            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)\r
        }\r
-       utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)*/\r
+       utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)\r
        }\r
 \r
 \r