summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorLukasz Rajewski <lukasz.rajewski@t-mobile.pl>2022-08-05 14:19:19 +0200
committerLukasz Rajewski <lukasz.rajewski@t-mobile.pl>2022-08-05 14:19:57 +0200
commitb0f785e99096f230281d17e0fa89c21aca00fbac (patch)
treeecaa9d853037faa87310ab8c6562a3454e687179 /common
parent0d39f06a571e48ee3c8a05aca0c244d2595468e8 (diff)
parent2ef42cd813c85015322da874de668b79e790c5eb (diff)
Merge branch 'recursive-orch'
Issue-ID: SO-3980 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> Change-Id: Ie0cd0f973800196d5cb1e038db4a49208a6c4a3b
Diffstat (limited to 'common')
-rw-r--r--common/src/main/java/org/onap/so/serviceinstancebeans/Resources.java12
-rw-r--r--common/src/main/java/org/onap/so/serviceinstancebeans/Service.java15
2 files changed, 25 insertions, 2 deletions
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 + "]";
}
}
diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/Service.java b/common/src/main/java/org/onap/so/serviceinstancebeans/Service.java
index 3c3e10c483..90df220b52 100644
--- a/common/src/main/java/org/onap/so/serviceinstancebeans/Service.java
+++ b/common/src/main/java/org/onap/so/serviceinstancebeans/Service.java
@@ -45,6 +45,9 @@ public class Service implements Serializable {
private List<Map<String, Object>> instanceParams = new ArrayList<>();
@JsonProperty("resources")
protected Resources resources;
+ @JsonProperty("processingPriority")
+ protected Integer processingPriority = 0;
+
public ModelInfo getModelInfo() {
return modelInfo;
@@ -86,9 +89,19 @@ public class Service implements Serializable {
this.resources = resources;
}
+ public Integer getProcessingPriority() {
+ return processingPriority;
+ }
+
+ public void setProcessingPriority(Integer processingPriority) {
+ this.processingPriority = processingPriority;
+ }
+
+
@Override
public String toString() {
return "Service [modelInfo=" + modelInfo + ", cloudConfiguration=" + cloudConfiguration + ", instanceName="
- + instanceName + ", instanceParams=" + instanceParams + ", resources=" + resources + "]";
+ + instanceName + ", instanceParams=" + instanceParams + ", resources=" + resources
+ + ", processingPriority=" + processingPriority + "]";
}
}