diff options
| author |   Chuanyu Chen <chenchuanyu@huawei.com> | 2018-06-01 00:53:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-06-01 00:53:53 +0000 |
| commit | 34a7fab6dd31818f73eaae50e3f4ed8dc5dd7bd4 (patch) | |
| tree | 5a04844c22f0bddb24045d17c6cae5d787c013e3 /bpmn/MSOInfrastructureBPMN/src/main/groovy | |
| parent | 5e443968bb53aee67f034882ce3afbe3eacf7ffa (diff) | |
| parent | 9ac13899b368c83566c280157a51c49f99cad4f3 (diff) | |
Merge "Introduce resource sequence as per modelname"
Diffstat (limited to 'bpmn/MSOInfrastructureBPMN/src/main/groovy')
| -rw-r--r-- | bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateResources.groovy | 5 |
1 files changed, 4 insertions, 1 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 |