diff options
author | Seshu Kumar M <seshu.kumar.m@huawei.com> | 2019-08-11 18:18:02 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-08-11 18:18:02 +0000 |
commit | 3081381bb2ba253fc0aa34203c90ea8bf63b26b4 (patch) | |
tree | 0f8fa92bf0ab650ec4d8fba9716115743e5ffcc9 /bpmn/MSOCommonBPMN/src/main | |
parent | cbcd0e0c4ab35c2a5b9577e06d41438ee708d44f (diff) | |
parent | 48e27590754f8b005986c7781092275480b347f7 (diff) |
Merge changes Ia52d9db2,Iab16430b
* changes:
Remove unused public access modifier
Add vfmodule support to e2e service instance
Diffstat (limited to 'bpmn/MSOCommonBPMN/src/main')
-rw-r--r-- | bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/InstanceResourceList.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/InstanceResourceList.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/InstanceResourceList.java index b1173bbf95..cc3ec52c7a 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/InstanceResourceList.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/InstanceResourceList.java @@ -108,6 +108,11 @@ public class InstanceResourceList { sequencedResourceList.add(vnfResource); } + // check if the resource contains vf-module + if (vnfResource != null && vnfResource.getVfModules() != null) { + sequencedResourceList.addAll(vnfResource.getVfModules()); + } + return sequencedResourceList; } |