summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/onap
diff options
context:
space:
mode:
authorMatthieu Geerebaert <matthieu.geerebaert@orange.com>2018-04-24 12:08:28 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-24 12:08:28 +0000
commitba36f43b2812e4b14771562aaab227781e9d1c59 (patch)
tree00e2e3febfe99bafa76ed81b8b385899e3ae6119 /src/main/java/org/onap
parentace06bb0c86ea0a26cd098f1c04bd1b5d1a1f746 (diff)
parent826b92463401b16719144c6494e4454cb2252584 (diff)
Merge "add field in SO Request"
Diffstat (limited to 'src/main/java/org/onap')
-rw-r--r--src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/ModelInfo.java24
-rw-r--r--src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskProcessor.java1
2 files changed, 21 insertions, 4 deletions
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/ModelInfo.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/ModelInfo.java
index 3479f85..bef4183 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/ModelInfo.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/ModelInfo.java
@@ -21,6 +21,8 @@ public class ModelInfo {
private String modelInvariantId;
+ private String modelVersionId;
+
private String modelNameVersionId;
private String modelName;
@@ -87,11 +89,25 @@ public class ModelInfo {
this.modelCustomizationId = modelCustomizationId;
}
+ public String getModelVersionId() {
+ return modelVersionId;
+ }
+
+ public void setModelVersionId(String modelVersionId) {
+ this.modelVersionId = modelVersionId;
+ }
+
@Override
public String toString() {
- return "ModelInfo{" + "modelType='" + modelType + '\'' + ", modelInvariantId='" + modelInvariantId + '\''
- + ", modelNameVersionId='" + modelNameVersionId + '\'' + ", modelName='" + modelName + '\''
- + ", modelVersion='" + modelVersion + '\'' + ", modelCustomizationName='" + modelCustomizationName
- + '\'' + ", modelCustomizationId='" + modelCustomizationId + '\'' + '}';
+ return "ModelInfo{" +
+ "modelType='" + modelType + '\'' +
+ ", modelInvariantId='" + modelInvariantId + '\'' +
+ ", modelVersionId='" + modelVersionId + '\'' +
+ ", modelNameVersionId='" + modelNameVersionId + '\'' +
+ ", modelName='" + modelName + '\'' +
+ ", modelVersion='" + modelVersion + '\'' +
+ ", modelCustomizationName='" + modelCustomizationName + '\'' +
+ ", modelCustomizationId='" + modelCustomizationId + '\'' +
+ '}';
}
}
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskProcessor.java b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskProcessor.java
index 1d1ef36..d623b89 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskProcessor.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskProcessor.java
@@ -246,6 +246,7 @@ public class SOTaskProcessor {
modelInfo.setModelType("service");
modelInfo.setModelInvariantId((String) sdcInfos.get("invariantUUID"));
modelInfo.setModelNameVersionId(orderItem.getService().getServiceSpecification().getId());
+ modelInfo.setModelVersionId(orderItem.getService().getServiceSpecification().getId());
modelInfo.setModelName((String) sdcInfos.get("name"));
modelInfo.setModelVersion((String) sdcInfos.get("version"));
requestDetails.setModelInfo(modelInfo);