Merge "Flows fail to update status in requests DB"

diff --combined bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy
index 8d1f317,b5295ae..abd6936
--- 1/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy
--- 2/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
@@@ -140,7 -140,7 +140,7 @@@ public class CreateCustomE2EServiceInst
                        
                        utils.log("DEBUG", "User Input Parameters map: " + userParams.toString(), isDebugEnabled)
                        execution.setVariable("serviceInputParams", inputMap)
 -                      
 +                      execution.setVariable("URN_mso_openecomp_adapters_db_endpoint","http://mso.mso.testlab.openecomp.org:8080/dbadapters/RequestsDbAdapter")
                        //TODO
                        //execution.setVariable("serviceInputParams", jsonUtil.getJsonValue(siRequest, "requestDetails.requestParameters.userParams"))
                        //execution.setVariable("failExists", true)
@@@ -304,7 -304,7 +304,7 @@@
              execution.setVariable("operationId", operationId)
              execution.setVariable("operationType", operationType)
  
-             def dbAdapterEndpoint = execution.getVariable("URN_mso_openecomp_adapters_db_endpoint")
+             def dbAdapterEndpoint = execution.getVariable("URN_mso_adapters_openecomp_db_endpoint")
              execution.setVariable("CVFMI_dbAdapterEndpoint", dbAdapterEndpoint)
              utils.log("DEBUG", "DB Adapter Endpoint is: " + dbAdapterEndpoint, isDebugEnabled)
  
@@@ -317,7 -317,7 +317,7 @@@
                              <serviceId>${serviceId}</serviceId>
                              <operationId>${operationId}</operationId>
                              <operationType>${operationType}</operationType>
 -                            <userId>${userId}</responseBody>
 +                            <userId>${userId}</userId>
                              <result>${result}</result>
                              <operationContent>${operationContent}</operationContent>
                              <progress>${progress}</progress>
@@@ -338,4 -338,4 +338,4 @@@
          utils.log("DEBUG", "======== COMPLETED prepareInitServiceOperationStatus Process ======== ", isDebugEnabled)    
        }
        
- }
+ }

diff --combined bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn
index 5344ed0,5f50581..4b26e6b
--- 1/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn
--- 2/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn
@@@ -152,11 -152,11 +152,11 @@@ csi.prepareInitServiceOperationStatus(e
        <bpmn:extensionElements>
          <camunda:connector>
            <camunda:inputOutput>
-             <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter>
+             <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
              <camunda:inputParameter name="headers">
                <camunda:map>
                  <camunda:entry key="content-type">application/soap+xml</camunda:entry>
 -                <camunda:entry key="Authorization">#{BasicAuthHeaderValueDB}</camunda:entry>
 +                <camunda:entry key="Authorization">Basic QlBFTENsaWVudDpwYXNzd29yZDEk</camunda:entry>
                </camunda:map>
              </camunda:inputParameter>
              <camunda:inputParameter name="payload">${CVFMI_updateServiceOperStatusRequest}</camunda:inputParameter>

diff --combined bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn
index 0c839d3,7b422b6..43c8aee
--- 1/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn
--- 2/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn
@@@ -188,11 -188,11 +188,11 @@@ ddsi.preInitResourcesOperStatus(executi
        <bpmn2:extensionElements>
          <camunda:connector>
            <camunda:inputOutput>
-             <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter>
+             <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
              <camunda:inputParameter name="headers">
                <camunda:map>
                  <camunda:entry key="content-type">application/soap+xml</camunda:entry>
 -                <camunda:entry key="Authorization">#{BasicAuthHeaderValueDB}</camunda:entry>
 +                <camunda:entry key="Authorization">Basic QlBFTENsaWVudDpwYXNzd29yZDEk</camunda:entry>
                </camunda:map>
              </camunda:inputParameter>
              <camunda:inputParameter name="payload">${CVFMI_initResOperStatusRequest}</camunda:inputParameter>