Merge "Reorder modifiers"

[so.git] / bpmn / MSOCommonBPMN / src / main / groovy / org / openecomp / mso / bpmn / common / scripts / SDNCAdapterUtils.groovy

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy
index 20a8210..7aa7b20 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy
@@ -22,7 +22,8 @@ package org.openecomp.mso.bpmn.common.scripts;
 \r
 import org.apache.commons.lang3.*\r
 import org.camunda.bpm.engine.delegate.BpmnError\r
-import org.camunda.bpm.engine.delegate.DelegateExecution\r\r
+import org.camunda.bpm.engine.delegate.DelegateExecution\r
+\r
 import org.openecomp.mso.bpmn.core.WorkflowException\r
 import org.openecomp.mso.bpmn.core.json.JsonUtils;\r
 import org.springframework.web.util.UriUtils\r
@@ -43,7 +44,8 @@ class SDNCAdapterUtils {
                this.taskProcessor = taskProcessor\r
        }\r
 \r
-       String SDNCAdapterFeatureRequest(DelegateExecution execution, String requestName, String action, String callbackURL, String serviceOperation, String timeoutValueInMinutes) {\r\r
+       String SDNCAdapterFeatureRequest(DelegateExecution execution, String requestName, String action, String callbackURL, String serviceOperation, String timeoutValueInMinutes) {\r
+\r
                def utils=new MsoUtils()\r
 \r
                def prefix = execution.getVariable('prefix')\r
@@ -88,7 +90,8 @@ class SDNCAdapterUtils {
                return sdncAdapterFeatureRequest\r
        }\r
 \r
-       String SDNCAdapterActivateVnfRequest(DelegateExecution execution, String action, String callbackURL, String serviceOperation, String msoAction, String timeoutValueInMinutes) {\r\r
+       String SDNCAdapterActivateVnfRequest(DelegateExecution execution, String action, String callbackURL, String serviceOperation, String msoAction, String timeoutValueInMinutes) {\r
+\r
                def utils=new MsoUtils()\r
 \r
                def prefix = execution.getVariable('prefix')\r
@@ -131,7 +134,8 @@ class SDNCAdapterUtils {
                return sdncAdapterActivateVnfRequest\r
        }\r
 \r
-       String SDNCAdapterL3ToHigherLayerRequest(DelegateExecution execution, String action, String callbackURL, String serviceOperation, String timeoutValueInMinutes) {\r\r
+       String SDNCAdapterL3ToHigherLayerRequest(DelegateExecution execution, String action, String callbackURL, String serviceOperation, String timeoutValueInMinutes) {\r
+\r
                def utils=new MsoUtils()\r
 \r
                def prefix = execution.getVariable('prefix')\r
@@ -230,7 +234,8 @@ class SDNCAdapterUtils {
 \r
 \r
 \r
-       private void SDNCAdapterActivateRequest(DelegateExecution execution, String resultVar, String svcAction,\r\r
+       private void SDNCAdapterActivateRequest(DelegateExecution execution, String resultVar, String svcAction,\r
+\r
                        String svcOperation, String additionalData) {\r
                        def utils=new MsoUtils()\r
 \r
@@ -329,7 +334,8 @@ class SDNCAdapterUtils {
         * @param resultVar the execution variable in which the result will be stored\r
         * @param isAic3 boolean to indicate whether request is for AIC3.0\r
         */\r
-       public void sdncReservePrep(DelegateExecution execution, String action, String resultVar, boolean isAic3) {\r\r
+       public void sdncReservePrep(DelegateExecution execution, String action, String resultVar, boolean isAic3) {\r
+\r
                sdncPrep(execution, resultVar, action , 'service-configuration-operation', null, isAic3, this.taskProcessor)\r
        }\r
 \r
@@ -356,7 +362,8 @@ class SDNCAdapterUtils {
         * @param additionalData additional XML content to be inserted into the RequestData element (may be null)\r
         * @param isAic3 boolean to indicate whether request is for AIC3.0\r
         */\r
-       public void sdncPrep(DelegateExecution execution, String resultVar, String svcAction,\r\r
+       public void sdncPrep(DelegateExecution execution, String resultVar, String svcAction,\r
+\r
                        String svcOperation, String additionalData, boolean isAic3, AbstractServiceTaskProcessor taskProcessor) {\r
                def method = getClass().getSimpleName() + '.sdncPrep(' +\r
                        'execution=' + execution.getId() +\r
@@ -489,7 +496,8 @@ class SDNCAdapterUtils {
         * @param additionalData additional XML content to be inserted into the\r
         *   RequestData element (may be null)\r
         */\r
-        public String sdncTopologyRequestV2 (DelegateExecution execution, String requestXML, String serviceInstanceId, String callbackUrl, String action, String requestAction, String cloudRegionId, networkId, String queryAAIResponse, String additionalData) {\r\r
+        public String sdncTopologyRequestV2 (DelegateExecution execution, String requestXML, String serviceInstanceId, String callbackUrl, String action, String requestAction, String cloudRegionId, networkId, String queryAAIResponse, String additionalData) {\r
+\r
                 def utils=new MsoUtils()\r
 \r
                 // SNDC is expecting request Id for header as unique each call.\r
@@ -607,7 +615,8 @@ class SDNCAdapterUtils {
          * @param additionalData additional XML content to be inserted into the\r
          *   RequestData element (may be null)\r
          */\r
-         public String sdncTopologyRequestRsrc (DelegateExecution execution, String requestXML, String serviceInstanceId, String callbackUrl, String action, String requestAction, String cloudRegionId, networkId, String additionalData) {\r\r
+         public String sdncTopologyRequestRsrc (DelegateExecution execution, String requestXML, String serviceInstanceId, String callbackUrl, String action, String requestAction, String cloudRegionId, networkId, String additionalData) {\r
+\r
                  def utils=new MsoUtils()\r
 \r
                  // SNDC is expecting request Id for header as unique each call.\r
@@ -729,12 +738,12 @@ class SDNCAdapterUtils {
                                                   <service-information>\r
                                                      <service-id>${serviceId}</service-id>\r
                                                      <subscription-service-type>${subscriptionServiceType}</subscription-service-type>\r
-                                                         <ecomp-model-information>\r
+                                                         <onap-model-information>\r
                                                                   <model-invariant-uuid>${serviceModelInvariantUuid}</model-invariant-uuid>\r
                                                                   <model-uuid>${serviceModelUuid}</model-uuid>\r
                                                                   <model-version>${serviceModelVersion}</model-version>\r
                                                                   <model-name>${serviceModelName}</model-name>\r
-                              </ecomp-model-information>\r
+                              </onap-model-information>\r
                                                      <service-instance-id>${serviceInstanceId}</service-instance-id>\r
                                                      <global-customer-id>${globalCustomerId}</global-customer-id>\r
                                                      <subscriber-name>${subscriberName}</subscriber-name>\r
@@ -742,13 +751,13 @@ class SDNCAdapterUtils {
                                                   <network-information>\r
                                                      <network-id>${networkId}</network-id>\r
                                                      <network-type>${networkType}</network-type>\r
-                                                         <ecomp-model-information>\r
+                                                         <onap-model-information>\r
                                                                   <model-invariant-uuid>${modelInvariantUuid}</model-invariant-uuid>\r
                                                                   <model-customization-uuid>${modelCustomizationUuid}</model-customization-uuid>\r
                                                                   <model-uuid>${modelUuid}</model-uuid>\r
                                                                   <model-version>${modelVersion}</model-version>\r
                                                                   <model-name>${modelName}</model-name>\r
-                                                         </ecomp-model-information>\r
+                                                         </onap-model-information>\r
                                                   </network-information>\r
                                                   <network-request-input>\r
                                                     <network-name>${networkName}</network-name>\r
@@ -769,7 +778,8 @@ class SDNCAdapterUtils {
                         * @param responseVar the execution variable in which the response is stored\r
                         * @param workflowException the WorkflowException Object returned from sdnc call\r
                         */\r
-       public void validateSDNCResponse(DelegateExecution execution, String response, WorkflowException workflowException, boolean successIndicator){\r\r
+       public void validateSDNCResponse(DelegateExecution execution, String response, WorkflowException workflowException, boolean successIndicator){\r
+\r
                def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')\r
                taskProcessor.utils.log("DEBUG", "SDNC Response is: " + response, isDebugLogEnabled)\r
                taskProcessor.utils.log("DEBUG", "SuccessIndicator is: " + successIndicator, isDebugLogEnabled)\r
@@ -883,7 +893,8 @@ class SDNCAdapterUtils {
                         * @param responseCodeVar the execution variable in which the response code is stored\r
                         * @param errorResponseVar the execution variable in which the error response is stored\r
                         */\r
-                       public void validateL3BondingSDNCResp(DelegateExecution execution, String response, WorkflowException workflowException, boolean success) {\r\r
+                       public void validateL3BondingSDNCResp(DelegateExecution execution, String response, WorkflowException workflowException, boolean success) {\r
+\r
                                def method = getClass().getSimpleName() + '.validateL3BondingSDNCResp(' +\r
                                        'execution=' + execution.getId() +\r
                                        ', response=' + response +\r
@@ -1006,13 +1017,13 @@ class SDNCAdapterUtils {
                }               \r
                String modelName = jsonUtil.getJsonValue(jsonModelInfo, "modelName")\r
                String ecompModelInformation =\r
-                               """<ecomp-model-information>\r
+                               """<onap-model-information>\r
                                                <model-invariant-uuid>${modelInvariantUuid}</model-invariant-uuid>\r
                                                <model-uuid>${modelUuid}</model-uuid>\r
                                                ${modelCustomizationString}\r
                                                <model-version>${modelVersion}</model-version>\r
                                                <model-name>${modelName}</model-name>\r
-                               </ecomp-model-information>"""\r
+                               </onap-model-information>"""\r
 \r
                return ecompModelInformation            \r
        } \r