summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Csongvai <jozsef.csongvai@bell.ca>2021-11-26 15:49:36 -0500
committerJozsef Csongvai <jozsef.csongvai@bell.ca>2021-11-26 16:52:57 -0500
commit65386bb78fb5afe2ccab967e35bd40f65720dd60 (patch)
treedf9bf58adad38a3849585ecc35f8e90072421f93
parent7861185045a47e86ea34afb22038cce3ab4196b7 (diff)
Enable recursive model by adding services to resources
Issue-ID: SO-3811 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: I13ea0986b9c81971432626163d323991b57f9545
-rw-r--r--bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/Resource.java4
-rw-r--r--common/src/main/java/org/onap/so/serviceinstancebeans/Resources.java12
2 files changed, 15 insertions, 1 deletions
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/Resource.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/Resource.java
index 2a8852a4bd..0214a3f998 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/Resource.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/Resource.java
@@ -156,4 +156,8 @@ public class Resource implements Serializable {
public List<Resource> getChildren() {
return this.children;
}
+
+ public Boolean hasParent() {
+ return parent != null;
+ }
}
diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/Resources.java b/common/src/main/java/org/onap/so/serviceinstancebeans/Resources.java
index acac8c4033..9cb5b33251 100644
--- a/common/src/main/java/org/onap/so/serviceinstancebeans/Resources.java
+++ b/common/src/main/java/org/onap/so/serviceinstancebeans/Resources.java
@@ -42,6 +42,8 @@ public class Resources implements Serializable {
private List<Pnfs> pnfs = new ArrayList<>();
@JsonProperty("networks")
private List<Networks> networks = new ArrayList<>();
+ @JsonProperty("services")
+ private List<Service> services = new ArrayList<>();
public List<Vnfs> getVnfs() {
return vnfs;
@@ -67,8 +69,16 @@ public class Resources implements Serializable {
this.networks = networks;
}
+ public List<Service> getServices() {
+ return services;
+ }
+
+ public void setServices(List<Service> services) {
+ this.services = services;
+ }
+
@Override
public String toString() {
- return "Resources [vnfs=" + vnfs + ", networks=" + networks + "]";
+ return "Resources [vnfs=" + vnfs + ", networks=" + networks + ", services=" + services + "]";
}
}