[MSO-8] Additional fixes for the second rebase

DB fixes + BPMN flows and groovy fixes + Fix issue with CloudConfig file
not reloaded properly when it's wrong (JSON error or model hierarchy
mistake) at MSO startup

Change-Id: I2853030b78499e2a761706b643ea210955e72de3
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

[MSO-8] Restore files removed in patch set 2

Those groovy files must be there

Change-Id: I9a47ac3d9c8fc06774a1b8f518491b1b0b00af04
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

13 files changed, 1586 insertions, 1373 deletions

diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/AaiUtilTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/AaiUtilTest.groovy
index 8a5f9e96cd..19d21275be 100644
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/AaiUtilTest.groovy
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/AaiUtilTest.groovy
@@ -1,305 +1,385 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.bpmn.common.scripts;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*
-
-import org.mockito.MockitoAnnotations
-import org.mockito.runners.MockitoJUnitRunner
-import org.mockito.internal.debugging.MockitoDebuggerImpl
-import org.junit.Before
-import org.openecomp.mso.bpmn.common.scripts.AaiUtil;
-import org.junit.Rule;
-import org.junit.Test
-import org.junit.Ignore
-import org.junit.runner.RunWith
-import org.junit.Before;
-import org.junit.Test;
-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.impl.pvm.process.ProcessDefinitionImpl
-import org.camunda.bpm.engine.repository.ProcessDefinition
-
-@RunWith(MockitoJUnitRunner.class)
-class AaiUtilTest extends MsoGroovyTest {
-
-	@Test
-	public void testGetVersionDefault() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')
-		assertEquals('8', version)
-	}
-
-	@Test
-	public void testGetVersionResourceSpecific() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_l3_network_version")).thenReturn('7')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')
-		assertEquals('7', version)
-	}
-
-	@Test
-	public void testGetVersionFlowSpecific() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_custom_CreateAAIVfModule_aai_version")).thenReturn('6')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_l3_network_version")).thenReturn('7')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')
-		assertEquals('6', version)
-	}
-
-	@Test(expected=java.lang.Exception.class)
-	public void testGetVersionNotDefined() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')
-	}
-
-	@Test
-	public void testGetUriDefaultVersion() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_l3_network_uri")).thenReturn('/aai/v8/network/l3-networks/l3-network')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getUri(mockExecution, 'l3-network')
-		assertEquals('/aai/v8/network/l3-networks/l3-network', uri)
-	}
-
-	@Test
-	public void testGetUriFlowAndResourceSpecific() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_CreateAAIVfModule_aai_l3_network_uri")).thenReturn('/aai/v6/network/l3-networks/l3-network')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_l3_network_uri")).thenReturn('/aai/v8/network/l3-networks/l3-network')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getUri(mockExecution, 'l3-network')
-		assertEquals('/aai/v6/network/l3-networks/l3-network', uri)
-	}
-
-	@Test
-	public void testGetNetworkGenericVnfEndpoint() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_generic_vnf_uri")).thenReturn('/aai/v8/network/generic-vnfs/generic-vnf')
-		when(mockExecution.getVariable('URN_aai_endpoint')).thenReturn('http://localhost:28090')
-
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def endpoint = aaiUtil.getNetworkGenericVnfEndpoint(mockExecution)
-		assertEquals('http://localhost:28090/aai/v8/network/generic-vnfs/generic-vnf', endpoint)
-	}
-
-	@Test
-	public void testGetNetworkGenericVnfUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_generic_vnf_uri")).thenReturn('/aai/v8/network/generic-vnfs/generic-vnf')
-
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getNetworkGenericVnfUri(mockExecution)
-		assertEquals('/aai/v8/network/generic-vnfs/generic-vnf', uri)
-	}
-
-	@Test
-	public void testGetNetworkVpnBindingUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_vpn_binding_uri")).thenReturn('/aai/v8/network/vpn-bindings/vpn-binding')
-
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getNetworkVpnBindingUri(mockExecution)
-		assertEquals('/aai/v8/network/vpn-bindings/vpn-binding', uri)
-	}
-
-	@Test
-	public void testGetNetworkPolicyUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_network_policy_uri")).thenReturn('/aai/v8/network/network-policies/network-policy')
-
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getNetworkPolicyUri(mockExecution)
-		assertEquals('/aai/v8/network/network-policies/network-policy', uri)
-	}
-
-	@Test
-	public void testGetNetworkTableReferencesUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_route_table_reference_uri")).thenReturn('/aai/v8/network/route-table-references/route-table-reference')
-
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getNetworkTableReferencesUri(mockExecution)
-		assertEquals('/aai/v8/network/route-table-references/route-table-reference', uri)
-	}
-
-	@Test
-	public void testGetNetworkVceUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_vce_uri")).thenReturn('/aai/v8/network/vces/vce')
-
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getNetworkVceUri(mockExecution)
-		assertEquals('/aai/v8/network/vces/vce', uri)
-	}
-
-	@Test
-	public void testGetNetworkL3NetworkUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_l3_network_uri")).thenReturn('/aai/v8/network/l3-networks/l3-network')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getNetworkL3NetworkUri(mockExecution)
-		assertEquals('/aai/v8/network/l3-networks/l3-network', uri)
-	}
-
-	@Test
-	public void testGetBusinessCustomerUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_customer_uri")).thenReturn('/aai/v8/business/customers/customer')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getBusinessCustomerUri(mockExecution)
-		assertEquals('/aai/v8/business/customers/customer', uri)
-	}
-
-	@Test
-	public void testGetCloudInfrastructureCloudRegionEndpoint() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_cloud_region_uri")).thenReturn('/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic')
-		when(mockExecution.getVariable('URN_aai_endpoint')).thenReturn('http://localhost:28090')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getCloudInfrastructureCloudRegionEndpoint(mockExecution)
-		assertEquals('http://localhost:28090/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic', uri)
-	}
-
-	@Test
-	public void testGetCloudInfrastructureCloudRegionUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_cloud_region_uri")).thenReturn('/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getCloudInfrastructureCloudRegionUri(mockExecution)
-		assertEquals('/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic', uri)
-	}
-
-	@Test
-	public void testGetCloudInfrastructureTenantUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_tenant_uri")).thenReturn('/aai/v8/cloud-infrastructure/tenants/tenant')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getCloudInfrastructureTenantUri(mockExecution)
-		assertEquals('/aai/v8/cloud-infrastructure/tenants/tenant', uri)
-	}
-
-	@Test
-	public void testGetSearchNodesQueryUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_nodes_query_uri")).thenReturn('/aai/v8/search/nodes-query')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getSearchNodesQueryUri(mockExecution)
-		assertEquals('/aai/v8/search/nodes-query', uri)
-	}
-
-	@Test
-	public void testGetSearchNodesQueryEndpoint() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_nodes_query_uri")).thenReturn('/aai/v8/search/nodes-query')
-		when(mockExecution.getVariable('URN_aai_endpoint')).thenReturn('http://localhost:28090')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getSearchNodesQueryEndpoint(mockExecution)
-		assertEquals('http://localhost:28090/aai/v8/search/nodes-query', uri)
-	}
-
-	@Test
-	public void testGetSearchGenericQueryUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_generic_query_uri")).thenReturn('/aai/v8/search/generic-query')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getSearchGenericQueryUri(mockExecution)
-		assertEquals('/aai/v8/search/generic-query', uri)
-	}
-
-	@Test
-	public void testGetNamespaceFromUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def ns = aaiUtil.getNamespaceFromUri('/aai/v6/search/generic-query')
-		assertEquals('http://org.openecomp.aai.inventory/v6', ns)
-	}
-
-}
+/*- 

+ * ============LICENSE_START======================================================= 

+ * OPENECOMP - MSO 

+ * ================================================================================ 

+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. 

+ * ================================================================================ 

+ * Licensed under the Apache License, Version 2.0 (the "License"); 

+ * you may not use this file except in compliance with the License. 

+ * You may obtain a copy of the License at 

+ * 

+ *      http://www.apache.org/licenses/LICENSE-2.0 

+ * 

+ * Unless required by applicable law or agreed to in writing, software 

+ * distributed under the License is distributed on an "AS IS" BASIS, 

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 

+ * See the License for the specific language governing permissions and 

+ * limitations under the License. 

+ * ============LICENSE_END========================================================= 

+ */ 

+

+package org.openecomp.mso.bpmn.common.scripts;

+

+import static org.junit.Assert.*;

+import static org.mockito.Mockito.*

+

+import org.openecomp.mso.rest.HttpHeader

+import org.mockito.MockitoAnnotations

+import org.mockito.runners.MockitoJUnitRunner

+import org.mockito.internal.debugging.MockitoDebuggerImpl

+import org.junit.Before

+import org.openecomp.mso.bpmn.common.scripts.AaiUtil;

+import org.junit.Rule;

+import org.junit.Test

+import org.junit.Ignore

+import org.junit.runner.RunWith

+import org.junit.Before;

+import org.junit.Test;

+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.impl.pvm.process.ProcessDefinitionImpl

+import org.camunda.bpm.engine.repository.ProcessDefinition

+

+@RunWith(MockitoJUnitRunner.class)

+class AaiUtilTest extends MsoGroovyTest {

+	

+	@Test

+	public void testGetVersionDefault() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')

+		assertEquals('8', version)

+	}

+	

+	@Test

+	public void testGetVersionResourceSpecific() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_l3_network_version")).thenReturn('7')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')

+		assertEquals('7', version)

+	}

+

+	@Test

+	public void testGetVersionFlowSpecific() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_custom_CreateAAIVfModule_aai_version")).thenReturn('6')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_l3_network_version")).thenReturn('7')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')

+		assertEquals('6', version)

+	}

+

+	@Test(expected=java.lang.Exception.class)

+	public void testGetVersionNotDefined() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')

+	}

+	

+	@Test

+	public void testGetUriDefaultVersion() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_l3_network_uri")).thenReturn('/aai/v8/network/l3-networks/l3-network')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getUri(mockExecution, 'l3-network')

+		assertEquals('/aai/v8/network/l3-networks/l3-network', uri)

+	}

+	

+	@Test

+	public void testGetUriFlowAndResourceSpecific() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_CreateAAIVfModule_aai_l3_network_uri")).thenReturn('/aai/v6/network/l3-networks/l3-network')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_l3_network_uri")).thenReturn('/aai/v8/network/l3-networks/l3-network')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getUri(mockExecution, 'l3-network')

+		assertEquals('/aai/v6/network/l3-networks/l3-network', uri)

+	}

+	

+	@Test

+	public void testGetNetworkGenericVnfEndpoint() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_generic_vnf_uri")).thenReturn('/aai/v8/network/generic-vnfs/generic-vnf')

+		when(mockExecution.getVariable('URN_aai_endpoint')).thenReturn('http://localhost:28090')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def endpoint = aaiUtil.getNetworkGenericVnfEndpoint(mockExecution)

+		assertEquals('http://localhost:28090/aai/v8/network/generic-vnfs/generic-vnf', endpoint)

+	}

+	

+	@Test

+	public void testGetNetworkGenericVnfUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_generic_vnf_uri")).thenReturn('/aai/v8/network/generic-vnfs/generic-vnf')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getNetworkGenericVnfUri(mockExecution)

+		assertEquals('/aai/v8/network/generic-vnfs/generic-vnf', uri)

+	}

+	

+	@Test

+	public void testGetNetworkVpnBindingUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_vpn_binding_uri")).thenReturn('/aai/v8/network/vpn-bindings/vpn-binding')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getNetworkVpnBindingUri(mockExecution)

+		assertEquals('/aai/v8/network/vpn-bindings/vpn-binding', uri)

+	}

+

+	@Test

+	public void testGetNetworkPolicyUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_network_policy_uri")).thenReturn('/aai/v8/network/network-policies/network-policy')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getNetworkPolicyUri(mockExecution)

+		assertEquals('/aai/v8/network/network-policies/network-policy', uri)

+	}

+	

+	@Test

+	public void testGetNetworkTableReferencesUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_route_table_reference_uri")).thenReturn('/aai/v8/network/route-table-references/route-table-reference')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getNetworkTableReferencesUri(mockExecution)

+		assertEquals('/aai/v8/network/route-table-references/route-table-reference', uri)

+	}

+	

+	@Test

+	public void testGetNetworkVceUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_vce_uri")).thenReturn('/aai/v8/network/vces/vce')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getNetworkVceUri(mockExecution)

+		assertEquals('/aai/v8/network/vces/vce', uri)

+	}

+	

+	@Test

+	public void testGetNetworkL3NetworkUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_l3_network_uri")).thenReturn('/aai/v8/network/l3-networks/l3-network')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getNetworkL3NetworkUri(mockExecution)

+		assertEquals('/aai/v8/network/l3-networks/l3-network', uri)

+	}

+	

+	@Test

+	public void testGetBusinessCustomerUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_customer_uri")).thenReturn('/aai/v8/business/customers/customer')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getBusinessCustomerUri(mockExecution)

+		assertEquals('/aai/v8/business/customers/customer', uri)

+	}

+	

+	@Test

+	public void testGetCloudInfrastructureCloudRegionEndpoint() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_cloud_region_uri")).thenReturn('/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic')

+		when(mockExecution.getVariable('URN_aai_endpoint')).thenReturn('http://localhost:28090')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getCloudInfrastructureCloudRegionEndpoint(mockExecution)

+		assertEquals('http://localhost:28090/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic', uri)

+	}

+	

+	@Test

+	public void testGetCloudInfrastructureCloudRegionUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_cloud_region_uri")).thenReturn('/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getCloudInfrastructureCloudRegionUri(mockExecution)

+		assertEquals('/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic', uri)

+	}

+	

+	@Test

+	public void testGetCloudInfrastructureTenantUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_tenant_uri")).thenReturn('/aai/v8/cloud-infrastructure/tenants/tenant')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getCloudInfrastructureTenantUri(mockExecution)

+		assertEquals('/aai/v8/cloud-infrastructure/tenants/tenant', uri)

+	}

+	

+	@Test

+	public void testGetSearchNodesQueryUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_nodes_query_uri")).thenReturn('/aai/v8/search/nodes-query')

+		when(mockExecution.getVariable('URN_aai_endpoint')).thenReturn('http://localhost:28090')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getSearchNodesQueryUri(mockExecution)

+		assertEquals('/aai/v8/search/nodes-query', uri)

+	}

+	

+	@Test

+	public void testGetSearchNodesQueryEndpoint() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_nodes_query_uri")).thenReturn('/aai/v8/search/nodes-query')

+		when(mockExecution.getVariable('URN_aai_endpoint')).thenReturn('http://localhost:28090')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getSearchNodesQueryEndpoint(mockExecution)

+		assertEquals('http://localhost:28090/aai/v8/search/nodes-query', uri)

+	}

+	

+	@Test

+	public void testGetSearchGenericQueryUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_generic_query_uri")).thenReturn('/aai/v8/search/generic-query')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getSearchGenericQueryUri(mockExecution)

+		assertEquals('/aai/v8/search/generic-query', uri)

+	}

+	

+	@Test

+	public void testGetNamespaceFromUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('6')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v6_l3_network_uri")).thenReturn('/aai/v6/network/l3-networks/l3-network')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getNetworkL3NetworkUri(mockExecution)  // Required to populate the namespace in the class

+		def ns = aaiUtil.getNamespaceFromUri('/aai/v6/search/generic-query')

+		assertEquals('http://org.openecomp.aai.inventory/v6', ns)

+	}

+	

+	@Test

+	public void testGetNamespaceFromUri2() {

+		   ExecutionEntity mockExecution = setupMock('DeleteVfModuleVolumeInfraV1')

+		   //

+		   when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		   when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('10')

+		   when(mockExecution.getVariable("URN_mso_workflow_default_aai_v10_l3_network_uri")).thenReturn('/aai/v10/network/l3-networks/l3-network')

+		   when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		   //

+		   when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		   CreateAAIVfModule myproc = new CreateAAIVfModule()

+		   AaiUtil aaiUtil = new AaiUtil(myproc)

+		   def uri = aaiUtil.getNetworkL3NetworkUri(mockExecution)  // Required to populate the namespace in the class

+		   def ns = aaiUtil.getNamespaceFromUri('/aai/v10/search/generic-query')

+		   assertEquals('http://org.openecomp.aai.inventory/v10', ns)

+	}

+	

+	@Test

+	public void testGetNamespaceFromUri3() {

+		   ExecutionEntity mockExecution = setupMock('DeleteVfModuleVolumeInfraV1')

+		   //

+		   when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		   when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('100')

+		   when(mockExecution.getVariable("URN_mso_workflow_default_aai_v100_l3_network_uri")).thenReturn('/aai/v100/network/l3-networks/l3-network')

+		   when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		   //

+		   when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		   CreateAAIVfModule myproc = new CreateAAIVfModule()

+		   AaiUtil aaiUtil = new AaiUtil(myproc)

+		   def uri = aaiUtil.getNetworkL3NetworkUri(mockExecution)  // Required to populate the namespace in the class

+		   def ns = aaiUtil.getNamespaceFromUri('/aai/v100/search/generic-query')

+		   assertEquals('http://org.openecomp.aai.inventory/v100', ns)

+	}

+

+	@Test

+	public void testGetNamespaceFromUri_twoArguments() {  // (execution, uri)

+		   ExecutionEntity mockExecution = setupMock('DeleteVfModuleVolumeInfraV1')

+		   //

+		   when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		   when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('10')

+		   when(mockExecution.getVariable("URN_mso_workflow_default_aai_v10_l3_network_uri")).thenReturn('/aai/v10/network/l3-networks/l3-network')

+		   when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		   //

+		   when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		   CreateAAIVfModule myproc = new CreateAAIVfModule()

+		   AaiUtil aaiUtil = new AaiUtil(myproc)

+		   def ns = aaiUtil.getNamespaceFromUri(mockExecution,'/aai/v10/search/generic-query')

+		   assertEquals('http://org.openecomp.aai.inventory/v10', ns)

+	}

+}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CreateAAIVfModuleVolumeGroupTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CreateAAIVfModuleVolumeGroupTest.java
index f1a2d7b4e2..e2942c9db5 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CreateAAIVfModuleVolumeGroupTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CreateAAIVfModuleVolumeGroupTest.java
@@ -1,136 +1,136 @@
-/*- 
- * ============LICENSE_START======================================================= 
- * OPENECOMP - MSO 
- * ================================================================================ 
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. 
- * ================================================================================ 
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
- * You may obtain a copy of the License at 
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0 
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
- * limitations under the License. 
- * ============LICENSE_END========================================================= 
- */ 
-
-package org.openecomp.mso.bpmn.common;
-
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdWithPriority;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetVfModuleId;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutVfModuleIdNoResponse;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.camunda.bpm.engine.test.Deployment;
-import org.junit.Assert;
-import org.junit.Test;
-import org.openecomp.mso.bpmn.mock.FileUtil;
-
-/**
- * Unit tests for CreateAAIVfModuleVolumeGroup.bpmn.
- */
-public class CreateAAIVfModuleVolumeGroupTest extends WorkflowTest {
-		
-	/**
-	 * Test the happy path through the flow.
-	 */
-	@Test	
-	@Deployment(resources = {
-			"subprocess/CreateAAIVfModuleVolumeGroup.bpmn"
-		})
-	public void happyPath() throws IOException {
-		
-		logStart();
-		
-		String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/CreateAAIVfModuleVolumeGroupRequest.xml"); 
-		MockGetGenericVnfByIdWithPriority("skask", "lukewarm", 200, "VfModularity/VfModule-lukewarm.xml", 2);
-		MockPutVfModuleIdNoResponse("skask", "PCRF", "lukewarm");
-		
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<String, Object>();
-		variables.put("mso-request-id", "999-99-9999");
-		variables.put("isDebugLogEnabled","true");
-		variables.put("CreateAAIVfModuleVolumeGroupRequest", updateAAIVfModuleRequest);
-		invokeSubProcess("CreateAAIVfModuleVolumeGroup", businessKey, variables);
-		
-		Assert.assertTrue(isProcessEnded(businessKey));
-		String response = (String) getVariableFromHistory(businessKey, "CAAIVfModVG_updateVfModuleResponse");
-		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "CAAIVfModVG_updateVfModuleResponseCode");
-		System.out.println("Subflow response code: " + responseCode);
-		System.out.println("Subflow response: " + response);
-		Assert.assertEquals(200, responseCode.intValue());
-		
-		logEnd();
-	}
-
-	/**
-	 * Test the case where the GET to AAI returns a 404.
-	 */
-	@Test	
-	@Deployment(resources = {
-			"subprocess/CreateAAIVfModuleVolumeGroup.bpmn"
-		})
-	public void badGet() throws IOException {
-		
-		logStart();
-		
-		String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/CreateAAIVfModuleVolumeGroupRequest.xml"); 
-		MockGetVfModuleId("skask", ".*", "VfModularity/VfModule-supercool.xml", 404);
-		
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<String, Object>();
-		variables.put("mso-request-id", "999-99-9999");
-		variables.put("isDebugLogEnabled","true");
-		variables.put("CreateAAIVfModuleVolumeGroupRequest", updateAAIVfModuleRequest);
-		invokeSubProcess("CreateAAIVfModuleVolumeGroup", businessKey, variables);
-		
-		Assert.assertTrue(isProcessEnded(businessKey));
-		String response = (String) getVariableFromHistory(businessKey, "CAAIVfModVG_getVfModuleResponse");
-		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "CAAIVfModVG_getVfModuleResponseCode");
-		System.out.println("Subflow response code: " + responseCode);
-		System.out.println("Subflow response: " + response);
-		Assert.assertEquals(404, responseCode.intValue());
-		
-		logEnd();
-	}
-
-	/**
-	 * Test the case where the GET to AAI is successful, but he subsequent PUT returns 404.
-	 */
-	@Test	
-	@Deployment(resources = {
-			"subprocess/CreateAAIVfModuleVolumeGroup.bpmn"
-		})
-	public void badPut() throws IOException {
-		
-		logStart();
-		
-		String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/CreateAAIVfModuleVolumeGroupRequest.xml"); 
-		MockGetVfModuleId("skask", "lukewarm", "VfModularity/VfModule-lukewarm.xml", 200);
-		
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<String, Object>();
-		variables.put("mso-request-id", "999-99-9999");
-		variables.put("isDebugLogEnabled","true");
-		variables.put("CreateAAIVfModuleVolumeGroupRequest", updateAAIVfModuleRequest);
-		invokeSubProcess("CreateAAIVfModuleVolumeGroup", businessKey, variables);
-		
-		Assert.assertTrue(isProcessEnded(businessKey));
-		String response = (String) getVariableFromHistory(businessKey, "CAAIVfModVG_updateVfModuleResponse");
-		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "CAAIVfModVG_updateVfModuleResponseCode");
-		System.out.println("Subflow response code: " + responseCode);
-		System.out.println("Subflow response: " + response);
-		Assert.assertEquals(404, responseCode.intValue());
-		
-		logEnd();
-	}
-}
-
+/*- 

+ * ============LICENSE_START======================================================= 

+ * OPENECOMP - MSO 

+ * ================================================================================ 

+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. 

+ * ================================================================================ 

+ * Licensed under the Apache License, Version 2.0 (the "License"); 

+ * you may not use this file except in compliance with the License. 

+ * You may obtain a copy of the License at 

+ * 

+ *      http://www.apache.org/licenses/LICENSE-2.0 

+ * 

+ * Unless required by applicable law or agreed to in writing, software 

+ * distributed under the License is distributed on an "AS IS" BASIS, 

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 

+ * See the License for the specific language governing permissions and 

+ * limitations under the License. 

+ * ============LICENSE_END========================================================= 

+ */ 

+

+package org.openecomp.mso.bpmn.common;

+

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdWithPriority;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetVfModuleId;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutVfModuleIdNoResponse;

+

+import java.io.IOException;

+import java.util.HashMap;

+import java.util.Map;

+import java.util.UUID;

+

+import org.camunda.bpm.engine.test.Deployment;

+import org.junit.Assert;

+import org.junit.Test;

+import org.openecomp.mso.bpmn.mock.FileUtil;

+

+/**

+ * Unit tests for CreateAAIVfModuleVolumeGroup.bpmn.

+ */

+public class CreateAAIVfModuleVolumeGroupTest extends WorkflowTest {

+		

+	/**

+	 * Test the happy path through the flow.

+	 */

+	@Test	

+	@Deployment(resources = {

+			"subprocess/CreateAAIVfModuleVolumeGroup.bpmn"

+		})

+	public void happyPath() throws IOException {

+		

+		logStart();

+		

+		String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/CreateAAIVfModuleVolumeGroupRequest.xml"); 

+		MockGetGenericVnfByIdWithPriority("skask", "lukewarm", 200, "VfModularity/VfModule-lukewarm.xml", 2);

+		MockPutVfModuleIdNoResponse("skask", "PCRF", "lukewarm");

+		

+		String businessKey = UUID.randomUUID().toString();

+		Map<String, Object> variables = new HashMap<String, Object>();

+		variables.put("mso-request-id", "999-99-9999");

+		variables.put("isDebugLogEnabled","true");

+		variables.put("CreateAAIVfModuleVolumeGroupRequest", updateAAIVfModuleRequest);

+		invokeSubProcess("CreateAAIVfModuleVolumeGroup", businessKey, variables);

+		

+		Assert.assertTrue(isProcessEnded(businessKey));

+		String response = (String) getVariableFromHistory(businessKey, "CAAIVfModVG_updateVfModuleResponse");

+		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "CAAIVfModVG_updateVfModuleResponseCode");

+		System.out.println("Subflow response code: " + responseCode);

+		System.out.println("Subflow response: " + response);

+		Assert.assertEquals(200, responseCode.intValue());

+		

+		logEnd();

+	}

+

+	/**

+	 * Test the case where the GET to AAI returns a 404.

+	 */

+	@Test	

+	@Deployment(resources = {

+			"subprocess/CreateAAIVfModuleVolumeGroup.bpmn"

+		})

+	public void badGet() throws IOException {

+		

+		logStart();

+		

+		String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/CreateAAIVfModuleVolumeGroupRequest.xml"); 

+		MockGetVfModuleId("skask", ".*", "VfModularity/VfModule-supercool.xml", 404);

+		

+		String businessKey = UUID.randomUUID().toString();

+		Map<String, Object> variables = new HashMap<String, Object>();

+		variables.put("mso-request-id", "999-99-9999");

+		variables.put("isDebugLogEnabled","true");

+		variables.put("CreateAAIVfModuleVolumeGroupRequest", updateAAIVfModuleRequest);

+		invokeSubProcess("CreateAAIVfModuleVolumeGroup", businessKey, variables);

+		

+		Assert.assertTrue(isProcessEnded(businessKey));

+		String response = (String) getVariableFromHistory(businessKey, "CAAIVfModVG_getVfModuleResponse");

+		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "CAAIVfModVG_getVfModuleResponseCode");

+		System.out.println("Subflow response code: " + responseCode);

+		System.out.println("Subflow response: " + response);

+		Assert.assertEquals(404, responseCode.intValue());

+		

+		logEnd();

+	}

+

+	/**

+	 * Test the case where the GET to AAI is successful, but he subsequent PUT returns 404.

+	 */

+	@Test	

+	@Deployment(resources = {

+			"subprocess/CreateAAIVfModuleVolumeGroup.bpmn"

+		})

+	public void badPatch() throws IOException {

+		

+		logStart();

+		

+		String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/CreateAAIVfModuleVolumeGroupRequest.xml"); 

+		MockGetVfModuleId("skask", "lukewarm", "VfModularity/VfModule-lukewarm.xml", 200);

+

+		String businessKey = UUID.randomUUID().toString();

+		Map<String, Object> variables = new HashMap<String, Object>();

+		variables.put("mso-request-id", "999-99-9999");

+		variables.put("isDebugLogEnabled","true");

+		variables.put("CreateAAIVfModuleVolumeGroupRequest", updateAAIVfModuleRequest);

+		invokeSubProcess("CreateAAIVfModuleVolumeGroup", businessKey, variables);

+		

+		Assert.assertTrue(isProcessEnded(businessKey));

+		String response = (String) getVariableFromHistory(businessKey, "CAAIVfModVG_updateVfModuleResponse");

+		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "CAAIVfModVG_updateVfModuleResponseCode");

+		System.out.println("Subflow response code: " + responseCode);

+		System.out.println("Subflow response: " + response);

+		Assert.assertEquals(404, responseCode.intValue());

+		

+		logEnd();

+	}

+}

+

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetServiceTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetServiceTest.java
index 2af42db574..b73ad7ab1c 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetServiceTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetServiceTest.java
@@ -1,505 +1,505 @@
-/*
- * © 2014 AT&T Intellectual Property. All rights reserved. Used under license from AT&T Intellectual Property.
- */
-/*- 
- * ============LICENSE_START======================================================= 
- * OPENECOMP - MSO 
- * ================================================================================ 
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. 
- * ================================================================================ 
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
- * You may obtain a copy of the License at 
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0 
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
- * limitations under the License. 
- * ============LICENSE_END========================================================= 
- */ 
-
-package org.openecomp.mso.bpmn.common;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.openecomp.mso.bpmn.common.BPMNUtil.executeWorkFlow;
-import static org.openecomp.mso.bpmn.common.BPMNUtil.waitForWorkflowToFinish;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceInstance;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceInstance_404;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceInstance_500;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceSubscription;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById_404;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById_500;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceByName;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceByName_404;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceByName_500;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.camunda.bpm.engine.test.Deployment;
-import org.junit.Test;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;
-
-
-/**
- * Unit Test for the GenericGetService Sub Flow
- */
-public class GenericGetServiceTest extends WorkflowTest {
-
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceInstance() throws Exception{
-		MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		assertEquals("true", successIndicator);
-		assertEquals("true", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertNotNull(response);
-		assertEquals(null, workflowException);
-	}
-
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceSubscription() throws Exception{
-
-		MockGetServiceSubscription("1604-MVM-26", "SDN-ETHERNET-INTERNET", "GenericFlows/getServiceSubscription.xml");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesSubscription(variables, "", null , "1604-MVM-26", "SDN-ETHERNET-INTERNET");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-
-		assertEquals("true", successIndicator);
-		assertEquals("true", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertNotNull(response);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceInstance_byName() throws Exception{
-
-		MockNodeQueryServiceInstanceByName("1604-MVM-26", "GenericFlows/getSIUrlByName.xml");
-		MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, null, "1604-MVM-26", null, null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");
-
-		assertEquals("true", successIndicator);
-		assertEquals("true", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("true", byName);
-		assertNotNull(response);
-		assertEquals("200", siUrlResponseCode);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceInstance_byId() throws Exception{
-
-		MockNodeQueryServiceInstanceById("MIS%2F1604%2F0026%2FSW_INTERNET", "GenericFlows/getSIUrlById.xml");
-		MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");
-
-		assertEquals("true", successIndicator);
-		assertEquals("true", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("false", byName);
-		assertNotNull(response);
-		assertEquals("200", siUrlResponseCode);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceInstance_404Response() throws Exception{
-
-		MockGetServiceInstance_404("SDN-ETHERNET-INTERNET", "123456789", "MIS%2F1604%2F0026%2FSW_INTERNET");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceSubscription404() throws Exception{
-		MockGetServiceSubscription("1604-MVM-26", "SDN-ETHERNET-INTERNET", 404);
-		
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesSubscription(variables, "", "", "SDN-ETHERNET-INTERNET", "1604-MVM-26");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertNotNull(response);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceInstanceByName404() throws Exception{
-
-		MockNodeQueryServiceInstanceByName_404("1604-MVM-26");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, "", "1604-MVM-26", null, null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("true", byName);
-		assertEquals("404", siUrlResponseCode);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceInstanceById404() throws Exception{
-
-		MockNodeQueryServiceInstanceById_404("MIS%2F1604%2F0026%2FSW_INTERNET");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals("404", siUrlResponseCode);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceInstanceEmptyResponse() throws Exception{
-
-		MockGetServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET", " ");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceInstanceByNameEmpty() throws Exception{
-		MockNodeQueryServiceInstanceByName("1604-MVM-26", "");
-		
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, "", "1604-MVM-26", null, null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("true", byName);
-		assertEquals("200", siUrlResponseCode);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceInstanceByIdEmpty() throws Exception{
-
-	        MockNodeQueryServiceInstanceById("MIS[%]2F1604[%]2F0026[%]2FSW_INTERNET", "");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals("200", siUrlResponseCode);
-		assertEquals(null, workflowException);
-	}
-
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_error_serviceInstanceInvalidVariables() throws Exception{
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, null, null, "SDN-ETHERNET-INTERNET", null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-
-		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Incoming serviceInstanceId and serviceInstanceName are null. ServiceInstanceId or ServiceInstanceName is required to Get a service-instance.]";
-
-		assertEquals("false", successIndicator);
-		assertEquals("false", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals(expectedWorkflowException, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceSubscriptionInvalidVariables() throws Exception{
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesSubscription(variables, "", "", "SDN-ETHERNET-INTERNET", null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-
-		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Incoming ServiceType or GlobalCustomerId is null. These variables are required to Get a service-subscription.]";
-
-
-		assertEquals("false", successIndicator);
-		assertEquals("false", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals(expectedWorkflowException, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_error_serviceInstance_getSIBadResponse() throws Exception{
-
-		MockGetServiceInstance_500("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "123456789");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-
-		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Received a bad response from AAI]";
-
-		assertEquals("false", successIndicator);
-		assertEquals("false", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals(expectedWorkflowException, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_error_serviceInstance_getUrlByIdBadResponse() throws Exception{
-
-		MockNodeQueryServiceInstanceById_500("MIS%2F1604%2F0026%2FSW_INTERNET");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");
-
-		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Received a bad response from AAI]";
-
-		assertEquals("false", successIndicator);
-		assertEquals("false", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals("500", siUrlResponseCode);
-		assertEquals(expectedWorkflowException, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_error_serviceInstance_getUrlByNameBadResponse() throws Exception{
-
-		MockNodeQueryServiceInstanceByName_500("1604-MVM-26");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, null, "1604-MVM-26", null, null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");
-
-		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Received a bad response from AAI]";
-
-		assertEquals("false", successIndicator);
-		assertEquals("false", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("true", byName);
-		assertEquals("500", siUrlResponseCode);
-		assertEquals(expectedWorkflowException, workflowException);
-	}
-
-
-	private void setVariablesInstance(Map<String, String> variables, String siId, String siName, String globalCustId, String serviceType) {
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("GENGS_serviceInstanceId", siId);
-		variables.put("GENGS_serviceInstanceName", siName);
-		variables.put("GENGS_globalCustomerId",globalCustId);
-		variables.put("GENGS_serviceType", serviceType);
-		variables.put("GENGS_type", "service-instance");
-	}
-
-	private void setVariablesSubscription(Map<String, String> variables, String siId, String siName, String globalCustId, String serviceType) {
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("GENGS_serviceInstanceId", siId);
-		variables.put("GENGS_serviceInstanceName", siName);
-		variables.put("GENGS_globalCustomerId",globalCustId);
-		variables.put("GENGS_serviceType", serviceType);
-		variables.put("GENGS_type", "service-subscription");
-	}
-
-
-}
+/*

+ * © 2014 AT&T Intellectual Property. All rights reserved. Used under license from AT&T Intellectual Property.

+ */

+/*- 

+ * ============LICENSE_START======================================================= 

+ * OPENECOMP - MSO 

+ * ================================================================================ 

+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. 

+ * ================================================================================ 

+ * Licensed under the Apache License, Version 2.0 (the "License"); 

+ * you may not use this file except in compliance with the License. 

+ * You may obtain a copy of the License at 

+ * 

+ *      http://www.apache.org/licenses/LICENSE-2.0 

+ * 

+ * Unless required by applicable law or agreed to in writing, software 

+ * distributed under the License is distributed on an "AS IS" BASIS, 

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 

+ * See the License for the specific language governing permissions and 

+ * limitations under the License. 

+ * ============LICENSE_END========================================================= 

+ */ 

+

+package org.openecomp.mso.bpmn.common;

+

+import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertNotNull;

+import static org.openecomp.mso.bpmn.common.BPMNUtil.executeWorkFlow;

+import static org.openecomp.mso.bpmn.common.BPMNUtil.waitForWorkflowToFinish;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceInstance;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceInstance_404;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceInstance_500;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceSubscription;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById_404;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById_500;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceByName;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceByName_404;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceByName_500;

+

+import java.util.HashMap;

+import java.util.Map;

+

+import org.camunda.bpm.engine.test.Deployment;

+import org.junit.Test;

+import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;

+

+

+/**

+ * Unit Test for the GenericGetService Sub Flow

+ */

+public class GenericGetServiceTest extends WorkflowTest {

+

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceInstance() throws Exception{

+		MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		assertEquals("true", successIndicator);

+		assertEquals("true", found);

+		assertEquals("false", obtainUrl);

+		assertEquals("false", byName);

+		assertNotNull(response);

+		assertEquals(null, workflowException);

+	}

+

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceSubscription() throws Exception{

+

+		MockGetServiceSubscription("1604-MVM-26", "SDN-ETHERNET-INTERNET", "GenericFlows/getServiceSubscription.xml");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesSubscription(variables, "", null , "1604-MVM-26", "SDN-ETHERNET-INTERNET");

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+

+		assertEquals("true", successIndicator);

+		assertEquals("true", found);

+		assertEquals("false", obtainUrl);

+		assertEquals("false", byName);

+		assertNotNull(response);

+		assertEquals(null, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceInstance_byName() throws Exception{

+

+		MockNodeQueryServiceInstanceByName("1604-MVM-26", "GenericFlows/getSIUrlByName.xml");

+		MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, null, "1604-MVM-26", null, null);

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");

+

+		assertEquals("true", successIndicator);

+		assertEquals("true", found);

+		assertEquals("true", obtainUrl);

+		assertEquals("true", byName);

+		assertNotNull(response);

+		assertEquals("200", siUrlResponseCode);

+		assertEquals(null, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceInstance_byId() throws Exception{

+

+		MockNodeQueryServiceInstanceById("MIS%2F1604%2F0026%2FSW_INTERNET", "GenericFlows/getSIUrlById.xml");

+		MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_genericQueryResponseCode");

+

+		assertEquals("true", successIndicator);

+		assertEquals("true", found);

+		assertEquals("true", obtainUrl);

+		assertEquals("false", byName);

+		assertNotNull(response);

+		assertEquals("200", siUrlResponseCode);

+		assertEquals(null, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceInstance_404Response() throws Exception{

+

+		MockGetServiceInstance_404("SDN-ETHERNET-INTERNET", "123456789", "MIS%2F1604%2F0026%2FSW_INTERNET");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+

+		assertEquals("true", successIndicator);

+		assertEquals("false", found);

+		assertEquals("false", obtainUrl);

+		assertEquals("false", byName);

+		assertEquals(null, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceSubscription404() throws Exception{

+		MockGetServiceSubscription("1604-MVM-26", "SDN-ETHERNET-INTERNET", 404);

+		

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesSubscription(variables, "", "", "SDN-ETHERNET-INTERNET", "1604-MVM-26");

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+

+		assertEquals("true", successIndicator);

+		assertEquals("false", found);

+		assertEquals("false", obtainUrl);

+		assertEquals("false", byName);

+		assertNotNull(response);

+		assertEquals(null, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceInstanceByName404() throws Exception{

+

+		MockNodeQueryServiceInstanceByName_404("1604-MVM-26");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, "", "1604-MVM-26", null, null);

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");

+

+		assertEquals("true", successIndicator);

+		assertEquals("false", found);

+		assertEquals("true", obtainUrl);

+		assertEquals("true", byName);

+		assertEquals("404", siUrlResponseCode);

+		assertEquals(null, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceInstanceById404() throws Exception{

+

+		MockNodeQueryServiceInstanceById_404("MIS%2F1604%2F0026%2FSW_INTERNET");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_genericQueryResponseCode");

+

+		assertEquals("true", successIndicator);

+		assertEquals("false", found);

+		assertEquals("true", obtainUrl);

+		assertEquals("false", byName);

+		assertEquals("404", siUrlResponseCode);

+		assertEquals(null, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceInstanceEmptyResponse() throws Exception{

+

+		MockGetServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET", " ");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+

+		assertEquals("true", successIndicator);

+		assertEquals("false", found);

+		assertEquals("false", obtainUrl);

+		assertEquals("false", byName);

+		assertEquals(null, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceInstanceByNameEmpty() throws Exception{

+		MockNodeQueryServiceInstanceByName("1604-MVM-26", "");

+		

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, "", "1604-MVM-26", null, null);

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");

+

+		assertEquals("true", successIndicator);

+		assertEquals("false", found);

+		assertEquals("true", obtainUrl);

+		assertEquals("true", byName);

+		assertEquals("200", siUrlResponseCode);

+		assertEquals(null, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceInstanceByIdEmpty() throws Exception{

+

+	        MockNodeQueryServiceInstanceById("MIS[%]2F1604[%]2F0026[%]2FSW_INTERNET", "");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_genericQueryResponseCode");

+

+		assertEquals("true", successIndicator);

+		assertEquals("false", found);

+		assertEquals("true", obtainUrl);

+		assertEquals("false", byName);

+		assertEquals("200", siUrlResponseCode);

+		assertEquals(null, workflowException);

+	}

+

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_error_serviceInstanceInvalidVariables() throws Exception{

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, null, null, "SDN-ETHERNET-INTERNET", null);

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+

+		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Incoming serviceInstanceId and serviceInstanceName are null. ServiceInstanceId or ServiceInstanceName is required to Get a service-instance.]";

+

+		assertEquals("false", successIndicator);

+		assertEquals("false", found);

+		assertEquals("false", obtainUrl);

+		assertEquals("false", byName);

+		assertEquals(expectedWorkflowException, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceSubscriptionInvalidVariables() throws Exception{

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesSubscription(variables, "", "", "SDN-ETHERNET-INTERNET", null);

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+

+		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Incoming ServiceType or GlobalCustomerId is null. These variables are required to Get a service-subscription.]";

+

+

+		assertEquals("false", successIndicator);

+		assertEquals("false", found);

+		assertEquals("false", obtainUrl);

+		assertEquals("false", byName);

+		assertEquals(expectedWorkflowException, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_error_serviceInstance_getSIBadResponse() throws Exception{

+

+		MockGetServiceInstance_500("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "123456789");

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+

+		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Received a bad response from AAI]";

+

+		assertEquals("false", successIndicator);

+		assertEquals("false", found);

+		assertEquals("false", obtainUrl);

+		assertEquals("false", byName);

+		assertEquals(expectedWorkflowException, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_error_serviceInstance_getUrlByIdBadResponse() throws Exception{

+

+		MockNodeQueryServiceInstanceById_500("MIS%2F1604%2F0026%2FSW_INTERNET");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_genericQueryResponseCode");

+

+		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Received a bad response from AAI]";

+

+		assertEquals("false", successIndicator);

+		assertEquals("false", found);

+		assertEquals("true", obtainUrl);

+		assertEquals("false", byName);

+		assertEquals("500", siUrlResponseCode);

+		assertEquals(expectedWorkflowException, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_error_serviceInstance_getUrlByNameBadResponse() throws Exception{

+

+		MockNodeQueryServiceInstanceByName_500("1604-MVM-26");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, null, "1604-MVM-26", null, null);

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");

+

+		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Received a bad response from AAI]";

+

+		assertEquals("false", successIndicator);

+		assertEquals("false", found);

+		assertEquals("true", obtainUrl);

+		assertEquals("true", byName);

+		assertEquals("500", siUrlResponseCode);

+		assertEquals(expectedWorkflowException, workflowException);

+	}

+

+

+	private void setVariablesInstance(Map<String, String> variables, String siId, String siName, String globalCustId, String serviceType) {

+		variables.put("isDebugLogEnabled", "true");

+		variables.put("GENGS_serviceInstanceId", siId);

+		variables.put("GENGS_serviceInstanceName", siName);

+		variables.put("GENGS_globalCustomerId",globalCustId);

+		variables.put("GENGS_serviceType", serviceType);

+		variables.put("GENGS_type", "service-instance");

+	}

+

+	private void setVariablesSubscription(Map<String, String> variables, String siId, String siName, String globalCustId, String serviceType) {

+		variables.put("isDebugLogEnabled", "true");

+		variables.put("GENGS_serviceInstanceId", siId);

+		variables.put("GENGS_serviceInstanceName", siName);

+		variables.put("GENGS_globalCustomerId",globalCustId);

+		variables.put("GENGS_serviceType", serviceType);

+		variables.put("GENGS_type", "service-subscription");

+	}

+

+

+}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/PrepareUpdateAAIVfModuleTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/PrepareUpdateAAIVfModuleTest.java
index 6fe6df6e11..e2babb7919 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/PrepareUpdateAAIVfModuleTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/PrepareUpdateAAIVfModuleTest.java
@@ -20,10 +20,11 @@
 

 package org.openecomp.mso.bpmn.common;

 

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockAAIVfModuleBadPatch;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdWithDepth;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfById_404;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutGenericVnf;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchVfModuleId;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutGenericVnf;

 

 import java.io.IOException;

 import java.util.HashMap;

@@ -179,14 +180,15 @@ public class PrepareUpdateAAIVfModuleTest extends WorkflowTest {
 	@Deployment(resources = {

 			"subprocess/PrepareUpdateAAIVfModule.bpmn"

 		})

-	public void badPut() throws IOException {

+	public void badPatch() throws IOException {

 		

 		logStart();

 		

 		String prepareUpdateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/PrepareUpdateAAIVfModuleRequest.xml"); 

 		

 		MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");

-			

+		MockAAIVfModuleBadPatch("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/supercool", 404);

+		

 		String businessKey = UUID.randomUUID().toString();

 		Map<String, Object> variables = new HashMap<String, Object>();		

 		variables.put("mso-request-id", "999-99-9999");

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterV1Test.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterV1Test.java
index 846a14f45f..3eb7acd91a 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterV1Test.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterV1Test.java
@@ -33,7 +33,6 @@ import java.util.Map;
 

 import javax.ws.rs.core.Response;

 

-import org.camunda.bpm.engine.MismatchingMessageCorrelationException;

 import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl;

 import org.camunda.bpm.engine.runtime.Job;

 import org.camunda.bpm.engine.test.Deployment;

@@ -44,9 +43,10 @@ import org.openecomp.mso.bpmn.common.adapter.sdnc.CallbackHeader;
 import org.openecomp.mso.bpmn.common.adapter.sdnc.SDNCAdapterCallbackRequest;

 import org.openecomp.mso.bpmn.common.adapter.sdnc.SDNCAdapterResponse;

 import org.openecomp.mso.bpmn.common.workflow.service.SDNCAdapterCallbackServiceImpl;

-import org.openecomp.mso.bpmn.common.workflow.service.SDNCAdapterCallbackServiceImpl.SDNCAdapterExceptionResponse;

+import org.openecomp.mso.bpmn.common.workflow.service.SDNCAdapterCallbackServiceImpl.SDNCAdapterErrorResponse;

 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResource;

 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;

+import org.openecomp.mso.bpmn.core.PropertyConfigurationSetup;

 import org.openecomp.mso.bpmn.mock.FileUtil;

 

 /**

@@ -129,7 +129,7 @@ public class SDNCAdapterV1Test extends WorkflowTest {
 		SDNCAdapterResponse sdncAdapterResponse = callbackService.sdncAdapterCallback(sdncAdapterCallbackRequest);

 		//System.out.println("Back from executing process again");

 

-		assertFalse(sdncAdapterResponse instanceof SDNCAdapterExceptionResponse);

+		assertFalse(sdncAdapterResponse instanceof SDNCAdapterErrorResponse);

 		assertProcessInstanceFinished(pid);

 

 		//System.out.println("SDNCAdapter sunny day flow Completed!");

@@ -167,7 +167,7 @@ public class SDNCAdapterV1Test extends WorkflowTest {
 		SDNCAdapterResponse sdncAdapterResponse = callbackService.sdncAdapterCallback(sdncAdapterCallbackRequest);

 		//System.out.println("Back from executing process again");

 

-		assertFalse(sdncAdapterResponse instanceof SDNCAdapterExceptionResponse);

+		assertFalse(sdncAdapterResponse instanceof SDNCAdapterErrorResponse);

 		assertProcessInstanceNotFinished(pid);

 

 		checkForTimeout(pid);

@@ -212,7 +212,7 @@ public class SDNCAdapterV1Test extends WorkflowTest {
 		SDNCAdapterResponse sdncAdapterResponse = callbackService.sdncAdapterCallback(sdncAdapterCallbackRequest);

 		//System.out.println("Back from executing process again");

 

-		assertFalse(sdncAdapterResponse instanceof SDNCAdapterExceptionResponse);

+		assertFalse(sdncAdapterResponse instanceof SDNCAdapterErrorResponse);

 		assertProcessInstanceNotFinished(pid);

 		assertEquals(true, (Boolean) (getVariable(pid, "continueListening")));

 

@@ -221,7 +221,7 @@ public class SDNCAdapterV1Test extends WorkflowTest {
 		sdncAdapterResponse = callbackService.sdncAdapterCallback(sdncAdapterCallbackRequest);

 		//System.out.println("Back from executing process again");

 

-		assertFalse(sdncAdapterResponse instanceof SDNCAdapterExceptionResponse);

+		assertFalse(sdncAdapterResponse instanceof SDNCAdapterErrorResponse);

 		assertProcessInstanceFinished(pid);

 		assertEquals(false, (Boolean) (getVariable(pid, "continueListening")));

 

@@ -241,10 +241,14 @@ public class SDNCAdapterV1Test extends WorkflowTest {
 	@Deployment(resources = {"subprocess/SDNCAdapterV1.bpmn",

 			"subprocess/GenericNotificationService.bpmn"

 			})

-	public void badCorrelationIdTest() throws InterruptedException {

+	public void badCorrelationIdTest() throws InterruptedException, IOException {

 

 		mockSDNCAdapter(200);

 

+		Map<String, String> urnProperties = PropertyConfigurationSetup.createBpmnUrnProperties();

+		urnProperties.put("mso.correlation.timeout", "5");

+		PropertyConfigurationSetup.addProperties(urnProperties, 10000);

+

 		//System.out.println("SDNCAdapter bad RequestId test Started!");

 

 		ProcessExecutionThread thread = new ProcessExecutionThread(sdncAdapterWorkflowRequest);

@@ -267,8 +271,8 @@ public class SDNCAdapterV1Test extends WorkflowTest {
 		SDNCAdapterResponse sdncAdapterResponse = callbackService.sdncAdapterCallback(sdncAdapterCallbackRequest);

 		//System.out.println("Back from executing process again");

 

-		assertTrue(sdncAdapterResponse instanceof SDNCAdapterExceptionResponse);

-		assertTrue(((SDNCAdapterExceptionResponse) sdncAdapterResponse).getException() instanceof IllegalStateException);

+		assertTrue(sdncAdapterResponse instanceof SDNCAdapterErrorResponse);

+		assertTrue(((SDNCAdapterErrorResponse) sdncAdapterResponse).getError().contains("No process is waiting for sdncAdapterCallbackRequest"));

 		assertProcessInstanceNotFinished(pid);

 

 		//System.out.println("SDNCAdapter bad RequestId test Completed!");

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIGenericVnfTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIGenericVnfTest.java
index 18fb5acbce..1573c8f757 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIGenericVnfTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIGenericVnfTest.java
@@ -20,11 +20,12 @@
 

 package org.openecomp.mso.bpmn.common;

 

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockAAIVfModuleBadPatch;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdWithDepth;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfById_404;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchGenericVnf;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutGenericVnf;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutGenericVnf_Bad;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchGenericVnf;

 

 import java.io.IOException;

 import java.util.HashMap;

@@ -144,7 +145,7 @@ public class UpdateAAIGenericVnfTest extends WorkflowTest {
 	@Deployment(resources = {

 			"subprocess/UpdateAAIGenericVnf.bpmn"

 		})

-	public void badPut() throws IOException {

+	public void badPatch() throws IOException {

 		

 		logStart();

 		

@@ -152,6 +153,7 @@ public class UpdateAAIGenericVnfTest extends WorkflowTest {
 		

 		MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");

 		MockPutGenericVnf_Bad("skask", 404);

+		MockAAIVfModuleBadPatch("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask", 404);

 		

 		String businessKey = UUID.randomUUID().toString();

 		Map<String, Object> variables = new HashMap<String, Object>();

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIVfModuleTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIVfModuleTest.java
index 035f097be2..d081fcc7f6 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIVfModuleTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIVfModuleTest.java
@@ -20,11 +20,12 @@
 

 package org.openecomp.mso.bpmn.common;

 

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockAAIVfModuleBadPatch;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfById;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdWithPriority;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfById_404;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutGenericVnf;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchVfModuleId;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutGenericVnf;

 

 import java.io.IOException;

 import java.util.HashMap;

@@ -111,13 +112,14 @@ public class UpdateAAIVfModuleTest extends WorkflowTest {
 	@Deployment(resources = {

 			"subprocess/UpdateAAIVfModule.bpmn"

 		})

-	public void badPut() throws IOException {

+	public void badPatch() throws IOException {

 		

 		logStart();

 		

 		String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/UpdateAAIVfModuleRequest.xml"); 

 		MockGetGenericVnfById_404("/skask/vf-modules/vf-module/supercool");

 		MockGetGenericVnfById("/skask/vf-modules/vf-module/supercool", "VfModularity/VfModule-supercool.xml", 200);

+		MockAAIVfModuleBadPatch("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/supercool", 404);

 		

 		String businessKey = UUID.randomUUID().toString();

 		Map<String, Object> variables = new HashMap<String, Object>();

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java
index 46bbb72e56..49ad6d6e34 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java
@@ -110,6 +110,16 @@ public class WorkflowTest {
 	public final WireMockRule wireMockRule;

 

 	/**

+	 * Content-Type for XML.

+	 */

+	protected static final String XML = "application/xml";

+

+	/**

+	 * Content-Type for JSON.

+	 */

+	protected static final String JSON = "application/json; charset=UTF-8";

+

+	/**

 	 * Constructor.

 	 */

 	public WorkflowTest() throws RuntimeException {

@@ -197,15 +207,15 @@ public class WorkflowTest {
 	 * @param businessKey a unique key that will identify the process instance

 	 * @param injectedVariables variables to inject into the process

 	 */

-	protected void invokeSubProcess(String processKey, String businessKey,

-			Map<String, Object> injectedVariables) {

+	protected void invokeSubProcess(String processKey, String businessKey, Map<String, Object> injectedVariables) {

 		RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean();

 		List<String> arguments = runtimeMxBean.getInputArguments();

 		System.out.println("JVM args = " + arguments);

 

 		msoRequestId = (String) injectedVariables.get("mso-request-id");

+		String requestId = (String) injectedVariables.get("msoRequestId");

 

-		if (msoRequestId == null) {

+		if (msoRequestId == null && requestId == null) {

 			String msg = "mso-request-id variable was not provided";

 			System.out.println(msg);

 			fail(msg);

@@ -242,7 +252,7 @@ public class WorkflowTest {
 	 * @param injectedVariables optional variables to inject into the process

 	 * @return a TestAsyncResponse object associated with the test

 	 */

-	public TestAsyncResponse invokeAsyncProcess(String processKey,

+	protected TestAsyncResponse invokeAsyncProcess(String processKey,

 			String schemaVersion, String businessKey, String request,

 			Map<String, Object> injectedVariables) {

 

@@ -438,7 +448,7 @@ public class WorkflowTest {
 	 * @param timeout the timeout in milliseconds

 	 * @return the WorkflowResponse

 	 */

-	public WorkflowResponse receiveResponse(String businessKey,

+	protected WorkflowResponse receiveResponse(String businessKey,

 			TestAsyncResponse asyncResponse, long timeout) {

 		System.out.println("Waiting " + timeout + "ms for process with business key " + businessKey

 			+ " to send a response");

@@ -512,24 +522,34 @@ public class WorkflowTest {
 			}

 

 			String content = null;

+			String contentType = null;

 

 			if ("STD".equals(modifier)) {

-				content = callbacks.get(action);

+				CallbackData callbackData = callbacks.get(action);

 

-				if (content == null) {

+				if (callbackData == null) {

 					String msg = "No callback defined for '" + action + "' SDNC request";

 					System.out.println(msg);

 					fail(msg);

 				}

+

+				content = callbackData.getContent();

+				contentType = callbackData.getContentType();

 			} else if ("ERR".equals(modifier)) {

 				content = "{\"SDNCServiceError\":{\"sdncRequestId\":\"((REQUEST-ID))\",\"responseCode\":\"500\",\"responseMessage\":\"SIMULATED ERROR FROM SDNC ADAPTER\",\"ackFinalIndicator\":\"Y\"}}";

+				contentType = JSON;

 			} else {

 				String msg = "Invalid SDNC program modifier: '" + modifier + "'";

 				System.out.println(msg);

 				fail(msg);

 			}

 

-			if (!injectSDNCRestCallback(content, 10000)) {

+			if (contentType == null) {

+				// Default for backward compatibility with existing tests.

+				contentType = JSON;

+			}

+

+			if (!injectSDNCRestCallback(contentType, content, 10000)) {

 				fail("Failed to inject SDNC '" + action + "' callback");

 			}

 

@@ -548,67 +568,14 @@ public class WorkflowTest {
 	 * <pre>

 	 *     event1, event2

 	 * </pre>

+	 * NOTE: Each callback must have a message type associated with it, e.g.

+	 * "SDNCAEvent".

 	 * Errors are handled with junit assertions and will cause the test to fail.

-	 * Defaults the Event Type to "SDNCAEvent" for backward compatibility.

 	 * @param callbacks an object containing event data for the program

 	 * @param program the program to execute

 	 */

 	protected void injectSDNCEvents(CallbackSet callbacks, String program) {

-		injectSDNCEvents(callbacks, program, "SDNCAEvent");

-	}

-

-	/**

-	 * Runs a program to inject SDNC events into the test environment.

-	 * A program is essentially just a list of keys that identify event data

-	 * to be injected, in sequence. An example program:

-	 * <pre>

-	 *     event1, event2

-	 * </pre>

-	 * Errors are handled with junit assertions and will cause the test to fail.

-	 * @param callbacks an object containing event data for the program

-	 * @param program the program to execute

-	 * @param eventType (i.e. "SDNCAEvent", "SNIROResponse", etc.)

-	 */

-	protected void injectSDNCEvents(CallbackSet callbacks, String program, String eventType) {

-

-		String[] cmds = program.replaceAll("\\s+", "").split(",");

-

-		for (String cmd : cmds) {

-			String action = cmd;

-			String modifier = "STD";

-

-			if (cmd.contains(":")) {

-				String[] parts = cmd.split(":");

-				action = parts[0];

-				modifier = parts[1];

-			}

-

-			String content = null;

-

-			if ("STD".equals(modifier)) {

-				content = callbacks.get(action);

-

-				if (content == null) {

-					String msg = "No SDNC event callback defined for '" + action + "'";

-					System.out.println(msg);

-					fail(msg);

-				}

-			} else {

-				String msg = "Invalid SDNC program modifier: '" + modifier + "'";

-				System.out.println(msg);

-				fail(msg);

-			}

-

-			if (!injectWorkflowMessage(eventType, content, 10000)) {

-				fail("Failed to inject SDNC '" + action + "' event");

-			}

-

-			try {

-				Thread.sleep(1000);

-			} catch (InterruptedException e) {

-				fail("Interrupted after injection of SDNC '" + action + "' event");

-			}

-		}

+		injectWorkflowMessages(callbacks, program);

 	}

 

 	/**

@@ -622,7 +589,7 @@ public class WorkflowTest {
 	 * @param callbacks an object containing callback data for the program

 	 * @param program the program to execute

 	 */

-	public void injectSDNCCallbacks(CallbackSet callbacks, String program) {

+	protected void injectSDNCCallbacks(CallbackSet callbacks, String program) {

 

 		String[] cmds = program.replaceAll("\\s+", "").split(",");

 

@@ -641,14 +608,15 @@ public class WorkflowTest {
 			String respMsg = "OK";

 

 			if ("STD".equals(modifier)) {

-				content = callbacks.get(action);

+				CallbackData callbackData = callbacks.get(action);

 

-				if (content == null) {

+				if (callbackData == null) {

 					String msg = "No callback defined for '" + action + "' SDNC request";

 					System.out.println(msg);

 					fail(msg);

 				}

 

+				content = callbackData.getContent();

 				respCode = 200;

 				respMsg = "OK";

 			} else if ("ERR".equals(modifier)) {

@@ -684,7 +652,7 @@ public class WorkflowTest {
 	 * @param callbacks an object containing callback data for the program

 	 * @param program the program to execute

 	 */

-	public void injectVNFRestCallbacks(CallbackSet callbacks, String program) {

+	protected void injectVNFRestCallbacks(CallbackSet callbacks, String program) {

 

 		String[] cmds = program.replaceAll("\\s+", "").split(",");

 

@@ -699,24 +667,34 @@ public class WorkflowTest {
 			}

 

 			String content = null;

+			String contentType = null;

 

 			if ("STD".equals(modifier)) {

-				content = callbacks.get(action);

+				CallbackData callbackData = callbacks.get(action);

 

-				if (content == null) {

+				if (callbackData == null) {

 					String msg = "No callback defined for '" + action + "' VNF REST request";

 					System.out.println(msg);

 					fail(msg);

 				}

+

+				content = callbackData.getContent();

+				contentType = callbackData.getContentType();

 			} else if ("ERR".equals(modifier)) {

 				content = "SIMULATED ERROR FROM VNF ADAPTER";

+				contentType = "text/plain";

 			} else {

 				String msg = "Invalid VNF REST program modifier: '" + modifier + "'";

 				System.out.println(msg);

 				fail(msg);

 			}

 

-			if (!injectVnfAdapterRestCallback(content, 10000)) {

+			if (contentType == null) {

+				// Default for backward compatibility with existing tests.

+				contentType = XML;

+			}

+

+			if (!injectVnfAdapterRestCallback(contentType, content, 10000)) {

 				fail("Failed to inject VNF REST '" + action + "' callback");

 			}

 

@@ -756,14 +734,15 @@ public class WorkflowTest {
 			String content = null;

 

 			if ("STD".equals(modifier)) {

-				content = callbacks.get(action);

+				CallbackData callbackData = callbacks.get(action);

 

-				if (content == null) {

+				if (callbackData == null) {

 					String msg = "No callback defined for '" + action + "' VNF request";

 					System.out.println(msg);

 					fail(msg);

 				}

 

+				content = callbackData.getContent();

 			} else if ("ERR".equals(modifier)) {

 				String msg = "Currently unsupported VNF program modifier: '" + modifier + "'";

 				System.out.println(msg);

@@ -805,7 +784,7 @@ public class WorkflowTest {
 	 * @param count the desired count

 	 * @param timeout the timeout in milliseconds

 	 */

-	public void waitForRunningProcessCount(String processKey, int count, long timeout) {

+	protected void waitForRunningProcessCount(String processKey, int count, long timeout) {

 		System.out.println("Waiting " + timeout + "ms for there to be " + count + " "

 			+ processKey + " instances");

 

@@ -916,11 +895,12 @@ public class WorkflowTest {
 	 * may contain the placeholder string ((REQUEST-ID)) which is replaced with

 	 * the actual SDNC request ID. Note: this is not the requestId in the original

 	 * MSO request.

+	 * @param contentType the HTTP content type for the callback

 	 * @param content the content of the callback

 	 * @param timeout the timeout in milliseconds

 	 * @return true if the callback could be injected, false otherwise

 	 */

-	protected boolean injectSDNCRestCallback(String content, long timeout) {

+	protected boolean injectSDNCRestCallback(String contentType, String content, long timeout) {

 		String sdncRequestId = (String) getProcessVariable("SDNCAdapterRestV1",

 			"SDNCAResponse_CORRELATOR", timeout);

 

@@ -935,7 +915,7 @@ public class WorkflowTest {
 		System.out.println("Injecting SDNC adapter callback");

 		WorkflowMessageResource workflowMessageResource = new WorkflowMessageResource();

 		workflowMessageResource.setProcessEngineServices4junit(processEngineRule);

-		Response response = workflowMessageResource.deliver("SDNCAResponse", sdncRequestId, content);

+		Response response = workflowMessageResource.deliver(contentType, "SDNCAResponse", sdncRequestId, content);

 		System.out.println("Workflow response to SDNC adapter callback: " + response);

 		return true;

 	}

@@ -986,11 +966,12 @@ public class WorkflowTest {
 	 * may contain the placeholder string ((MESSAGE-ID)) which is replaced with

 	 * the actual message ID. Note: this is not the requestId in the original

 	 * MSO request.

+	 * @param contentType the HTTP content type for the callback

 	 * @param content the content of the callback

 	 * @param timeout the timeout in milliseconds

 	 * @return true if the callback could be injected, false otherwise

 	 */

-	protected boolean injectVnfAdapterRestCallback(String content, long timeout) {

+	protected boolean injectVnfAdapterRestCallback(String contentType, String content, long timeout) {

 		String messageId = (String) getProcessVariable("vnfAdapterRestV1",

 			"VNFAResponse_CORRELATOR", timeout);

 

@@ -1005,7 +986,7 @@ public class WorkflowTest {
 		System.out.println("Injecting VNF adapter callback");

 		WorkflowMessageResource workflowMessageResource = new WorkflowMessageResource();

 		workflowMessageResource.setProcessEngineServices4junit(processEngineRule);

-		Response response = workflowMessageResource.deliver("VNFAResponse", messageId, content);

+		Response response = workflowMessageResource.deliver(contentType, "VNFAResponse", messageId, content);

 		System.out.println("Workflow response to VNF adapter callback: " + response);

 		return true;

 	}

@@ -1308,15 +1289,83 @@ public class WorkflowTest {
 	}

 

 	/**

+	 * Runs a program to inject workflow messages into the test environment.

+	 * A program is essentially just a list of keys that identify event data

+	 * to be injected, in sequence. An example program:

+	 * <pre>

+	 *     event1, event2

+	 * </pre>

+	 * Errors are handled with junit assertions and will cause the test to fail.

+	 * NOTE: Each callback must have a workflow message type associated with it.

+	 * @param callbacks an object containing event data for the program

+	 * @param program the program to execute

+	 */

+	protected void injectWorkflowMessages(CallbackSet callbacks, String program) {

+

+		String[] cmds = program.replaceAll("\\s+", "").split(",");

+

+		for (String cmd : cmds) {

+			String action = cmd;

+			String modifier = "STD";

+

+			if (cmd.contains(":")) {

+				String[] parts = cmd.split(":");

+				action = parts[0];

+				modifier = parts[1];

+			}

+

+			String messageType = null;

+			String content = null;

+			String contentType = null;

+

+			if ("STD".equals(modifier)) {

+				CallbackData callbackData = callbacks.get(action);

+

+				if (callbackData == null) {

+					String msg = "No '" + action + "' workflow message callback is defined";

+					System.out.println(msg);

+					fail(msg);

+				}

+

+				messageType = callbackData.getMessageType();

+

+				if (messageType == null || messageType.trim().equals("")) {

+					String msg = "No workflow message type is defined in the '" + action + "' callback";

+					System.out.println(msg);

+					fail(msg);

+				}

+

+				content = callbackData.getContent();

+				contentType = callbackData.getContentType();

+			} else {

+				String msg = "Invalid workflow message program modifier: '" + modifier + "'";

+				System.out.println(msg);

+				fail(msg);

+			}

+

+			if (!injectWorkflowMessage(contentType, messageType, content, 10000)) {

+				fail("Failed to inject '" + action + "' workflow message");

+			}

+

+			try {

+				Thread.sleep(1000);

+			} catch (InterruptedException e) {

+				fail("Interrupted after injection of '" + action + "' workflow message");

+			}

+		}

+	}

+

+	/**

 	 * Injects a workflow message. The specified callback data may contain the

 	 * placeholder string ((CORRELATOR)) which is replaced with the actual

 	 * correlator value.

-	 * @param content the message type

-	 * @param content the message content

+	 * @param contentType the HTTP contentType for the message (possibly null)

+	 * @param messageType the message type

+	 * @param content the message content (possibly null)

 	 * @param timeout the timeout in milliseconds

-	 * @return true if the event could be injected, false otherwise

+	 * @return true if the message could be injected, false otherwise

 	 */

-	protected boolean injectWorkflowMessage(String messageType, String content, long timeout) {

+	protected boolean injectWorkflowMessage(String contentType, String messageType, String content, long timeout) {

 		String correlator = (String) getProcessVariable("ReceiveWorkflowMessage",

 			messageType + "_CORRELATOR", timeout);

 

@@ -1324,12 +1373,14 @@ public class WorkflowTest {
 			return false;

 		}

 

-		content = content.replace("((CORRELATOR))", correlator);

+		if (content != null) {

+			content = content.replace("((CORRELATOR))", correlator);

+		}

 

 		System.out.println("Injecting " + messageType + " message");

 		WorkflowMessageResource workflowMessageResource = new WorkflowMessageResource();

 		workflowMessageResource.setProcessEngineServices4junit(processEngineRule);

-		Response response = workflowMessageResource.deliver(messageType, correlator, content);

+		Response response = workflowMessageResource.deliver(contentType, messageType, correlator, content);

 		System.out.println("Workflow response to " + messageType + " message: " + response);

 		return true;

 	}

@@ -1339,7 +1390,7 @@ public class WorkflowTest {
 	 * @param businessKey the process business key

 	 * @param timeout the amount of time to wait, in milliseconds

 	 */

-	public void waitForProcessEnd(String businessKey, long timeout) {

+	protected void waitForProcessEnd(String businessKey, long timeout) {

 		System.out.println("Waiting " + timeout + "ms for process with business key " +

 			businessKey + " to end");

 

@@ -1377,7 +1428,7 @@ public class WorkflowTest {
 	 * @param variable the variable name

 	 * @param value the expected variable value

 	 */

-	public void checkVariable(String businessKey, String variable, Object value) {

+	protected void checkVariable(String businessKey, String variable, Object value) {

 		if (!isProcessEnded(businessKey)) {

 			fail("Cannot get historic variable " + variable + " because process with business key " +

 				businessKey + " has not ended");

@@ -1405,7 +1456,7 @@ public class WorkflowTest {
 	 * @return the variable value, or null if the variable could not be

 	 * obtained

 	 */

-	public Object getVariableFromHistory(String businessKey, String variableName) {

+	protected Object getVariableFromHistory(String businessKey, String variableName) {

 		try {

 			HistoricProcessInstance processInstance = processEngineRule.getHistoryService()

 				.createHistoricProcessInstanceQuery().processInstanceBusinessKey(businessKey).singleResult();

@@ -1426,6 +1477,8 @@ public class WorkflowTest {
 	}

 

 	/**

+	 * @author cb645j

+	 *

 	 * Gets the value of a subflow variable from the specified subflow's

 	 * historical process instance.

 	 *

@@ -1440,6 +1493,10 @@ public class WorkflowTest {
 			List<HistoricProcessInstance> processInstanceList = processEngineRule.getHistoryService()

 					.createHistoricProcessInstanceQuery().processDefinitionName(subflowName).list();

 

+			if (processInstanceList == null) {

+				return null;

+			}

+

 			Collections.sort(processInstanceList, new Comparator<HistoricProcessInstance>() {

 			    public int compare(HistoricProcessInstance m1, HistoricProcessInstance m2) {

 			        return m1.getStartTime().compareTo(m2.getStartTime());

@@ -1448,10 +1505,6 @@ public class WorkflowTest {
 

 			HistoricProcessInstance processInstance = processInstanceList.get(0);

 

-			if (processInstanceList == null) {

-				return null;

-			}

-

 			HistoricVariableInstance v = processEngineRule.getHistoryService()

 				.createHistoricVariableInstanceQuery().processInstanceId(processInstance.getId())

 				.variableName(variableName).singleResult();

@@ -1464,6 +1517,8 @@ public class WorkflowTest {
 	}

 

 	/**

+	 * @author cb645j

+	 *

 	 * Gets the value of a subflow variable from the subflow's

 	 * historical process x instance.

 	 *

@@ -1478,6 +1533,10 @@ public class WorkflowTest {
 			List<HistoricProcessInstance> processInstanceList = processEngineRule.getHistoryService()

 					.createHistoricProcessInstanceQuery().processDefinitionName(subflowName).list();

 

+			if (processInstanceList == null) {

+				return null;

+			}

+

 			Collections.sort(processInstanceList, new Comparator<HistoricProcessInstance>() {

 			    public int compare(HistoricProcessInstance m1, HistoricProcessInstance m2) {

 			        return m1.getStartTime().compareTo(m2.getStartTime());

@@ -1486,10 +1545,6 @@ public class WorkflowTest {
 

 			HistoricProcessInstance processInstance = processInstanceList.get(subflowInstanceIndex);

 

-			if (processInstanceList == null) {

-				return null;

-			}

-

 			HistoricVariableInstance v = processEngineRule.getHistoryService()

 				.createHistoricVariableInstanceQuery().processInstanceId(processInstance.getId())

 				.variableName(variableName).singleResult();

@@ -1594,15 +1649,36 @@ public class WorkflowTest {
 	 * An object that contains callback data for a "program".

 	 */

 	public class CallbackSet {

-		private final Map<String, String> map = new HashMap<String, String>();

+		private final Map<String, CallbackData> map = new HashMap<String, CallbackData>();

 

 		/**

-		 * Add callback data to the set.

+		 * Add untyped callback data to the set.

 		 * @param action the action with which the data is associated

 		 * @param content the callback data

 		 */

 		public void put(String action, String content) {

-			map.put(action, content);

+			map.put(action, new CallbackData(null, null, content));

+		}

+

+		/**

+		 * Add callback data to the set.

+		 * @param action the action with which the data is associated

+		 * @param messageType the callback message type

+		 * @param content the callback data

+		 */

+		public void put(String action, String messageType, String content) {

+			map.put(action, new CallbackData(null, messageType, content));

+		}

+

+		/**

+		 * Add callback data to the set.

+		 * @param action the action with which the data is associated

+		 * @param contentType the callback HTTP content type

+		 * @param messageType the callback message type

+		 * @param content the callback data

+		 */

+		public void put(String action, String contentType, String messageType, String content) {

+			map.put(action, new CallbackData(contentType, messageType, content));

 		}

 

 		/**

@@ -1610,12 +1686,54 @@ public class WorkflowTest {
 		 * @param action the action with which the data is associated

 		 * @return the callback data, or null if there is none for the specified operation

 		 */

-		public String get(String action) {

+		public CallbackData get(String action) {

 			return map.get(action);

 		}

 	}

 

 	/**

+	 * Represents a callback data item.

+	 */

+	public class CallbackData {

+		private final String contentType;

+		private final String messageType;

+		private final String content;

+

+		/**

+		 * Constructor

+		 * @param contentType the HTTP content type (optional)

+		 * @param type the callback message type (optional)

+		 * @param content the content

+		 */

+		public CallbackData(String contentType, String messageType, String content) {

+			this.contentType = contentType;

+			this.messageType = messageType;

+			this.content = content;

+		}

+

+		/**

+		 * Gets the callback HTTP content type, possibly null.

+		 */

+		public String getContentType() {

+			return contentType;

+		}

+

+		/**

+		 * Gets the callback message type, possibly null.

+		 */

+		public String getMessageType() {

+			return messageType;

+		}

+

+		/**

+		 * Gets the callback content.

+		 */

+		public String getContent() {

+			return content;

+		}

+	}

+

+	/**

 	 * A tool for evaluating XPath expressions.

 	 */

 	protected class XPathTool {

@@ -1772,7 +1890,7 @@ public class WorkflowTest {
 	 * Helper class to make it easier to create this type.

 	 */

 	private static class CreateVnfNotificationOutputs

-			extends org.openecomp.mso.bpmn.common.adapter.vnf.CreateVnfNotification.Outputs {

+			extends CreateVnfNotification.Outputs {

 		public void add(String key, String value) {

 			Entry entry = new Entry();

 			entry.setKey(key);

@@ -1785,7 +1903,7 @@ public class WorkflowTest {
 	 * Helper class to make it easier to create this type.

 	 */

 	private static class UpdateVnfNotificationOutputs

-			extends org.openecomp.mso.bpmn.common.adapter.vnf.UpdateVnfNotification.Outputs {

+			extends UpdateVnfNotification.Outputs {

 		public void add(String key, String value) {

 			Entry entry = new Entry();

 			entry.setKey(key);

diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/drop_mariadb_engine_7.5.6.sql b/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/drop_mariadb_engine_7.5.6.sql
index 10e9930720..6ebc6e221e 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/drop_mariadb_engine_7.5.6.sql
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/drop_mariadb_engine_7.5.6.sql
@@ -1,76 +1,75 @@
--- Fix for https://itrack.web.att.com/browse/AJSCCMDA-90 --
-use camundabpmn;
-/* 
-Drop a archive tables
-*/
-/*-- TMP_ARCHIVING_PROCINST */
-DROP TABLE IF EXISTS TMP_ARCHIVING_PROCINST;
-
-/*-- TMP_ARCHIVING_BYTEARRAY */
-DROP TABLE IF EXISTS TMP_ARCHIVING_BYTEARRAY;
-
-/*-- TMP LOG TABLE */
-DROP TABLE IF EXISTS TMPLOGTABLE;
-
-/* -- Camunda Hi Tables --*/
-DROP TABLE IF EXISTS Camunda_Hi_Tables;
-
-/* drop own extentions columns:
-alter table  ARCHIVE_ACT_HI_PROCINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_ACTINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_TASKINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_VARINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_DETAIL DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_COMMENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_ATTACHMENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_OP_LOG DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_INCIDENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-*/
-
-/*--#1 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_PROCINST;
-/*--#2 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_ACTINST;
-/*--#3 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_TASKINST;
-/*--#4 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_VARINST;
-/*--#5 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_DETAIL;
-/*--#6 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_COMMENT;
-/*--#7 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_ATTACHMENT;
-/*--#8 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_OP_LOG;
-/*--#9 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_INCIDENT;
-/*--#10 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_GE_BYTEARRAY;
-
-/* drop PL SQL procedures: */
-DROP PROCEDURE IF EXISTS ARCHIVE_CAMUNDA_HISTORY;
-DROP PROCEDURE IF EXISTS ROLLB_ARCHIVE_CAMUNDA_HISTORY;
- 
-/*-- Sequence */
--- as sequence drop doesn't work automatically in MariaDB, use this procedure to drop sequence
- DROP PROCEDURE IF EXISTS DropSequence;
- 
-  DELIMITER //
- 
-  CREATE PROCEDURE DropSequence (vname VARCHAR(30))
-  BEGIN
-     -- Drop the sequence
-     DELETE FROM _sequences WHERE name = vname;  
-  END
-  //
-  DELIMITER ;
-
--- use the above procedure to drop sequence 
-CALL DropSequence('STAT_EXECUTION_SEQ');
-
-/*-- To Drop the MariaDB specific user defined procedures and functions */
-DROP FUNCTION IF EXISTS NextVal;
-DROP PROCEDURE IF EXISTS CreateSequence;
-DROP PROCEDURE IF EXISTS DropSequence;
+use camundabpmn;

+/* 

+Drop a archive tables

+*/

+/*-- TMP_ARCHIVING_PROCINST */

+DROP TABLE IF EXISTS TMP_ARCHIVING_PROCINST;

+

+/*-- TMP_ARCHIVING_BYTEARRAY */

+DROP TABLE IF EXISTS TMP_ARCHIVING_BYTEARRAY;

+

+/*-- TMP LOG TABLE */

+DROP TABLE IF EXISTS TMPLOGTABLE;

+

+/* -- Camunda Hi Tables --*/

+DROP TABLE IF EXISTS Camunda_Hi_Tables;

+

+/* drop own extentions columns:

+alter table  ARCHIVE_ACT_HI_PROCINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

+alter table  ARCHIVE_ACT_HI_ACTINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

+alter table  ARCHIVE_ACT_HI_TASKINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

+alter table  ARCHIVE_ACT_HI_VARINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

+alter table  ARCHIVE_ACT_HI_DETAIL DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

+alter table  ARCHIVE_ACT_HI_COMMENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

+alter table  ARCHIVE_ACT_HI_ATTACHMENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

+alter table  ARCHIVE_ACT_HI_OP_LOG DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

+alter table  ARCHIVE_ACT_HI_INCIDENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

+*/

+

+/*--#1 */

+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_PROCINST;

+/*--#2 */

+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_ACTINST;

+/*--#3 */

+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_TASKINST;

+/*--#4 */

+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_VARINST;

+/*--#5 */

+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_DETAIL;

+/*--#6 */

+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_COMMENT;

+/*--#7 */

+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_ATTACHMENT;

+/*--#8 */

+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_OP_LOG;

+/*--#9 */

+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_INCIDENT;

+/*--#10 */

+DROP TABLE IF EXISTS ARCHIVE_ACT_GE_BYTEARRAY;

+

+/* drop PL SQL procedures: */

+DROP PROCEDURE IF EXISTS ARCHIVE_CAMUNDA_HISTORY;

+DROP PROCEDURE IF EXISTS ROLLB_ARCHIVE_CAMUNDA_HISTORY;

+ 

+/*-- Sequence */

+-- as sequence drop doesn't work automatically in MariaDB, use this procedure to drop sequence

+ DROP PROCEDURE IF EXISTS DropSequence;

+ 

+  DELIMITER //

+ 

+  CREATE PROCEDURE DropSequence (vname VARCHAR(30))

+  BEGIN

+     -- Drop the sequence

+     DELETE FROM _sequences WHERE name = vname;  

+  END

+  //

+  DELIMITER ;

+

+-- use the above procedure to drop sequence 

+CALL DropSequence('STAT_EXECUTION_SEQ');

+

+/*-- To Drop the MariaDB specific user defined procedures and functions */

+DROP FUNCTION IF EXISTS NextVal;

+DROP PROCEDURE IF EXISTS CreateSequence;

+DROP PROCEDURE IF EXISTS DropSequence;

 DROP TABLE IF EXISTS _sequences;
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/mariadb_engine_7.5_patch_7.5.6.sql b/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/mariadb_engine_7.5_patch_7.5.6.sql
index 8c7faa0792..c5b69c7a34 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/mariadb_engine_7.5_patch_7.5.6.sql
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/mariadb_engine_7.5_patch_7.5.6.sql
@@ -1,222 +1,221 @@
--- Fix for https://itrack.web.att.com/browse/AJSCCMDA-90 --
-use camundabpmn;
-/*
- 1.  Add some Camunda Indexes to history schema part (for Archiving)
-*/
-create INDEX IF NOT EXISTS IDX_ACT_HI_TASKINST_PIID ON ACT_HI_TASKINST (PROC_INST_ID_); 
-create INDEX IF NOT EXISTS IDX_ACT_HI_COMMENT_PIID ON ACT_HI_COMMENT (PROC_INST_ID_);
-create INDEX IF NOT EXISTS IDX_ACT_HI_ATTACHMENT_PIID ON ACT_HI_ATTACHMENT (PROC_INST_ID_);
-create INDEX IF NOT EXISTS IDX_ACT_HI_OP_LOG_PIID ON ACT_HI_OP_LOG (PROC_INST_ID_);
-create INDEX IF NOT EXISTS IDX_ACT_HI_INCIDENT_PIID ON ACT_HI_INCIDENT (PROC_INST_ID_);
-create INDEX IF NOT EXISTS IDX_ACT_HI_ACTINST_PIID ON ACT_HI_ACTINST(PROC_INST_ID_); 
-
-
-/*
- 2.  Create Archiving Tables in current schema 
-*/
-
-/*-- TMP_ARCHIVING_PROCINST */
-CREATE TABLE TMP_ARCHIVING_PROCINST
-( PROC_INST_ID_ varchar(64) not null,
-  END_TIME_ datetime(3)
-);
-CREATE INDEX AI_TMP_ARCH_PROCINST_PI_ID ON TMP_ARCHIVING_PROCINST(PROC_INST_ID_);
-
-/*-- TMP_ARCHIVING_BYTEARRAY */
-CREATE TABLE TMP_ARCHIVING_BYTEARRAY
-( BYTEARRAY_ID_ varchar(64) not null,
-  PROC_INST_ID_ varchar(64)
-);
-CREATE INDEX AI_TMP_ARCH_BYTEARRAY_BAID ON TMP_ARCHIVING_BYTEARRAY(BYTEARRAY_ID_);
-
-
-/*--#1 ARCHIVE_ACT_HI_PROCINST; */
-create TABLE ARCHIVE_ACT_HI_PROCINST
-AS ( select * from ACT_HI_PROCINST where 1=0);
-
-create index AI_HI_PROCINST_END_TIME on ARCHIVE_ACT_HI_PROCINST(END_TIME_);
-ALTER TABLE ARCHIVE_ACT_HI_PROCINST ADD CONSTRAINT  ARCHIVE_ACT_HI_PROCINST_UQ UNIQUE ( PROC_INST_ID_);
-
-/*--#2   ARCHIVE_ACT_HI_ACTINST; */
-create TABLE ARCHIVE_ACT_HI_ACTINST
-AS ( select * from ACT_HI_ACTINST where 1=0);
-
-create index AI_HI_ACTINST_PROC_INST_ID on ARCHIVE_ACT_HI_ACTINST(PROC_INST_ID_);
-create index AI_HI_ACTINST_END_TIME on ARCHIVE_ACT_HI_ACTINST(END_TIME_);
-
-/*--#3  ARCHIVE_ACT_HI_TASKINST; */
-create TABLE ARCHIVE_ACT_HI_TASKINST
-AS ( select * from ACT_HI_TASKINST where 1=0);
-
-create index AI_HI_TASKINST_PROC_INST_ID on ARCHIVE_ACT_HI_TASKINST(PROC_INST_ID_);
-create index AI_HI_TASKINST_END_TIME on ARCHIVE_ACT_HI_TASKINST(END_TIME_);
-
-/*--#4 ARCHIVE_ACT_HI_VARINST; */
-create TABLE ARCHIVE_ACT_HI_VARINST
-AS ( select * from ACT_HI_VARINST where 1=0);
-
-create index AI_HI_VARINST_PROC_INST_ID on ARCHIVE_ACT_HI_VARINST(PROC_INST_ID_);
-
-/*--#5 ARCHIVE_ACT_HI_DETAIL; */
-create TABLE ARCHIVE_ACT_HI_DETAIL
-AS ( select * from ACT_HI_DETAIL where 1=0);
-
-create index AI_HI_DETAIL_PROC_INST_ID on ARCHIVE_ACT_HI_DETAIL(PROC_INST_ID_);
-create index AI_HI_DETAIL_TIME on ARCHIVE_ACT_HI_DETAIL(TIME_);
-
-/*--#6 ARCHIVE_ACT_HI_COMMENT; */
-create TABLE ARCHIVE_ACT_HI_COMMENT
-AS ( select * from ACT_HI_COMMENT where 1=0);
-
-create index AI_HI_COMMENT_PROC_INST_ID on ARCHIVE_ACT_HI_COMMENT(PROC_INST_ID_);
-create index AI_HI_COMMENT_TIME on ARCHIVE_ACT_HI_COMMENT(TIME_);
-
-/*--#7 ARCHIVE_ACT_HI_ATTACHMENT; */
-create TABLE ARCHIVE_ACT_HI_ATTACHMENT
-AS ( select * from ACT_HI_ATTACHMENT where 1=0);
-
-create index AI_HI_ATTACHMENT_PROC_INST_ID on ARCHIVE_ACT_HI_ATTACHMENT(PROC_INST_ID_);
-
-/*--#8 ARCHIVE_ACT_HI_OP_LOG; */
-create TABLE ARCHIVE_ACT_HI_OP_LOG
-AS ( select * from ACT_HI_OP_LOG where 1=0);
-
-create index AI_HI_OP_LOG_PROC_INST_ID on ARCHIVE_ACT_HI_OP_LOG(PROC_INST_ID_);
-create index AI_HI_OP_LOG_TIMESTAMP on ARCHIVE_ACT_HI_OP_LOG(TIMESTAMP_);
-
-/*--#9 ARCHIVE_ACT_HI_INCIDENT; */
-create TABLE ARCHIVE_ACT_HI_INCIDENT
-AS ( select * from ACT_HI_INCIDENT where 1=0);
-
-create index AI_HI_INCIDENT_PROC_INST_ID on ARCHIVE_ACT_HI_INCIDENT(PROC_INST_ID_);
-
-/*--#10 ARCHIVE_ACT_GE_BYTEARRAY; */
-create TABLE ARCHIVE_ACT_GE_BYTEARRAY
-AS ( select * from ACT_GE_BYTEARRAY where 1=0);
-
-create index AI_GE_BYTEARRAY_ID_ on ARCHIVE_ACT_GE_BYTEARRAY(ID_);
-
-/* -----------------------------------------------------------------------------
-Extend a ARCHIVE: Table by two attributes: STAT_EXECUTION_ID, STAT_EXECUTION_TS 
-*/
- 
-/*
---TEMPLATE:
-alter table ARCHIVE_%TableName%
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_%TableName%_EXE_ID ON ARCHIVE_%TableName%(STAT_EXECUTION_ID);
-*/
-
-
-/*--#1 ACT_HI_PROCINST */
-alter table ARCHIVE_ACT_HI_PROCINST
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_PROCINST_EXE_ID ON ARCHIVE_ACT_HI_PROCINST(STAT_EXECUTION_ID);
-
-/*--#2 ACT_HI_ACTINST */
-alter table ARCHIVE_ACT_HI_ACTINST
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_ACTINST_EXE_ID ON ARCHIVE_ACT_HI_ACTINST(STAT_EXECUTION_ID);
-
-/*--#3 ACT_HI_TASKINST */
-alter table ARCHIVE_ACT_HI_TASKINST
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_TASKINST_EXE_ID ON ARCHIVE_ACT_HI_TASKINST(STAT_EXECUTION_ID);
-
-/*--#4 ACT_HI_VARINST */
-alter table ARCHIVE_ACT_HI_VARINST
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_VARINST_EXE_ID ON ARCHIVE_ACT_HI_VARINST(STAT_EXECUTION_ID);
-
-/*--#5 ACT_HI_DETAIL */
-alter table ARCHIVE_ACT_HI_DETAIL
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_DETAIL_EXE_ID ON ARCHIVE_ACT_HI_DETAIL(STAT_EXECUTION_ID);
-
-/*--#6 ACT_HI_COMMENT */
-alter table ARCHIVE_ACT_HI_COMMENT
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_COMMENT_EXE_ID ON ARCHIVE_ACT_HI_COMMENT(STAT_EXECUTION_ID);
-
-/*--#7 ACT_HI_ATTACHMENT */
-alter table ARCHIVE_ACT_HI_ATTACHMENT
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_ATTACHMENT_EXE_ID ON ARCHIVE_ACT_HI_ATTACHMENT(STAT_EXECUTION_ID);
-
-/*--#8 ACT_HI_OP_LOG */
-alter table ARCHIVE_ACT_HI_OP_LOG
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_OP_LOG_EXE_ID ON ARCHIVE_ACT_HI_OP_LOG(STAT_EXECUTION_ID);
-
-/*--#9 ACT_HI_INCIDENT */
-alter table ARCHIVE_ACT_HI_INCIDENT
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_INCIDENT_EXE_ID ON ARCHIVE_ACT_HI_INCIDENT(STAT_EXECUTION_ID);
-
-/*--#10 ACT_GE_BYTEARRAY */
-alter table ARCHIVE_ACT_GE_BYTEARRAY
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_GE_BYTEARRAY_EXE_ID ON ARCHIVE_ACT_GE_BYTEARRAY(STAT_EXECUTION_ID);
-
-
-/* -- Next Val as a user defined function needed only in MariaDB--*/
-DROP FUNCTION IF EXISTS NextVal;
-  DELIMITER //
-  CREATE FUNCTION NextVal (vname VARCHAR(30))
-    RETURNS INT
-  BEGIN
-     -- Retrieve and update in single statement
-     UPDATE _sequences
-       SET next = next + 1
-       WHERE name = vname;
- 
-     RETURN (SELECT next FROM _sequences LIMIT 1);
-  END
-  //
-  DELIMITER ;
-  
-/* -- History tables for use in archive procedure, there is no array type in MariaDB --*/
-Create Table Camunda_Hi_Tables (id_ MEDIUMINT NOT NULL AUTO_INCREMENT,
-     TableName_ varchar(80) NOT NULL,
-     PRIMARY KEY (id_));
-   
-Insert Into Camunda_Hi_Tables(TableName_) Values ('ACT_HI_PROCINST');
-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_ACTINST');
-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_TASKINST');
-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_VARINST');
-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_DETAIL');
-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_COMMENT');
-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_ATTACHMENT');
-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_OP_LOG');
-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_INCIDENT');
-
-/*-- log table --*/
-CREATE TABLE TMPLOGTABLE (LogMessage Varchar(700));
-
-
-/* -- Below user defined functions and procedures needed only in MariaDB, they are in-built in Oracle --*/
-/*-- Create a sequence SP */
-DROP PROCEDURE IF EXISTS CreateSequence;
-  DELIMITER //
-  CREATE PROCEDURE CreateSequence (name VARCHAR(30), start INT, inc INT)
-  BEGIN
-     -- Create a table to store sequences
-     CREATE TABLE IF NOT EXISTS _sequences
-     (
-         name VARCHAR(70) NOT NULL UNIQUE,
-         next INT NOT NULL,
-         inc INT NOT NULL
-     );
- 
-     -- Add the new sequence
-     INSERT INTO _sequences VALUES (name, start, inc);  
-  END
-  //
-  DELIMITER ;
-
-/*--------------------------------------------------------------------------------------------------
- Add Meta to Archive
- -------------------------------------------------------------------------------------------------- */
-
-/* Create STAT_EXECUTION_SEQ: each Archive Entry has a same Execution ID during one Archiving Run */
-CALL CreateSequence('STAT_EXECUTION_SEQ', 1, 1);
+use camundabpmn;

+/*

+ 1.  Add some Camunda Indexes to history schema part (for Archiving)

+*/

+create INDEX IF NOT EXISTS IDX_ACT_HI_TASKINST_PIID ON ACT_HI_TASKINST (PROC_INST_ID_); 

+create INDEX IF NOT EXISTS IDX_ACT_HI_COMMENT_PIID ON ACT_HI_COMMENT (PROC_INST_ID_);

+create INDEX IF NOT EXISTS IDX_ACT_HI_ATTACHMENT_PIID ON ACT_HI_ATTACHMENT (PROC_INST_ID_);

+create INDEX IF NOT EXISTS IDX_ACT_HI_OP_LOG_PIID ON ACT_HI_OP_LOG (PROC_INST_ID_);

+create INDEX IF NOT EXISTS IDX_ACT_HI_INCIDENT_PIID ON ACT_HI_INCIDENT (PROC_INST_ID_);

+create INDEX IF NOT EXISTS IDX_ACT_HI_ACTINST_PIID ON ACT_HI_ACTINST(PROC_INST_ID_); 

+

+

+/*

+ 2.  Create Archiving Tables in current schema 

+*/

+

+/*-- TMP_ARCHIVING_PROCINST */

+CREATE TABLE TMP_ARCHIVING_PROCINST

+( PROC_INST_ID_ varchar(64) not null,

+  END_TIME_ datetime(3)

+);

+CREATE INDEX AI_TMP_ARCH_PROCINST_PI_ID ON TMP_ARCHIVING_PROCINST(PROC_INST_ID_);

+

+/*-- TMP_ARCHIVING_BYTEARRAY */

+CREATE TABLE TMP_ARCHIVING_BYTEARRAY

+( BYTEARRAY_ID_ varchar(64) not null,

+  PROC_INST_ID_ varchar(64)

+);

+CREATE INDEX AI_TMP_ARCH_BYTEARRAY_BAID ON TMP_ARCHIVING_BYTEARRAY(BYTEARRAY_ID_);

+

+

+/*--#1 ARCHIVE_ACT_HI_PROCINST; */

+create TABLE ARCHIVE_ACT_HI_PROCINST

+AS ( select * from ACT_HI_PROCINST where 1=0);

+

+create index AI_HI_PROCINST_END_TIME on ARCHIVE_ACT_HI_PROCINST(END_TIME_);

+ALTER TABLE ARCHIVE_ACT_HI_PROCINST ADD CONSTRAINT  ARCHIVE_ACT_HI_PROCINST_UQ UNIQUE ( PROC_INST_ID_);

+

+/*--#2   ARCHIVE_ACT_HI_ACTINST; */

+create TABLE ARCHIVE_ACT_HI_ACTINST

+AS ( select * from ACT_HI_ACTINST where 1=0);

+

+create index AI_HI_ACTINST_PROC_INST_ID on ARCHIVE_ACT_HI_ACTINST(PROC_INST_ID_);

+create index AI_HI_ACTINST_END_TIME on ARCHIVE_ACT_HI_ACTINST(END_TIME_);

+

+/*--#3  ARCHIVE_ACT_HI_TASKINST; */

+create TABLE ARCHIVE_ACT_HI_TASKINST

+AS ( select * from ACT_HI_TASKINST where 1=0);

+

+create index AI_HI_TASKINST_PROC_INST_ID on ARCHIVE_ACT_HI_TASKINST(PROC_INST_ID_);

+create index AI_HI_TASKINST_END_TIME on ARCHIVE_ACT_HI_TASKINST(END_TIME_);

+

+/*--#4 ARCHIVE_ACT_HI_VARINST; */

+create TABLE ARCHIVE_ACT_HI_VARINST

+AS ( select * from ACT_HI_VARINST where 1=0);

+

+create index AI_HI_VARINST_PROC_INST_ID on ARCHIVE_ACT_HI_VARINST(PROC_INST_ID_);

+

+/*--#5 ARCHIVE_ACT_HI_DETAIL; */

+create TABLE ARCHIVE_ACT_HI_DETAIL

+AS ( select * from ACT_HI_DETAIL where 1=0);

+

+create index AI_HI_DETAIL_PROC_INST_ID on ARCHIVE_ACT_HI_DETAIL(PROC_INST_ID_);

+create index AI_HI_DETAIL_TIME on ARCHIVE_ACT_HI_DETAIL(TIME_);

+

+/*--#6 ARCHIVE_ACT_HI_COMMENT; */

+create TABLE ARCHIVE_ACT_HI_COMMENT

+AS ( select * from ACT_HI_COMMENT where 1=0);

+

+create index AI_HI_COMMENT_PROC_INST_ID on ARCHIVE_ACT_HI_COMMENT(PROC_INST_ID_);

+create index AI_HI_COMMENT_TIME on ARCHIVE_ACT_HI_COMMENT(TIME_);

+

+/*--#7 ARCHIVE_ACT_HI_ATTACHMENT; */

+create TABLE ARCHIVE_ACT_HI_ATTACHMENT

+AS ( select * from ACT_HI_ATTACHMENT where 1=0);

+

+create index AI_HI_ATTACHMENT_PROC_INST_ID on ARCHIVE_ACT_HI_ATTACHMENT(PROC_INST_ID_);

+

+/*--#8 ARCHIVE_ACT_HI_OP_LOG; */

+create TABLE ARCHIVE_ACT_HI_OP_LOG

+AS ( select * from ACT_HI_OP_LOG where 1=0);

+

+create index AI_HI_OP_LOG_PROC_INST_ID on ARCHIVE_ACT_HI_OP_LOG(PROC_INST_ID_);

+create index AI_HI_OP_LOG_TIMESTAMP on ARCHIVE_ACT_HI_OP_LOG(TIMESTAMP_);

+

+/*--#9 ARCHIVE_ACT_HI_INCIDENT; */

+create TABLE ARCHIVE_ACT_HI_INCIDENT

+AS ( select * from ACT_HI_INCIDENT where 1=0);

+

+create index AI_HI_INCIDENT_PROC_INST_ID on ARCHIVE_ACT_HI_INCIDENT(PROC_INST_ID_);

+

+/*--#10 ARCHIVE_ACT_GE_BYTEARRAY; */

+create TABLE ARCHIVE_ACT_GE_BYTEARRAY

+AS ( select * from ACT_GE_BYTEARRAY where 1=0);

+

+create index AI_GE_BYTEARRAY_ID_ on ARCHIVE_ACT_GE_BYTEARRAY(ID_);

+

+/* -----------------------------------------------------------------------------

+Extend a ARCHIVE: Table by two attributes: STAT_EXECUTION_ID, STAT_EXECUTION_TS 

+*/

+ 

+/*

+--TEMPLATE:

+alter table ARCHIVE_%TableName%

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_%TableName%_EXE_ID ON ARCHIVE_%TableName%(STAT_EXECUTION_ID);

+*/

+

+

+/*--#1 ACT_HI_PROCINST */

+alter table ARCHIVE_ACT_HI_PROCINST

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_ACT_HI_PROCINST_EXE_ID ON ARCHIVE_ACT_HI_PROCINST(STAT_EXECUTION_ID);

+

+/*--#2 ACT_HI_ACTINST */

+alter table ARCHIVE_ACT_HI_ACTINST

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_ACT_HI_ACTINST_EXE_ID ON ARCHIVE_ACT_HI_ACTINST(STAT_EXECUTION_ID);

+

+/*--#3 ACT_HI_TASKINST */

+alter table ARCHIVE_ACT_HI_TASKINST

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_ACT_HI_TASKINST_EXE_ID ON ARCHIVE_ACT_HI_TASKINST(STAT_EXECUTION_ID);

+

+/*--#4 ACT_HI_VARINST */

+alter table ARCHIVE_ACT_HI_VARINST

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_ACT_HI_VARINST_EXE_ID ON ARCHIVE_ACT_HI_VARINST(STAT_EXECUTION_ID);

+

+/*--#5 ACT_HI_DETAIL */

+alter table ARCHIVE_ACT_HI_DETAIL

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_ACT_HI_DETAIL_EXE_ID ON ARCHIVE_ACT_HI_DETAIL(STAT_EXECUTION_ID);

+

+/*--#6 ACT_HI_COMMENT */

+alter table ARCHIVE_ACT_HI_COMMENT

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_ACT_HI_COMMENT_EXE_ID ON ARCHIVE_ACT_HI_COMMENT(STAT_EXECUTION_ID);

+

+/*--#7 ACT_HI_ATTACHMENT */

+alter table ARCHIVE_ACT_HI_ATTACHMENT

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_ACT_HI_ATTACHMENT_EXE_ID ON ARCHIVE_ACT_HI_ATTACHMENT(STAT_EXECUTION_ID);

+

+/*--#8 ACT_HI_OP_LOG */

+alter table ARCHIVE_ACT_HI_OP_LOG

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_ACT_HI_OP_LOG_EXE_ID ON ARCHIVE_ACT_HI_OP_LOG(STAT_EXECUTION_ID);

+

+/*--#9 ACT_HI_INCIDENT */

+alter table ARCHIVE_ACT_HI_INCIDENT

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_ACT_HI_INCIDENT_EXE_ID ON ARCHIVE_ACT_HI_INCIDENT(STAT_EXECUTION_ID);

+

+/*--#10 ACT_GE_BYTEARRAY */

+alter table ARCHIVE_ACT_GE_BYTEARRAY

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_ACT_GE_BYTEARRAY_EXE_ID ON ARCHIVE_ACT_GE_BYTEARRAY(STAT_EXECUTION_ID);

+

+

+/* -- Next Val as a user defined function needed only in MariaDB--*/

+DROP FUNCTION IF EXISTS NextVal;

+  DELIMITER //

+  CREATE FUNCTION NextVal (vname VARCHAR(30))

+    RETURNS INT

+  BEGIN

+     -- Retrieve and update in single statement

+     UPDATE _sequences

+       SET next = next + 1

+       WHERE name = vname;

+ 

+     RETURN (SELECT next FROM _sequences LIMIT 1);

+  END

+  //

+  DELIMITER ;

+  

+/* -- History tables for use in archive procedure, there is no array type in MariaDB --*/

+Create Table Camunda_Hi_Tables (id_ MEDIUMINT NOT NULL AUTO_INCREMENT,

+     TableName_ varchar(80) NOT NULL,

+     PRIMARY KEY (id_));

+   

+Insert Into Camunda_Hi_Tables(TableName_) Values ('ACT_HI_PROCINST');

+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_ACTINST');

+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_TASKINST');

+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_VARINST');

+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_DETAIL');

+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_COMMENT');

+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_ATTACHMENT');

+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_OP_LOG');

+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_INCIDENT');

+

+/*-- log table --*/

+CREATE TABLE TMPLOGTABLE (LogMessage Varchar(700));

+

+

+/* -- Below user defined functions and procedures needed only in MariaDB, they are in-built in Oracle --*/

+/*-- Create a sequence SP */

+DROP PROCEDURE IF EXISTS CreateSequence;

+  DELIMITER //

+  CREATE PROCEDURE CreateSequence (name VARCHAR(30), start INT, inc INT)

+  BEGIN

+     -- Create a table to store sequences

+     CREATE TABLE IF NOT EXISTS _sequences

+     (

+         name VARCHAR(70) NOT NULL UNIQUE,

+         next INT NOT NULL,

+         inc INT NOT NULL

+     );

+ 

+     -- Add the new sequence

+     INSERT INTO _sequences VALUES (name, start, inc);  

+  END

+  //

+  DELIMITER ;

+

+/*--------------------------------------------------------------------------------------------------

+ Add Meta to Archive

+ -------------------------------------------------------------------------------------------------- */

+

+/* Create STAT_EXECUTION_SEQ: each Archive Entry has a same Execution ID during one Archiving Run */

+CALL CreateSequence('STAT_EXECUTION_SEQ', 1, 1);

diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/UpdateAAIVfModuleRequest.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/UpdateAAIVfModuleRequest.xml
index 8a690403c4..7b72812f1a 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/UpdateAAIVfModuleRequest.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/UpdateAAIVfModuleRequest.xml
@@ -1,10 +1,10 @@
-<UpdateAAIVfModuleRequest>
-	<vnf-id>skask</vnf-id>
-	<vf-module-id>supercool</vf-module-id>
-	<heat-stack-id>slowburn</heat-stack-id>
-	<orchestration-status>complete</orchestration-status>
-	<volume-group-id>78987</volume-group-id>
-	<persona-model-id>introvert</persona-model-id>
-	<persona-model-version>3.14</persona-model-version>
-	<contrail-service-instance-fqdn>myhost.appl.com</contrail-service-instance-fqdn>
+<UpdateAAIVfModuleRequest>

+	<vnf-id>skask</vnf-id>

+	<vf-module-id>supercool</vf-module-id>

+	<heat-stack-id>slowburn</heat-stack-id>

+	<orchestration-status>complete</orchestration-status>

+	<volume-group-id>78987</volume-group-id>

+	<persona-model-id>introvert</persona-model-id>

+	<persona-model-version>3.14</persona-model-version>

+	<contrail-service-instance-fqdn>myhost.appl.com</contrail-service-instance-fqdn>

 </UpdateAAIVfModuleRequest>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml
index 3370e33ce2..ee09c9bc4a 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml
@@ -5,8 +5,8 @@
 	<orchestration-status>pending-create</orchestration-status>

 	<is-base-vf-module>false</is-base-vf-module>

 	<resource-version>330-89</resource-version>

-	<persona-model-id>introvert</persona-model-id>

-	<persona-model-version>2.0</persona-model-version>

+	<model-invariant-id>introvert</model-invariant-id>

+	<model-version-id>2.0</model-version-id>

 	<relationship-list>

 		<relationship>

 			<related-to>volume-group</related-to>

diff --git a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties b/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
index 133f58593c..1ac75e9456 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
+++ b/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
@@ -57,7 +57,7 @@ aai.endpoint=http://localhost:28090
 # Example to override default version for a resource:

 #mso.workflow.default.aai.vce.version=6

 #mso.workflow.default.aai.v6.vce.uri=/aai/v6/network/vces/vce

-

+mso.workflow.global.default.aai.namespace=http://org.openecomp.aai.inventory/

 mso.workflow.global.default.aai.version=8

 mso.workflow.default.aai.cloud-region.version=9

 mso.workflow.default.aai.generic-vnf.version=9

@@ -83,4 +83,11 @@ log.debug.FalloutHandler=true
 log.debug.GenericGetService=true

 log.debug.sdncAdapter=true

 log.debug.UpdateNetworkInstanceInfra=true

-log.debug.VnfAdapterRestV1=true
\ No newline at end of file
+log.debug.VnfAdapterRestV1=true

+log.debug.GenericGetNetwork=true

+log.debug.GenericGetVnf=true

+log.debug.GenericDeleteService=true

+log.debug.GenericDeleteNetwork=true

+log.debug.GenericDeleteVnf=true

+log.debug.vnfAdapterCreateV1=true

+log.debug.vnfAdapterRestV1=true