Added Groovy for E2E svc

IssueId: SO-146

Change-Id: Id247132c451e16c49dde8b8547d50924cdfa00c4
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CustomE2EGetService.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CustomE2EGetService.groovy
index aece07e..af2da67 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CustomE2EGetService.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CustomE2EGetService.groovy
@@ -3,6 +3,7 @@
  * ONAP - SO\r
  * ================================================================================\r
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. \r
  * ================================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CustomE2EPutService.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CustomE2EPutService.groovy
index eaccdc0..946ba1a 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CustomE2EPutService.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CustomE2EPutService.groovy
@@ -3,6 +3,7 @@
  * ONAP - SO
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. 
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy
index f376c44..33bbbd8 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy
@@ -1,8 +1,9 @@
 /*-
  * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
+ * ONAP - SO
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. 
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +26,7 @@ import groovy.xml.XmlUtil
 import groovy.json.*
 import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
 import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
-import org.openecomp.mso.bpmn.common.scripts.VidUtils
+
 import org.openecomp.mso.bpmn.core.WorkflowException
 import org.openecomp.mso.bpmn.core.json.JsonUtils
 import org.openecomp.mso.rest.APIResponse
@@ -47,7 +48,7 @@ public class CreateCustomE2EServiceInstance extends AbstractServiceTaskProcessor
        String Prefix="CRESI_"
        ExceptionUtil exceptionUtil = new ExceptionUtil()
        JsonUtils jsonUtil = new JsonUtils()
-       VidUtils vidUtils = new VidUtils()
+
 
        public void preProcessRequest (Execution execution) {
                def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
@@ -72,71 +73,6 @@ public class CreateCustomE2EServiceInstance extends AbstractServiceTaskProcessor
                        serviceInstanceId = UriUtils.encode(serviceInstanceId,"UTF-8")
                        execution.setVariable("serviceInstanceId", serviceInstanceId)
 
-                       //parameters
-                       String p_domainHost = jsonUtil.getJsonValue(siRequest, "service.parameters.domainHost")
-                       if (isBlank(p_domainHost)) {
-                               msg = "Input parameters domainHost is null"
-                               exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-                       } else {
-                               execution.setVariable("p_domainHost", p_domainHost)
-                       }
-
-                       String p_nodeTemplateName = jsonUtil.getJsonValue(siRequest, "service.parameters.nodeTemplateName")
-                       if (isBlank(p_nodeTemplateName)) {
-                               msg = "Input parameters nodeTemplateName is null"
-                               exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-                       } else {
-                               execution.setVariable("p_nodeTemplateName", p_nodeTemplateName)
-                       }
-                       
-                       String p_nodeType = jsonUtil.getJsonValue(siRequest, "service.parameters.nodeType")
-                       if (isBlank(p_nodeType)) {
-                               msg = "Input parameters nodeType is null"
-                               exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-                       } else {
-                               execution.setVariable("p_nodeType", p_nodeType)
-                       }
-
-                       //segments
-                       def jsonSlurper = new JsonSlurper()
-                       //def jsonOutput = new JsonOutput()
-
-                       Map reqMap = jsonSlurper.parseText(siRequest)           
-                       
-                       def p_segments = reqMap.service?.parameters?.segments
-                       
-                       //List<Segment> segList = []
-                       //if (p_segments) {
-                       //    p_segments.each {
-                       //              p_segment -> segList.add(p_segment)
-                       //              //p_segment.domainHost
-                       //      }
-                       //}
-                       //execution.setVariable("segments", segList)
-                       
-                       //location Constraints
-                       def p_locationConstraints = reqMap.service?.parameters?.nsParameters?.locationConstraints
-                       if(p_locationConstraints){
-                       //Copy data. no data available now so ignoring
-                       }
-                       
-                       //additionalParamForNs
-                       String p_param1 = jsonUtil.getJsonValue(siRequest, "service.parameters.nsParameters.additionalParamForNs.E2EServcie.param1")
-                       if (isBlank(p_param1)) {
-                               msg = "Input parameters p_param1 is null"
-                               exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-                       } else {
-                               execution.setVariable("p_param1", p_param1)
-                       }
-                       
-                       String p_param2 = jsonUtil.getJsonValue(siRequest, "service.parameters.nsParameters.additionalParamForNs.E2EServcie.param2")
-                       if (isBlank(p_param2)) {
-                               msg = "Input parameters p_param2 is null"
-                               exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-                       } else {
-                               execution.setVariable("p_param2", p_param2)
-                       }
-
                        //subscriberInfo
                        String globalSubscriberId = jsonUtil.getJsonValue(siRequest, "requestDetails.subscriberInfo.globalSubscriberId")
                        if (isBlank(globalSubscriberId)) {
@@ -183,6 +119,28 @@ public class CreateCustomE2EServiceInstance extends AbstractServiceTaskProcessor
                                execution.setVariable("subscriptionServiceType", subscriptionServiceType)
                        }
 
+                       
+                       /*
+                        * Extracting User Parameters from incoming Request and converting into a Map
+                        */
+                       def jsonSlurper = new JsonSlurper()
+                       def jsonOutput = new JsonOutput()
+
+                       Map reqMap = jsonSlurper.parseText(siRequest)
+
+                       //InputParams
+                       def userParams = reqMap.requestDetails?.requestParameters?.userParams
+
+                       Map<String, String> inputMap = [:]
+                       if (userParams) {
+                               userParams.each {
+                                       userParam -> inputMap.put(userParam.name, userParam.value)
+                               }
+                       }
+                       
+                       utils.log("DEBUG", "User Input Parameters map: " + userParams.toString(), isDebugEnabled)
+                       execution.setVariable("serviceInputParams", inputMap)
+                       
                        //TODO
                        //execution.setVariable("serviceInputParams", jsonUtil.getJsonValue(siRequest, "requestDetails.requestParameters.userParams"))
                        //execution.setVariable("failExists", true)
@@ -312,7 +270,7 @@ public class CreateCustomE2EServiceInstance extends AbstractServiceTaskProcessor
                                           <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">\r
                                              <request-id>${requestId}</request-id>
                                              <action>CREATE</action>
-                                             <source>VID</source>
+                                             <source>UUI</source>
                                           </request-info>
                                                <aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">\r
                                                        <aetgt:ErrorMessage>${errorException}</aetgt:ErrorMessage>

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy
index 518c30b..4129a76 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy
@@ -3,6 +3,7 @@
  * ONAP - SO
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. 
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -132,68 +133,22 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
                        String serviceType = ""
                        String serviceRole = ""
                        
-                       ServiceDecomposition serviceDecomp = (ServiceDecomposition) execution.getVariable("serviceDecomposition")
-                       if (serviceDecomp != null)
-                       {
-                               serviceType = serviceDecomp.getServiceType()
-                               if (serviceType == null)
-                               {
-                                       utils.log("DEBUG", "null serviceType", isDebugEnabled)
-                                       serviceType = ""
-                               }
-                               else
-                               {
-                                       utils.log("DEBUG", "serviceType:" + serviceType, isDebugEnabled)
-                               }
-                               serviceRole = serviceDecomp.getServiceRole()
-                               if (serviceRole == null)
-                               {
-                                       serviceRole = ""
-                               }
-                               
-                               ServiceInstance serviceInstance = serviceDecomp.getServiceInstance()
-                               if (serviceInstance != null)
-                               {
-                                       serviceInstanceId = serviceInstance.getInstanceId()
-                                       serviceInstanceName = serviceInstance.getInstanceName()
-                                       execution.setVariable("serviceInstanceId", serviceInstanceId)
-                                       execution.setVariable("serviceInstanceName", serviceInstanceName)
-                               }
-                               
-                               ModelInfo modelInfo = serviceDecomp.getModelInfo()
-                               if (modelInfo != null)
-                               {
-                                       modelInvariantUuid = modelInfo.getModelInvariantUuid()
-                                       modelVersion = modelInfo.getModelVersion()
-                                       modelUuid = modelInfo.getModelUuid()
-                                       modelName = modelInfo.getModelName()
-                               }
-                               else 
-                               {
-                                       msg = "Input serviceModelInfo is null"
-                                       utils.log("DEBUG", msg, isDebugEnabled)
-                                       exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-                               }
+                       //requestDetails.requestInfo. for AAI GET/PUT serviceInstanceData & SDNC assignToplology
+                       serviceInstanceName = execution.getVariable("serviceInstanceName")
+                       serviceInstanceId = execution.getVariable("serviceInstanceId")
+                       
+                       String serviceModelInfo = execution.getVariable("serviceModelInfo")
+                       if (isBlank(serviceModelInfo)) {
+                               msg = "Input serviceModelInfo is null"
+                               utils.log("DEBUG", msg, isDebugEnabled)
+                               exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
                        }
-                       else
-                       {
-                               //requestDetails.requestInfo. for AAI GET/PUT serviceInstanceData & SDNC assignToplology
-                               serviceInstanceName = execution.getVariable("serviceInstanceName")
-                               serviceInstanceId = execution.getVariable("serviceInstanceId")
-                               
-                               String serviceModelInfo = execution.getVariable("serviceModelInfo")
-                               if (isBlank(serviceModelInfo)) {
-                                       msg = "Input serviceModelInfo is null"
-                                       utils.log("DEBUG", msg, isDebugEnabled)
-                                       exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-                               }
-                               modelInvariantUuid = jsonUtil.getJsonValue(serviceModelInfo, "modelInvariantUuid")
-                               modelVersion = jsonUtil.getJsonValue(serviceModelInfo, "modelVersion")
-                               modelUuid = jsonUtil.getJsonValue(serviceModelInfo, "modelUuid")
-                               modelName = jsonUtil.getJsonValue(serviceModelInfo, "modelName")
-                               //modelCustomizationUuid NA for SI
+                       modelInvariantUuid = jsonUtil.getJsonValue(serviceModelInfo, "modelInvariantUuid")
+                       modelVersion = jsonUtil.getJsonValue(serviceModelInfo, "modelVersion")
+                       modelUuid = jsonUtil.getJsonValue(serviceModelInfo, "modelUuid")
+                       modelName = jsonUtil.getJsonValue(serviceModelInfo, "modelName")
+                       //modelCustomizationUuid NA for SI
        
-                       }
                        execution.setVariable("serviceType", serviceType)
                        execution.setVariable("serviceRole", serviceRole)
                        
@@ -285,14 +240,14 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
                utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)
        }
 
-       //TODO: Will be able to replace with call to GenericGetService
+       //TODO: Will be able to replace with call to CustomE2EGetService as per the GenericGetService
        public void getAAICustomerById (Execution execution) {
                // https://{aaiEP}/aai/v8/business/customers/customer/{globalCustomerId}
                def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
                String msg = ""
                try {
 
-                       String globalCustomerId = execution.getVariable("globalSubscriberId") //VID to AAI name map
+                       String globalCustomerId = execution.getVariable("globalSubscriberId") //UUI to AAI name map
                        utils.log("DEBUG"," ***** getAAICustomerById ***** globalCustomerId:" + globalCustomerId, isDebugEnabled)
 
                        String aai_endpoint = execution.getVariable("URN_aai_endpoint")

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstanceRollback.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstanceRollback.groovy
index 9fa6664..dfe210c 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstanceRollback.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstanceRollback.groovy
@@ -3,6 +3,7 @@
  * ONAP - SO\r
  * ================================================================================\r
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.\r
  * ================================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r