Merge "Add service role"

1 files changed, 20 insertions, 1 deletions

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 c96c38dab1..f8b1298dd8 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
@@ -306,6 +306,7 @@ public class TestDataSetup{
 		modelInfoServiceInstance.setModelVersion("testModelVersion" + serviceInstanceCounter);
 		modelInfoServiceInstance.setModelName("testModelName" + serviceInstanceCounter);
 		modelInfoServiceInstance.setServiceType("testServiceType" + serviceInstanceCounter);
+		modelInfoServiceInstance.setServiceRole("testServiceRole" + serviceInstanceCounter);
 		serviceInstance.setModelInfoServiceInstance(modelInfoServiceInstance);
 
 		serviceInstance.setProject(buildProject());
@@ -381,6 +382,24 @@ public class TestDataSetup{
 
 		collection.setInstanceGroup(instanceGroup);
 
+
+		return instanceGroup;
+	}
+
+	public InstanceGroup setInstanceGroupVnf() {
+		InstanceGroup instanceGroup = buildInstanceGroup();
+
+		ServiceInstance serviceInstance = null;
+
+		try {
+			serviceInstance = extractPojosForBB.extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID, execution.getLookupMap().get(ResourceKey.SERVICE_INSTANCE_ID));
+		} catch(BBObjectNotFoundException e) {
+			serviceInstance = setServiceInstance();
+		}
+
+		serviceInstance.getInstanceGroups().add(instanceGroup);
+		lookupKeyMap.put(ResourceKey.INSTANCE_GROUP_ID, instanceGroup.getId());
+
 		return instanceGroup;
 	}
 
@@ -700,4 +719,4 @@ public class TestDataSetup{
         subnet.setNeutronSubnetId("testNeutronSubnetId");
 		return subnet;
 	}
-}
\ No newline at end of file
+}