Accommodate WAN Networking

checked and evaluated naming policy only if infra bonding.
Updated workflowAction to include vrf configuration for vpn-binding in
resourceIds list.
added in linked resource to service proxy cust
committing the asdc controller classpath change
added some unit tests for vrf validation and updated bbinput setup test
update config resource cust foreign key mapping
Moved mockbean for AssignVrfConfiguration task class into BaseBpmnTest.
added in a check to see if list is empty before access
added unit tests for bbinput setup for vrf config
Update AssignFlows enum with correct AssignVrfConfiguration flow name

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

17 files changed, 668 insertions, 17 deletions

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 b40e43b959..39efa6dc76 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
@@ -35,6 +35,7 @@ import org.onap.so.client.aai.mapper.AAIObjectMapper;
 import org.onap.so.client.adapter.network.mapper.NetworkAdapterObjectMapper;
 import org.onap.so.client.appc.ApplicationControllerAction;
 import org.onap.so.client.exception.ExceptionBuilder;
+import org.onap.so.client.namingservice.NamingRequestObject;
 import org.onap.so.client.orchestration.AAICollectionResources;
 import org.onap.so.client.orchestration.AAIConfigurationResources;
 import org.onap.so.client.orchestration.AAIInstanceGroupResources;
@@ -150,4 +151,8 @@ public abstract class BaseTaskTest extends TestDataSetup {
 
     @Mock
     protected Environment env;
+
+    @Mock
+    protected NamingRequestObject namingRequestObject;
+
 }
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/SniroHomingV2IT.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/SniroHomingV2IT.java
index b5a8318ce9..7b6ba6b8fd 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/SniroHomingV2IT.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/SniroHomingV2IT.java
@@ -110,13 +110,13 @@ public class SniroHomingV2IT extends BaseIntegrationTest {
 
     public void beforeServiceProxy() {
         ServiceProxy sp = setServiceProxy("1", "infrastructure");
-        Candidate requiredCandidate = new Candidate();
-        requiredCandidate.setIdentifierType(CandidateType.CLOUD_REGION_ID);
+        Candidate filteringAttributes = new Candidate();
+        filteringAttributes.setIdentifierType(CandidateType.CLOUD_REGION_ID);
         List<String> c = new ArrayList<String>();
         c.add("testCloudRegionId");
-        requiredCandidate.setCloudOwner("att");
-        requiredCandidate.setIdentifiers(c);
-        sp.addRequiredCandidates(requiredCandidate);
+        filteringAttributes.setCloudOwner("att");
+        filteringAttributes.setIdentifiers(c);
+        sp.getFilteringAttributes().add(filteringAttributes);
         serviceInstance.getServiceProxies().add(sp);
     }
 
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/namingservice/tasks/NamingServiceCreateTasksTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/namingservice/tasks/NamingServiceCreateTasksTest.java
index f5785f94fd..3f62a61518 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/namingservice/tasks/NamingServiceCreateTasksTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/namingservice/tasks/NamingServiceCreateTasksTest.java
@@ -22,31 +22,50 @@ package org.onap.so.bpmn.infrastructure.namingservice.tasks;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import java.util.Optional;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentMatchers;
 import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.onap.aai.domain.yang.Zone;
 import org.onap.so.bpmn.BaseTaskTest;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.InstanceGroup;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
+import org.onap.so.bpmn.servicedecomposition.entities.GeneralBuildingBlock;
 import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
+import org.onap.so.bpmn.servicedecomposition.tasks.BBInputSetupUtils;
+import org.onap.so.client.aai.AAICommonObjectMapperProvider;
+import org.onap.so.client.aai.entities.AAIResultWrapper;
+import org.onap.so.client.aai.entities.Relationships;
 import org.onap.so.client.exception.BBObjectNotFoundException;
 
 public class NamingServiceCreateTasksTest extends BaseTaskTest {
     @InjectMocks
-    private NamingServiceCreateTasks namingServiceCreateTasks = new NamingServiceCreateTasks();
+    private NamingServiceCreateTasks namingServiceCreateTasks;
+
+    @Mock
+    private BBInputSetupUtils MOCK_bbInputSetupUtils;
 
     private InstanceGroup instanceGroup;
+    private ServiceInstance serviceInstance;
 
     @Before
     public void before() throws BBObjectNotFoundException {
         instanceGroup = setInstanceGroup();
         when(extractPojosForBB.extractByKey(any(), ArgumentMatchers.eq(ResourceKey.INSTANCE_GROUP_ID)))
                 .thenReturn(instanceGroup);
+        serviceInstance = setServiceInstance();
+        when(extractPojosForBB.extractByKey(any(), ArgumentMatchers.eq(ResourceKey.SERVICE_INSTANCE_ID)))
+                .thenReturn(serviceInstance);
     }
 
     @Test
@@ -80,7 +99,62 @@ public class NamingServiceCreateTasksTest extends BaseTaskTest {
         namingServiceCreateTasks.createInstanceGroupName(execution);
         verify(namingServiceResources, times(1)).generateInstanceGroupName(instanceGroup, policyInstanceName,
                 nfNamingCode);
+    }
 
+    @Test
+    public void createWanTransportServiceNameTest() throws Exception {
+        String generatedName = "generatedWanTransportServiceName";
+        doReturn(generatedName).when(namingServiceResources).generateServiceInstanceName(any());
+        NamingServiceCreateTasks spy = Mockito.spy(namingServiceCreateTasks);
+        doReturn("testZoneId").when(spy).getRelatedZoneId(any());
+        spy.createWanTransportServiceName(execution);
+        verify(namingServiceResources, times(1)).generateServiceInstanceName(any());
+        assertEquals(generatedName, serviceInstance.getServiceInstanceName());
     }
 
+    @Test
+    public void createVpnBondingServiceNameTest() throws Exception {
+        when(extractPojosForBB.extractByKey(any(), ArgumentMatchers.eq(ResourceKey.NETWORK_ID)))
+                .thenReturn(buildL3Network());
+        when(extractPojosForBB.extractByKey(any(), ArgumentMatchers.eq(ResourceKey.VPN_ID)))
+                .thenReturn(buildVpnBinding());
+        String generatedName = "generatedWanTransportServiceName";
+        doReturn(generatedName).when(namingServiceResources).generateServiceInstanceName(any());
+        namingServiceCreateTasks.createVpnBondingServiceName(execution);
+        verify(namingServiceResources, times(1)).generateServiceInstanceName(any());
+        assertEquals(generatedName, serviceInstance.getServiceInstanceName());
+    }
+
+    @Test
+    public void getRelatedZoneIdTest() throws Exception {
+
+        String zoneId = "zoneId";
+        Zone zone = new Zone();
+        zone.setZoneId(zoneId);
+
+        CloudRegion cloudRegion = new CloudRegion();
+        cloudRegion.setCloudOwner("testCloudOwner");
+        cloudRegion.setLcpCloudRegionId("testLcpCloudRegionId");
+        GeneralBuildingBlock gBBInput = execution.getGeneralBuildingBlock();
+        gBBInput.setCloudRegion(cloudRegion);
+
+        AAIResultWrapper cloudRegionWrapper =
+                new AAIResultWrapper(new AAICommonObjectMapperProvider().getMapper().writeValueAsString(cloudRegion));
+
+        Relationships relationships = Mockito.mock(Relationships.class);
+        relationships.getAll().add(cloudRegionWrapper);
+        Optional<Relationships> relationshipsOp = Optional.of(relationships);
+
+        doReturn(cloudRegionWrapper).when(MOCK_bbInputSetupUtils).getAAIResourceDepthOne(any());
+
+        NamingServiceCreateTasks spy = Mockito.spy(namingServiceCreateTasks);
+
+        doReturn(relationshipsOp).when(spy).getRelationshipsFromWrapper(isA(AAIResultWrapper.class));
+        doReturn(zone).when(spy).getRelatedZone(any());
+        spy.setBbInputSetupUtils(MOCK_bbInputSetupUtils);
+
+        String returnedZoneId = spy.getRelatedZoneId(execution);
+
+        assertEquals(zoneId, returnedZoneId);
+    }
 }
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/namingservice/tasks/NamingServiceDeleteTasksTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/namingservice/tasks/NamingServiceDeleteTasksTest.java
index 758b8f4ffd..32550a5467 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/namingservice/tasks/NamingServiceDeleteTasksTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/namingservice/tasks/NamingServiceDeleteTasksTest.java
@@ -21,6 +21,7 @@
 package org.onap.so.bpmn.infrastructure.namingservice.tasks;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.times;
@@ -32,14 +33,17 @@ import org.mockito.ArgumentMatchers;
 import org.mockito.InjectMocks;
 import org.onap.so.bpmn.BaseTaskTest;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.InstanceGroup;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
 import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
 import org.onap.so.client.exception.BBObjectNotFoundException;
+import org.onap.so.client.namingservice.NamingRequestObject;
 
 public class NamingServiceDeleteTasksTest extends BaseTaskTest {
     @InjectMocks
     private NamingServiceDeleteTasks namingServiceDeleteTasks = new NamingServiceDeleteTasks();
 
     private InstanceGroup instanceGroup;
+    private ServiceInstance serviceInstance;
 
     @Before
     public void before() throws BBObjectNotFoundException {
@@ -68,4 +72,15 @@ public class NamingServiceDeleteTasksTest extends BaseTaskTest {
         verify(namingServiceResources, times(1)).deleteInstanceGroupName(instanceGroup);
     }
 
+    @Test
+    public void deleteServiceInstanceNameTest() throws Exception {
+        serviceInstance = setServiceInstance();
+        when(extractPojosForBB.extractByKey(any(), ArgumentMatchers.eq(ResourceKey.SERVICE_INSTANCE_ID)))
+                .thenReturn(serviceInstance);
+        doNothing().when(namingRequestObject).setExternalKeyValue(serviceInstance.getServiceInstanceId());
+        doReturn("").when(namingServiceResources).deleteServiceInstanceName(namingRequestObject);
+        namingServiceDeleteTasks.deleteServiceInstanceName(execution);
+        verify(namingServiceResources, times(1)).deleteServiceInstanceName(any(NamingRequestObject.class));
+    }
+
 }
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/VrfValidationTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/VrfValidationTest.java
new file mode 100644
index 0000000000..526ebe8581
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/VrfValidationTest.java
@@ -0,0 +1,177 @@
+package org.onap.so.bpmn.infrastructure.workflow.tasks;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.doReturn;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.mockito.InjectMocks;
+import org.mockito.Mockito;
+import org.onap.aai.domain.yang.AggregateRoute;
+import org.onap.aai.domain.yang.AggregateRoutes;
+import org.onap.aai.domain.yang.L3Network;
+import org.onap.aai.domain.yang.RouteTarget;
+import org.onap.aai.domain.yang.RouteTargets;
+import org.onap.aai.domain.yang.Subnet;
+import org.onap.aai.domain.yang.Subnets;
+import org.onap.aai.domain.yang.VpnBinding;
+import org.onap.so.bpmn.BaseTaskTest;
+import org.onap.so.client.aai.AAIObjectType;
+import org.onap.so.client.aai.entities.AAIResultWrapper;
+import org.onap.so.client.aai.entities.uri.AAIResourceUri;
+import org.onap.so.db.catalog.beans.ConfigurationResourceCustomization;
+import org.onap.so.db.catalog.beans.Service;
+import org.onap.so.db.catalog.beans.ServiceProxyResourceCustomization;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class VrfValidationTest extends BaseTaskTest {
+
+    protected ObjectMapper mapper = new ObjectMapper();
+
+    @InjectMocks
+    protected VrfValidation vrfValidation;
+
+    @Rule
+    public ExpectedException exceptionRule = ExpectedException.none();
+
+    @Before
+    public void before() throws Exception {
+        vrfValidation.setBbInputSetupUtils(bbSetupUtils);
+    }
+
+    @Test
+    public void testVrfServiceValidation() throws VrfBondingServiceException {
+        Service service = new Service();
+        service.setModelName("modelName");
+        service.setServiceType("BONDING");
+        service.setServiceRole("VPN");
+        exceptionRule.expect(VrfBondingServiceException.class);
+        exceptionRule.expectMessage(
+                "Service: modelName does not have service type of BONDING and does not have service role of INFRASTRUCTURE-VPN");
+        vrfValidation.vrfServiceValidation(service);
+
+        service.setServiceType("BOND");
+        service.setServiceRole("INFRASTRUCTURE-VPN");
+        exceptionRule.expect(VrfBondingServiceException.class);
+        exceptionRule.expectMessage(
+                "Service: modelName does not have service type of BONDING and does not have service role of INFRASTRUCTURE-VPN");
+        vrfValidation.vrfServiceValidation(service);
+
+        service.setServiceType("BONDING");
+        service.setServiceRole("INFRASTRUCTURE-VPN");
+        ExpectedException.none();
+        vrfValidation.vrfServiceValidation(service);
+    }
+
+    @Test
+    public void testVrfCatalogDbChecks() throws VrfBondingServiceException {
+        Service service = new Service();
+        service.setModelName("modelName");
+        ConfigurationResourceCustomization configuration = new ConfigurationResourceCustomization();
+        service.setConfigurationCustomizations(new ArrayList<>());
+        service.getConfigurationCustomizations().add(configuration);
+        ServiceProxyResourceCustomization serviceProxy = new ServiceProxyResourceCustomization();
+        configuration.setServiceProxyResourceCustomization(serviceProxy);
+        service.setServiceProxyCustomizations(new ArrayList<>());
+        service.getServiceProxyCustomizations().add(serviceProxy);
+        Service sourceService = new Service();
+        sourceService.setServiceType("TRANSPORT");
+        serviceProxy.setSourceService(sourceService);
+        configuration.setType("VRF-ENTRY");
+        configuration.setRole("INFRASTRUCTURE-CLOUD-VPN");
+        ExpectedException.none();
+        vrfValidation.vrfCatalogDbChecks(service);
+    }
+
+    @Test
+    public void testAaiVpnBindingValidation() throws VrfBondingServiceException {
+        org.onap.aai.domain.yang.VpnBinding aaiVpnBinding = new org.onap.aai.domain.yang.VpnBinding();
+        aaiVpnBinding.setVpnType("SERVICE-INFRASTRUCTURE");
+        ExpectedException.none();
+        vrfValidation.aaiVpnBindingValidation(aaiVpnBinding);
+    }
+
+    @Test
+    public void testAaiAggregateRouteValidation() throws VrfBondingServiceException {
+        org.onap.aai.domain.yang.L3Network aaiLocalNetwork = new org.onap.aai.domain.yang.L3Network();
+        aaiLocalNetwork.setAggregateRoutes(new AggregateRoutes());
+        aaiLocalNetwork.getAggregateRoutes().getAggregateRoute().add(new AggregateRoute());
+        aaiLocalNetwork.getAggregateRoutes().getAggregateRoute().get(0).setIpVersion("4");
+        ExpectedException.none();
+        vrfValidation.aaiAggregateRouteValidation(aaiLocalNetwork);
+
+        aaiLocalNetwork.getAggregateRoutes().getAggregateRoute().add(new AggregateRoute());
+        aaiLocalNetwork.getAggregateRoutes().getAggregateRoute().get(1).setIpVersion("6");
+        ExpectedException.none();
+        vrfValidation.aaiAggregateRouteValidation(aaiLocalNetwork);
+
+        aaiLocalNetwork.setAggregateRoutes(null);
+        ExpectedException.none();
+        vrfValidation.aaiAggregateRouteValidation(aaiLocalNetwork);
+    }
+
+    @Test
+    public void testAaiSubnetValidation() throws VrfBondingServiceException {
+        org.onap.aai.domain.yang.L3Network aaiLocalNetwork = new org.onap.aai.domain.yang.L3Network();
+        aaiLocalNetwork.setNetworkId("myNetworkID");
+        aaiLocalNetwork.setSubnets(new Subnets());
+        aaiLocalNetwork.getSubnets().getSubnet().add(new Subnet());
+        aaiLocalNetwork.getSubnets().getSubnet().get(0).setIpVersion("4");
+        ExpectedException.none();
+        vrfValidation.aaiSubnetValidation(aaiLocalNetwork);
+
+        aaiLocalNetwork.getSubnets().getSubnet().add(new Subnet());
+        aaiLocalNetwork.getSubnets().getSubnet().get(1).setIpVersion("6");
+        ExpectedException.none();
+        vrfValidation.aaiSubnetValidation(aaiLocalNetwork);
+
+        aaiLocalNetwork.setSubnets(null);
+        exceptionRule.expect(VrfBondingServiceException.class);
+        exceptionRule.expectMessage("LocalNetwork: myNetworkID has no subnets");
+        vrfValidation.aaiSubnetValidation(aaiLocalNetwork);
+    }
+
+    @Test
+    public void testIpVersionValidation() {
+        String ipVersion1 = "4";
+        String ipVersion2 = "6";
+        boolean validation = vrfValidation.ipVersionValidation(ipVersion1, ipVersion2);
+        assertEquals("Validation is correct", true, validation);
+
+
+        validation = vrfValidation.ipVersionValidation(ipVersion2, ipVersion1);
+        assertEquals("Validation is correct", true, validation);
+
+        ipVersion1 = "6";
+        validation = vrfValidation.ipVersionValidation(ipVersion1, ipVersion2);
+        assertEquals("Validation is correct", false, validation);
+    }
+
+    @Test
+    public void testAaiRouteTargetValidation()
+            throws VrfBondingServiceException, JsonParseException, JsonMappingException, IOException {
+        L3Network l3Network = mapper.readValue(
+                new File("src/test/resources/__files/BuildingBlocks/aaiNetworkWrapper.json"), L3Network.class);
+        AAIResultWrapper networkWrapper = new AAIResultWrapper(l3Network);
+        if (networkWrapper.getRelationships().isPresent()) {
+            List<AAIResourceUri> vpnBindingUris =
+                    networkWrapper.getRelationships().get().getRelatedUris(AAIObjectType.VPN_BINDING);
+            VpnBinding vpnBinding = new VpnBinding();
+            vpnBinding.setRouteTargets(new RouteTargets());
+            vpnBinding.getRouteTargets().getRouteTarget().add(new RouteTarget());
+            AAIResultWrapper wrapper = Mockito.mock(AAIResultWrapper.class);
+            doReturn(wrapper).when(bbSetupUtils).getAAIResourceDepthOne(vpnBindingUris.get(0));
+            doReturn(Optional.of(vpnBinding)).when(wrapper).asBean(VpnBinding.class);
+            ExpectedException.none();
+            vrfValidation.aaiRouteTargetValidation(l3Network);
+        }
+    }
+}
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 ad1238b86f..10d36f9527 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
@@ -22,6 +22,7 @@
 
 package org.onap.so.bpmn.infrastructure.workflow.tasks;
 
+import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.*;
@@ -45,6 +46,7 @@ import java.util.UUID;
 import org.camunda.bpm.engine.delegate.BpmnError;
 import org.camunda.bpm.engine.delegate.DelegateExecution;
 import org.camunda.bpm.extension.mockito.delegate.DelegateExecutionFake;
+import org.javatuples.Pair;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Rule;
@@ -1584,7 +1586,8 @@ public class WorkflowActionTest extends BaseTaskTest {
         ServiceInstancesRequest sIRequest = mapper.readValue(bpmnRequest, ServiceInstancesRequest.class);
         List<Resource> resourceCounter = new ArrayList<>();
         thrown.expect(BpmnError.class);
-        workflowAction.traverseCatalogDbService(execution, sIRequest, resourceCounter);
+        List<Pair<WorkflowType, String>> aaiResourceIds = new ArrayList<>();
+        workflowAction.traverseCatalogDbService(execution, sIRequest, resourceCounter, aaiResourceIds);
     }
 
     @Test
@@ -1672,6 +1675,72 @@ public class WorkflowActionTest extends BaseTaskTest {
         assertNotNull(result);
     }
 
+    @Test
+    public void traverseAAIServiceTest() {
+        List<Resource> resourceCounter = new ArrayList<>();
+        String resourceId = "si0";
+        List<Pair<WorkflowType, String>> aaiResourceIds = new ArrayList<>();
+
+        ServiceInstance serviceInstanceAAI = new ServiceInstance();
+        serviceInstanceAAI.setServiceInstanceId(resourceId);
+
+        org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance serviceInstance = setServiceInstance();
+        setGenericVnf();
+        setVfModule(true);
+        setVolumeGroup();
+        setL3Network();
+        setCollection();
+        setConfiguration();
+
+        Configuration config = new Configuration();
+        config.setConfigurationId("testConfigurationId2");
+        serviceInstance.getConfigurations().add(config);
+
+        Relationship relationship1 = new Relationship();
+        relationship1.setRelatedTo("vnfc");
+        RelationshipList relationshipList1 = new RelationshipList();
+        relationshipList1.getRelationship().add(relationship1);
+
+        Relationship relationship2 = new Relationship();
+        relationship2.setRelatedTo("vpn-binding");
+        RelationshipList relationshipList2 = new RelationshipList();
+        relationshipList2.getRelationship().add(relationship2);
+
+        org.onap.aai.domain.yang.Configuration aaiConfiguration1 = new org.onap.aai.domain.yang.Configuration();
+        aaiConfiguration1.setConfigurationId("testConfigurationId");
+        aaiConfiguration1.setRelationshipList(relationshipList1);
+
+        org.onap.aai.domain.yang.Configuration aaiConfiguration2 = new org.onap.aai.domain.yang.Configuration();
+        aaiConfiguration2.setConfigurationId("testConfigurationId2");
+        aaiConfiguration2.setRelationshipList(relationshipList1);
+
+        try {
+            doReturn(serviceInstanceAAI).when(bbSetupUtils).getAAIServiceInstanceById(resourceId);
+            doReturn(serviceInstance).when(bbInputSetup).getExistingServiceInstance(serviceInstanceAAI);
+            doReturn(Optional.of(aaiConfiguration1)).when(aaiConfigurationResources)
+                    .getConfiguration("testConfigurationId");
+            doReturn(Optional.of(aaiConfiguration2)).when(aaiConfigurationResources)
+                    .getConfiguration("testConfigurationId2");
+            workflowAction.traverseAAIService(execution, resourceCounter, resourceId, aaiResourceIds);
+            assertEquals(8, resourceCounter.size());
+            assertThat(aaiResourceIds, sameBeanAs(getExpectedResourceIds()));
+        } catch (Exception e) {
+            fail("Unexpected exception was thrown.");
+        }
+    }
+
+    private List<Pair<WorkflowType, String>> getExpectedResourceIds() {
+        List<Pair<WorkflowType, String>> resourceIds = new ArrayList<>();
+        resourceIds.add(new Pair<WorkflowType, String>(WorkflowType.VNF, "testVnfId1"));
+        resourceIds.add(new Pair<WorkflowType, String>(WorkflowType.VFMODULE, "testVfModuleId1"));
+        resourceIds.add(new Pair<WorkflowType, String>(WorkflowType.VOLUMEGROUP, "testVolumeGroupId1"));
+        resourceIds.add(new Pair<WorkflowType, String>(WorkflowType.NETWORK, "testNetworkId1"));
+        resourceIds.add(new Pair<WorkflowType, String>(WorkflowType.NETWORKCOLLECTION, "testId"));
+        resourceIds.add(new Pair<WorkflowType, String>(WorkflowType.CONFIGURATION, "testConfigurationId"));
+        resourceIds.add(new Pair<WorkflowType, String>(WorkflowType.CONFIGURATION, "testConfigurationId2"));
+        return resourceIds;
+    }
+
     private List<OrchestrationFlow> createFlowList(String... flowNames) {
         List<OrchestrationFlow> result = new ArrayList<>();
         for (String flowName : flowNames) {
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingClientResponseValidatorTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingClientResponseValidatorTest.java
index f50916c0be..f7fd00a673 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingClientResponseValidatorTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingClientResponseValidatorTest.java
@@ -36,6 +36,7 @@ public class NamingClientResponseValidatorTest extends TestDataSetup {
 
     private NamingClientResponseValidator responseValidator = new NamingClientResponseValidator();
     private String instanceGroupName = "generatedInstanceGroupName";
+    private String serviceInstanceName = "generatedServiceInstanceName";
 
     @Test
     public void validateNameGenResponseSuccessTest() throws BadResponseException {
@@ -54,6 +55,22 @@ public class NamingClientResponseValidatorTest extends TestDataSetup {
     }
 
     @Test
+    public void validateServiceInstanceNameGenResponseSuccessTest() throws BadResponseException {
+        NameGenResponse name = new NameGenResponse();
+        Respelement respElement = new Respelement();
+        respElement.setResourceName("Service-Instance-Name");
+        respElement.setResourceValue(serviceInstanceName);
+        List<Respelement> respList = new ArrayList<Respelement>();
+        respList.add(respElement);
+        name.setElements(respList);
+        ResponseEntity<NameGenResponse> resp = new ResponseEntity<>(name, null, HttpStatus.OK);
+
+        String actual = responseValidator.validateNameGenResponse(resp);
+
+        assertEquals(actual, "generatedServiceInstanceName");
+    }
+
+    @Test
     public void validateNameGenResponseNoNameGeneratedTest() throws BadResponseException {
         NameGenResponse name = new NameGenResponse();
         Respelement respElement = new Respelement();
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingRequestObjectTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingRequestObjectTest.java
new file mode 100644
index 0000000000..49f858d2ce
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingRequestObjectTest.java
@@ -0,0 +1,85 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2019 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.client.namingservice;
+
+import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
+import static org.junit.Assert.assertThat;
+import java.util.HashMap;
+import org.junit.Test;
+import org.onap.namingservice.model.Element;
+
+public class NamingRequestObjectTest {
+
+    private String externalKey = "95cbbe59-1017-4c13-b4e8-d824e54def3e";
+    private String policyInstanceName = "MSO_Policy.Config_MS_VNFInstanceGroup";
+    private String namingType = "Service";
+    private String nfNamingCode = "NamingCode";
+    private String resourceName = "resourceName";
+    private String serviceModelName = "serviceModelName";
+    private String modelVersion = "modelVersion";
+    private String zoneId = "zoneId";
+
+    @Test
+    public void namingRequestObjectTest() {
+
+        Element expected = new Element();
+        expected.put(NamingServiceConstants.NS_EXTERNAL_KEY, externalKey);
+        expected.put(NamingServiceConstants.NS_POLICY_INSTANCE_NAME, policyInstanceName);
+        expected.put(NamingServiceConstants.NS_NAMING_TYPE, namingType);
+        expected.put(NamingServiceConstants.NS_RESOURCE_NAME, resourceName);
+        expected.put(NamingServiceConstants.NS_NF_NAMING_CODE, nfNamingCode);
+
+        NamingRequestObject namingRequestObject = new NamingRequestObject();
+        namingRequestObject.setExternalKeyValue(externalKey);
+        namingRequestObject.setPolicyInstanceNameValue(policyInstanceName);
+        namingRequestObject.setNamingTypeValue(namingType);
+        namingRequestObject.setNfNamingCodeValue(nfNamingCode);
+        namingRequestObject.setResourceNameValue(resourceName);
+
+        HashMap<String, String> actual = namingRequestObject.getNamingRequestObjectMap();
+        assertThat(actual, sameBeanAs(expected));
+    }
+
+    @Test
+    public void namingWanTransportRequestObjectTest() {
+
+        Element expected = new Element();
+        expected.put(NamingServiceConstants.NS_EXTERNAL_KEY, externalKey);
+        expected.put(NamingServiceConstants.NS_POLICY_INSTANCE_NAME, policyInstanceName);
+        expected.put(NamingServiceConstants.NS_NAMING_TYPE, namingType);
+        expected.put(NamingServiceConstants.NS_RESOURCE_NAME, resourceName);
+        expected.put(NamingServiceConstants.NS_SERVICE_MODEL_NAME, serviceModelName);
+        expected.put(NamingServiceConstants.NS_MODEL_VERSION, modelVersion);
+        expected.put(NamingServiceConstants.NS_ZONE_ID, zoneId);
+
+        NamingRequestObject namingRequestObject = new NamingRequestObject();
+        namingRequestObject.setExternalKeyValue(externalKey);
+        namingRequestObject.setPolicyInstanceNameValue(policyInstanceName);
+        namingRequestObject.setNamingTypeValue(namingType);
+        namingRequestObject.setResourceNameValue(resourceName);
+        namingRequestObject.setModelVersionValue(modelVersion);
+        namingRequestObject.setServiceModelNameValue(serviceModelName);
+        namingRequestObject.setZoneIdValue(zoneId);
+
+        HashMap<String, String> actual = namingRequestObject.getNamingRequestObjectMap();
+        assertThat(actual, sameBeanAs(expected));
+    }
+}
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingRequestUtilsTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingRequestUtilsTest.java
new file mode 100644
index 0000000000..5fdb790405
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingRequestUtilsTest.java
@@ -0,0 +1,136 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2019 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.client.namingservice;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.when;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentMatchers;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.onap.so.bpmn.BaseTaskTest;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
+import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoServiceInstance;
+import org.onap.so.client.exception.BBObjectNotFoundException;
+
+public class NamingRequestUtilsTest extends BaseTaskTest {
+
+    @Mock
+    private ServiceInstance serviceInstanceMock;
+
+    @Mock
+    ModelInfoServiceInstance modelInfoServiceInstanceMock;
+
+    @InjectMocks
+    private NamingServiceUtils namingServiceUtils = new NamingServiceUtils();
+
+    @Before
+    public void before() throws BBObjectNotFoundException {
+        when(extractPojosForBB.extractByKey(any(), ArgumentMatchers.eq(ResourceKey.SERVICE_INSTANCE_ID)))
+                .thenReturn(serviceInstanceMock);
+        doReturn(modelInfoServiceInstanceMock).when(serviceInstanceMock).getModelInfoServiceInstance();
+    }
+
+    @Test
+    public void checkVpnBondingServiceTest() {
+        doReturn("bonding").when(modelInfoServiceInstanceMock).getServiceType();
+        doReturn("infrastructure-vpn").when(modelInfoServiceInstanceMock).getServiceRole();
+        doReturn("testNaminPolicy").when(modelInfoServiceInstanceMock).getNamingPolicy();
+        doReturn(true).when(modelInfoServiceInstanceMock).getOnapGeneratedNaming();
+        namingServiceUtils.checkVpnBondingService(execution);
+        assertTrue(execution.getVariable("isVpnBondingService"));
+
+        doReturn("bonding-false").when(modelInfoServiceInstanceMock).getServiceType();
+        doReturn("infrastructure-vpn").when(modelInfoServiceInstanceMock).getServiceRole();
+        namingServiceUtils.checkVpnBondingService(execution);
+        assertFalse(execution.getVariable("isVpnBondingService"));
+    }
+
+    @Test
+    public void checkBondingAndInfrastureVpnTrueTest() {
+        doReturn("bonding").when(modelInfoServiceInstanceMock).getServiceType();
+        doReturn("infrastructure-vpn").when(modelInfoServiceInstanceMock).getServiceRole();
+        namingServiceUtils.checkBondingAndInfrastureVpn(execution);
+        assertTrue(execution.getVariable("isBondingAndInsfrastructureVpn"));
+    }
+
+    @Test
+    public void checkBondingAndInfrastureVpnFalse1Test() {
+        doReturn("falseBonding").when(modelInfoServiceInstanceMock).getServiceType();
+        doReturn("infrastructure-vpn").when(modelInfoServiceInstanceMock).getServiceRole();
+        namingServiceUtils.checkBondingAndInfrastureVpn(execution);
+        assertFalse(execution.getVariable("isBondingAndInsfrastructureVpn"));
+    }
+
+    @Test
+    public void checkBondingAndInfrastureVpnFalse2Test() {
+        doReturn("bonding").when(modelInfoServiceInstanceMock).getServiceType();
+        doReturn("false-infrastructure-vpn").when(modelInfoServiceInstanceMock).getServiceRole();
+        namingServiceUtils.checkBondingAndInfrastureVpn(execution);
+        assertFalse(execution.getVariable("isBondingAndInsfrastructureVpn"));
+    }
+
+    @Test
+    public void checkNamingPolicyAndAndEcompGeneratedNaming_TrueTest() {
+        doReturn("testNaminPolicy").when(modelInfoServiceInstanceMock).getNamingPolicy();
+        doReturn(true).when(modelInfoServiceInstanceMock).getOnapGeneratedNaming();
+        namingServiceUtils.checkNamingPolicyAndOnapGeneratedNaming(execution);
+        assertTrue(execution.getVariable("isNamingPolicyAndOnapGeneratedNaming"));
+    }
+
+    @Test
+    public void checkNamingPolicyAndAndEcompGeneratedNamingFalse1Test() throws BBObjectNotFoundException {
+        doReturn(null).when(modelInfoServiceInstanceMock).getNamingPolicy();
+        doReturn(true).when(modelInfoServiceInstanceMock).getOnapGeneratedNaming();
+        namingServiceUtils.checkNamingPolicyAndOnapGeneratedNaming(execution);
+        assertFalse(execution.getVariable("isNamingPolicyAndOnapGeneratedNaming"));
+    }
+
+    @Test
+    public void checkNamingPolicyAndAndEcompGeneratedNamingFalse2Test() throws BBObjectNotFoundException {
+        doReturn("testNaminPolicy").when(modelInfoServiceInstanceMock).getNamingPolicy();
+        doReturn(false).when(modelInfoServiceInstanceMock).getOnapGeneratedNaming();
+        namingServiceUtils.checkNamingPolicyAndOnapGeneratedNaming(execution);
+        assertFalse(execution.getVariable("isNamingPolicyAndOnapGeneratedNaming"));
+    }
+
+    @Test
+    public void checkNamingPolicyAndAndEcompGeneratedNamingFalse3Test() throws BBObjectNotFoundException {
+        doReturn("").when(modelInfoServiceInstanceMock).getNamingPolicy();
+        doReturn(false).when(modelInfoServiceInstanceMock).getOnapGeneratedNaming();
+        namingServiceUtils.checkNamingPolicyAndOnapGeneratedNaming(execution);
+        assertFalse(execution.getVariable("isNamingPolicyAndOnapGeneratedNaming"));
+    }
+
+    @Test
+    public void checkNamingPolicyAndAndEcompGeneratedNamingFalse4Test() throws BBObjectNotFoundException {
+        doReturn("bonding").when(modelInfoServiceInstanceMock).getNamingPolicy();
+        doReturn(null).when(modelInfoServiceInstanceMock).getOnapGeneratedNaming();
+        namingServiceUtils.checkNamingPolicyAndOnapGeneratedNaming(execution);
+        assertFalse(execution.getVariable("isNamingPolicyAndOnapGeneratedNaming"));
+    }
+
+}
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 be58ccb046..91d9070c0f 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
@@ -7,9 +7,9 @@
  * 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.
@@ -231,4 +231,13 @@ public class AAIConfigurationResourcesTest extends TestDataSetup {
         verify(MOCK_aaiResourcesClient, times(1)).update(any(AAIResourceUri.class), ArgumentMatchers.isNull());
         assertEquals(OrchestrationStatus.ACTIVE, configuration.getOrchestrationStatus());
     }
+
+    @Test
+    public void updateConfigurationOrchestrationStatusTest() throws Exception {
+        doNothing().when(MOCK_aaiResourcesClient).update(isA(AAIResourceUri.class),
+                isA(org.onap.aai.domain.yang.Configuration.class));
+        aaiConfigurationResources.updateConfigurationOrchestrationStatus(configuration, OrchestrationStatus.ACTIVE);
+        verify(MOCK_aaiResourcesClient, times(1)).update(any(AAIResourceUri.class),
+                any(org.onap.aai.domain.yang.Configuration.class));
+    }
 }
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/NamingServiceResourcesTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/NamingServiceResourcesTest.java
index 195c89a651..1f5b42b94e 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/NamingServiceResourcesTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/NamingServiceResourcesTest.java
@@ -42,7 +42,9 @@ import org.onap.namingservice.model.NameGenRequest;
 import org.onap.namingservice.model.NameGenResponse;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.InstanceGroup;
 import org.onap.so.client.namingservice.NamingClient;
+import org.onap.so.client.namingservice.NamingRequestObject;
 import org.onap.so.client.namingservice.NamingRequestObjectBuilder;
+import org.onap.so.client.namingservice.NamingServiceConstants;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
@@ -100,5 +102,25 @@ public class NamingServiceResourcesTest extends TestDataSetup {
 
     }
 
+    @Test
+    public void generateServiceInstanceNameTest() throws Exception {
+
+        NameGenRequest req = new NameGenRequest();
+        doReturn("generatedServiceInstanceName").when(MOCK_namingClient).postNameGenRequest(isA(NameGenRequest.class));
+        doReturn(req).when(MOCK_namingRequestObjectBuilder).nameGenRequestMapper(isA(List.class));
 
+        NamingRequestObject nrObject = new NamingRequestObject();
+        nrObject.setExternalKeyValue("testExternalKey");
+        nrObject.setNamingTypeValue(NamingServiceConstants.NAMING_TYPE_SERVICE);
+        nrObject.setResourceNameValue(NamingServiceConstants.RESOURCE_NAME_SERVICE_INSTANCE_NAME);
+        nrObject.setPolicyInstanceNameValue(execution.getVariable("policyInstanceName"));
+        nrObject.setServiceModelNameValue("testServiceInstanceModelName");
+        nrObject.setModelVersionValue("testServiceInstanceModelVersion");
+        nrObject.setZoneIdValue(execution.getVariable("zoneId"));
+
+        String generatedName = namingServiceResources.generateServiceInstanceName(nrObject);
+
+        verify(MOCK_namingClient, times(1)).postNameGenRequest(any(NameGenRequest.class));
+        assertEquals("generatedServiceInstanceName", generatedName);
+    }
 }
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest1SP.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest1SP.json
index 27463350ab..31e6fd5f53 100644
--- a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest1SP.json
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest1SP.json
@@ -32,7 +32,7 @@
         "modelVersion" : "testProxyModelVersion1",
         "modelInvariantId" : "testProxyModelInvariantUuid1"
       },
-      "requiredCandidates" : [ {
+      "filteringAttributes" : [ {
         "identifierType" : "cloudRegionId",
         "identifiers" : [ "testCloudRegionId" ],
         "cloudOwner" : "att"
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/aaiNetworkWrapper.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/aaiNetworkWrapper.json
new file mode 100644
index 0000000000..aaa2c4ba35
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/aaiNetworkWrapper.json
@@ -0,0 +1,42 @@
+{
+	"networkId": "0384d743-f69b-4cc8-9aa8-c3ae66662c44",
+	"networkName": "Dev_Bindings_1802_020118",
+	"networkType": "CONTRAIL30_BASIC",
+	"networkRole": "GN_EVPN_direct",
+	"networkTechnology": "contrail",
+	"neutronNetworkId": "1112b912-0e00-4d6d-9392-014e106399ee",
+	"isBoundToVpn": true,
+	"serviceId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+	"networkRoleInstance": 0,
+	"resourceVersion": "1517496965485",
+	"orchestrationStatus": "Active",
+	"heatStackId": "Dev_Bindings_1802_020118/06c2445f-1ca1-4ad8-be08-454c4de443bb",
+	"contrailNetworkFqdn": "default-domain:ECOMP_MSO_DND:Dev_Bindings_1802_020118",
+	"physicalNetworkName": "tbd",
+	"isProviderNetwork": false,
+	"isSharedNetwork": true,
+	"isExternalNetwork": false,
+	"relationshipList": {
+		"relationship": [
+			{
+				"relatedTo": "vpn-binding",
+				"relatedLink": "/aai/v11/network/vpn-bindings/vpn-binding/9a7b327d9-287aa00-82c4b0-100001",
+				"relationshipData": [
+					{
+						"relationshipKey": "vpn-binding.vpn-id",
+						"relationshipValue": "9a7b327d9-287aa00-82c4b0-100001"
+					}
+				],
+				"relatedToProperty": [
+					{
+						"propertyKey": "vpn-binding.vpn-name",
+						"propertyValue": "MSO_VPN_TEST"
+					},
+					{
+						"propertyKey": "vpn-binding.vpn-type"
+					}
+				]
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/CreateNetworkCollection.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/CreateNetworkCollection.json
index 579075f502..692ecfdf75 100644
--- a/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/CreateNetworkCollection.json
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/CreateNetworkCollection.json
@@ -4,7 +4,7 @@
 			"modelType": "service",
 			"modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b",
 			"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
-			"modelName": "MOW AVPN vMX BV vPE 1 Service",
+			"modelName": "Sample Service Model",
 			"modelVersion": "10"
 		},
 		"cloudConfiguration": {
@@ -35,7 +35,7 @@
 				{
 					"service": {
 						"modelInfo": {
-							"modelName": "MOW AVPN vMX BV vPE 1 Service",
+							"modelName": "Sample Service Model",
 							"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a"
 						},
 						"instanceParams": [],
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroActivateDeleteUnassign.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroActivateDeleteUnassign.json
index 26838024da..5753f69d3f 100644
--- a/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroActivateDeleteUnassign.json
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroActivateDeleteUnassign.json
@@ -4,7 +4,7 @@
 			"modelType": "service",
 			"modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b",
 			"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
-			"modelName": "MOW AVPN vMX BV vPE 1 Service",
+			"modelName": "Sample Service Model",
 			"modelVersion": "10.0"
 		},
 		"cloudConfiguration": {
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroAssign.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroAssign.json
index ddb118ea49..39e87f19f1 100644
--- a/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroAssign.json
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroAssign.json
@@ -4,7 +4,7 @@
 			"modelType": "service",
 			"modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b",
 			"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
-			"modelName": "MOW AVPN vMX BV vPE 1 Service",
+			"modelName": "Sample Service Model",
 			"modelVersion": "10.0"
 		},
 		"cloudConfiguration": {
@@ -34,7 +34,7 @@
 					"service": {
 						"modelInfo": {
 							"modelType": "service",
-							"modelName": "MOW AVPN vMX BV vPE 1 Service",
+							"modelName": "Sample Service Model",
 							"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a"
 						},
 						"instanceParams": [],
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroAssignNoCloud.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroAssignNoCloud.json
index 51caddd48a..b86a2a28f6 100644
--- a/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroAssignNoCloud.json
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroAssignNoCloud.json
@@ -4,7 +4,7 @@
 			"modelType": "service",
 			"modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b",
 			"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
-			"modelName": "MOW AVPN vMX BV vPE 1 Service",
+			"modelName": "Sample Service Model",
 			"modelVersion": "10.0"
 		},
 		"owningEntity": {
@@ -31,7 +31,7 @@
 					"service": {
 						"modelInfo": {
 							"modelType": "service",
-							"modelName": "MOW AVPN vMX BV vPE 1 Service",
+							"modelName": "Sample Service Model",
 							"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a"
 						},
 						"instanceParams": [],