From: sreeja gattagouni Date: Thu, 21 Apr 2022 09:54:22 +0000 (+0530) Subject: Processing Priority for Nested Services X-Git-Tag: 1.11.0~11^2~1 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=so.git;a=commitdiff_plain;h=fb7e0b5f8b13a0cd8b01011445c27cf47a415954 Processing Priority for Nested Services - Processing Priority For Nested Services. - Prioritising services by mentioning priority number while triggering requests will allow the Services to be instantiated as per the priority in a Nested-Services having Parent-Child Services Relationships. Issue-ID: SO-3855 Change-Id: I66d83f324c122d842f52f0b808dab5640b8c9abf Signed-off-by: sreeja gattagouni --- diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ebb/loader/UserParamsServiceTraversal.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ebb/loader/UserParamsServiceTraversal.java index 074aa9e5a1..b8b9c458fa 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ebb/loader/UserParamsServiceTraversal.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ebb/loader/UserParamsServiceTraversal.java @@ -115,6 +115,7 @@ public class UserParamsServiceTraversal { for (Service childService : validate.getResources().getServices()) { Resource childServiceResource = new Resource(WorkflowType.SERVICE, childService.getModelInfo().getModelVersionId(), false, serviceResource); + childServiceResource.setProcessingPriority(childService.getProcessingPriority()); childServiceResource.setInstanceName(childService.getInstanceName()); resourceList.add(childServiceResource); } 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 c368f67907..14b1ab5974 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> 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 + "]"; } }