summaryrefslogtreecommitdiffstats
path: root/bpmn/MSOCoreBPMN
diff options
context:
space:
mode:
authorsubhash kumar singh <subhash.kumar.singh@huawei.com>2019-04-30 07:04:39 +0530
committersubhash kumar singh <subhash.kumar.singh@huawei.com>2019-05-02 16:34:39 +0530
commit5ed1062dcc39cfa7a99b8a5b6882a75f4acffea6 (patch)
tree3087a18d758354ff3fddd544abefb197ebbbf256 /bpmn/MSOCoreBPMN
parentacb8997a69725a39270a6527b33995f51c1e4586 (diff)
Modify instance resource list creation
Modify instance resource list creation to avoid hard locking of model name in UUI request. e.g. VF resource and gruop resource has resource input vf { resource_input : { key1:value2, key2:[vf_prop_list,INDEX,key]|default} Derive the key ("vf_prop_list") from resource input and use this info to map UUI request. UUI req: { ... resourceInput: { vf_prop_list : /// mapped with resource input of resource { .... Change-Id: Ic40079a094b2628bcf6f5758121b7492ee3c1353 Issue-ID: SO-1393 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
Diffstat (limited to 'bpmn/MSOCoreBPMN')
-rw-r--r--bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/GroupResource.java2
-rw-r--r--bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/VnfcResource.java14
2 files changed, 16 insertions, 0 deletions
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/GroupResource.java b/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/GroupResource.java
index d194f2750a..79714d0f0e 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/GroupResource.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/GroupResource.java
@@ -19,10 +19,12 @@
*/
package org.onap.so.bpmn.core.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List;
import java.util.UUID;
+@JsonIgnoreProperties(ignoreUnknown = true)
public class GroupResource extends Resource {
private static final long serialVersionUID = 1L;
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/VnfcResource.java b/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/VnfcResource.java
index 5fced9a8ab..c363fcc7ff 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/VnfcResource.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/VnfcResource.java
@@ -19,13 +19,27 @@
*/
package org.onap.so.bpmn.core.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.UUID;
+@JsonIgnoreProperties(ignoreUnknown = true)
public class VnfcResource extends Resource {
private static final long serialVersionUID = 1L;
+ @JsonProperty("resource-input")
+ private String resourceInput;
+
public VnfcResource() {
resourceType = ResourceType.VNFC;
setResourceId(UUID.randomUUID().toString());
}
+
+ public String getResourceInput() {
+ return resourceInput;
+ }
+
+ public void setResourceInput(String resourceInput) {
+ this.resourceInput = resourceInput;
+ }
}