Updated xml tags and moved sleep to bpmn

Per issue, changed "_" to "-".  Also related to a comment to SO-303,
made "sleep" time a property and moved the sleep calls from groovy
scripts to bpmn.
Fixed a few test resources that still had "_" instead of "-".  Changed
variable name from sdnReplDelay to sdncReplDelay.

Change-Id: I893254c0ab735508732fcf2c3e82934f26c2a05a
Issue-Id: SO-308
Signed-off-by: Jim Hahn <jrh3@att.com>

3 files changed, 112 insertions, 111 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy
index f646eae130..f0645b2bc7 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy
@@ -85,7 +85,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** preProcessRequest *****

 			

 	@Test

-	@Ignore  

+	// @Ignore  

 	public void preProcessRequest() {

 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -96,6 +96,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 

 		verify(mex).getVariable(DBGFLAG)

 		verify(mex).setVariable("prefix", Prefix)
+		verify(mex).setVariable("aaiDistDelay", "aaidelay")
 		verify(mex).setVariable("createVcpeServiceRequest", request)
 		verify(mex).setVariable("msoRequestId", "mri")
 		assertEquals("sii", map.get("serviceInstanceId"))
@@ -118,7 +119,21 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
+	public void preProcessRequest_MissingAaiDistDelay() {
+		ExecutionEntity mex = setupMock()
+		def map = setupMap(mex)
+		initPreProcess(mex)
+		
+		when(mex.getVariable("URN_mso_workflow_aai_distribution_delay")).thenReturn(null)
+		
+		CreateVcpeResCustService CreateVcpeResCustService = new CreateVcpeResCustService()
+		
+		assertTrue(doBpmnError( { _ -> CreateVcpeResCustService.preProcessRequest(mex) }))
+	}
+			
+	@Test
+	// @Ignore  
 	public void preProcessRequest_EmptyParts() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -160,7 +175,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void preProcessRequest_MissingSubscriberId() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -178,7 +193,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void preProcessRequest_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		initPreProcess(mex)
@@ -191,7 +206,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void preProcessRequest_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPreProcess(mex)
@@ -206,7 +221,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** sendSyncResponse *****
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void sendSyncResponse() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -229,7 +244,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void sendSyncResponse_Ex() {
 		ExecutionEntity mex = setupMock()
 		initSendSyncResponse(mex)
@@ -245,7 +260,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** prepareDecomposeService *****
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void prepareDecomposeService() {
 		ExecutionEntity mex = setupMock()
 		initPrepareDecomposeService(mex)
@@ -258,7 +273,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void prepareDecomposeService_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPrepareDecomposeService(mex)
@@ -274,7 +289,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** prepareCreateServiceInstance *****
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void prepareCreateServiceInstance() {
 		ExecutionEntity mex = setupMock()
 		initPrepareCreateServiceInstance(mex)
@@ -288,7 +303,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void prepareCreateServiceInstance_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPrepareCreateServiceInstance(mex)
@@ -304,7 +319,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** postProcessServiceInstanceCreate *****
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void postProcessServiceInstanceCreate() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -323,7 +338,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void postProcessServiceInstanceCreate_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		initPostProcessServiceInstanceCreate(mex)
@@ -336,7 +351,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void postProcessServiceInstanceCreate_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPostProcessServiceInstanceCreate(mex)
@@ -352,7 +367,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** processDecomposition *****
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void processDecomposition() {
 		ExecutionEntity mex = setupMock()
 		def svcdecomp = initProcessDecomposition(mex, true, true)
@@ -371,7 +386,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void processDecomposition_EmptyNet_EmptyVnf() {
 		ExecutionEntity mex = setupMock()
 		def svcdecomp = initProcessDecomposition(mex, true, true)
@@ -392,7 +407,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void processDecomposition_Ex() {
 		ExecutionEntity mex = setupMock()
 		def svcdecomp = initProcessDecomposition(mex, true, true)
@@ -405,26 +420,10 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 	
 	
-	// ***** awaitAaiDistribution *****
-			
-	@Test
-	@Ignore  
-	public void awaitAaiDistribution() {
-		ExecutionEntity mex = setupMock()
-		initAwaitAaiDistribution(mex)
-		
-		CreateVcpeResCustService CreateVcpeResCustService = new CreateVcpeResCustService()
-		CreateVcpeResCustService.awaitAaiDistribution(mex)
-
-		verify(mex).getVariable(DBGFLAG)
-		verify(mex).getVariable("junitSleepMs")
-	}
-	
-	
 	// ***** prepareCreateAllottedResourceTXC *****
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void prepareCreateAllottedResourceTXC() {
 		ExecutionEntity mex = setupMock()
 		initPrepareCreateAllottedResourceTXC(mex)
@@ -442,7 +441,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void prepareCreateAllottedResourceTXC_NullArList() {
 		ExecutionEntity mex = setupMock()
 		def svcdecomp = initPrepareCreateAllottedResourceTXC(mex)
@@ -462,7 +461,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void prepareCreateAllottedResourceTXC_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPrepareCreateAllottedResourceTXC(mex)
@@ -478,7 +477,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** prepareCreateAllottedResourceBRG *****
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void prepareCreateAllottedResourceBRG() {
 		ExecutionEntity mex = setupMock()
 		initPrepareCreateAllottedResourceBRG(mex)
@@ -496,7 +495,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void prepareCreateAllottedResourceBRG_NullArList() {
 		ExecutionEntity mex = setupMock()
 		def svcdecomp = initPrepareCreateAllottedResourceBRG(mex)
@@ -516,7 +515,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void prepareCreateAllottedResourceBRG_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPrepareCreateAllottedResourceBRG(mex)
@@ -532,7 +531,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** prepareVnfAndModulesCreate *****
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void prepareVnfAndModulesCreate() {
 		ExecutionEntity mex = setupMock()
 		initPrepareVnfAndModulesCreate(mex)
@@ -548,7 +547,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void prepareVnfAndModulesCreate_EmptyList() {
 		ExecutionEntity mex = setupMock()
 		initPrepareVnfAndModulesCreate(mex)
@@ -566,7 +565,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void prepareVnfAndModulesCreate_NullList() {
 		ExecutionEntity mex = setupMock()
 		initPrepareVnfAndModulesCreate(mex)
@@ -584,7 +583,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void prepareVnfAndModulesCreate_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPrepareVnfAndModulesCreate(mex)
@@ -600,7 +599,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** validateVnfCreate *****
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void validateVnfCreate() {
 		ExecutionEntity mex = setupMock()
 		initValidateVnfCreate(mex)
@@ -614,7 +613,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void validateVnfCreate_Ex() {
 		ExecutionEntity mex = setupMock()
 		initValidateVnfCreate(mex)
@@ -630,7 +629,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** postProcessResponse *****
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void postProcessResponse() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -651,7 +650,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void postProcessResponse_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -665,7 +664,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void postProcessResponse_Ex() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -682,7 +681,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** preProcessRollback *****
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void preProcessRollback() {
 		ExecutionEntity mex = setupMock()
 		def wfe = initPreProcessRollback(mex)
@@ -696,7 +695,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void preProcessRollback_NullWfe() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -713,7 +712,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void preProcessRollback_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -730,7 +729,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void preProcessRollback_Ex() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -750,7 +749,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** postProcessRollback *****
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void postProcessRollback() {
 		ExecutionEntity mex = setupMock()
 		def wfe = initPostProcessRollback(mex)
@@ -764,7 +763,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void postProcessRollback_NullWfe() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -781,7 +780,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void postProcessRollback_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -794,7 +793,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void postProcessRollback_Ex() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -814,7 +813,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** prepareFalloutRequest *****
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void prepareFalloutRequest() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -833,7 +832,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void prepareFalloutRequest_Ex() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -849,7 +848,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** sendSyncError *****
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void sendSyncError() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -873,7 +872,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void sendSyncError_NotWfe() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -899,7 +898,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void sendSyncError_NullWfe() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -925,7 +924,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void sendSyncError_Ex() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -944,7 +943,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** processJavaException *****
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void processJavaException() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -964,7 +963,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void processJavaException_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -980,7 +979,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-	@Ignore  
+	// @Ignore  
 	public void processJavaException_Ex() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -1001,6 +1000,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	private void initPreProcess(ExecutionEntity mex) {
 		when(mex.getVariable(DBGFLAG)).thenReturn("true")
 		when(mex.getVariable("bpmnRequest")).thenReturn(request)
+		when(mex.getVariable("URN_mso_workflow_aai_distribution_delay")).thenReturn("aaidelay")
 		when(mex.getVariable("mso-request-id")).thenReturn("mri")
 		when(mex.getVariable("serviceInstanceId")).thenReturn("sii")
 		when(mex.getVariable("requestAction")).thenReturn("ra")
@@ -1055,7 +1055,6 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	
 	private initAwaitAaiDistribution(ExecutionEntity mex) {
 		when(mex.getVariable(DBGFLAG)).thenReturn("true")
-		when(mex.getVariable("junitSleepMs")).thenReturn("5")
 	}
 	
 	private ServiceDecomposition initPrepareCreateAllottedResourceTXC(ExecutionEntity mex) {
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRGTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRGTest.groovy
index 1d4d3ea5a3..ecf3869b6e 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRGTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRGTest.groovy
@@ -89,6 +89,7 @@ class DoCreateAllottedResourceBRGTest extends GroovyTestBase {
 		verify(mex).setVariable("prefix", Prefix)

 				
 		assertTrue(checkMissingPreProcessRequest("URN_mso_workflow_sdncadapter_callback"))
+		assertTrue(checkMissingPreProcessRequest("URN_mso_workflow_sdnc_replication_delay"))
 		assertTrue(checkMissingPreProcessRequest("serviceInstanceId"))
 		assertTrue(checkMissingPreProcessRequest("parentServiceInstanceId"))
 		assertTrue(checkMissingPreProcessRequest("allottedResourceModelInfo"))
@@ -886,6 +887,7 @@ class DoCreateAllottedResourceBRGTest extends GroovyTestBase {
 	private void initPreProcess(ExecutionEntity mex) {
 		when(mex.getVariable(DBGFLAG)).thenReturn("true")
 		when(mex.getVariable("URN_mso_workflow_sdncadapter_callback")).thenReturn("sdncurn")
+		when(mex.getVariable("URN_mso_workflow_sdnc_replication_delay")).thenReturn("sdncdelay")
 		when(mex.getVariable("serviceInstanceId")).thenReturn("sii")
 		when(mex.getVariable("parentServiceInstanceId")).thenReturn("psii")
 		when(mex.getVariable("allottedResourceModelInfo")).thenReturn("armi")
@@ -963,7 +965,6 @@ class DoCreateAllottedResourceBRGTest extends GroovyTestBase {
 		when(mex.getVariable("aaiARGetResponse")).thenReturn("<selflink>arlink</selflink>")
 		when(mex.getVariable("sdncAssignResponse")).thenReturn("<response-data>&lt;object-path&gt;assignlink&lt;/object-path&gt;</response-data>")
 		when(mex.getVariable("serviceInstanceId")).thenReturn("sii")
-		when(mex.getVariable("junitSleepMs")).thenReturn("5")
 		when(mex.getVariable("sdncCallbackUrl")).thenReturn("myurl")
 	}
 	
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCTest.groovy
index 026c490eb1..64d49bbea2 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCTest.groovy
@@ -83,7 +83,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** preProcessRequest *****

 			

 	@Test

-	@Ignore  

+	// @Ignore  

 	public void preProcessRequest() {

 		ExecutionEntity mex = setupMock()
 		initPreProcess(mex)
@@ -95,6 +95,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 		verify(mex).setVariable("prefix", Prefix)

 				
 		assertTrue(checkMissingPreProcessRequest("URN_mso_workflow_sdncadapter_callback"))
+		assertTrue(checkMissingPreProcessRequest("URN_mso_workflow_sdnc_replication_delay"))
 		assertTrue(checkMissingPreProcessRequest("serviceInstanceId"))
 		assertTrue(checkMissingPreProcessRequest("parentServiceInstanceId"))
 		assertTrue(checkMissingPreProcessRequest("allottedResourceModelInfo"))
@@ -107,7 +108,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** getAaiAR *****
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void getAaiAR() {
 		MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml")
 		
@@ -121,7 +122,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void getAaiAR_Duplicate() {
 		MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml")
 		
@@ -137,7 +138,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void getAaiAR_NotActive() {
 		MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml")
 		
@@ -153,7 +154,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void getAaiAR_NoStatus() {
 		MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml")
 		
@@ -172,7 +173,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** createAaiAR *****
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void createAaiAR() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -196,7 +197,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void createAaiAR_NoArid_NoModelUuids() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -226,7 +227,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void createAaiAR_MissingPsiLink() {
 		ExecutionEntity mex = setupMock()
 		initCreateAaiAr(mex)
@@ -241,7 +242,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void createAaiAR_HttpFailed() {
 		ExecutionEntity mex = setupMock()
 		initCreateAaiAr(mex)
@@ -254,7 +255,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void createAaiAR_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		initCreateAaiAr(mex)
@@ -269,7 +270,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void createAaiAR_Ex() {
 		ExecutionEntity mex = setupMock()
 		initCreateAaiAr(mex)
@@ -287,7 +288,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** buildSDNCRequest *****
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void buildSDNCRequest() {
 		ExecutionEntity mex = setupMock()
 		initBuildSDNCRequest(mex)
@@ -312,7 +313,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void buildSDNCRequest_Ex() {
 		ExecutionEntity mex = setupMock()
 		initBuildSDNCRequest(mex)
@@ -328,7 +329,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** preProcessSDNCAssign *****
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void preProcessSDNCAssign() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -354,7 +355,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void preProcessSDNCAssign_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		initPreProcessSDNC(mex)
@@ -367,7 +368,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void preProcessSDNCAssign_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPreProcessSDNC(mex)
@@ -383,7 +384,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** preProcessSDNCCreate *****
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void preProcessSDNCCreate() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -410,7 +411,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void preProcessSDNCCreate_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		initPreProcessSDNC(mex)
@@ -423,7 +424,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void preProcessSDNCCreate_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPreProcessSDNC(mex)
@@ -439,7 +440,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** preProcessSDNCActivate *****
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void preProcessSDNCActivate() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -466,7 +467,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void preProcessSDNCActivate_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		initPreProcessSDNC(mex)
@@ -479,7 +480,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void preProcessSDNCActivate_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPreProcessSDNC(mex)
@@ -495,7 +496,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** validateSDNCResp *****
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void validateSDNCResp() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -519,7 +520,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void validateSDNCResp_Get() {
 		ExecutionEntity mex = setupMock()
 		def data = initValidateSDNCResp(mex)
@@ -538,7 +539,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void validateSDNCResp_Unsuccessful() {
 		ExecutionEntity mex = setupMock()
 		initValidateSDNCResp(mex)
@@ -553,7 +554,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void validateSDNCResp_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		initValidateSDNCResp(mex)
@@ -567,7 +568,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void validateSDNCResp_Ex() {
 		ExecutionEntity mex = setupMock()
 		initValidateSDNCResp(mex)
@@ -584,7 +585,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** preProcessSDNCGet *****
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void preProcessSDNCGet_FoundAR() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -603,7 +604,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void preProcessSDNCGet_NotFoundAR() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -624,7 +625,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void preProcessSDNCGet_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPreProcessSDNCGet(mex)
@@ -640,7 +641,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** updateAaiAROrchStatus *****
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void updateAaiAROrchStatus() {
 		MockPatchAllottedResource(CUST, SVC, INST, ARID)
 		
@@ -655,7 +656,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** generateOutputs *****
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void generateOutputs() {
 		ExecutionEntity mex = setupMock()
 		def txctop = FileUtil.readResourceFile("__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml")
@@ -674,7 +675,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void generateOutputs_BadXml() {
 		ExecutionEntity mex = setupMock()
 		
@@ -689,7 +690,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void generateOutputs_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		
@@ -704,7 +705,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void generateOutputs_Ex() {
 		ExecutionEntity mex = setupMock()
 		
@@ -722,7 +723,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** preProcessRollback *****
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void preProcessRollback() {
 		ExecutionEntity mex = setupMock()
 		WorkflowException wfe = mock(WorkflowException.class)
@@ -738,7 +739,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void preProcessRollback_NotWFE() {
 		ExecutionEntity mex = setupMock()
 		
@@ -753,7 +754,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void preProcessRollback_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		
@@ -767,7 +768,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void preProcessRollback_Ex() {
 		ExecutionEntity mex = setupMock()
 		
@@ -784,7 +785,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** postProcessRollback *****
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void postProcessRollback() {
 		ExecutionEntity mex = setupMock()
 		WorkflowException wfe = mock(WorkflowException.class)
@@ -801,7 +802,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void postProcessRollback_NotWFE() {
 		ExecutionEntity mex = setupMock()
 		
@@ -817,7 +818,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void postProcessRollback_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		
@@ -832,7 +833,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-	@Ignore
+	// @Ignore
 	public void postProcessRollback_Ex() {
 		ExecutionEntity mex = setupMock()
 		
@@ -860,6 +861,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	private void initPreProcess(ExecutionEntity mex) {
 		when(mex.getVariable(DBGFLAG)).thenReturn("true")
 		when(mex.getVariable("URN_mso_workflow_sdncadapter_callback")).thenReturn("sdncurn")
+		when(mex.getVariable("URN_mso_workflow_sdnc_replication_delay")).thenReturn("sdncdelay")
 		when(mex.getVariable("serviceInstanceId")).thenReturn("sii")
 		when(mex.getVariable("parentServiceInstanceId")).thenReturn("psii")
 		when(mex.getVariable("allottedResourceModelInfo")).thenReturn("armi")
@@ -923,7 +925,6 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 		when(mex.getVariable("aaiARGetResponse")).thenReturn("<selflink>arlink</selflink>")
 		when(mex.getVariable("sdncAssignResponse")).thenReturn("<response-data>&lt;object-path&gt;assignlink&lt;/object-path&gt;</response-data>")
 		when(mex.getVariable("serviceInstanceId")).thenReturn("sii")
-		when(mex.getVariable("junitSleepMs")).thenReturn("5")
 		when(mex.getVariable("sdncCallbackUrl")).thenReturn("myurl")
 	}