aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsubhash kumar singh <subhash.kumar.singh@huawei.com>2018-05-31 17:46:32 +0800
committersubhash kumar singh <subhash.kumar.singh@huawei.com>2018-05-31 17:46:32 +0800
commit9ac13899b368c83566c280157a51c49f99cad4f3 (patch)
treebc87a02a577f854e648d0a2d0af63eacdd70c667
parentc8981f10b0332aa30a3d1861409b3e9e5296cabe (diff)
Introduce resource sequence as per modelname
Resource sequence can be defined in mso.apihandler-infra.properties file as per following: mso.workflow.custom.<service-model-name>.resource.sequence=<, separated values> Change-Id: I156cfcfea4936be541014726dc6063f7f4e2d2b4 Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateResources.groovy5
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/properties/BPMNProperties.java4
2 files changed, 6 insertions, 3 deletions
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateResources.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateResources.groovy
index 9cdbdfde1c..ab84168007 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateResources.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateResources.groovy
@@ -105,7 +105,10 @@ public class DoCreateResources extends AbstractServiceTaskProcessor
List<NetworkResource> networkResourceList = new ArrayList<NetworkResource>()
List<Resource> sequencedResourceList = new ArrayList<Resource>()
- def resourceSequence = BPMNProperties.getResourceSequenceProp()
+
+ String serviceDecompose = execution.getVariable("serviceDecomposition")
+ String serviceModelName = jsonUtil.getJsonValue(serviceDecompose, "serviceResources.modelInfo.modelName")
+ def resourceSequence = BPMNProperties.getResourceSequenceProp(serviceModelName)
if(resourceSequence != null) {
// sequence is defined in config file
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/properties/BPMNProperties.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/properties/BPMNProperties.java
index dbb552c818..64d8530df1 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/properties/BPMNProperties.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/properties/BPMNProperties.java
@@ -47,8 +47,8 @@ public class BPMNProperties {
return value;
}
- public static List<String> getResourceSequenceProp() {
- String resourceSequence = getProperty("mso.workflow.custom.VolTE.resource.sequence", null);
+ public static List<String> getResourceSequenceProp(String input) {
+ String resourceSequence = getProperty("mso.workflow.custom." + input + ".resource.sequence", null);
if (resourceSequence != null) {
return Arrays.asList(resourceSequence.split(","));
}