aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu Geerebaert <matthieu.geerebaert@orange.com>2018-09-13 15:28:04 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-13 15:28:04 +0000
commitdda5ac49bf32bab31ef8ea516fb7211500d20166 (patch)
treebf9d69d23dd19e8b0732025fd653892d569a64f7
parent056728aca8d2d4ded0c3e8e425d7a6231260cc20 (diff)
parent94d77c1ef91575c0aa059e689a15a25289e38839 (diff)
Merge "EXTAPI-149 : Add resourceCustomizationUuid for E2E"
-rw-r--r--src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/ResourceModel.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/ResourceModel.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/ResourceModel.java
index 0aabb63..9faef49 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/ResourceModel.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/ResourceModel.java
@@ -23,7 +23,7 @@ public class ResourceModel {
private String resourceUuid;
- //private String resourceCustomizationUuid;
+ private String resourceCustomizationUuid;
private ParametersModel parameters;
@@ -32,7 +32,7 @@ public class ResourceModel {
setResourceName((String)info.get("name"));
setResourceInvariantUuid((String)info.get("resourceInvariantUUID"));
setResourceUuid((String)info.get("id"));
- //setResourceCustomizationUuid((String)info.get("modelCustomizationId"));
+ setResourceCustomizationUuid((String)info.get("modelCustomizationId"));
}
public String getResourceName() {
@@ -59,7 +59,6 @@ public class ResourceModel {
this.resourceUuid = resourceUuid;
}
- /*
public String getResourceCustomizationUuid() {
return resourceCustomizationUuid;
}
@@ -67,7 +66,7 @@ public class ResourceModel {
public void setResourceCustomizationUuid(String resourceCustomizationUuid) {
this.resourceCustomizationUuid = resourceCustomizationUuid;
}
- */
+
public ParametersModel getParameters() {
return parameters;
}
@@ -82,6 +81,7 @@ public class ResourceModel {
"resourceName='" + resourceName + '\'' +
", resourceInvariantUuid='" + resourceInvariantUuid + '\'' +
", resourceUuid='" + resourceUuid + '\'' +
+ ", resourceCustomizationUuid='" + resourceCustomizationUuid + '\'' +
", parameters='" + parameters + '}';
}
}