diff options
author | Steve Smokowski <ss835w@att.com> | 2019-03-15 12:47:18 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-03-15 12:47:18 +0000 |
commit | b905d4096e2a2378b464e8a556b064bd3443548a (patch) | |
tree | f296a456d2c73e5f4e6f0a3937b9def591ac153a /bpmn/MSOCommonBPMN/src/main/java | |
parent | 3ee6e148e8763f95f0161bc666b3e8a7bdf9ee6e (diff) | |
parent | 87b1e89da514fcfdfd0af7286ad4f4c02823d904 (diff) |
Merge "vfModule id should be retrieved from resourceId"
Diffstat (limited to 'bpmn/MSOCommonBPMN/src/main/java')
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; } |