2 files changed, 19 insertions, 12 deletions
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy
index 85ff43946d..dba1a8b581 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy
@@ -363,6 +363,24 @@ public class CreateVcpeResCustService extends AbstractServiceTaskProcessor {
 	}
 
 
+	public void awaitAaiDistribution(Execution execution) {
+		def isDebugEnabled=execution.getVariable(DebugFlag)
+
+		try {
+			String tsleep = execution.getVariable("junitSleepMs")
+			
+			//workaround for aai replication issue
+			utils.log("DEBUG", "sleeping while AAI distributes data", isDebugEnabled)
+			sleep(tsleep == null ? 30000 : tsleep as Long)
+			
+		} catch (Exception ex) {
+			// try error in method block
+			String exceptionMessage = "Unexpected Error from method awaitAaiDistribution() - " + ex.getMessage()
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		}
+	 }
+
+
 	public void prepareCreateAllottedResourceTXC(Execution execution) {
 		def isDebugEnabled=execution.getVariable(DebugFlag)
 
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXC.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXC.groovy
index c721ae833b..8a4e591654 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXC.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXC.groovy
@@ -80,18 +80,7 @@ public class DoCreateAllottedResourceTXC extends AbstractServiceTaskProcessor{
 		try {
 			String msoRequestId	 = execution.getVariable("msoRequestId")
 			utils.log("DEBUG", " msoRequestId  = " + msoRequestId,  isDebugEnabled)
-
-			if ((msoRequestId == null) || ("testRequestId".equals(msoRequestId)) || ("testRequestId123".equals(msoRequestId)))
-			{
-				utils.log("DEBUG"," ***** NOT sleeping 30 seconds for Junit *****",  isDebugEnabled)
-			}
-			else
-			{
-				utils.log("DEBUG"," ***** sleeping 30 seconds for AAI replication *****",  isDebugEnabled)
-				sleep(30000);
-				utils.log("DEBUG"," ***** sleep over *****",  isDebugEnabled)
-			}
-
+			
 			execution.setVariable("prefix", Prefix)
 
 			//Config Inputs