Merge "Unable to Find Instance Group"

5 files changed, 4 insertions, 5 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoInstanceGroup.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoInstanceGroup.java
index 1f02fea071..e03ee358f3 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoInstanceGroup.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoInstanceGroup.java
@@ -28,7 +28,6 @@ public class ModelInfoInstanceGroup  implements Serializable {
 	private static final long serialVersionUID = -8279040393230356226L;
 	
 	public static final String TYPE_L3_NETWORK = "L3-NETWORK";
-	public static final String TYPE_NETWORK_INSTANCE_GROUP = "networkInstanceGroup";
 	public static final String TYPE_VNFC = "VNFC";
 		
 	@JsonProperty("model-uuid")
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/AssignVnf.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/AssignVnf.java
index 534e93637a..ee80ba4c55 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/AssignVnf.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/AssignVnf.java
@@ -58,7 +58,7 @@ public class AssignVnf {
 					aaiInstanceGroupResources.createInstanceGroup(instanceGroup);
 					aaiInstanceGroupResources.connectInstanceGroupToVnf(instanceGroup, vnf, AAIEdgeLabel.BELONGS_TO);
 				}
-				else if(ModelInfoInstanceGroup.TYPE_NETWORK_INSTANCE_GROUP.equalsIgnoreCase(instanceGroup.getModelInfoInstanceGroup().getType())) {
+				else if(ModelInfoInstanceGroup.TYPE_L3_NETWORK.equalsIgnoreCase(instanceGroup.getModelInfoInstanceGroup().getType())) {
 					aaiInstanceGroupResources.connectInstanceGroupToVnf(instanceGroup, vnf, AAIEdgeLabel.USES);
 				}
 			}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VnfTopologyOperationRequestMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VnfTopologyOperationRequestMapper.java
index bf128a4838..e860d3cc48 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VnfTopologyOperationRequestMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VnfTopologyOperationRequestMapper.java
@@ -123,7 +123,7 @@ public class VnfTopologyOperationRequestMapper {
 		List<GenericResourceApiVnfrequestinputVnfrequestinputVnfNetworkInstanceGroupIds> networkInstanceGroupIdList = new ArrayList<GenericResourceApiVnfrequestinputVnfrequestinputVnfNetworkInstanceGroupIds>();
 
 		for (InstanceGroup instanceGroup : instanceGroups) {
-			if (ModelInfoInstanceGroup.TYPE_NETWORK_INSTANCE_GROUP
+			if (ModelInfoInstanceGroup.TYPE_L3_NETWORK
 					.equalsIgnoreCase(instanceGroup.getModelInfoInstanceGroup().getType())) {
 				GenericResourceApiVnfrequestinputVnfrequestinputVnfNetworkInstanceGroupIds instanceGroupId = new GenericResourceApiVnfrequestinputVnfrequestinputVnfNetworkInstanceGroupIds();
 				instanceGroupId.setVnfNetworkInstanceGroupId(instanceGroup.getId());
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/AssignVnfTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/AssignVnfTest.java
index 756fe5120d..4ad6fba910 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/AssignVnfTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/AssignVnfTest.java
@@ -67,7 +67,7 @@ public class AssignVnfTest extends BaseTaskTest {
 		modelVnfc.setFunction("function");
 		
 		ModelInfoInstanceGroup modelNetworkInstanceGroup = new ModelInfoInstanceGroup();
-		modelNetworkInstanceGroup.setType("networkInstanceGroup");
+		modelNetworkInstanceGroup.setType("L3-NETWORK");
 		modelNetworkInstanceGroup.setFunction("function");
 		
 		instanceGroup1 = new InstanceGroup();
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/VnfTopologyOperationRequestMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/VnfTopologyOperationRequestMapperTest.java
index 54ca116d55..63c3680e8c 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/VnfTopologyOperationRequestMapperTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/VnfTopologyOperationRequestMapperTest.java
@@ -67,7 +67,7 @@ public class VnfTopologyOperationRequestMapperTest {
 		genericVnf.setModelCustomizationUuid("vnfModelCustomizationUUID");
 
 		ModelInfoInstanceGroup modelL3Network = new ModelInfoInstanceGroup();
-		modelL3Network.setType("networkInstanceGroup");
+		modelL3Network.setType("L3-NETWORK");
 
 		InstanceGroup instanceGroup1 = new InstanceGroup();
 		instanceGroup1.setId("l3-network-ig-111");