1710 Rebase - Second Attempt

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

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/FalloutHandler.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/FalloutHandler.groovy
index 282cbb3..a97e86b 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/FalloutHandler.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/FalloutHandler.groovy
@@ -101,18 +101,8 @@ public class FalloutHandler extends AbstractServiceTaskProcessor {
                // Initialize flow variables\r
                initializeProcessVariables(execution)\r
                setSuccessIndicator(execution, false)\r
-       
-               try {\r
-                       String basicAuthValueDB = execution.getVariable("URN_mso_adapters_db_auth")\r
-                       utils.log("DEBUG", " Obtained BasicAuth userid password for Catalog DB adapter: " + basicAuthValueDB, isDebugLogEnabled)\r
-                       \r
-                       def encodedString = utils.getBasicAuth(basicAuthValueDB, execution.getVariable("URN_mso_msoKey"))\r
-                       execution.setVariable("BasicAuthHeaderValueDB",encodedString)\r
-               } catch (IOException ex) {\r
-                       String dataErrorMessage = " Unable to encode Catalog DB user/password string - " + ex.getMessage()\r
-                       utils.log("DEBUG", dataErrorMessage, isDebugLogEnabled)\r
-                       exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)\r
-               } \r
+       \r
+               setBasicDBAuthHeader(execution, isDebugLogEnabled)\r
                \r
                try {\r
                        def xml = execution.getVariable("FalloutHandlerRequest")\r
@@ -285,7 +275,7 @@ public class FalloutHandler extends AbstractServiceTaskProcessor {
        \r
                try {\r
                        String payload = """\r
-                                       <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">\r
+                                       <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="${execution.getVariable("URN_mso_default_adapter_namespace")}/requestsdb">\r
                                        <soapenv:Header/>\r
                                        <soapenv:Body>\r
                                                <req:updateRequest>\r