Merge "Reorder modifiers"

[so.git] / bpmn / MSOInfrastructureBPMN / src / test / groovy / org / openecomp / mso / bpmn / vcpe / scripts / CreateVcpeResCustServiceTest.groovy

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 0b29219..a8401d7 100644 (file)
--- 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
@@ -18,21 +18,21 @@
  * ============LICENSE_END=========================================================
  */
 package org.openecomp.mso.bpmn.vcpe.scripts
-\r
-\r
-import org.camunda.bpm.engine.ProcessEngineServices\r
-import org.camunda.bpm.engine.RepositoryService\r
-import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity\r
-import org.camunda.bpm.engine.repository.ProcessDefinition\r
-import org.camunda.bpm.engine.runtime.Execution\r
+
+
+import org.camunda.bpm.engine.ProcessEngineServices
+import org.camunda.bpm.engine.RepositoryService
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.repository.ProcessDefinition
 import org.junit.Before
-import org.junit.BeforeClass\r
-import org.junit.Rule\r
+import org.junit.BeforeClass
+import org.junit.Rule
 import org.junit.Test
-import org.junit.Ignore\r
+import org.junit.Ignore
 import org.mockito.MockitoAnnotations
-import org.camunda.bpm.engine.delegate.BpmnError\r
+import org.camunda.bpm.engine.delegate.BpmnError
 import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.bpmn.core.domain.HomingSolution
 import org.openecomp.mso.bpmn.mock.FileUtil
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse
@@ -41,7 +41,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.patch
 import static com.github.tomakehurst.wiremock.client.WireMock.put
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching
-import static org.junit.Assert.*;\r
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.*
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetAllottedResource
 import org.openecomp.mso.bpmn.core.domain.ServiceDecomposition
@@ -53,28 +53,27 @@ import org.openecomp.mso.bpmn.core.RollbackData
 import org.openecomp.mso.bpmn.vcpe.scripts.MapGetter
 import org.openecomp.mso.bpmn.vcpe.scripts.MapSetter
 
-import com.github.tomakehurst.wiremock.junit.WireMockRule\r
-\r
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+
 class CreateVcpeResCustServiceTest extends GroovyTestBase {
        
-       private static String request\r
-       \r
-       @Rule\r
+       private static String request
+       
+       @Rule
        public WireMockRule wireMockRule = new WireMockRule(PORT)
-\r
+
        String Prefix = "CVRCS_"
-       String RbType = "DCRENI_"\r
+       String RbType = "DCRENI_"
 
        @BeforeClass
        public static void setUpBeforeClass() {
-               super.setUpBeforeClass()
                request = FileUtil.readResourceFile("__files/VCPE/CreateVcpeResCustService/request.json")
        }
-         \r
-    @Before\r
-       public void init()\r
-       {\r
-               MockitoAnnotations.initMocks(this)\r
+         
+    @Before
+       public void init()
+       {
+               MockitoAnnotations.initMocks(this)
        }
        
        public CreateVcpeResCustServiceTest() {
@@ -82,20 +81,21 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
        
        
-       // ***** preProcessRequest *****\r
-                       \r
-       @Test\r
-//     @Ignore  \r
-       public void preProcessRequest() {\r
+       // ***** preProcessRequest *****
+                       
+       @Test
+       @Ignore // 1802 merge
+       public void preProcessRequest() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
                initPreProcess(mex)
-               \r
-               CreateVcpeResCustService CreateVcpeResCustService = new CreateVcpeResCustService()\r
-               CreateVcpeResCustService.preProcessRequest(mex)\r
-\r
-               verify(mex).getVariable(DBGFLAG)\r
+               
+               CreateVcpeResCustService CreateVcpeResCustService = new CreateVcpeResCustService()
+               CreateVcpeResCustService.preProcessRequest(mex)
+
+               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"))
@@ -109,16 +109,32 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
                assertTrue(map.containsKey("subscriberInfo"))
                
                verify(mex).setVariable("brgWanMacAddress", "brgmac")
+               verify(mex).setVariable("customerLocation", ["customerLatitude":"32.897480", "customerLongitude":"-97.040443", "customerName":"some_company"])
+               verify(mex).setVariable("homingService", "sniro")
                assertTrue(map.containsKey("serviceInputParams"))
                assertTrue(map.containsKey(Prefix+"requestInfo"))
                
                def reqinfo = map.get(Prefix+"requestInfo")
                assertTrue(reqinfo.indexOf("<request-id>mri</") >= 0)
-               assertTrue(reqinfo.indexOf("<source>VID</") >= 0)\r
+               assertTrue(reqinfo.indexOf("<source>VID</") >= 0)
        }
                        
        @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 // 1802 merge
        public void preProcessRequest_EmptyParts() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -127,6 +143,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
                def req = request
                                        .replace('"source"', '"sourceXXX"')
                                        .replace('"BRG_WAN_MAC_Address"', '"BRG_WAN_MAC_AddressXXX"')
+                                       .replace('"Customer_Location"', '"Customer_LocationXXX"')
                
                when(mex.getVariable("bpmnRequest")).thenReturn(req)
                when(mex.getVariable("serviceInstanceId")).thenReturn(null)
@@ -150,6 +167,8 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
                assertTrue(map.containsKey("subscriberInfo"))
                
                assertEquals("", map.get("brgWanMacAddress"))
+               assertEquals("", map.get("customerLocation"))
+               assertEquals("oof", map.get("homingService"))
                assertTrue(map.containsKey("serviceInputParams"))
                assertTrue(map.containsKey(Prefix+"requestInfo"))
                
@@ -160,7 +179,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void preProcessRequest_MissingSubscriberId() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -178,7 +197,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void preProcessRequest_BpmnError() {
                ExecutionEntity mex = setupMock()
                initPreProcess(mex)
@@ -191,7 +210,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void preProcessRequest_Ex() {
                ExecutionEntity mex = setupMock()
                initPreProcess(mex)
@@ -206,7 +225,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        // ***** sendSyncResponse *****
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void sendSyncResponse() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -229,7 +248,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void sendSyncResponse_Ex() {
                ExecutionEntity mex = setupMock()
                initSendSyncResponse(mex)
@@ -245,7 +264,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        // ***** prepareDecomposeService *****
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void prepareDecomposeService() {
                ExecutionEntity mex = setupMock()
                initPrepareDecomposeService(mex)
@@ -258,7 +277,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void prepareDecomposeService_Ex() {
                ExecutionEntity mex = setupMock()
                initPrepareDecomposeService(mex)
@@ -274,7 +293,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        // ***** prepareCreateServiceInstance *****
                        
        @Test
-       @Ignore  
+       // @Ignore  
        public void prepareCreateServiceInstance() {
                ExecutionEntity mex = setupMock()
                initPrepareCreateServiceInstance(mex)
@@ -288,7 +307,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void prepareCreateServiceInstance_Ex() {
                ExecutionEntity mex = setupMock()
                initPrepareCreateServiceInstance(mex)
@@ -304,7 +323,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        // ***** postProcessServiceInstanceCreate *****
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void postProcessServiceInstanceCreate() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -323,7 +342,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void postProcessServiceInstanceCreate_BpmnError() {
                ExecutionEntity mex = setupMock()
                initPostProcessServiceInstanceCreate(mex)
@@ -336,7 +355,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void postProcessServiceInstanceCreate_Ex() {
                ExecutionEntity mex = setupMock()
                initPostProcessServiceInstanceCreate(mex)
@@ -352,10 +371,10 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        // ***** processDecomposition *****
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void processDecomposition() {
                ExecutionEntity mex = setupMock()
-               def svcdecomp = initProcessDecomposition(mex, true, true)
+               def svcdecomp = initProcessDecomposition(mex)
                
                CreateVcpeResCustService CreateVcpeResCustService = new CreateVcpeResCustService()
                CreateVcpeResCustService.processDecomposition(mex)
@@ -363,18 +382,18 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
                verify(mex).getVariable(DBGFLAG)
                
                verify(mex).setVariable("vnfList", svcdecomp.getServiceVnfs())
-               verify(mex).setVariable("vnfListString", '[myvnf, myvnf2, myvnf3]')
-               verify(mex).setVariable(Prefix+"VNFsCount", 3)
+               verify(mex).setVariable("vnfListString", '[myvnf]')
+               verify(mex).setVariable(Prefix+"VNFsCount", 1)
                
                verify(mex).setVariable("vnfModelInfo", "mymodel")
                verify(mex).setVariable("vnfModelInfoString", "mymodel")
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void processDecomposition_EmptyNet_EmptyVnf() {
                ExecutionEntity mex = setupMock()
-               def svcdecomp = initProcessDecomposition(mex, true, true)
+               def svcdecomp = initProcessDecomposition(mex)
                
                when(svcdecomp.getServiceVnfs()).thenReturn(new LinkedList<VnfResource>())
                
@@ -392,10 +411,10 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void processDecomposition_Ex() {
                ExecutionEntity mex = setupMock()
-               def svcdecomp = initProcessDecomposition(mex, true, true)
+               def svcdecomp = initProcessDecomposition(mex)
                
                when(svcdecomp.getServiceVnfs()).thenThrow(new RuntimeException("expected exception"))
                
@@ -405,10 +424,39 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
        
        
+       // ***** filterVnfs *****
+                       
+       @Test
+       // @Ignore  
+       public void filterVnfs() {
+               ExecutionEntity mex = setupMock()
+               def svcdecomp = initFilterVnfs(mex)
+               
+               CreateVcpeResCustService CreateVcpeResCustService = new CreateVcpeResCustService()
+               CreateVcpeResCustService.processDecomposition(mex)
+               
+               verify(mex).setVariable("vnfListString", '[myvnf3, myvnf5]')
+       }
+                       
+       @Test
+       // @Ignore  
+       public void filterVnfs_Null() {
+               ExecutionEntity mex = setupMock()
+               def svcdecomp = initFilterVnfs(mex)
+               
+               when(svcdecomp.getServiceVnfs()).thenReturn(null)
+               
+               CreateVcpeResCustService CreateVcpeResCustService = new CreateVcpeResCustService()
+               CreateVcpeResCustService.processDecomposition(mex)
+               
+               // nothing more to check, as long as it didn't throw an exception
+       }
+       
+       
        // ***** prepareCreateAllottedResourceTXC *****
                        
        @Test
-       @Ignore  
+       // @Ignore  
        public void prepareCreateAllottedResourceTXC() {
                ExecutionEntity mex = setupMock()
                initPrepareCreateAllottedResourceTXC(mex)
@@ -421,12 +469,12 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
                verify(mex).setVariable("createTXCAR", true)
                verify(mex).setVariable("allottedResourceModelInfoTXC", "modelB")
                verify(mex).setVariable("allottedResourceRoleTXC", "TXCr")
-               verify(mex).setVariable("allottedResourceTypeTXC", "TunnelXConn")
+               verify(mex).setVariable("allottedResourceTypeTXC", "Tunnel XConn")
                verify(mex).setVariable("parentServiceInstanceIdTXC", "homeB")
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void prepareCreateAllottedResourceTXC_NullArList() {
                ExecutionEntity mex = setupMock()
                def svcdecomp = initPrepareCreateAllottedResourceTXC(mex)
@@ -441,12 +489,12 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
                verify(mex, never()).setVariable("createTXCAR", true)
                verify(mex, never()).setVariable("allottedResourceModelInfoTXC", "modelB")
                verify(mex, never()).setVariable("allottedResourceRoleTXC", "TXCr")
-               verify(mex, never()).setVariable("allottedResourceTypeTXC", "TunnelXConn")
+               verify(mex, never()).setVariable("allottedResourceTypeTXC", "Tunnel XConn")
                verify(mex, never()).setVariable("parentServiceInstanceIdTXC", "homeB")
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void prepareCreateAllottedResourceTXC_Ex() {
                ExecutionEntity mex = setupMock()
                initPrepareCreateAllottedResourceTXC(mex)
@@ -462,7 +510,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        // ***** prepareCreateAllottedResourceBRG *****
                        
        @Test
-       @Ignore  
+       // @Ignore  
        public void prepareCreateAllottedResourceBRG() {
                ExecutionEntity mex = setupMock()
                initPrepareCreateAllottedResourceBRG(mex)
@@ -480,7 +528,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void prepareCreateAllottedResourceBRG_NullArList() {
                ExecutionEntity mex = setupMock()
                def svcdecomp = initPrepareCreateAllottedResourceBRG(mex)
@@ -500,7 +548,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void prepareCreateAllottedResourceBRG_Ex() {
                ExecutionEntity mex = setupMock()
                initPrepareCreateAllottedResourceBRG(mex)
@@ -516,7 +564,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        // ***** prepareVnfAndModulesCreate *****
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void prepareVnfAndModulesCreate() {
                ExecutionEntity mex = setupMock()
                initPrepareVnfAndModulesCreate(mex)
@@ -532,7 +580,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void prepareVnfAndModulesCreate_EmptyList() {
                ExecutionEntity mex = setupMock()
                initPrepareVnfAndModulesCreate(mex)
@@ -550,7 +598,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void prepareVnfAndModulesCreate_NullList() {
                ExecutionEntity mex = setupMock()
                initPrepareVnfAndModulesCreate(mex)
@@ -568,7 +616,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void prepareVnfAndModulesCreate_Ex() {
                ExecutionEntity mex = setupMock()
                initPrepareVnfAndModulesCreate(mex)
@@ -584,7 +632,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        // ***** validateVnfCreate *****
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void validateVnfCreate() {
                ExecutionEntity mex = setupMock()
                initValidateVnfCreate(mex)
@@ -598,7 +646,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void validateVnfCreate_Ex() {
                ExecutionEntity mex = setupMock()
                initValidateVnfCreate(mex)
@@ -614,7 +662,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        // ***** postProcessResponse *****
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void postProcessResponse() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -635,7 +683,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void postProcessResponse_BpmnError() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -649,7 +697,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void postProcessResponse_Ex() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -666,7 +714,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        // ***** preProcessRollback *****
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void preProcessRollback() {
                ExecutionEntity mex = setupMock()
                def wfe = initPreProcessRollback(mex)
@@ -680,7 +728,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void preProcessRollback_NullWfe() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -697,7 +745,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void preProcessRollback_BpmnError() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -714,7 +762,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void preProcessRollback_Ex() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -734,7 +782,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        // ***** postProcessRollback *****
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void postProcessRollback() {
                ExecutionEntity mex = setupMock()
                def wfe = initPostProcessRollback(mex)
@@ -748,7 +796,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void postProcessRollback_NullWfe() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -765,7 +813,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void postProcessRollback_BpmnError() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -778,7 +826,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void postProcessRollback_Ex() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -798,7 +846,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        // ***** prepareFalloutRequest *****
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void prepareFalloutRequest() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -817,7 +865,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void prepareFalloutRequest_Ex() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -833,7 +881,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        // ***** sendSyncError *****
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void sendSyncError() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -857,7 +905,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void sendSyncError_NotWfe() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -883,7 +931,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void sendSyncError_NullWfe() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -909,7 +957,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void sendSyncError_Ex() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -928,7 +976,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        // ***** processJavaException *****
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void processJavaException() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -948,7 +996,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void processJavaException_BpmnError() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -964,7 +1012,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        }
                        
        @Test
-//     @Ignore  
+       // @Ignore  
        public void processJavaException_Ex() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -985,6 +1033,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")
@@ -1008,7 +1057,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) {
@@ -1018,13 +1067,11 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
                when(mex.getVariable("serviceInstanceName")).thenReturn("sin")
        }
        
-       private ServiceDecomposition initProcessDecomposition(ExecutionEntity mex, boolean haveNet, boolean haveVnf) {
+       private ServiceDecomposition initProcessDecomposition(ExecutionEntity mex) {
                List<VnfResource> vnflst = new LinkedList<>()
-               if(haveVnf) {
-                       vnflst.add(makeVnf(""))
-                       vnflst.add(makeVnf("2"))
-                       vnflst.add(makeVnf("3"))
-               }
+               vnflst.add(makeVnf("", ""))
+               vnflst.add(makeVnf("2", "BRG"))
+               vnflst.add(makeVnf("3", "BRG"))
                        
                ServiceDecomposition svcdecomp = mock(ServiceDecomposition.class)
                when(svcdecomp.getServiceVnfs()).thenReturn(vnflst)
@@ -1037,6 +1084,29 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
                return svcdecomp
        }
        
+       private ServiceDecomposition initFilterVnfs(ExecutionEntity mex) {
+               List<VnfResource> vnflst = new LinkedList<>()
+               vnflst.add(makeVnf("", "BRG"))
+               vnflst.add(makeVnf("2", "Tunnel XConn"))
+               vnflst.add(makeVnf("3", ""))
+               vnflst.add(makeVnf("4", "BRG"))
+               vnflst.add(makeVnf("5", "other"))
+                       
+               ServiceDecomposition svcdecomp = mock(ServiceDecomposition.class)
+               when(svcdecomp.getServiceVnfs()).thenReturn(vnflst)
+               
+               when(mex.getVariable(DBGFLAG)).thenReturn("true")
+               when(mex.getVariable("serviceDecomposition")).thenReturn(svcdecomp)
+               when(mex.getVariable("serviceInstanceId")).thenReturn("sii")
+               when(mex.getVariable("serviceInstanceName")).thenReturn("sin")
+               
+               return svcdecomp
+       }
+       
+       private initAwaitAaiDistribution(ExecutionEntity mex) {
+               when(mex.getVariable(DBGFLAG)).thenReturn("true")
+       }
+       
        private ServiceDecomposition initPrepareCreateAllottedResourceTXC(ExecutionEntity mex) {
                ServiceDecomposition svcdecomp = mock(ServiceDecomposition.class)
                List<AllottedResource> arlst = new LinkedList<>()
@@ -1078,13 +1148,13 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
                ModelInfo mod = mock(ModelInfo.class)
                HomingSolution home = mock(HomingSolution.class)
                
-               when(ar.toJsonString()).thenReturn("json"+id)
-               when(ar.getAllottedResourceType()).thenReturn("TunnelXConn")
+               when(ar.toJsonStringNoRootName()).thenReturn("json"+id)
+               when(ar.getAllottedResourceType()).thenReturn("Tunnel XConn")
                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 +1166,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)
                
@@ -1113,10 +1183,10 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
                
                List<VnfResource> vnflst = new LinkedList<>()
                
-               vnflst.add(makeVnf("A"))
-               vnflst.add(makeVnf("B"))
-               vnflst.add(makeVnf("C"))
-               vnflst.add(makeVnf("D"))
+               vnflst.add(makeVnf("A", "BRG"))
+               vnflst.add(makeVnf("B", ""))
+               vnflst.add(makeVnf("C", ""))
+               vnflst.add(makeVnf("D", "Tunnel XConn"))
                
                when(mex.getVariable(DBGFLAG)).thenReturn("true")
                when(mex.getVariable("createVcpeServiceRequest")).thenReturn(request)
@@ -1126,7 +1196,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
                when(mex.getVariable("sdncVersion")).thenReturn("myvers")
        }
        
-       private VnfResource makeVnf(String id) {                
+       private VnfResource makeVnf(String id, String role) {           
                ModelInfo mod = mock(ModelInfo.class)           
                VnfResource vnf = mock(VnfResource.class)
                
@@ -1134,8 +1204,9 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
                
                when(vnf.toString()).thenReturn("myvnf"+id)
                when(vnf.getModelInfo()).thenReturn(mod)
+               when(vnf.getNfRole()).thenReturn(role)
 
-               return vnf              
+               return vnf
        }
        
        private initValidateVnfCreate(ExecutionEntity mex) {
@@ -1193,6 +1264,6 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
        
        private initProcessJavaException(ExecutionEntity mex) {
                when(mex.getVariable(DBGFLAG)).thenReturn("true")
-       }\r
-               \r
+       }
+               
 }