vfModule id should be retrieved from resourceId

fix unit test that was broken because of mapping
correctly connect the configuration to vfModule
added in mapping of configuration to aai object
fix compilation error with mapper layer
Fix unit test compare to contain vfnc name
Update vnfc to have proper generated serialVersionID

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

7 files changed, 31 insertions, 6 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Vnfc.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Vnfc.java
index 68caeb244f..b432fe10b7 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Vnfc.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Vnfc.java
@@ -13,11 +13,11 @@ import com.fasterxml.jackson.annotation.JsonRootName;
 @JsonRootName("vnfc")
 public class Vnfc implements Serializable {
 	
-	
+
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = -9170269565756850796L;
 	@Id
 	@JsonProperty("vnfc-name")
 	private String vnfcName;
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoConfiguration.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoConfiguration.java
index 87168107e1..462664c612 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoConfiguration.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoConfiguration.java
@@ -34,9 +34,25 @@ public class ModelInfoConfiguration implements Serializable{
 	private String modelVersionId;
 	@JsonProperty("model-customization-id")
 	private String modelCustomizationId;
+	@JsonProperty("configuration-type")
+	private String configurationType;
+	@JsonProperty("configuration-role")
+	private String configurationRole;
 	@JsonProperty("policy-name")
 	private String policyName;
 	
+	public String getConfigurationRole() {
+		return configurationRole;
+	}
+	public void setConfigurationRole(String configurationRole) {
+		this.configurationRole = configurationRole;
+	}
+	public String getConfigurationType() {
+		return configurationType;
+	}
+	public void setConfigurationType(String configurationType) {
+		this.configurationType = configurationType;
+	}
 	public String getModelInvariantId() {
 		return modelInvariantId;
 	}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java
index 0a334cde6f..50a9c4e8b1 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java
@@ -505,6 +505,8 @@ public class BBInputSetupMapperLayer {
 		modelInfoConfiguration.setModelCustomizationId(vnfVfmoduleCvnfcConfigurationCustomization.getModelCustomizationUUID());
 		modelInfoConfiguration.setModelInvariantId(vnfVfmoduleCvnfcConfigurationCustomization.getConfigurationResource().getModelInvariantUUID());
 		modelInfoConfiguration.setPolicyName(vnfVfmoduleCvnfcConfigurationCustomization.getPolicyName());
+		modelInfoConfiguration.setConfigurationType(vnfVfmoduleCvnfcConfigurationCustomization.getConfigurationType());
+		modelInfoConfiguration.setConfigurationRole(vnfVfmoduleCvnfcConfigurationCustomization.getConfigurationRole());
 		return modelInfoConfiguration;
 	}
 
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
index 877a0dded7..482957e006 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
@@ -368,7 +368,8 @@ public class WorkflowActionBBTasks {
 			ExecuteBuildingBlock ebb, List<ExecuteBuildingBlock> flowsToExecute) {
 		try {
 			String vnfId = ebb.getWorkflowResourceIds().getVnfId();
-			String vfModuleId = ebb.getWorkflowResourceIds().getVfModuleId();
+			String vfModuleId = ebb.getResourceId();
+			ebb.getWorkflowResourceIds().setVfModuleId(vfModuleId);
 			String vnfCustomizationUUID = bbInputSetupUtils.getAAIGenericVnf(vnfId).getModelCustomizationId();
 			String vfModuleCustomizationUUID = bbInputSetupUtils.getAAIVfModule(vnfId, vfModuleId).getModelCustomizationId();
 			List<Vnfc> vnfcs = workflowAction.getRelatedResourcesInVfModule(vnfId, vfModuleId, Vnfc.class, AAIObjectType.VNFC);
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/aai/mapper/AAIObjectMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/aai/mapper/AAIObjectMapper.java
index c8eeaa7a2b..518da1fa5f 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/aai/mapper/AAIObjectMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/aai/mapper/AAIObjectMapper.java
@@ -254,6 +254,9 @@ public class AAIObjectMapper {
 					map().setModelCustomizationId(source.getModelInfoConfiguration().getModelCustomizationId());
 					map().setModelVersionId(source.getModelInfoConfiguration().getModelVersionId());
 					map().setModelInvariantId(source.getModelInfoConfiguration().getModelInvariantId());
+					map().setConfigurationType(source.getModelInfoConfiguration().getConfigurationType());
+					map().setConfigurationSubType(source.getModelInfoConfiguration().getConfigurationRole());
+					map().setConfigPolicyName(source.getModelInfoConfiguration().getPolicyName());
 				}
 			});
 		}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/AAIConfigurationResources.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/AAIConfigurationResources.java
index 3bb1d81e27..138a20b609 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/AAIConfigurationResources.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/AAIConfigurationResources.java
@@ -165,7 +165,7 @@ public class AAIConfigurationResources {
         injectionHelper.getAaiClient().connect(configurationURI, vpnBindingURI);
     }
 
-    public void connectConfigurationToVfModule(String configurationId, String vfModuleId, String vnfId){
+    public void connectConfigurationToVfModule(String configurationId, String vnfId, String vfModuleId){
     	 AAIResourceUri configurationURI = AAIUriFactory.createResourceUri(AAIObjectType.CONFIGURATION, configurationId);
     	 AAIResourceUri vfModuleURI = AAIUriFactory.createResourceUri(AAIObjectType.VF_MODULE, vnfId, vfModuleId);
     	 injectionHelper.getAaiClient().connect(configurationURI, vfModuleURI);
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 a8e9a7e57e..d5b529288f 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
@@ -74,24 +74,27 @@ public class AAIObjectMapperTest {
 		Configuration configuration = new Configuration();
 		configuration.setConfigurationId("configId");
 		configuration.setConfigurationName("VNR");
-		configuration.setConfigurationType("VNR-TYPE");
 		configuration.setOrchestrationStatus(OrchestrationStatus.ASSIGNED);
 		configuration.setManagementOption("managementOption");
 		ModelInfoConfiguration modelInfoConfiguration = new ModelInfoConfiguration();
 		modelInfoConfiguration.setModelCustomizationId("modelCustId");
 		modelInfoConfiguration.setModelInvariantId("modelInvariantId");
 		modelInfoConfiguration.setModelVersionId("modelVersionId");
+		modelInfoConfiguration.setConfigurationType("5G");
+		modelInfoConfiguration.setConfigurationRole("ConfigurationRole");
 		configuration.setModelInfoConfiguration(modelInfoConfiguration);
 
 		org.onap.aai.domain.yang.Configuration expectedConfiguration = new org.onap.aai.domain.yang.Configuration();
 		expectedConfiguration.setConfigurationId(configuration.getConfigurationId());
 		expectedConfiguration.setConfigurationName(configuration.getConfigurationName());
-		expectedConfiguration.setConfigurationType(configuration.getConfigurationType());
+		expectedConfiguration.setConfigurationType(configuration.getModelInfoConfiguration().getConfigurationType());
 		expectedConfiguration.setOrchestrationStatus(configuration.getOrchestrationStatus().toString());
 		expectedConfiguration.setManagementOption(configuration.getManagementOption());
 		expectedConfiguration.setModelInvariantId(configuration.getModelInfoConfiguration().getModelInvariantId());
 		expectedConfiguration.setModelVersionId(configuration.getModelInfoConfiguration().getModelVersionId());
 		expectedConfiguration.setModelCustomizationId(configuration.getModelInfoConfiguration().getModelCustomizationId());
+		expectedConfiguration.setConfigurationSubType(configuration.getModelInfoConfiguration().getConfigurationRole());
+		expectedConfiguration.setConfigPolicyName(configuration.getModelInfoConfiguration().getPolicyName());
 
 		org.onap.aai.domain.yang.Configuration actualConfiguration = aaiObjectMapper.mapConfiguration(configuration);