added generic fabric support to SO

Fix Autoincrement of ID field in table
Fix accidental removal of method
Update usage of requestdb client
removed unused imports in common tasks and test
Fix broken branch, have unit tests pass
references
the Epic branch
Fix broken branch from compiling
committing classpath for vfc adapter cause its not going away
added in the fail case for when there are no profiles
removed second set of adapters in application test yml
removed double adapters in request db application test
added jpa repo dependency to the so bpmn folder pom
add creation timestamp column to the table
added in null checks for Config returned from policy
switched to string in requestprocess with jenerate
switched to string in requestprocess with jenerate
updated aai version in common pom to 605 from 591
renamed the db scripts for flyway sync to register
added endpoint to application test yml for failing test
...

Change-Id: I800f837ea75d7cdff740dc3a387e4d7654cfd085
Issue-ID: SO-972
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

10 files changed, 282 insertions, 109 deletions

diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/TestApplication.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/TestApplication.java
index 6401d5516d..9244f7ee1f 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/TestApplication.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/TestApplication.java
@@ -21,14 +21,8 @@ package org.onap.so;
 
 
 
-import java.io.IOException;
-
-import javax.annotation.PreDestroy;
-
 import org.camunda.bpm.spring.boot.starter.annotation.EnableProcessApplication;
 import org.onap.so.bpmn.common.DefaultToShortClassNameBeanNameGenerator;
-import org.onap.so.db.request.data.repository.InfraActiveRequestsRepositoryImpl;
-import org.onap.so.requestsdb.RequestsDBHelper;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
@@ -40,9 +34,7 @@ import org.springframework.context.annotation.Profile;
 @Profile("test")
 @EnableProcessApplication("MSO CommonBPMN Test Application")
 @ComponentScan(basePackages = {"org.onap.so"}, nameGenerator = DefaultToShortClassNameBeanNameGenerator.class, excludeFilters = {
-		@Filter(type = FilterType.ANNOTATION, classes = SpringBootApplication.class),
-		@Filter(type = FilterType.ASSIGNABLE_TYPE, classes = RequestsDBHelper.class),
-		@Filter(type = FilterType.ASSIGNABLE_TYPE, classes = InfraActiveRequestsRepositoryImpl.class) })
+		@Filter(type = FilterType.ANNOTATION, classes = SpringBootApplication.class)})
 public class TestApplication {
 	public static void main(String... args) {
 		SpringApplication.run(TestApplication.class, args);
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/BaseTaskTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/BaseTaskTest.java
index 3fce15a6c4..2b25dfd9f1 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/BaseTaskTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/BaseTaskTest.java
@@ -28,8 +28,8 @@ import org.onap.so.bpmn.servicedecomposition.tasks.BBInputSetup;
 import org.onap.so.bpmn.servicedecomposition.tasks.BBInputSetupUtils;
 import org.onap.so.client.adapter.network.mapper.NetworkAdapterObjectMapper;
 import org.onap.so.client.appc.ApplicationControllerAction;
-import org.onap.so.client.db.request.RequestsDbClient;
 import org.onap.so.client.orchestration.AAICollectionResources;
+import org.onap.so.client.orchestration.AAIConfigurationResources;
 import org.onap.so.client.orchestration.AAIInstanceGroupResources;
 import org.onap.so.client.orchestration.AAINetworkResources;
 import org.onap.so.client.orchestration.AAIServiceInstanceResources;
@@ -46,6 +46,8 @@ import org.onap.so.client.orchestration.VnfAdapterVfModuleResources;
 import org.onap.so.client.orchestration.VnfAdapterVolumeGroupResources;
 import org.onap.so.client.sdnc.SDNCClient;
 import org.onap.so.db.catalog.client.CatalogDbClient;
+import org.onap.so.db.request.client.RequestsDbClient;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.boot.test.mock.mockito.SpyBean;
@@ -111,6 +113,7 @@ public abstract class BaseTaskTest extends TestDataSetup {
 	protected CatalogDbClient catalogDbClient;
 	
 	@MockBean
+	@Qualifier("RequestsDbClient")
 	protected RequestsDbClient requestsDbClient;
 	
 	@Mock
@@ -118,10 +121,13 @@ public abstract class BaseTaskTest extends TestDataSetup {
 	
 	@Mock
 	protected BBInputSetup bbInputSetup;
-
+	
 	@SpyBean
 	protected SDNCClient SPY_sdncClient;
 	
 	@MockBean
 	protected ApplicationControllerAction appCClient;
+
+	@MockBean
+	protected AAIConfigurationResources aaiConfigurationResources;
 }
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/common/data/TestDataSetup.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/common/data/TestDataSetup.java
index 675e8a1d95..fb9533091b 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/common/data/TestDataSetup.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/common/data/TestDataSetup.java
@@ -663,4 +663,20 @@ public class TestDataSetup{
 		
 		return ar;
 	}
+	
+	public Configuration setConfiguration () {
+		Configuration config = new Configuration();
+		config.setConfigurationId("testConfigurationId");
+		List<Configuration> configurations = new ArrayList<>();
+		configurations.add(config);
+		ServiceInstance serviceInstance = new ServiceInstance();
+		try {
+			serviceInstance = extractPojosForBB.extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID, execution.getLookupMap().get(ResourceKey.SERVICE_INSTANCE_ID));
+		} catch(BBObjectNotFoundException e) {
+			serviceInstance = setServiceInstance();
+		}
+		lookupKeyMap.put(ResourceKey.CONFIGURATION_ID, "testConfigurationId");
+		serviceInstance.setConfigurations(configurations);
+		return config;
+	}
 }
\ No newline at end of file
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAICreateTasksTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAICreateTasksTest.java
index 51a7f1ab04..0b802a3385 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAICreateTasksTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAICreateTasksTest.java
@@ -26,6 +26,9 @@ import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.camunda.bpm.engine.delegate.BpmnError;
 import org.junit.Before;
 import org.junit.Rule;
@@ -33,6 +36,7 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.onap.so.bpmn.BaseTaskTest;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Configuration;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.L3Network;
@@ -54,6 +58,7 @@ public class AAICreateTasksTest extends BaseTaskTest{
 	private CloudRegion cloudRegion;
 	private VfModule vfModule;
 	private Customer customer;
+	private Configuration configuration;
 	
 	 @Rule
 	 public final ExpectedException exception = ExpectedException.none();
@@ -67,6 +72,7 @@ public class AAICreateTasksTest extends BaseTaskTest{
 		volumeGroup = setVolumeGroup();
 		cloudRegion = setCloudRegion();
 		vfModule = setVfModule();
+		configuration = setConfiguration();
 
 	}
 	
@@ -384,4 +390,12 @@ public class AAICreateTasksTest extends BaseTaskTest{
 		aaiCreateTasks.connectNetworkToTenant(execution);
 		verify(aaiNetworkResources, times(1)).connectNetworkToTenant(network, gBBInput.getCloudRegion());
 	}
+	
+	@Test
+	public void createConfigurationTest() throws Exception {
+		gBBInput = execution.getGeneralBuildingBlock();
+		doNothing().when(aaiConfigurationResources).createConfiguration(configuration);
+		aaiCreateTasks.createConfiguration(execution);
+		verify(aaiConfigurationResources, times(1)).createConfiguration(configuration);
+	}
 }
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIDeleteTasksTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIDeleteTasksTest.java
new file mode 100644
index 0000000000..efe5b5d971
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIDeleteTasksTest.java
@@ -0,0 +1,162 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.infrastructure.aai.tasks;
+
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.camunda.bpm.engine.delegate.BpmnError;
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.so.bpmn.BaseTaskTest;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Configuration;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.L3Network;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.VfModule;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.VolumeGroup;
+import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class AAIDeleteTasksTest extends BaseTaskTest {
+	@Autowired
+	private AAIDeleteTasks aaiDeleteTasks;
+	
+	private L3Network network;
+	private ServiceInstance serviceInstance;
+	private GenericVnf genericVnf;
+	private VfModule vfModule;
+	private VolumeGroup volumeGroup;
+	private CloudRegion cloudRegion;
+	private Configuration configuration;
+	
+	@Before
+	public void before() {
+		serviceInstance = setServiceInstance();
+		genericVnf = setGenericVnf();
+		vfModule = setVfModule();
+		network = setL3Network();
+		volumeGroup = setVolumeGroup();
+		cloudRegion = setCloudRegion();
+		configuration = setConfiguration();
+	}
+	
+	@Test
+	public void deleteVfModuleTest() throws Exception {
+		doNothing().when(aaiVfModuleResources).deleteVfModule(vfModule, genericVnf);
+		aaiDeleteTasks.deleteVfModule(execution);
+		verify(aaiVfModuleResources, times(1)).deleteVfModule(vfModule, genericVnf);
+	}
+	
+	@Test
+	public void deleteVfModuleExceptionTest() throws Exception {
+		expectedException.expect(BpmnError.class);
+		doThrow(Exception.class).when(aaiVfModuleResources).deleteVfModule(vfModule, genericVnf);
+		aaiDeleteTasks.deleteVfModule(execution);
+	}
+	
+	@Test
+	public void deleteServiceInstanceTest() throws Exception {
+		doNothing().when(aaiServiceInstanceResources).deleteServiceInstance(serviceInstance);
+		
+		aaiDeleteTasks.deleteServiceInstance(execution);
+		
+		verify(aaiServiceInstanceResources, times(1)).deleteServiceInstance(serviceInstance);
+	}
+	
+	@Test 
+	public void deleteServiceInstanceExceptionTest() throws Exception {
+		expectedException.expect(BpmnError.class);
+		
+		doThrow(Exception.class).when(aaiServiceInstanceResources).deleteServiceInstance(serviceInstance);
+		
+		aaiDeleteTasks.deleteServiceInstance(execution);
+	}	
+	
+	@Test
+	public void deleteVnfTest() throws Exception {
+		doNothing().when(aaiVnfResources).deleteVnf(genericVnf);
+		aaiDeleteTasks.deleteVnf(execution);
+		verify(aaiVnfResources, times(1)).deleteVnf(genericVnf);
+	}
+	
+	@Test
+	public void deleteVnfTestException() throws Exception {
+		expectedException.expect(BpmnError.class);
+		doThrow(Exception.class).when(aaiVnfResources).deleteVnf(genericVnf);
+		
+		aaiDeleteTasks.deleteVnf(execution);
+		verify(aaiVnfResources, times(1)).deleteVnf(genericVnf);
+	}
+	
+	@Test 
+	public void deleteNetworkTest() throws Exception {
+		doNothing().when(aaiNetworkResources).deleteNetwork(network);
+		aaiDeleteTasks.deleteNetwork(execution);
+		verify(aaiNetworkResources, times(1)).deleteNetwork(network);
+	}
+	
+	@Test 
+	public void deleteCollectionTest() throws Exception {
+		doNothing().when(aaiNetworkResources).deleteCollection(serviceInstance.getCollection());
+		aaiDeleteTasks.deleteCollection(execution);
+		verify(aaiNetworkResources, times(1)).deleteCollection(serviceInstance.getCollection());
+	}
+	
+	@Test 
+	public void deleteInstanceGroupTest() throws Exception {
+		doNothing().when(aaiNetworkResources).deleteNetworkInstanceGroup(serviceInstance.getCollection().getInstanceGroup());
+		aaiDeleteTasks.deleteInstanceGroup(execution);
+		verify(aaiNetworkResources, times(1)).deleteNetworkInstanceGroup(serviceInstance.getCollection().getInstanceGroup());
+	}
+
+	@Test
+	public void deleteVolumeGroupTest() {
+		doNothing().when(aaiVolumeGroupResources).deleteVolumeGroup(volumeGroup, cloudRegion);
+		
+		aaiDeleteTasks.deleteVolumeGroup(execution);
+		
+		verify(aaiVolumeGroupResources, times(1)).deleteVolumeGroup(volumeGroup, cloudRegion);
+	}
+	
+	@Test
+	public void deleteVolumeGroupExceptionTest() {
+		expectedException.expect(BpmnError.class);
+		
+		doThrow(Exception.class).when(aaiVolumeGroupResources).deleteVolumeGroup(volumeGroup, cloudRegion);
+		
+		aaiDeleteTasks.deleteVolumeGroup(execution);
+	}
+	
+	@Test
+	public void deleteConfigurationTest() throws Exception {
+		gBBInput = execution.getGeneralBuildingBlock();
+		doNothing().when(aaiConfigurationResources).deleteConfiguration(configuration);
+		aaiDeleteTasks.deleteConfiguration(execution);
+		verify(aaiConfigurationResources, times(1)).deleteConfiguration(configuration);
+	}
+}
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIUpdateTasksTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIUpdateTasksTest.java
index b45752957e..d800ae9618 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIUpdateTasksTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIUpdateTasksTest.java
@@ -32,6 +32,7 @@ import org.junit.Test;
 import org.onap.so.adapters.nwrest.CreateNetworkResponse;
 import org.onap.so.bpmn.BaseTaskTest;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Configuration;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.L3Network;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
@@ -50,6 +51,7 @@ public class AAIUpdateTasksTest extends BaseTaskTest{
 	private GenericVnf genericVnf;
 	private VolumeGroup volumeGroup;
 	private CloudRegion cloudRegion;
+	private Configuration configuration;
 	
 	@Before
 	public void before() {
@@ -59,6 +61,7 @@ public class AAIUpdateTasksTest extends BaseTaskTest{
 		volumeGroup = setVolumeGroup();
 		cloudRegion = setCloudRegion();
 		network = setL3Network();
+		configuration = setConfiguration();
 	}
 	
 	@Test
@@ -462,4 +465,23 @@ public class AAIUpdateTasksTest extends BaseTaskTest{
 		doThrow(Exception.class).when(aaiVfModuleResources).changeAssignVfModule(vfModule, genericVnf);
 		aaiUpdateTasks.updateModelVfModule(execution);
 	}
+	
+	@Test
+	public void updateOrchestrationStatusDeactivateFabricConfigurationTest() throws Exception {
+		gBBInput = execution.getGeneralBuildingBlock();
+		doNothing().when(aaiConfigurationResources).updateOrchestrationStatusConfiguration(configuration, OrchestrationStatus.ASSIGNED);
+
+		aaiUpdateTasks.updateOrchestrationStatusDeactivateFabricConfiguration(execution);
+
+		verify(aaiConfigurationResources, times(1)).updateOrchestrationStatusConfiguration(configuration, OrchestrationStatus.ASSIGNED);
+	}
+	@Test
+	public void updateOrchestrationStatusActivateFabricConfigurationTest() throws Exception {
+		gBBInput = execution.getGeneralBuildingBlock();
+		doNothing().when(aaiConfigurationResources).updateOrchestrationStatusConfiguration(configuration, OrchestrationStatus.ACTIVE);
+
+		aaiUpdateTasks.updateOrchestrationStatusActivateFabricConfiguration(execution);
+
+		verify(aaiConfigurationResources, times(1)).updateOrchestrationStatusConfiguration(configuration, OrchestrationStatus.ACTIVE);
+	}
 }
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
index 3869988c40..65d16adb40 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
@@ -36,7 +36,6 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
@@ -74,7 +73,6 @@ import org.onap.so.db.catalog.beans.Service;
 import org.onap.so.db.catalog.beans.VfModuleCustomization;
 import org.onap.so.db.catalog.beans.macro.NorthBoundRequest;
 import org.onap.so.db.catalog.beans.macro.OrchestrationFlow;
-import org.onap.so.serviceinstancebeans.ModelInfo;
 import org.onap.so.serviceinstancebeans.RequestDetails;
 import org.onap.so.serviceinstancebeans.RequestParameters;
 import org.onap.so.serviceinstancebeans.ServiceInstancesRequest;
@@ -304,7 +302,7 @@ public class WorkflowActionTest extends BaseTaskTest {
 		orchFlows.add(orch7);
 		OrchestrationFlow orch8 = new OrchestrationFlow();
 		orch8.setFlowName("ActivateServiceInstanceBB");
-		orchFlows.add(orch8);	
+		orchFlows.add(orch8);
 		
 		ServiceInstance serviceInstanceAAI = new ServiceInstance();
 		serviceInstanceAAI.setServiceInstanceId("si0");
@@ -718,6 +716,9 @@ public class WorkflowActionTest extends BaseTaskTest {
 		orch15.setFlowName("ActivateServiceInstanceBB");
 		orchFlows.add(orch15);
 		
+		Service service = new Service();
+		service.setModelUUID("3c40d244-808e-42ca-b09a-256d83d19d0a");
+		
 		VfModuleCustomization vfModuleCustomization = new VfModuleCustomization();
 		vfModuleCustomization.setModelCustomizationUUID("a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f");
 		HeatEnvironment volumeHeatEnv = new HeatEnvironment();
@@ -743,6 +744,7 @@ public class WorkflowActionTest extends BaseTaskTest {
 		when(catalogDbClient.getVfModuleCustomizationByModelCuztomizationUUID("a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f")).thenReturn(vfModuleCustomization);
 		when(catalogDbClient.getVfModuleCustomizationByModelCuztomizationUUID("72d9d1cd-f46d-447a-abdb-451d6fb05fa8")).thenReturn(vfModuleCustomization2);
 		when(catalogDbClient.getVfModuleCustomizationByModelCuztomizationUUID("da4d4327-fb7d-4311-ac7a-be7ba60cf969")).thenReturn(vfModuleCustomization3);
+		when(catalogDbClient.getServiceByID("3c40d244-808e-42ca-b09a-256d83d19d0a")).thenReturn(service);
 		workflowAction.selectExecutionList(execution);
 		List<ExecuteBuildingBlock> ebbs = (List<ExecuteBuildingBlock>) execution.getVariable("flowsToExecute");
 		
@@ -796,48 +798,48 @@ public class WorkflowActionTest extends BaseTaskTest {
 		NorthBoundRequest northBoundRequest = new NorthBoundRequest();
 		List<OrchestrationFlow> orchFlows = new LinkedList<>();
 		northBoundRequest.setOrchestrationFlowList(orchFlows);	
-		OrchestrationFlow orch1 = new OrchestrationFlow();
-		orch1.setFlowName("DeactivateVfModuleBB");
-		orchFlows.add(orch1);
-		OrchestrationFlow orch2 = new OrchestrationFlow();
-		orch2.setFlowName("DeleteVfModuleBB");
-		orchFlows.add(orch2);
 		OrchestrationFlow orch3 = new OrchestrationFlow();
-		orch3.setFlowName("DeactivateVolumeGroupBB");
+		orch3.setFlowName("DeactivateVfModuleBB");
 		orchFlows.add(orch3);
 		OrchestrationFlow orch4 = new OrchestrationFlow();
-		orch4.setFlowName("DeleteVolumeGroupBB");
+		orch4.setFlowName("DeleteVfModuleBB");
 		orchFlows.add(orch4);
 		OrchestrationFlow orch5 = new OrchestrationFlow();
-		orch5.setFlowName("DeactivateVnfBB");
+		orch5.setFlowName("DeactivateVolumeGroupBB");
 		orchFlows.add(orch5);
 		OrchestrationFlow orch6 = new OrchestrationFlow();
-		orch6.setFlowName("DeactivateNetworkBB");
+		orch6.setFlowName("DeleteVolumeGroupBB");
 		orchFlows.add(orch6);
 		OrchestrationFlow orch7 = new OrchestrationFlow();
-		orch7.setFlowName("DeleteNetworkBB");
+		orch7.setFlowName("DeactivateVnfBB");
 		orchFlows.add(orch7);
 		OrchestrationFlow orch8 = new OrchestrationFlow();
-		orch8.setFlowName("DeleteNetworkCollectionBB");
+		orch8.setFlowName("DeactivateNetworkBB");
 		orchFlows.add(orch8);	
 		OrchestrationFlow orch9 = new OrchestrationFlow();
-		orch9.setFlowName("DeactivateServiceInstanceBB");
+		orch9.setFlowName("DeleteNetworkBB");
 		orchFlows.add(orch9);	
 		OrchestrationFlow orch10 = new OrchestrationFlow();
-		orch10.setFlowName("UnassignVfModuleBB");
+		orch10.setFlowName("DeleteNetworkCollectionBB");
 		orchFlows.add(orch10);	
 		OrchestrationFlow orch11 = new OrchestrationFlow();
-		orch11.setFlowName("UnassignVolumeGroupBB");
+		orch11.setFlowName("DeactivateServiceInstanceBB");
 		orchFlows.add(orch11);	
 		OrchestrationFlow orch12 = new OrchestrationFlow();
-		orch12.setFlowName("UnassignVnfBB");
+		orch12.setFlowName("UnassignVfModuleBB");
 		orchFlows.add(orch12);	
 		OrchestrationFlow orch13 = new OrchestrationFlow();
-		orch13.setFlowName("UnassignNetworkBB");
+		orch13.setFlowName("UnassignVolumeGroupBB");
 		orchFlows.add(orch13);	
 		OrchestrationFlow orch14 = new OrchestrationFlow();
-		orch14.setFlowName("UnassignServiceInstanceBB");
+		orch14.setFlowName("UnassignVnfBB");
 		orchFlows.add(orch14);	
+		OrchestrationFlow orch15 = new OrchestrationFlow();
+		orch15.setFlowName("UnassignNetworkBB");
+		orchFlows.add(orch15);	
+		OrchestrationFlow orch16 = new OrchestrationFlow();
+		orch16.setFlowName("UnassignServiceInstanceBB");
+		orchFlows.add(orch16);	
 		
 		ServiceInstance serviceInstanceAAI = new ServiceInstance();
 		serviceInstanceAAI.setServiceInstanceId("aaisi123");
@@ -954,49 +956,49 @@ public class WorkflowActionTest extends BaseTaskTest {
 		
 		NorthBoundRequest northBoundRequest = new NorthBoundRequest();
 		List<OrchestrationFlow> orchFlows = new LinkedList<>();
-		northBoundRequest.setOrchestrationFlowList(orchFlows);				
-		OrchestrationFlow orch1 = new OrchestrationFlow();
-		orch1.setFlowName("DeactivateVfModuleBB");
-		orchFlows.add(orch1);
-		OrchestrationFlow orch2 = new OrchestrationFlow();
-		orch2.setFlowName("DeleteVfModuleBB");
-		orchFlows.add(orch2);
+		northBoundRequest.setOrchestrationFlowList(orchFlows);	
 		OrchestrationFlow orch3 = new OrchestrationFlow();
-		orch3.setFlowName("DeactivateVolumeGroupBB");
+		orch3.setFlowName("DeactivateVfModuleBB");
 		orchFlows.add(orch3);
 		OrchestrationFlow orch4 = new OrchestrationFlow();
-		orch4.setFlowName("DeleteVolumeGroupBB");
+		orch4.setFlowName("DeleteVfModuleBB");
 		orchFlows.add(orch4);
 		OrchestrationFlow orch5 = new OrchestrationFlow();
-		orch5.setFlowName("DeactivateVnfBB");
+		orch5.setFlowName("DeactivateVolumeGroupBB");
 		orchFlows.add(orch5);
 		OrchestrationFlow orch6 = new OrchestrationFlow();
-		orch6.setFlowName("DeactivateNetworkBB");
+		orch6.setFlowName("DeleteVolumeGroupBB");
 		orchFlows.add(orch6);
 		OrchestrationFlow orch7 = new OrchestrationFlow();
-		orch7.setFlowName("DeleteNetworkBB");
+		orch7.setFlowName("DeactivateVnfBB");
 		orchFlows.add(orch7);
 		OrchestrationFlow orch8 = new OrchestrationFlow();
-		orch8.setFlowName("DeleteNetworkCollectionBB");
-		orchFlows.add(orch8);
+		orch8.setFlowName("DeactivateNetworkBB");
+		orchFlows.add(orch8);	
 		OrchestrationFlow orch9 = new OrchestrationFlow();
-		orch9.setFlowName("DeactivateServiceInstanceBB");
-		orchFlows.add(orch9);
+		orch9.setFlowName("DeleteNetworkBB");
+		orchFlows.add(orch9);	
 		OrchestrationFlow orch10 = new OrchestrationFlow();
-		orch10.setFlowName("UnassignVfModuleBB");
-		orchFlows.add(orch10);
+		orch10.setFlowName("DeleteNetworkCollectionBB");
+		orchFlows.add(orch10);	
 		OrchestrationFlow orch11 = new OrchestrationFlow();
-		orch11.setFlowName("UnassignVolumeGroupBB");
-		orchFlows.add(orch11);
+		orch11.setFlowName("DeactivateServiceInstanceBB");
+		orchFlows.add(orch11);	
 		OrchestrationFlow orch12 = new OrchestrationFlow();
-		orch12.setFlowName("UnassignVnfBB");
-		orchFlows.add(orch12);
+		orch12.setFlowName("UnassignVfModuleBB");
+		orchFlows.add(orch12);	
 		OrchestrationFlow orch13 = new OrchestrationFlow();
-		orch13.setFlowName("UnassignNetworkBB");
-		orchFlows.add(orch13);
+		orch13.setFlowName("UnassignVolumeGroupBB");
+		orchFlows.add(orch13);	
 		OrchestrationFlow orch14 = new OrchestrationFlow();
-		orch14.setFlowName("UnassignServiceInstanceBB");
-		orchFlows.add(orch14);
+		orch14.setFlowName("UnassignVnfBB");
+		orchFlows.add(orch14);	
+		OrchestrationFlow orch15 = new OrchestrationFlow();
+		orch15.setFlowName("UnassignNetworkBB");
+		orchFlows.add(orch15);	
+		OrchestrationFlow orch16 = new OrchestrationFlow();
+		orch16.setFlowName("UnassignServiceInstanceBB");
+		orchFlows.add(orch16);	
 		
 		ServiceInstance serviceInstanceAAI = new ServiceInstance();
 		serviceInstanceAAI.setServiceInstanceId("aaisi123");
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/aai/mapper/AAIObjectMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/aai/mapper/AAIObjectMapperTest.java
index 0355006d15..99f1b188c9 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/aai/mapper/AAIObjectMapperTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/aai/mapper/AAIObjectMapperTest.java
@@ -562,7 +562,7 @@ public class AAIObjectMapperTest {
 		AAIObjectMapper aaiObjectMapper = new AAIObjectMapper();
 		org.onap.aai.domain.yang.CtagAssignments v12CtagAssingments = aaiObjectMapper.mapToAAICtagAssignmentList(ctagAssignments);
 
-		assertEquals(ctagAssignments.get(0).getVlanIdInner().longValue(), v12CtagAssingments.getCtagAssignment().get(0).getVlanIdInner());
+		assertEquals(new Long(ctagAssignments.get(0).getVlanIdInner().longValue()), new Long(v12CtagAssingments.getCtagAssignment().get(0).getVlanIdInner()));
 
 		String jsonToCompare = new String(Files.readAllBytes(Paths.get(JSON_FILE_LOCATION + "aaiCtagAssingmentsMapped_to_aai.json")));
 		ObjectMapper omapper = new ObjectMapper();
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAIConfigurationResourcesTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAIConfigurationResourcesTest.java
index cc48c46508..5948c66baa 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAIConfigurationResourcesTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAIConfigurationResourcesTest.java
@@ -177,4 +177,13 @@ public class AAIConfigurationResourcesTest extends TestDataSetup{
         aaiConfigurationResources.deleteConfiguration("configurationId");
         verify(MOCK_aaiResourcesClient, times(1)).delete(aaiResourceUri);
     }
+    
+    @Test
+	public void updateOrchestrationStatusConfigurationTest() throws Exception {
+		configuration.setOrchestrationStatus(OrchestrationStatus.ACTIVE);
+		doNothing().when(MOCK_aaiResourcesClient).update(isA(AAIResourceUri.class), isA(org.onap.aai.domain.yang.Configuration.class));
+		aaiConfigurationResources.updateOrchestrationStatusConfiguration(configuration,OrchestrationStatus.ACTIVE);		
+		verify(MOCK_aaiResourcesClient, times(1)).update(any(AAIResourceUri.class), any(org.onap.aai.domain.yang.Configuration.class));
+		assertEquals(OrchestrationStatus.ACTIVE, configuration.getOrchestrationStatus());
+	}
 }
\ No newline at end of file
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/BaseClientTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/BaseClientTest.java
deleted file mode 100644
index a564d8a21d..0000000000
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/BaseClientTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.onap.so.client.sdnc;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-
-import java.util.Map;
-
-import javax.ws.rs.core.UriBuilder;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.springframework.core.ParameterizedTypeReference;
-
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-
-import wiremock.org.apache.http.entity.ContentType;
-public class BaseClientTest {
-
-	
-	@Rule
-	public WireMockRule wm = new WireMockRule(options().dynamicPort());
-	
-	@Test
-	public void verifyString() {
-		BaseClient<String, String> client = new BaseClient<>();
-		String response = "{\"hello\" : \"world\"}";
-		client.setTargetUrl(UriBuilder.fromUri("http://localhost/test").port(wm.port()).build().toString());
-		wm.stubFor(get(urlEqualTo("/test"))
-                .willReturn(aResponse().withStatus(200).withBody(response).withHeader("Content-Type", ContentType.APPLICATION_JSON.toString())));
-		
-		String result = client.get("", new ParameterizedTypeReference<String>() {});
-		assertThat(result, equalTo(response));
-	}
-	
-	@Test
-	public void verifyMap() {
-		BaseClient<String, Map<String, Object>> client = new BaseClient<>();
-		String response = "{\"hello\" : \"world\"}";
-		client.setTargetUrl(UriBuilder.fromUri("http://localhost/test").port(wm.port()).build().toString());
-		wm.stubFor(get(urlEqualTo("/test"))
-                .willReturn(aResponse().withStatus(200).withBody(response).withHeader("Content-Type", ContentType.APPLICATION_JSON.toString())));
-		
-		Map<String, Object> result = client.get("", new ParameterizedTypeReference<Map<String, Object>>() {});
-		assertThat("world", equalTo(result.get("hello")));
-	}
-}