refactor fallouthandler

Created a new update method to allow accessibility from groovy
Ignore test that do not function in groovy.
Fixed typo and bug in request db client class
Fixed failing junits for falloouthandler
Add the request factory to the rest template so that patch works
updated check payload keyword to check response

Issue-ID: SO-2555
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: Iebfea31b659a02069bd6c59c09f025fdc6a99843

2 files changed, 204 insertions, 643 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CompleteMsoProcess.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CompleteMsoProcess.groovy
index 7e1280729c..841fe9f50e 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CompleteMsoProcess.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CompleteMsoProcess.groovy
@@ -9,9 +9,9 @@
  * 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.
@@ -25,295 +25,98 @@ package org.onap.so.bpmn.common.scripts
 import org.onap.so.logger.LoggingAnchor
 import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.db.request.beans.InfraActiveRequests
+import org.onap.so.db.request.client.RequestsDbClient
 import org.onap.so.logger.ErrorCode
 import org.onap.so.logger.MessageEnum
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import org.onap.so.bpmn.core.UrnPropertiesReader;
 
 public class CompleteMsoProcess extends AbstractServiceTaskProcessor {
-    private static final Logger logger = LoggerFactory.getLogger( CompleteMsoProcess.class);
-
-	String Prefix="CMSO_"
-	ExceptionUtil exceptionUtil = new ExceptionUtil()
-
-	// Complete MSO Request processing
-	public initializeProcessVariables(DelegateExecution execution){
-
-		def method = getClass().getSimpleName() + '.initializeProcessVariables(' +'execution=' + execution.getId() +')'
-		logger.trace('Entered ' + method)
-		try {
-
-			/* Initialize all the process request variables in this block */
-			execution.setVariable("prefix",Prefix)
-			execution.setVariable("CMSO_request_id","")
-			execution.setVariable("CMSO_notification-url","")
-			execution.setVariable("CMSO_mso-bpel-name","")
-			execution.setVariable("CMSO_request_action","")
-			execution.setVariable("CMSO_notification-url-Ok", false)
-			execution.setVariable("CMSO_request_id-Ok", false)
-
-			//updateRequest Adapter process variables
-			execution.setVariable("CMSO_updateRequestResponse", "")
-			execution.setVariable("CMSO_updateRequestResponseCode", "")
-			execution.setVariable("CMSO_updateFinalNotifyAckStatusFailedPayload", "")
-
-			//Set DB adapter variables here
-			execution.setVariable("CMSO_updateDBStatusToSuccessPayload", "")
-			execution.setVariable("CMSO_updateInfraRequestDBPayload", "")
-			execution.setVariable("CMSO_setUpdateDBstatustoSuccessPayload", "")
-
-			//Auth variables
-			execution.setVariable("BasicAuthHeaderValue","")
-
-			//Response variables
-			execution.setVariable("CompletionHandlerResponse","")
-			execution.setVariable("CMSO_ErrorResponse", null)
-			execution.setVariable("CMSO_ResponseCode", "")
-
-			setSuccessIndicator(execution, false)
-
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception e) {
-			logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(), 'Caught exception in' +
-					' ' + method, "BPMN", ErrorCode.UnknownError.getValue(), "Exception is:\n" + e);
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error - Occured in" + method)
-		}
-
-	}
-
-	public void preProcessRequest (DelegateExecution execution) {
-
-		initializeProcessVariables(execution)
-		def method = getClass().getSimpleName() + '.preProcessRequest(' +'execution=' + execution.getId() +')'
-		//		logger.trace("Started CompleteMsoProcess preProcessRequest Method ");
-		logger.trace('Entered ' + method)
-
-		setBasicDBAuthHeader(execution, execution.getVariable('isDebugLogEnabled'))
-
-		try {
-			def xml = execution.getVariable("CompleteMsoProcessRequest")
-
-			logger.debug("CompleteMsoProcess Request: " + xml)
-			logger.debug("Incoming Request is: "+ xml)
-
-			//mso-bpel-name from the incoming request
-			def msoBpelName = utils.getNodeText(xml,"mso-bpel-name")
-			execution.setVariable("CMSO_mso-bpel-name",msoBpelName)
-
-			//Check the incoming request type
-			//Incoming request can be ACTIVE_REQUESTS (request-information node) or  INFRA_ACTIVE_REQUESTS (request-info node)
-			if (utils.nodeExists(xml, "request-information")) {
-				execution.setVariable("CMSO_request_id-Ok", true) // Incoming request is for ACTIVE_REQUESTS
-			}
-
-			//Check for rehome indicator
-			def rehomeIndicator = utils.getNodeText(xml,"rehomeDone")
-			execution.setVariable("rehomeDone", rehomeIndicator)
-
-			//Check notification-url for the incoming request type
-			//ACTIVE_REQUESTS may have notificationurl node
-			//INFRA_ACTIVE_REQUESTS notificationurl node does not exist
-			def notificationurl = ""
-			if (utils.nodeExists(xml, "notification-url")) {
-				notificationurl = utils.getNodeText(xml,"notification-url")
-				if(notificationurl != null && !notificationurl.isEmpty()) {
-					execution.setVariable("CMSO_notification-url-Ok", true)
-					execution.setVariable("CMSO_notification-url",notificationurl)
-				}
-			}
-
-			//Check request_id for the incoming request type
-			//For INFRA_ACTIVE_REQUESTS payload request-id IS optional (Not sure why this is option since req id is primary key ... also tried exe through SOAP UI to check if MSO code handles null like auto generated seq not it does not)
-			//For ACTIVE_REQUESTS payload request-id is NOT optional
-			def request_id = ""
-			if (utils.nodeExists(xml, "request-id")) {
-				execution.setVariable("CMSO_request_id",utils.getNodeText(xml,"request-id"))
-			}
-
-
-			// INFRA_ACTIVE_REQUESTS	 have "action" element ... mandatory
-			// ACTIVE_REQUEST have "request-action" ... mandatory
-			if (utils.nodeExists(xml, "request-action")) {
-				execution.setVariable("CMSO_request_action",utils.getNodeText(xml,"request-action"))
-			} else if (utils.nodeExists(xml, "action")) {
-				execution.setVariable("CMSO_request_action",utils.getNodeText(xml,"action"))
-			}
-
-			//Check source for the incoming request type
-			//For INFRA_ACTIVE_REQUESTS payload source IS optional
-			//For ACTIVE_REQUESTS payload source is NOT optional
-			def source = ""
-			if (utils.nodeExists(xml, "source")) {
-				execution.setVariable("CMSO_source",utils.getNodeText(xml,"source"))
-			}
-
-			logger.trace("--> " + execution.getVariable(""))
-			logger.trace("--> " + execution.getVariable(""))
-
-			// set the DHV/Service Instantiation values if specified in the request
-			execution.setVariable("CMSO_is_srv_inst_req", String.valueOf("true".equals(utils.getNodeText(xml, "is-srv-inst-req"))))
-			logger.trace("--> " + execution.getVariable(""))
-			execution.setVariable("CMSO_is_json_content", String.valueOf("JSON".equals(utils.getNodeText(xml, "resp-content-type"))))
-			logger.trace("--> " + execution.getVariable(""))
-			execution.setVariable("CMSO_service_inst_id", utils.getNodeText(xml, "service-instance-id"))
-			logger.trace("--> " + execution.getVariable(""))
-			execution.setVariable("CMSO_start_time", utils.getNodeText(xml, "start-time"))
-			logger.trace("--> " + execution.getVariable(""))
-			// this variable is used by the camunda flow to set the Content-Type for the async response
-			if (execution.getVariable("CMSO_is_srv_inst_req").equals("true") &&
-				execution.getVariable("CMSO_is_json_content").equals("true")) {
-				execution.setVariable("CMSO_content_type", "application/json")
-			} else {
-				execution.setVariable("CMSO_content_type", "text/xml")
-			}
-
-			logger.trace('Exited ' + method)
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception e) {
-			logger.debug("Exception Occured During PreProcessRequest: " + e);
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error - Occured in " + method)
-		}
-	}
-
-	public void setUpdateDBstatustoSuccessPayload (DelegateExecution execution){
-
-		def method = getClass().getSimpleName() + '.setUpdateDBstatustoSuccessPayload(' +'execution=' + execution.getId() +')'
-		logger.trace('Entered ' + method)
-
-		try {
-
-			def xml = execution.getVariable("CompleteMsoProcessRequest")
-
-			//Get statusMessage if exists
-			def statusMessage
-			if(utils.nodeExists(xml, "status-message")){
-				statusMessage = utils.getNodeText(xml, "status-message")
-			}else{
-				statusMessage = "Resource Completed Successfully"
-			}
-
-			//Get instance Id if exist
-			String idXml = ""
-			if(utils.nodeExists(xml, "vnfId")){
-				idXml = utils.getNodeXml(xml, "vnfId")
-			}else if(utils.nodeExists(xml, "networkId")){
-				idXml = utils.getNodeXml(xml, "networkId")
-			}else if(utils.nodeExists(xml, "configurationId")){
-				idXml = utils.getNodeXml(xml, "configurationId")
-			}else if(utils.nodeExists(xml, "serviceInstanceId")){
-				idXml = utils.getNodeXml(xml, "serviceInstanceId")
-			}else if(utils.nodeExists(xml, "vfModuleId")){
-				idXml = utils.getNodeXml(xml, "vfModuleId")
-			}else if(utils.nodeExists(xml, "volumeGroupId")){
-				idXml = utils.getNodeXml(xml, "volumeGroupId")
-			}else{
-				idXml = ""
-			}
-			idXml = utils.removeXmlPreamble(idXml)
-			idXml = utils.removeXmlNamespaces(idXml)
-			logger.debug("Incoming Instance Id Xml: " + idXml)
-
-			String payload = """
-						<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.onap.so/requestsdb">
-						   <soapenv:Header/>
-						   <soapenv:Body>
-						      <req:updateInfraRequest>
-						         <requestId>${MsoUtils.xmlEscape(execution.getVariable("CMSO_request_id"))}</requestId>
-						         <lastModifiedBy>${MsoUtils.xmlEscape(execution.getVariable("CMSO_mso-bpel-name"))}</lastModifiedBy>
-						         <statusMessage>${MsoUtils.xmlEscape(statusMessage)}</statusMessage>
-						         <requestStatus>COMPLETE</requestStatus>
-								 <progress>100</progress>
-								 ${idXml}
-						      </req:updateInfraRequest>
-						   </soapenv:Body>
-						</soapenv:Envelope>"""
-
-			execution.setVariable("CMSO_setUpdateDBstatustoSuccessPayload", payload)
-			logger.debug("Outgoing Update Mso Request Payload is: " + payload)
-			logger.debug("setUpdateDBstatustoSuccessPayload: " + payload)
-
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception e) {
-			logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(),
-					'Caught exception in ' + method, "BPMN",
-					ErrorCode.UnknownError.getValue(), "Exception is:\n" + e);
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error - Occured in" + method)
-		}
-		logger.trace('Exited ' + method)
-	}
-
-	public void buildDataError (DelegateExecution execution, String message) {
-
-		def method = getClass().getSimpleName() + '.buildDataError(' +'execution=' + execution.getId() +')'
-		logger.trace('Entered ' + method)
-		try {
-
-			String msoCompletionResponse = """
-			<sdncadapterworkflow:MsoCompletionResponse xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1">
-			   <sdncadapterworkflow:out>BPEL ${execution.getVariable("CMSO_mso-bpel-name")} FAILED</sdncadapterworkflow:out>
-			</sdncadapterworkflow:MsoCompletionResponse>
-			""".trim()
-
-			// Format Response
-			def xmlMsoCompletionResponse = utils.formatXml(msoCompletionResponse)
-			String buildMsoCompletionResponseAsString = xmlMsoCompletionResponse.drop(38).trim()
-			logger.debug("CompleteMsoProcess Response: " + buildMsoCompletionResponseAsString)
-			execution.setVariable("CompleteMsoProcessResponse", buildMsoCompletionResponseAsString)
-			logger.debug("@@ CompleteMsoProcess Response @@ " + "\n" + execution.getVariable("CompletionHandlerResponse"))
-
-			exceptionUtil.buildAndThrowWorkflowException(execution, 500, message)
-
-		} catch (BpmnError e) {
-			logger.debug("Rethrowing MSOWorkflowException")
-			throw e;
-		} catch (Exception e) {
-			logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(),
-					'Caught exception in ' + method, "BPMN",
-					ErrorCode.UnknownError.getValue(), "Exception is:\n" + e);
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error - Occured in" + method)
-		}
-
-	}
-
-	public void postProcessResponse (DelegateExecution execution) {
-
-				def method = getClass().getSimpleName() + '.postProcessResponse(' +'execution=' + execution.getId() +')'
-				logger.trace('Entered ' + method)
-		//		logger.trace("Started CompleteMsoProcess PostProcessRequest Method ");
-				try {
-
-					String msoCompletionResponse = """
-			<sdncadapterworkflow:MsoCompletionResponse xmlns:sdncadapterworkflow="http://ecomp.com/mso/workflow/schema/v1">
-			   <sdncadapterworkflow:out>BPEL ${execution.getVariable("CMSO_mso-bpel-name")} completed</sdncadapterworkflow:out>
-			</sdncadapterworkflow:MsoCompletionResponse>
-			""".trim()
-
-					// Format Response
-					def xmlMsoCompletionResponse = utils.formatXML(msoCompletionResponse)
-					String buildMsoCompletionResponseAsString = xmlMsoCompletionResponse.drop(38).trim()
-					// TODO: Should deprecate use of processKey+Response variable for the response. Will use "WorkflowResponse" instead
-					execution.setVariable("WorkflowResponse", buildMsoCompletionResponseAsString)
-					logger.debug("CompleteMsoProcess Response: " + buildMsoCompletionResponseAsString)
-					execution.setVariable("CompleteMsoProcessResponse", buildMsoCompletionResponseAsString)
-					execution.setVariable("CMSO_ResponseCode", "200")
-
-					setSuccessIndicator(execution, true)
-
-					logger.debug("@@ CompleteMsoProcess Response @@ " + "\n" + execution.getVariable("CompleteMsoProcessResponse"))
-
-					logger.trace('Exited ' + method)
-				} catch (BpmnError e) {
-					throw e;
-				} catch (Exception e) {
-					logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(),
-							'Caught exception in ' + method, "BPMN",
-							ErrorCode.UnknownError.getValue(), "Exception is:\n" + e);
-					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error - Occured in" + method)
-				}
-	}
-
+    private static final Logger logger = LoggerFactory.getLogger(CompleteMsoProcess.class);
+
+    String Prefix="CMSO_"
+    ExceptionUtil exceptionUtil = new ExceptionUtil()
+
+    public void preProcessRequest (DelegateExecution execution) {
+        try {
+            def xml = execution.getVariable("CompleteMsoProcessRequest")
+
+            logger.debug("CompleteMsoProcess Request: " + xml)
+            logger.debug("Incoming Request is: "+ xml)
+
+            //mso-bpel-name from the incoming request
+            def msoBpelName = utils.getNodeText(xml,"mso-bpel-name")
+            execution.setVariable("CMSO_mso-bpel-name",msoBpelName)
+
+            if (utils.nodeExists(xml, "request-information")) {
+                throw new BpmnError("500", "FalloutHandler subflow does not support this request type.")
+            }
+
+            def request_id = ""
+            if (utils.nodeExists(xml, "request-id")) {
+                execution.setVariable("CMSO_request_id",utils.getNodeText(xml,"request-id"))
+            }
+
+        } catch (BpmnError e) {
+            throw e;
+        } catch (Exception e) {
+            logger.debug("Exception Occured During PreProcessRequest: " + e);
+            exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error - Occured in preprocess")
+        }
+    }
+
+    public void updateInfraRequestDB (DelegateExecution execution){
+        try {
+
+            def xml = execution.getVariable("CompleteMsoProcessRequest")
+
+            //Get statusMessage if exists
+            def statusMessage
+            if(utils.nodeExists(xml, "status-message")){
+                statusMessage = utils.getNodeText(xml, "status-message")
+            }else{
+                statusMessage = "Resource Completed Successfully"
+            }
+
+            RequestsDbClient dbClient = getDbClient()
+
+            InfraActiveRequests infraRequest = dbClient.getInfraActiveRequests(execution.getVariable("CMSO_request_id"), UrnPropertiesReader.getVariable("mso.adapters.requestDb.auth"), UrnPropertiesReader.getVariable("mso.adapters.requestDb.endpoint"))
+            if(infraRequest == null){
+                infraRequest = new InfraActiveRequests();
+                infraRequest.setRequestId(execution.getVariable("CMSO_request_id"))
+            }
+            infraRequest.setLastModifiedBy("BPMN")
+            infraRequest.setStatusMessage(statusMessage)
+            infraRequest.setRequestStatus("COMPLETED")
+            infraRequest.setProgress(100)
+
+            if(utils.nodeExists(xml, "vnfId")){
+                infraRequest.setVnfId(utils.getNodeText(xml, "vnfId"))
+            }else if(utils.nodeExists(xml, "networkId")){
+                infraRequest.setNetworkId(utils.getNodeText(xml, "networkId"))
+            }else if(utils.nodeExists(xml, "configurationId")){
+                infraRequest.setConfigurationId(utils.getNodeText(xml, "configurationId"))
+            }else if(utils.nodeExists(xml, "serviceInstanceId")){
+                infraRequest.setServiceInstanceId(utils.getNodeText(xml, "serviceInstanceId"))
+            }else if(utils.nodeExists(xml, "vfModuleId")){
+                infraRequest.setVfModuleId(utils.getNodeText(xml, "vfModuleId"))
+            }else if(utils.nodeExists(xml, "volumeGroupId")){
+                infraRequest.setVolumeGroupId(utils.getNodeText(xml, "volumeGroupId"))
+
+            }
+
+            dbClient.updateInfraActiveRequests(infraRequest, UrnPropertiesReader.getVariable("mso.adapters.requestDb.auth"), UrnPropertiesReader.getVariable("mso.adapters.requestDb.endpoint"))
+
+        } catch (Exception e) {
+            logger.error("Internal error while updating request db", e);
+            exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error - Occured in update infra request db")
+        }
+    }
+
+    protected RequestsDbClient getDbClient(){
+        return new RequestsDbClient()
+    }
 
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/FalloutHandler.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/FalloutHandler.groovy
index ed849755b7..8306f33592 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/FalloutHandler.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/FalloutHandler.groovy
@@ -9,9 +9,9 @@
  * 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.
@@ -24,376 +24,134 @@ package org.onap.so.bpmn.common.scripts
 
 import org.onap.so.logger.LoggingAnchor
 import org.onap.so.bpmn.core.UrnPropertiesReader
+import org.onap.so.db.request.beans.InfraActiveRequests
+import org.onap.so.db.request.client.RequestsDbClient
 import org.onap.so.logger.ErrorCode
-
+import org.onap.so.bpmn.core.UrnPropertiesReader;
 import java.text.SimpleDateFormat
 
 import org.apache.commons.lang3.*
+import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.delegate.DelegateExecution
 import org.onap.so.logger.MessageEnum
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
 public class FalloutHandler extends AbstractServiceTaskProcessor {
-    private static final Logger logger = LoggerFactory.getLogger( FalloutHandler.class);
-
-	String Prefix="FH_"
-	ExceptionUtil exceptionUtil = new ExceptionUtil()
-
-	public initializeProcessVariables(DelegateExecution execution){
-		def method = getClass().getSimpleName() + '.initializeProcessVariables(' +'execution=' + execution.getId() +')'
-		logger.trace('Entered ' + method)
-
-		try {
-			execution.setVariable("prefix",Prefix)
-
-			//These variables are form the input Message to the BPMN
-			execution.setVariable("FH_request_id","")
-			execution.setVariable("FH_request_action","")
-			execution.setVariable("FH_notification-url","")
-			execution.setVariable("FH_mso-bpel-name","")
-			execution.setVariable("FH_ErrorCode", "")
-			execution.setVariable("FH_ErrorMessage", "")
-
-			execution.setVariable("FH_notification-url-Ok", false)
-			execution.setVariable("FH_request_id-Ok", false)
-
-			//These variables are for Get Mso Aai Password Adapter
-			execution.setVariable("FH_deliveryStatus", true)
-	
-			//update Response Status to pending ...Adapter variables
-			execution.setVariable("FH_updateResponseStatusPayload", null)
-			execution.setVariable("FH_updateResponseStatusResponse", null)
-	
-			//update Request Gamma ...Adapter variables
-			execution.setVariable("FH_updateRequestGammaPayload", "")
-			execution.setVariable("FH_updateRequestGammaResponse", null)
-			execution.setVariable("FH_updateRequestGammaResponseCode", null)
-	
-			//update Request Infra ...Adapter variables
-			execution.setVariable("FH_updateRequestInfraPayload", "")
-			execution.setVariable("FH_updateRequestInfraResponse", null)
-			execution.setVariable("FH_updateRequestInfraResponseCode", null)
-	
-			//assign True to success variable
-			execution.setVariable("FH_success", true)
-	
-			//Set notify status to Failed variable
-			execution.setVariable("FH_NOTIFY_STATUS", "SUCCESS")
-	
-			//Set DB update variable
-			execution.setVariable("FH_updateRequestPayload", "")
-			execution.setVariable("FH_updateRequestResponse", null)
-			execution.setVariable("FH_updateRequestResponseCode", null)
-	
-			//Auth variables
-			execution.setVariable("BasicAuthHeaderValue","")
-
-			//Parameter list
-			execution.setVariable("FH_parameterList",  "")
-
-			//Response variables
-			execution.setVariable("FalloutHandlerResponse","")
-			execution.setVariable("FH_ErrorResponse", null)
-			execution.setVariable("FH_ResponseCode", "")
-
-		} catch (Exception e) {
-			logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(),
-					'Caught exception in ' + method, "BPMN",
-					ErrorCode.UnknownError.getValue(), "Exception is:\n" + e);
-		//	exceptionUtil.buildWorkflowException(execution, 2000, "Internal Error - Occured in " + method)
-		}
-	}
-
-	public void preProcessRequest (DelegateExecution execution) {
-		def method = getClass().getSimpleName() + '.preProcessRequest(' +'execution=' + execution.getId() +')'
-		logger.trace('Entered ' + method)
-
-		// Initialize flow variables
-		initializeProcessVariables(execution)
-		setSuccessIndicator(execution, false)
-
-		setBasicDBAuthHeader(execution, execution.getVariable('isDebugLogEnabled'))
-
-		try {
-			def xml = execution.getVariable("FalloutHandlerRequest")
-			logger.debug(" XML --> " + xml)
-			logger.debug("FalloutHandler request: " + xml)
-
-			//Check the incoming request type
-			//Incoming request can be ACTIVE_REQUESTS (request-information node) or  INFRA_ACTIVE_REQUESTS (request-info node)
-			if (utils.nodeExists(xml, "request-information")) {
-				execution.setVariable("FH_request_id-Ok", true) // Incoming request is for ACTIVE_REQUESTS
-			}
-
-			//Check notification-url for the incoming request type
-			//ACTIVE_REQUESTS may have notificationurl node
-			//INFRA_ACTIVE_REQUESTS notificationurl node does not exist
-			def notificationurl = ""
-			if (utils.nodeExists(xml, "notification-url")) {
-				notificationurl = utils.getNodeText(xml,"notification-url")
-				if(notificationurl != null && !notificationurl.isEmpty()) {
-					logger.debug("********** Incoming notification Url is: " + notificationurl);
-					execution.setVariable("FH_notification-url-Ok", true)
-					execution.setVariable("FH_notification-url",notificationurl)
-				}
-			}
-	
-			//Check request_id for the incoming request type
-			//For INFRA_ACTIVE_REQUESTS payload request-id IS optional (Not sure why this is option since req id is primary key ... also tried exe through SOAP UI to check if MSO code handles null like auto generated seq not it does not)
-			//For ACTIVE_REQUESTS payload request-id is NOT optional
-			def request_id = ""
-			if (utils.nodeExists(xml, "request-id")) {
-				execution.setVariable("FH_request_id",utils.getNodeText(xml,"request-id"))
-			}
-			logger.debug("FH_request_id: " + execution.getVariable("FH_request_id"))
-
-			// INFRA_ACTIVE_REQUESTS	 have "action" element ... mandatory
-			// ACTIVE_REQUEST have "request-action" ... mandatory
-			if (utils.nodeExists(xml, "request-action")) {
-				execution.setVariable("FH_request_action",utils.getNodeText(xml,"request-action"))
-			} else if (utils.nodeExists(xml, "action")) {
-				execution.setVariable("FH_request_action",utils.getNodeText(xml,"action"))
-			}
-
-
-			//Check source for the incoming request type
-			//For INFRA_ACTIVE_REQUESTS payload source IS optional
-			//For ACTIVE_REQUESTS payload source is NOT optional
-			def source = ""
-			if (utils.nodeExists(xml, "source")) {
-				execution.setVariable("FH_source",utils.getNodeText(xml,"source"))
-			}
-
-			//Check if ErrorCode node exists. If yes, initialize it from request xml, if no, it will stay with defaulf value already set in initializeProcessVariables() method above.
-			def errorCode = ""
-			if (utils.nodeExists(xml, "ErrorCode")) {
-				errorCode = utils.getNodeText(xml,"ErrorCode")
-				if(errorCode != null && !errorCode.isEmpty()) {
-					execution.setVariable("FH_ErrorCode", errorCode)
-				}
-			}
-			logger.debug("FH_ErrorCode: " + errorCode)
-
-			//Check if ErrorMessage node exists. If yes, initialize it from request xml, if no, it will stay with defaulf value already set in initializeProcessVariables() method above.
-			def errorMessage = ""
-			if (utils.nodeExists(xml, "ErrorMessage")) {
-				errorCode = utils.getNodeText(xml,"ErrorMessage")
-				if(errorCode != null && !errorCode.isEmpty()) {
-					errorCode = errorCode
-					execution.setVariable("FH_ErrorMessage", errorCode)
-				}
-			}
-
-			//Check for Parameter List
-			if (utils.nodeExists(xml, "parameter-list")) {
-				def parameterList = utils.getNodeXml(xml, "parameter-list", false)
-				execution.setVariable("FH_parameterList", parameterList)
-			}
-
-			logger.trace("--> " + execution.getVariable(""))
-			logger.debug("FH_request_id-OK --> " + execution.getVariable("FH_request_id-Ok"))
-
-			// set the DHV/Service Instantiation values if specified in the request
-			execution.setVariable("FH_is_srv_inst_req", String.valueOf("true".equals(utils.getNodeText(xml, "is-srv-inst-req"))))
-			logger.trace("--> " + execution.getVariable(""))
-			execution.setVariable("FH_is_json_content", String.valueOf("JSON".equals(utils.getNodeText(xml, "resp-content-type"))))
-			logger.trace("--> " + execution.getVariable(""))
-			execution.setVariable("FH_service_inst_id", utils.getNodeText(xml, "service-instance-id"))
-			logger.trace("--> " + execution.getVariable(""))
-			execution.setVariable("FH_start_time", utils.getNodeText(xml, "start-time"))
-			logger.trace("--> " + execution.getVariable(""))
-			// this variable is used by the camunda flow to set the Content-Type for the async response
-			if (execution.getVariable("FH_is_srv_inst_req").equals("true") &&
-				execution.getVariable("FH_is_json_content").equals("true")) {
-				execution.setVariable("FH_content_type", "application/json")
-			} else {
-				execution.setVariable("FH_content_type", "text/xml")
-			}
-		} catch (Exception e) {
-			logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(),
-					'Caught exception in ' + method, "BPMN",
-					ErrorCode.UnknownError.getValue(), "Exception is:\n" + e);
-		//	exceptionUtil.buildWorkflowException(execution, 2000, "Internal Error - Occured in" + method)
-		}
-
-		logger.debug("OUTOF --> Initialize Variables Fallout Handler #########");
-	}
-
-	public String updateRequestPayload (DelegateExecution execution){
-		def method = getClass().getSimpleName() + '.updateRequestPayload(' +'execution=' + execution.getId() +')'
-		logger.trace('Entered ' + method)
-
-		try {
-			String payload = """
-					<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.onap.so/requestsdb">
-					<soapenv:Header/>
-					<soapenv:Body>
-						<req:updateRequest>
-							<requestId>${MsoUtils.xmlEscape(execution.getVariable("FH_request_id"))}</requestId>
-							<lastModifiedBy>BPEL</lastModifiedBy>
-							<finalErrorMessage>${MsoUtils.xmlEscape(execution.getVariable("FH_ErrorMessage"))}</finalErrorMessage>
-							<finalErrorCode>${MsoUtils.xmlEscape(execution.getVariable("FH_ErrorCode"))}</finalErrorCode>
-							<status>FAILED</status>
-							<responseStatus>${MsoUtils.xmlEscape(execution.getVariable("FH_NOTIFY_STATUS"))}</responseStatus>
-						</req:updateRequest>
-					</soapenv:Body>
-					</soapenv:Envelope>
-				"""
-
-			logger.debug("updateRequestPayload: " + payload)
-			execution.setVariable("FH_updateRequestPayload", payload)
-			return execution.getVariable("FH_updateRequestPayload")
-		} catch (Exception e) {
-			logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(),
-					'Caught exception in ' + method, "BPMN",
-					ErrorCode.UnknownError.getValue(), "Exception is:\n" + e);
-		//	exceptionUtil.buildWorkflowException(execution, 2000, "Internal Error - Occured in " + method)
-		}
-	}
-
-	public String updateRequestInfraPayload (DelegateExecution execution){
-		def method = getClass().getSimpleName() + '.updateRequestInfraPayload(' +'execution=' + execution.getId() +')'
-		logger.trace('Entered ' + method)
-	
-		try {
-			String payload = """
-					<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.onap.so/requestsdb">
-					<soapenv:Header/>
-					<soapenv:Body>
-						<req:updateInfraRequest>
-							<requestId>${MsoUtils.xmlEscape(execution.getVariable("FH_request_id"))}</requestId>
-							<lastModifiedBy>BPEL</lastModifiedBy>
-							<statusMessage>${MsoUtils.xmlEscape(execution.getVariable("FH_ErrorMessage"))}</statusMessage>
-							<requestStatus>FAILED</requestStatus>
-							<progress>100</progress>
-						</req:updateInfraRequest>
-					</soapenv:Body>
-					</soapenv:Envelope>
-				"""
-	
-			execution.setVariable("FH_updateRequestInfraPayload", payload)
-			logger.debug("updateRequestInfraPayload: " + payload)
-			return execution.getVariable("FH_updateRequestInfraPayload")
-		} catch (Exception e) {
-			logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(),
-					'Caught exception in ' + method, "BPMN",
-					ErrorCode.UnknownError.getValue(), "Exception is:\n" + e);
-		//	exceptionUtil.buildWorkflowException(execution, 2000, "Internal Error - Occured in " + method)
-		}
-	}
-
-	public String updateRequestGammaPayload (DelegateExecution execution){
-		def method = getClass().getSimpleName() + '.updateRequestGammaPayload(' +'execution=' + execution.getId() +')'
-		logger.trace('Entered ' + method)
-
-		try {
-			String payload = """
-					<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="${UrnPropertiesReader.getVariable("mso.default.adapter.namespace", execution)}/requestsdb">
-					<soapenv:Header/>
-					<soapenv:Body>
-						<req:updateRequest>
-							<requestId>${MsoUtils.xmlEscape(execution.getVariable("FH_request_id"))}</requestId>
-							<lastModifiedBy>BPEL</lastModifiedBy>
-							<finalErrorMessage>${MsoUtils.xmlEscape(execution.getVariable("FH_ErrorMessage"))}</finalErrorMessage>
-							<finalErrorCode>${MsoUtils.xmlEscape(execution.getVariable("FH_ErrorCode"))}</finalErrorCode>
-							<status>FAILED</status>
-						</req:updateRequest>
-					</soapenv:Body>
-					</soapenv:Envelope>
-				"""
-
-			execution.setVariable("FH_updateRequestGammaPayload", payload)
-			logger.debug("updateRequestGammaPayload: " + payload)
-			return execution.getVariable("FH_updateRequestGammaPayload")
-		} catch (Exception e) {
-			logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(),
-					'Caught exception in ' + method, "BPMN",
-					ErrorCode.UnknownError.getValue(), "Exception is:\n" + e);
-		//	exceptionUtil.buildWorkflowException(execution, 2000, "Internal Error - Occured in " + method)
-		}
-	}
-
-	public String updateResponseStatusPayload (DelegateExecution execution){
-		def method = getClass().getSimpleName() + '.updateResponseStatusPayload(' +'execution=' + execution.getId() +')'
-		logger.trace('Entered ' + method)
-
-		try {
-			String payload = """
-					<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.onap.so/requestsdb">
-					<soapenv:Header/>
-					<soapenv:Body>
-						<req:updateResponseStatus>
-							<requestId>${MsoUtils.xmlEscape(execution.getVariable("FH_request_id"))}</requestId>
-							<lastModifiedBy>BPEL</lastModifiedBy>
-							<responseStatus>SENDING_FINAL_NOTIFY</responseStatus>
-						</req:updateResponseStatus>
-					</soapenv:Body>
-					</soapenv:Envelope>
-				"""
-
-			execution.setVariable("FH_updateResponseStatusPayload", payload)
-			logger.debug("updateResponseStatusPayload: " + payload)
-			return execution.getVariable("FH_updateResponseStatusPayload")
-		} catch (Exception e) {
-			logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(),
-					'Caught exception in ' + method, "BPMN",
-					ErrorCode.UnknownError.getValue(), "Exception is:\n" + e);
-		//	exceptionUtil.buildWorkflowException(execution, 2000, "Internal Error - Occured in " + method)
-		}
-	}
-
-	public void buildDBWorkflowException(DelegateExecution execution, String responseCodeVariable) {
-		def method = getClass().getSimpleName() + '.buildDBWorkflowException(' +
-			'execution=' + execution.getId() +
-			', responseCodeVariable=' + responseCodeVariable + ')'
-		logger.trace('Entered ' + method)
-
-		try {
-			def responseCode = execution.getVariable(responseCodeVariable)
-			// If the HTTP response code was null, it means a connection fault occurred (a java exception)
-			def errorMessage = responseCode == null ? "Could not connect to DB Adapter" : "DB Adapter returned ${responseCode} response"
-			def errorCode = responseCode == null ? 7000 : 7020
-		//	exceptionUtil.buildWorkflowException(execution, errorCode, errorMessage)
-		} catch (Exception e) {
-			logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(),
-					'Caught exception in ' + method, "BPMN",
-					ErrorCode.UnknownError.getValue(), "Exception is:\n" + e);
-		//	exceptionUtil.buildWorkflowException(execution, 2000, "Internal Error - Occured in " + method)
-		}
-	}
-
-	/**
-	 * Used to create a workflow response in success and failure cases.
-	 */
-	public void postProcessResponse (DelegateExecution execution) {
-		def method = getClass().getSimpleName() + '.postProcessResponse(' +'execution=' + execution.getId() +')'
-		logger.trace('Entered ' + method)
-
-		try {
-			Boolean success = (Boolean) execution.getVariable("FH_success")
-			String out = success ? "Fallout Handler Succeeded" : "Fallout Handler Failed";
-
-			String falloutHandlerResponse = """
+    private static final Logger logger = LoggerFactory.getLogger(FalloutHandler.class);
+
+    ExceptionUtil exceptionUtil = new ExceptionUtil()
+
+
+    public void preProcessRequest (DelegateExecution execution) {
+        def method = getClass().getSimpleName() + '.preProcessRequest(' +'execution=' + execution.getId() +')'
+        logger.trace('Entered ' + method)
+
+        execution.setVariable("FH_success", true)
+
+        try {
+            def xml = execution.getVariable("FalloutHandlerRequest")
+            logger.debug("FalloutHandler request: " + xml)
+
+            if (utils.nodeExists(xml, "request-information")) {
+                throw new BpmnError("500", "FalloutHandler subflow does not support this request type.")
+            }
+
+            //Check request_id for the incoming request type
+            //For INFRA_ACTIVE_REQUESTS payload request-id IS optional (Not sure why this is option since req id is primary key ... also tried exe through SOAP UI to check if MSO code handles null like auto generated seq not it does not)
+            //For ACTIVE_REQUESTS payload request-id is NOT optional
+            def request_id = ""
+            if (utils.nodeExists(xml, "request-id")) {
+                execution.setVariable("FH_request_id",utils.getNodeText(xml,"request-id"))
+            }
+            logger.debug("FH_request_id: " + execution.getVariable("FH_request_id"))
+
+            //Check if ErrorCode node exists. If yes, initialize it from request xml, if no, it will stay with defaulf value already set in initializeProcessVariables() method above.
+            def errorCode = "500"
+            if (utils.nodeExists(xml, "ErrorCode")) {
+                if(errorCode != null && !errorCode.isEmpty()) {
+                    errorCode = utils.getNodeText(xml,"ErrorCode")
+                }
+            }
+            execution.setVariable("FH_ErrorCode", errorCode)
+
+            //Check if ErrorMessage node exists. If yes, initialize it from request xml, if no, it will stay with defaulf value already set in initializeProcessVariables() method above.
+            String errorMessage = "Internal Error occured in MSO, unable to determine error message"
+            if (utils.nodeExists(xml, "ErrorMessage")) {
+                if(errorCode != null && !errorCode.isEmpty()) {
+                    errorMessage = utils.getNodeText(xml,"ErrorMessage")
+                }
+            }
+            execution.setVariable("FH_ErrorMessage", errorMessage)
+
+            //Check for Parameter List
+            if (utils.nodeExists(xml, "parameter-list")) {
+                def parameterList = utils.getNodeXml(xml, "parameter-list", false)
+                execution.setVariable("FH_parameterList", parameterList)
+            }
+
+
+        } catch (Exception e) {
+            logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(),
+                    'Caught exception in ' + method, "BPMN",
+                    ErrorCode.UnknownError.getValue(), "Exception is:\n" + e);
+            //	exceptionUtil.buildWorkflowException(execution, 2000, "Internal Error - Occured in" + method)
+        }
+
+    }
+
+    public String updateInfraRequestDB(DelegateExecution execution){
+        try {
+            RequestsDbClient client = getDbClient()
+            InfraActiveRequests infraRequest = client.getInfraActiveRequests(execution.getVariable("FH_request_id"), UrnPropertiesReader.getVariable("mso.adapters.requestDb.auth"), UrnPropertiesReader.getVariable("mso.adapters.requestDb.endpoint"))
+            if(infraRequest == null){
+                infraRequest = new InfraActiveRequests();
+                infraRequest.setRequestId(execution.getVariable("CMSO_request_id"))
+            }
+            infraRequest.setLastModifiedBy("BPMN")
+            infraRequest.setStatusMessage(MsoUtils.xmlEscape(execution.getVariable("FH_ErrorMessage")))
+            infraRequest.setRequestStatus("FAILED")
+            infraRequest.setProgress(100)
+            client.updateInfraActiveRequests(infraRequest, UrnPropertiesReader.getVariable("mso.adapters.requestDb.auth"), UrnPropertiesReader.getVariable("mso.adapters.requestDb.endpoint"))
+        } catch (Exception e) {
+            execution.setVariable("FH_success", false)
+            logger.error("Exception Occured while updating infra request db", e)
+        }
+    }
+
+    /**
+     * Used to create a workflow response in success and failure cases.
+     */
+    public void postProcessResponse (DelegateExecution execution) {
+        def method = getClass().getSimpleName() + '.postProcessResponse(' +'execution=' + execution.getId() +')'
+        logger.trace('Entered ' + method)
+
+        try {
+            Boolean success = (Boolean) execution.getVariable("FH_success")
+            String out = success ? "Fallout Handler Succeeded" : "Fallout Handler Failed";
+
+            String falloutHandlerResponse = """
 					<workflow:FalloutHandlerResponse xmlns:workflow="http://org.onap/so/workflow/schema/v1">
 					   <workflow:out>${MsoUtils.xmlEscape(out)}</workflow:out>
 					</workflow:FalloutHandlerResponse>
 				"""
 
-			falloutHandlerResponse = utils.formatXml(falloutHandlerResponse)
-			logger.debug("FalloutHandler Response: " + falloutHandlerResponse);
+            falloutHandlerResponse = utils.formatXml(falloutHandlerResponse)
+
+            execution.setVariable("FalloutHandlerResponse", falloutHandlerResponse)
+            execution.setVariable("WorkflowResponse", falloutHandlerResponse)
+            execution.setVariable("FH_ResponseCode", success ? "200" : "500")
+            setSuccessIndicator(execution, success)
 
-			execution.setVariable("FalloutHandlerResponse", falloutHandlerResponse)
-			execution.setVariable("WorkflowResponse", falloutHandlerResponse)
-			execution.setVariable("FH_ResponseCode", success ? "200" : "500")
-			setSuccessIndicator(execution, success)
+            logger.debug("FalloutHandlerResponse =\n" + falloutHandlerResponse)
+        } catch (Exception e) {
+            logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(),
+                    'Caught exception in ' + method, "BPMN",
+                    ErrorCode.UnknownError.getValue(), "Exception is:\n" + e);
+        }
+    }
 
-			logger.debug("FalloutHandlerResponse =\n" + falloutHandlerResponse)
-		} catch (Exception e) {
-			// Do NOT throw WorkflowException!
-			logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(),
-					'Caught exception in ' + method, "BPMN",
-					ErrorCode.UnknownError.getValue(), "Exception is:\n" + e);
-		}
-	}
+    protected RequestsDbClient getDbClient(){
+        return new RequestsDbClient()
+    }
 }