From: Jim Hahn Date: Sun, 5 Nov 2017 23:51:54 +0000 (-0500) Subject: Moved sleep to macro flow X-Git-Tag: v1.1.0~35^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f4b277d575a49778ad0e5940a539f0571ac5677d;p=so.git Moved sleep to macro flow Added new method to "Await AAI Distribution" to macro flow and moved sleep there. Added junit test for new method and updated existing tests. Change-Id: I91c8a787669a0fc8cf2038a4cfb6f6229d3949e2 Issue-Id: SO-303 Signed-off-by: Jim Hahn --- 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 diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn index 02f7f4815a..3c5e26874a 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn @@ -368,7 +368,7 @@ CreateVcpeResCustService.prepareCreateServiceInstance(execution)]]>SequenceFlow_0vj46ej SequenceFlow_13uceka - + SequenceFlow_1ky2sv9 SequenceFlow_0vj46ej @@ -431,7 +431,7 @@ CreateVcpeResCustService.prepareCreateAllottedResourceTXC(execution)]]> - SequenceFlow_13uceka + SequenceFlow_16acruh @@ -471,36 +471,11 @@ CreateVcpeResCustService.prepareCreateAllottedResourceTXC(execution)]]>SequenceFlow_0e9e6fo SequenceFlow_0hwsm6n - - - - - - - - - - - - - - - - - - - - - - SequenceFlow_0b5ztoe - SequenceFlow_0e9e6fo - - SequenceFlow_15vce9o SequenceFlow_0yecpl2 @@ -616,6 +591,39 @@ def CreateVcpeResCustService= new CreateVcpeResCustService() CreateVcpeResCustService.validateVnfCreate(execution)]]> + + + + + + + + + + + + + + + + + + + + + + SequenceFlow_0b5ztoe + SequenceFlow_0e9e6fo + + + + SequenceFlow_13uceka + SequenceFlow_16acruh + + + @@ -915,9 +923,9 @@ CreateVcpeResCustService.validateVnfCreate(execution)]]> - + - + @@ -1143,9 +1151,9 @@ CreateVcpeResCustService.validateVnfCreate(execution)]]> - + - + @@ -1261,9 +1269,6 @@ CreateVcpeResCustService.validateVnfCreate(execution)]]> - - - @@ -1287,15 +1292,7 @@ CreateVcpeResCustService.validateVnfCreate(execution)]]> - - - - - - - - - + @@ -1500,6 +1497,29 @@ CreateVcpeResCustService.validateVnfCreate(execution)]]> + + + + + + + + + + + + + + + + + + + + + + + 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 0b29219dd8..f646eae130 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) @@ -118,7 +118,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void preProcessRequest_EmptyParts() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -160,7 +160,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void preProcessRequest_MissingSubscriberId() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -178,7 +178,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void preProcessRequest_BpmnError() { ExecutionEntity mex = setupMock() initPreProcess(mex) @@ -191,7 +191,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void preProcessRequest_Ex() { ExecutionEntity mex = setupMock() initPreProcess(mex) @@ -206,7 +206,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { // ***** sendSyncResponse ***** @Test -// @Ignore + @Ignore public void sendSyncResponse() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -229,7 +229,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void sendSyncResponse_Ex() { ExecutionEntity mex = setupMock() initSendSyncResponse(mex) @@ -245,7 +245,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { // ***** prepareDecomposeService ***** @Test -// @Ignore + @Ignore public void prepareDecomposeService() { ExecutionEntity mex = setupMock() initPrepareDecomposeService(mex) @@ -258,7 +258,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void prepareDecomposeService_Ex() { ExecutionEntity mex = setupMock() initPrepareDecomposeService(mex) @@ -288,7 +288,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void prepareCreateServiceInstance_Ex() { ExecutionEntity mex = setupMock() initPrepareCreateServiceInstance(mex) @@ -304,7 +304,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { // ***** postProcessServiceInstanceCreate ***** @Test -// @Ignore + @Ignore public void postProcessServiceInstanceCreate() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -323,7 +323,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void postProcessServiceInstanceCreate_BpmnError() { ExecutionEntity mex = setupMock() initPostProcessServiceInstanceCreate(mex) @@ -336,7 +336,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void postProcessServiceInstanceCreate_Ex() { ExecutionEntity mex = setupMock() initPostProcessServiceInstanceCreate(mex) @@ -352,7 +352,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { // ***** processDecomposition ***** @Test -// @Ignore + @Ignore public void processDecomposition() { ExecutionEntity mex = setupMock() def svcdecomp = initProcessDecomposition(mex, true, true) @@ -371,7 +371,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void processDecomposition_EmptyNet_EmptyVnf() { ExecutionEntity mex = setupMock() def svcdecomp = initProcessDecomposition(mex, true, true) @@ -392,7 +392,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void processDecomposition_Ex() { ExecutionEntity mex = setupMock() def svcdecomp = initProcessDecomposition(mex, true, true) @@ -405,6 +405,22 @@ 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 @@ -426,7 +442,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void prepareCreateAllottedResourceTXC_NullArList() { ExecutionEntity mex = setupMock() def svcdecomp = initPrepareCreateAllottedResourceTXC(mex) @@ -446,7 +462,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void prepareCreateAllottedResourceTXC_Ex() { ExecutionEntity mex = setupMock() initPrepareCreateAllottedResourceTXC(mex) @@ -480,7 +496,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void prepareCreateAllottedResourceBRG_NullArList() { ExecutionEntity mex = setupMock() def svcdecomp = initPrepareCreateAllottedResourceBRG(mex) @@ -500,7 +516,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void prepareCreateAllottedResourceBRG_Ex() { ExecutionEntity mex = setupMock() initPrepareCreateAllottedResourceBRG(mex) @@ -516,7 +532,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { // ***** prepareVnfAndModulesCreate ***** @Test -// @Ignore + @Ignore public void prepareVnfAndModulesCreate() { ExecutionEntity mex = setupMock() initPrepareVnfAndModulesCreate(mex) @@ -532,7 +548,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void prepareVnfAndModulesCreate_EmptyList() { ExecutionEntity mex = setupMock() initPrepareVnfAndModulesCreate(mex) @@ -550,7 +566,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void prepareVnfAndModulesCreate_NullList() { ExecutionEntity mex = setupMock() initPrepareVnfAndModulesCreate(mex) @@ -568,7 +584,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void prepareVnfAndModulesCreate_Ex() { ExecutionEntity mex = setupMock() initPrepareVnfAndModulesCreate(mex) @@ -584,7 +600,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { // ***** validateVnfCreate ***** @Test -// @Ignore + @Ignore public void validateVnfCreate() { ExecutionEntity mex = setupMock() initValidateVnfCreate(mex) @@ -598,7 +614,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void validateVnfCreate_Ex() { ExecutionEntity mex = setupMock() initValidateVnfCreate(mex) @@ -614,7 +630,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { // ***** postProcessResponse ***** @Test -// @Ignore + @Ignore public void postProcessResponse() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -635,7 +651,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void postProcessResponse_BpmnError() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -649,7 +665,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void postProcessResponse_Ex() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -666,7 +682,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { // ***** preProcessRollback ***** @Test -// @Ignore + @Ignore public void preProcessRollback() { ExecutionEntity mex = setupMock() def wfe = initPreProcessRollback(mex) @@ -680,7 +696,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void preProcessRollback_NullWfe() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -697,7 +713,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void preProcessRollback_BpmnError() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -714,7 +730,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void preProcessRollback_Ex() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -734,7 +750,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { // ***** postProcessRollback ***** @Test -// @Ignore + @Ignore public void postProcessRollback() { ExecutionEntity mex = setupMock() def wfe = initPostProcessRollback(mex) @@ -748,7 +764,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void postProcessRollback_NullWfe() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -765,7 +781,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void postProcessRollback_BpmnError() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -778,7 +794,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void postProcessRollback_Ex() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -798,7 +814,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { // ***** prepareFalloutRequest ***** @Test -// @Ignore + @Ignore public void prepareFalloutRequest() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -817,7 +833,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void prepareFalloutRequest_Ex() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -833,7 +849,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { // ***** sendSyncError ***** @Test -// @Ignore + @Ignore public void sendSyncError() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -857,7 +873,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void sendSyncError_NotWfe() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -883,7 +899,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void sendSyncError_NullWfe() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -909,7 +925,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void sendSyncError_Ex() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -928,7 +944,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { // ***** processJavaException ***** @Test -// @Ignore + @Ignore public void processJavaException() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -948,7 +964,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void processJavaException_BpmnError() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -964,7 +980,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void processJavaException_Ex() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -1008,7 +1024,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { when(mex.getVariable("createVcpeServiceRequest")).thenReturn(request) when(mex.getVariable("serviceDecomposition")).thenReturn(svcdecomp) - when(svcdecomp.toJsonString()).thenReturn("mydecomp") + when(svcdecomp.toJsonStringNoRootName()).thenReturn("mydecomp") } private void initPostProcessServiceInstanceCreate(ExecutionEntity mex) { @@ -1037,6 +1053,11 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { return svcdecomp } + private initAwaitAaiDistribution(ExecutionEntity mex) { + when(mex.getVariable(DBGFLAG)).thenReturn("true") + when(mex.getVariable("junitSleepMs")).thenReturn("5") + } + private ServiceDecomposition initPrepareCreateAllottedResourceTXC(ExecutionEntity mex) { ServiceDecomposition svcdecomp = mock(ServiceDecomposition.class) List arlst = new LinkedList<>() @@ -1078,13 +1099,13 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { ModelInfo mod = mock(ModelInfo.class) HomingSolution home = mock(HomingSolution.class) - when(ar.toJsonString()).thenReturn("json"+id) + when(ar.toJsonStringNoRootName()).thenReturn("json"+id) when(ar.getAllottedResourceType()).thenReturn("TunnelXConn") when(ar.getModelInfo()).thenReturn(mod) when(ar.getAllottedResourceRole()).thenReturn("TXCr") when(ar.getHomingSolution()).thenReturn(home) - when(mod.toJsonString()).thenReturn("model"+id) + when(mod.toJsonStringNoRootName()).thenReturn("model"+id) when(home.getServiceInstanceId()).thenReturn("home"+id) @@ -1096,13 +1117,13 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { ModelInfo mod = mock(ModelInfo.class) HomingSolution home = mock(HomingSolution.class) - when(ar.toJsonString()).thenReturn("json"+id) + when(ar.toJsonStringNoRootName()).thenReturn("json"+id) when(ar.getAllottedResourceType()).thenReturn("BRG") when(ar.getModelInfo()).thenReturn(mod) when(ar.getAllottedResourceRole()).thenReturn("BRGr") when(ar.getHomingSolution()).thenReturn(home) - when(mod.toJsonString()).thenReturn("model"+id) + when(mod.toJsonStringNoRootName()).thenReturn("model"+id) when(home.getServiceInstanceId()).thenReturn("home"+id) 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 2b6d4ba6a0..026c490eb1 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) @@ -107,7 +107,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { // ***** getAaiAR ***** @Test -// @Ignore + @Ignore public void getAaiAR() { MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml") @@ -121,7 +121,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void getAaiAR_Duplicate() { MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml") @@ -137,7 +137,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void getAaiAR_NotActive() { MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml") @@ -153,7 +153,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void getAaiAR_NoStatus() { MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml") @@ -172,7 +172,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { // ***** createAaiAR ***** @Test -// @Ignore + @Ignore public void createAaiAR() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -196,7 +196,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void createAaiAR_NoArid_NoModelUuids() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -226,7 +226,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void createAaiAR_MissingPsiLink() { ExecutionEntity mex = setupMock() initCreateAaiAr(mex) @@ -241,7 +241,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void createAaiAR_HttpFailed() { ExecutionEntity mex = setupMock() initCreateAaiAr(mex) @@ -254,7 +254,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void createAaiAR_BpmnError() { ExecutionEntity mex = setupMock() initCreateAaiAr(mex) @@ -269,7 +269,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void createAaiAR_Ex() { ExecutionEntity mex = setupMock() initCreateAaiAr(mex) @@ -287,7 +287,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { // ***** buildSDNCRequest ***** @Test -// @Ignore + @Ignore public void buildSDNCRequest() { ExecutionEntity mex = setupMock() initBuildSDNCRequest(mex) @@ -312,7 +312,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void buildSDNCRequest_Ex() { ExecutionEntity mex = setupMock() initBuildSDNCRequest(mex) @@ -328,7 +328,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { // ***** preProcessSDNCAssign ***** @Test -// @Ignore + @Ignore public void preProcessSDNCAssign() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -354,7 +354,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void preProcessSDNCAssign_BpmnError() { ExecutionEntity mex = setupMock() initPreProcessSDNC(mex) @@ -367,7 +367,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void preProcessSDNCAssign_Ex() { ExecutionEntity mex = setupMock() initPreProcessSDNC(mex) @@ -383,7 +383,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { // ***** preProcessSDNCCreate ***** @Test -// @Ignore + @Ignore public void preProcessSDNCCreate() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -410,7 +410,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void preProcessSDNCCreate_BpmnError() { ExecutionEntity mex = setupMock() initPreProcessSDNC(mex) @@ -423,7 +423,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void preProcessSDNCCreate_Ex() { ExecutionEntity mex = setupMock() initPreProcessSDNC(mex) @@ -439,7 +439,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { // ***** preProcessSDNCActivate ***** @Test -// @Ignore + @Ignore public void preProcessSDNCActivate() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -466,7 +466,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void preProcessSDNCActivate_BpmnError() { ExecutionEntity mex = setupMock() initPreProcessSDNC(mex) @@ -479,7 +479,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void preProcessSDNCActivate_Ex() { ExecutionEntity mex = setupMock() initPreProcessSDNC(mex) @@ -495,7 +495,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { // ***** validateSDNCResp ***** @Test -// @Ignore + @Ignore public void validateSDNCResp() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -519,7 +519,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void validateSDNCResp_Get() { ExecutionEntity mex = setupMock() def data = initValidateSDNCResp(mex) @@ -538,7 +538,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void validateSDNCResp_Unsuccessful() { ExecutionEntity mex = setupMock() initValidateSDNCResp(mex) @@ -553,7 +553,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void validateSDNCResp_BpmnError() { ExecutionEntity mex = setupMock() initValidateSDNCResp(mex) @@ -567,7 +567,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void validateSDNCResp_Ex() { ExecutionEntity mex = setupMock() initValidateSDNCResp(mex) @@ -584,7 +584,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { // ***** preProcessSDNCGet ***** @Test -// @Ignore + @Ignore public void preProcessSDNCGet_FoundAR() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -603,7 +603,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void preProcessSDNCGet_NotFoundAR() { ExecutionEntity mex = setupMock() def map = setupMap(mex) @@ -624,7 +624,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void preProcessSDNCGet_Ex() { ExecutionEntity mex = setupMock() initPreProcessSDNCGet(mex) @@ -640,7 +640,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { // ***** updateAaiAROrchStatus ***** @Test -// @Ignore + @Ignore public void updateAaiAROrchStatus() { MockPatchAllottedResource(CUST, SVC, INST, ARID) @@ -655,7 +655,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 +674,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void generateOutputs_BadXml() { ExecutionEntity mex = setupMock() @@ -689,7 +689,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void generateOutputs_BpmnError() { ExecutionEntity mex = setupMock() @@ -704,7 +704,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void generateOutputs_Ex() { ExecutionEntity mex = setupMock() @@ -722,7 +722,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { // ***** preProcessRollback ***** @Test -// @Ignore + @Ignore public void preProcessRollback() { ExecutionEntity mex = setupMock() WorkflowException wfe = mock(WorkflowException.class) @@ -738,7 +738,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void preProcessRollback_NotWFE() { ExecutionEntity mex = setupMock() @@ -753,7 +753,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void preProcessRollback_BpmnError() { ExecutionEntity mex = setupMock() @@ -767,7 +767,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void preProcessRollback_Ex() { ExecutionEntity mex = setupMock() @@ -784,7 +784,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { // ***** postProcessRollback ***** @Test -// @Ignore + @Ignore public void postProcessRollback() { ExecutionEntity mex = setupMock() WorkflowException wfe = mock(WorkflowException.class) @@ -801,7 +801,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void postProcessRollback_NotWFE() { ExecutionEntity mex = setupMock() @@ -817,7 +817,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void postProcessRollback_BpmnError() { ExecutionEntity mex = setupMock() @@ -832,7 +832,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase { } @Test -// @Ignore + @Ignore public void postProcessRollback_Ex() { ExecutionEntity mex = setupMock() diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/vcpe/DoCreateAllottedResourceTXCTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/vcpe/DoCreateAllottedResourceTXCTest.java index 4323ccae1a..9cf059c24c 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/vcpe/DoCreateAllottedResourceTXCTest.java +++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/vcpe/DoCreateAllottedResourceTXCTest.java @@ -283,7 +283,6 @@ public class DoCreateAllottedResourceTXCTest extends AbstractTestBase { variables.put("allottedResourceType", "TXC"); variables.put("allottedResourceId", ARID); variables.put("brgWanMacAddress", "wanmac"); - variables.put("junitSleepMs", "5"); variables.put("serviceInstanceId", DEC_INST); variables.put("parentServiceInstanceId", DEC_PARENT_INST);