Code Review / so.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
[MSO-8] Second step of the rebase for MSO
[so.git] / bpmn / MSOInfrastructureBPMN / src / main / groovy / org / openecomp / mso / bpmn / infrastructure / scripts / CreateNetworkInstance.groovy
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateNetworkInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateNetworkInstance.groovy
index b9b97c7..11de8d9 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateNetworkInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateNetworkInstance.groovy
@@ -1,32 +1,32 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
+/*-\r
+ * ============LICENSE_START=======================================================\r
+ * OPENECOMP - MSO\r
+ * ================================================================================\r
+ * Copyright (C) 2017 AT&T Intellectual Property. 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
+ * You may obtain a copy of the License at\r
+ * \r
+ *      http://www.apache.org/licenses/LICENSE-2.0\r
+ * \r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ * ============LICENSE_END=========================================================\r
  */
-
-package org.openecomp.mso.bpmn.infrastructure.scripts;
+\r
+package org.openecomp.mso.bpmn.infrastructure.scripts;\r
 
 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.core.WorkflowException
-import org.openecomp.mso.bpmn.core.json.JsonUtils
-import org.openecomp.mso.rest.APIResponse
+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor\r
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil\r
+import org.openecomp.mso.bpmn.core.WorkflowException\r
+import org.openecomp.mso.bpmn.core.json.JsonUtils\r
+import org.openecomp.mso.rest.APIResponse\r
 
 import java.util.UUID;
 
@@ -105,12 +105,12 @@ public class CreateNetworkInstance extends AbstractServiceTaskProcessor {
                            utils.log("DEBUG", " 'disableRollback' : " + execution.getVariable("disableRollback") , isDebugEnabled)
                        }       
                        
-                       // get/set 'msoRequestId' and 'mso-request-id'
+                       // get/set 'msoRequestId' and 'mso-request-id'\r
                        String requestId = execution.getVariable("msoRequestId")
                        if (requestId != null) {
-                               execution.setVariable("mso-request-id", requestId)
+                               execution.setVariable("mso-request-id", requestId)\r
                        } else {
-                               requestId = execution.getVariable("mso-request-id")
+                               requestId = execution.getVariable("mso-request-id")\r
                        }
                        execution.setVariable(Prefix + "requestId", requestId)
                        
@@ -161,7 +161,7 @@ public class CreateNetworkInstance extends AbstractServiceTaskProcessor {
                utils.log("DEBUG", " ***** Inside sendSyncResponse() of CreateNetworkInstance ***** ", isDebugEnabled)
 
                try {
-                       String requestId = execution.getVariable("mso-request-id")
+                       String requestId = execution.getVariable("mso-request-id")\r
 
                        // RESTResponse (for API Handler (APIH) Reply Task)
                        String createNetworkRestRequest = """{"requestReferences":{"instanceId":"","requestId":"${requestId}"}}""".trim()
@@ -214,7 +214,7 @@ public class CreateNetworkInstance extends AbstractServiceTaskProcessor {
                
                try {
 
-                       String requestId = execution.getVariable("mso-request-id")
+                       String requestId = execution.getVariable("mso-request-id")\r
 
                        // REST Error (for API Handler (APIH) Reply Task)
                        String syncError = """{"requestReferences":{"instanceId":"","requestId":"${requestId}"}}""".trim()
@@ -248,7 +248,7 @@ public class CreateNetworkInstance extends AbstractServiceTaskProcessor {
                                        """<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
                                                <soapenv:Header/>
                                                <soapenv:Body>
-                                                       <ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">
+                                                       <ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">\r
                                                                <requestId>${requestId}</requestId>
                                                                <lastModifiedBy>BPMN</lastModifiedBy>
                                                                <statusMessage>${statusMessage}</statusMessage>
@@ -280,13 +280,13 @@ public class CreateNetworkInstance extends AbstractServiceTaskProcessor {
 
                try {
 
-                       String requestId = execution.getVariable("mso-request-id")
+                       String requestId = execution.getVariable("mso-request-id")\r
                        String source = execution.getVariable(Prefix + "source")
 
                        String msoCompletionRequest =
-                               """<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-                                                               xmlns:ns="http://org.openecomp/mso/request/types/v1">
-                                               <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+                               """<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"\r
+                                                               xmlns:ns="http://org.openecomp/mso/request/types/v1">\r
+                                               <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">\r
                                                        <request-id>${requestId}</request-id>
                                                        <action>CREATE</action>
                                                        <source>VID</source>
@@ -382,22 +382,22 @@ public class CreateNetworkInstance extends AbstractServiceTaskProcessor {
                utils.log("DEBUG", " ***** Prepare for FalloutHandler. FAILURE - prepare request for sub-process FalloutHandler. *****", isDebugEnabled)
 
                String falloutHandlerRequest = ""
-               String requestId = execution.getVariable("mso-request-id")
+               String requestId = execution.getVariable("mso-request-id")\r
 
                try {
                        WorkflowException wfe = execution.getVariable("WorkflowException")
                        String errorCode = String.valueOf(wfe.getErrorCode())
                        String errorMessage = wfe.getErrorMessage()
                        falloutHandlerRequest =
-                               """<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-                                                                    xmlns:ns="http://org.openecomp/mso/request/types/v1"
-                                                                    xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">
-                                          <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+                               """<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"\r
+                                                                    xmlns:ns="http://org.openecomp/mso/request/types/v1"\r
+                                                                    xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">\r
+                                          <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">\r
                                              <request-id>${requestId}</request-id>
                                              <action>CREATE</action>
                                              <source>VID</source>
                                           </request-info>
-                                               <aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
+                                               <aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">\r
                                                        <aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>
                                                        <aetgt:ErrorCode>${errorCode}</aetgt:ErrorCode>
                                                </aetgt:WorkflowException>
@@ -411,15 +411,15 @@ public class CreateNetworkInstance extends AbstractServiceTaskProcessor {
                        String errorException = "  Bpmn error encountered in CreateNetworkInstance flow. FalloutHandlerRequest,  buildErrorResponse() - " + ex.getMessage()
                        utils.log("DEBUG", errorException, isDebugEnabled)
                        falloutHandlerRequest =
-                       """<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-                                                                    xmlns:ns="http://org.openecomp/mso/request/types/v1"
-                                                                    xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">
-                                          <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+                       """<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"\r
+                                                                    xmlns:ns="http://org.openecomp/mso/request/types/v1"\r
+                                                                    xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">\r
+                                          <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">\r
                                              <request-id>${requestId}</request-id>
                                              <action>CREATE</action>
                                              <source>VID</source>
                                           </request-info>
-                                               <aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
+                                               <aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">\r
                                                        <aetgt:ErrorMessage>${errorException}</aetgt:ErrorMessage>
                                                        <aetgt:ErrorCode>7000</aetgt:ErrorCode>
                                                </aetgt:WorkflowException>
Service Orchestrator