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>

3 files changed, 20 insertions, 2 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;
 	}