From bb0a782bbec2ba9166804237b117ce0c70a1aa76 Mon Sep 17 00:00:00 2001 From: subhash kumar singh Date: Sat, 27 Apr 2019 12:31:21 +0530 Subject: Enhance resource sequence to add group Enhance resource sequence to add group. Change-Id: I9f7ad2a437cd66ba3b8382f3937b0b04752a184a Issue-ID: SO-1393 Signed-off-by: subhash kumar singh --- .../org/onap/so/bpmn/core/domain/ServiceDecomposition.java | 2 +- .../main/java/org/onap/so/bpmn/core/domain/VnfResource.java | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'bpmn/MSOCoreBPMN/src') diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/ServiceDecomposition.java b/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/ServiceDecomposition.java index 419f545cdf..b3439d58e3 100644 --- a/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/ServiceDecomposition.java +++ b/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/ServiceDecomposition.java @@ -245,7 +245,7 @@ public class ServiceDecomposition extends JsonWrapper implements Serializable { */ @JsonIgnore public List getServiceResources() { - ArrayList serviceResources = new ArrayList(); + ArrayList serviceResources = new ArrayList(); if (this.getAllottedResources() != null) { serviceResources.addAll(this.getAllottedResources()); } diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/VnfResource.java b/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/VnfResource.java index 0804cbb11b..da8d5a1f13 100644 --- a/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/VnfResource.java +++ b/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/VnfResource.java @@ -55,6 +55,9 @@ public class VnfResource extends Resource { @JsonProperty("groups") private List groups; + @JsonProperty("group-order") + private String groupOrder; + private String vnfHostname; private String vnfType; private String nfFunction; @@ -163,6 +166,14 @@ public class VnfResource extends Resource { this.groups = groups; } + public String getGroupOrder() { + return groupOrder; + } + + public void setGroupOrder(String groupOrder) { + this.groupOrder = groupOrder; + } + /** * Returns a list of all VfModule objects. Base module is first entry in the list * -- cgit 1.2.3-korg