Remove duplicate name check in createAAITasks.

Remove duplicate name check in createAAITasks. This hould be done prior
to status check in WorkflowAction or BBInputSetup.

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

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAICreateTasks.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAICreateTasks.java
index e3540ec..583e3e1 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAICreateTasks.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAICreateTasks.java
@@ -77,7 +77,6 @@ public class AAICreateTasks {
 
     private static final Logger logger = LoggerFactory.getLogger(AAICreateTasks.class);
     private static final String networkTypeProvider = "PROVIDER";
-    private static final String A_LA_CARTE = "aLaCarte";
     private static String NETWORK_COLLECTION_NAME = "networkCollectionName";
     private static String CONTRAIL_NETWORK_POLICY_FQDN_LIST = "contrailNetworkPolicyFqdnList";
     private static String HEAT_STACK_ID = "heatStackId";
@@ -107,12 +106,8 @@ public class AAICreateTasks {
 
     public void createServiceInstance(BuildingBlockExecution execution) {
         try {
-            Boolean alaCarte = execution.getVariable(A_LA_CARTE);
             ServiceInstance serviceInstance =
                     extractPojosForBB.extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID);
-            if (Boolean.TRUE.equals(alaCarte) && aaiSIResources.checkInstanceServiceNameInUse(serviceInstance)) {
-                throw new DuplicateNameException("service-instance", serviceInstance.getServiceInstanceName());
-            }
             Customer customer = execution.getGeneralBuildingBlock().getCustomer();
             aaiSIResources.createServiceInstance(serviceInstance, customer);
         } catch (Exception ex) {
@@ -199,11 +194,7 @@ public class AAICreateTasks {
 
     public void createVnf(BuildingBlockExecution execution) {
         try {
-            Boolean alaCarte = execution.getVariable(A_LA_CARTE);
             GenericVnf vnf = extractPojosForBB.extractByKey(execution, ResourceKey.GENERIC_VNF_ID);
-            if (Boolean.TRUE.equals(alaCarte) && aaiVnfResources.checkNameInUse(vnf.getVnfName())) {
-                throw new DuplicateNameException("generic-vnf", vnf.getVnfName());
-            }
             ServiceInstance serviceInstance =
                     extractPojosForBB.extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID);
             execution.setVariable("homing", Boolean.TRUE.equals(vnf.isCallHoming()));
@@ -262,10 +253,6 @@ public class AAICreateTasks {
             GenericVnf genericVnf = extractPojosForBB.extractByKey(execution, ResourceKey.GENERIC_VNF_ID);
             VolumeGroup volumeGroup = extractPojosForBB.extractByKey(execution, ResourceKey.VOLUME_GROUP_ID);
             CloudRegion cloudRegion = gBBInput.getCloudRegion();
-            Boolean alaCarte = execution.getVariable(A_LA_CARTE);
-            if (Boolean.TRUE.equals(alaCarte) && aaiVolumeGroupResources.checkNameInUse(volumeGroup)) {
-                throw new DuplicateNameException("volume-group", volumeGroup.getVolumeGroupName());
-            }
             aaiVolumeGroupResources.createVolumeGroup(volumeGroup, cloudRegion);
             aaiVolumeGroupResources.connectVolumeGroupToVnf(genericVnf, volumeGroup, cloudRegion);
             aaiVolumeGroupResources.connectVolumeGroupToTenant(volumeGroup, cloudRegion);
@@ -278,10 +265,6 @@ public class AAICreateTasks {
         try {
             GenericVnf vnf = extractPojosForBB.extractByKey(execution, ResourceKey.GENERIC_VNF_ID);
             VfModule vfModule = extractPojosForBB.extractByKey(execution, ResourceKey.VF_MODULE_ID);
-            Boolean alaCarte = execution.getVariable(A_LA_CARTE);
-            if (Boolean.TRUE.equals(alaCarte) && aaiVfModuleResources.checkNameInUse(vfModule)) {
-                throw new DuplicateNameException("vf-module", vfModule.getVfModuleName());
-            }
             int moduleIndex = 0;
             if (vfModule.getModelInfoVfModule() != null
                     && !Boolean.TRUE.equals(vfModule.getModelInfoVfModule().getIsBaseBoolean())) {
@@ -327,14 +310,9 @@ public class AAICreateTasks {
      */
     public void createNetwork(BuildingBlockExecution execution) {
         try {
-            Boolean alaCarte = execution.getVariable(A_LA_CARTE);
             ServiceInstance serviceInstance =
                     extractPojosForBB.extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID);
             L3Network l3network = extractPojosForBB.extractByKey(execution, ResourceKey.NETWORK_ID);
-            if (Boolean.TRUE.equals(alaCarte)
-                    && aaiNetworkResources.checkNetworkNameInUse(l3network.getNetworkName())) {
-                throw new DuplicateNameException("l3Network", l3network.getNetworkName());
-            }
             // set default to false. ToBe updated by SDNC
             l3network.setIsBoundToVpn(false);
             // define is bound to vpn flag as true if NEUTRON_NETWORK_TYPE is PROVIDER
@@ -385,16 +363,11 @@ public class AAICreateTasks {
      */
     public void createNetworkCollectionInstanceGroup(BuildingBlockExecution execution) {
         try {
-            Boolean alaCarte = execution.getVariable(A_LA_CARTE);
             ServiceInstance serviceInstance =
                     extractPojosForBB.extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID);
             InstanceGroup instanceGroup = serviceInstance.getCollection().getInstanceGroup();
             // set name generated for NetworkCollection/NetworkCollectionInstanceGroup in previous step of the BB flow
             instanceGroup.setInstanceGroupName(execution.getVariable(NETWORK_COLLECTION_NAME));
-            if (Boolean.TRUE.equals(alaCarte)
-                    && aaiInstanceGroupResources.checkInstanceGroupNameInUse(instanceGroup.getInstanceGroupName())) {
-                throw new DuplicateNameException("instance-group", instanceGroup.getInstanceGroupName());
-            }
             // put shell in AAI
             aaiNetworkResources.createNetworkInstanceGroup(instanceGroup);
         } catch (Exception ex) {
@@ -511,12 +484,7 @@ public class AAICreateTasks {
 
     public void createConfiguration(BuildingBlockExecution execution) {
         try {
-            Boolean alaCarte = execution.getVariable(A_LA_CARTE);
             Configuration configuration = extractPojosForBB.extractByKey(execution, ResourceKey.CONFIGURATION_ID);
-            if (Boolean.TRUE.equals(alaCarte)
-                    && aaiConfigurationResources.checkConfigurationNameInUse(configuration.getConfigurationName())) {
-                throw new DuplicateNameException("configuration", configuration.getConfigurationName());
-            }
             aaiConfigurationResources.createConfiguration(configuration);
         } catch (Exception ex) {
             exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
@@ -525,14 +493,9 @@ public class AAICreateTasks {
 
     public void createInstanceGroupVnf(BuildingBlockExecution execution) {
         try {
-            Boolean alaCarte = execution.getVariable(A_LA_CARTE);
             ServiceInstance serviceInstance =
                     extractPojosForBB.extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID);
             InstanceGroup instanceGroup = extractPojosForBB.extractByKey(execution, ResourceKey.INSTANCE_GROUP_ID);
-            if (Boolean.TRUE.equals(alaCarte)
-                    && aaiInstanceGroupResources.checkInstanceGroupNameInUse(instanceGroup.getInstanceGroupName())) {
-                throw new DuplicateNameException("instance-group", instanceGroup.getInstanceGroupName());
-            }
             aaiInstanceGroupResources.createInstanceGroupandConnectServiceInstance(instanceGroup, serviceInstance);
         } catch (Exception ex) {
             exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);

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 b889493..ed3ec75 100644 (file)
--- 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
@@ -60,7 +60,6 @@ import org.onap.so.bpmn.servicedecomposition.bbobjects.VolumeGroup;
 import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
 import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoGenericVnf;
 import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoVfModule;
-import org.onap.so.bpmn.servicedecomposition.tasks.exceptions.DuplicateNameException;
 import org.onap.so.client.exception.BBObjectNotFoundException;
 import org.onap.so.db.catalog.beans.OrchestrationStatus;
 import org.onap.so.client.aai.entities.uri.AAIResourceUri;
@@ -129,14 +128,6 @@ public class AAICreateTasksTest extends BaseTaskTest {
         verify(aaiServiceInstanceResources, times(1)).createServiceInstance(serviceInstance, customer);
     }
 
-    @Test
-    public void createServiceInstanceNameInUseExceptionTest() throws Exception {
-        expectedException.expect(BpmnError.class);
-        doReturn(true).when(aaiServiceInstanceResources).checkInstanceServiceNameInUse(serviceInstance);
-        execution.setVariable("aLaCarte", Boolean.TRUE);
-        aaiCreateTasks.createServiceInstance(execution);
-    }
-
     @Test
     public void createServiceInstanceExceptionTest() throws Exception {
         expectedException.expect(BpmnError.class);
@@ -161,14 +152,6 @@ public class AAICreateTasksTest extends BaseTaskTest {
         verify(aaiVolumeGroupResources, times(1)).connectVolumeGroupToTenant(volumeGroup, cloudRegion);
     }
 
-    @Test
-    public void createVolumeGroupDuplicateNameTest() throws Exception {
-        expectedException.expect(BpmnError.class);
-        execution.setVariable("aLaCarte", Boolean.TRUE);
-        doReturn(true).when(aaiVolumeGroupResources).checkNameInUse(volumeGroup);
-        aaiCreateTasks.createVolumeGroup(execution);
-    }
-
     @Test
     public void createVolumeGroupExceptionTest() throws Exception {
         expectedException.expect(BpmnError.class);
@@ -348,14 +331,6 @@ public class AAICreateTasksTest extends BaseTaskTest {
         verify(aaiVnfResources, times(1)).createVnfandConnectServiceInstance(genericVnf, serviceInstance);
     }
 
-    @Test
-    public void createVnfDuplicateNameTest() throws Exception {
-        expectedException.expect(BpmnError.class);
-        doReturn(true).when(aaiVnfResources).checkNameInUse(genericVnf.getVnfName());
-        execution.setVariable("aLaCarte", Boolean.TRUE);
-        aaiCreateTasks.createVnf(execution);
-    }
-
     @Test
     public void createVnfExceptionTest() throws Exception {
         expectedException.expect(BpmnError.class);
@@ -385,14 +360,6 @@ public class AAICreateTasksTest extends BaseTaskTest {
         verify(aaiVfModuleResources, times(1)).createVfModule(newVfModule, genericVnf);
     }
 
-    @Test
-    public void createVfModuleDuplicateNameTest() throws Exception {
-        expectedException.expect(BpmnError.class);
-        execution.setVariable("aLaCarte", Boolean.TRUE);
-        doReturn(true).when(aaiVfModuleResources).checkNameInUse(vfModule);
-        aaiCreateTasks.createVfModule(execution);
-    }
-
     @Test
     public void createServiceSubscriptionTest() {
         doNothing().when(aaiServiceInstanceResources).createServiceSubscription(customer);
@@ -440,14 +407,6 @@ public class AAICreateTasksTest extends BaseTaskTest {
         verify(aaiNetworkResources, times(1)).createNetworkConnectToServiceInstance(network, serviceInstance);
     }
 
-    @Test
-    public void createNetworkNameInUseExceptionTest() throws Exception {
-        expectedException.expect(BpmnError.class);
-        execution.setVariable("aLaCarte", Boolean.TRUE);
-        doReturn(true).when(aaiNetworkResources).checkNetworkNameInUse(network.getNetworkName());
-        aaiCreateTasks.createNetwork(execution);
-    }
-
     @Test
     public void createNetworkExceptionTest() throws Exception {
         expectedException.expect(BpmnError.class);
@@ -559,15 +518,6 @@ public class AAICreateTasksTest extends BaseTaskTest {
         verify(aaiConfigurationResources, times(1)).createConfiguration(configuration);
     }
 
-    @Test
-    public void createConfigurationNameInUseExceptionTest() throws Exception {
-        expectedException.expect(BpmnError.class);
-        doReturn(true).when(aaiConfigurationResources)
-                .checkConfigurationNameInUse(configuration.getConfigurationName());
-        execution.setVariable("aLaCarte", Boolean.TRUE);
-        aaiCreateTasks.createConfiguration(execution);
-    }
-
     @Test
     public void connectVnfToCloudRegionTest() throws Exception {
         gBBInput = execution.getGeneralBuildingBlock();
@@ -608,15 +558,6 @@ public class AAICreateTasksTest extends BaseTaskTest {
                 serviceInstance);
     }
 
-    @Test
-    public void createInstanceGroupVnfNameInUseExceptionTest() throws Exception {
-        expectedException.expect(BpmnError.class);
-        doReturn(true).when(aaiInstanceGroupResources)
-                .checkInstanceGroupNameInUse(instanceGroup.getInstanceGroupName());
-        execution.setVariable("aLaCarte", Boolean.TRUE);
-        aaiCreateTasks.createInstanceGroupVnf(execution);
-    }
-
     @Test
     public void createInstanceGroupVnfExceptionTest() throws Exception {
         expectedException.expect(BpmnError.class);