diff options
| author |   Seshu Kumar M <seshu.kumar.m@huawei.com> | 2020-11-06 14:33:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-11-06 14:33:46 +0000 |
| commit | 4f269bc7b8654db69469cd0aec1ceaaa57bf4c86 (patch) | |
| tree | e5e9de9b4e1c521d9678f3780307f6e5946f2bb6 | |
| parent | bb819501be5eab896e5274dfab0149487ccc25b7 (diff) | |
| parent | 6647c1dba9b6030573df6a1bfb1b4502a303b3e5 (diff) | |
Merge " helm name check added Issue-ID: SO-3336"
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java index 7c4f735577..561ae55ae1 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java @@ -1251,9 +1251,12 @@ public class WorkflowAction { foundVfModuleOrVG = true; } - if (vfModuleCustomization.getVfModule() != null - && vfModuleCustomization.getVfModule().getModuleHeatTemplate() != null - && vfModuleCustomization.getHeatEnvironment() != null) { + if ((vfModuleCustomization.getVfModule() != null) + && ((vfModuleCustomization.getVfModule().getModuleHeatTemplate() != null + && vfModuleCustomization.getHeatEnvironment() != null)) + || (vfModuleCustomization.getVfModule().getModelName() != null + && vfModuleCustomization.getVfModule().getModelName() + .contains("helm"))) { foundVfModuleOrVG = true; Resource resource = new Resource(WorkflowType.VFMODULE, vfModuleCustomization.getModelCustomizationUUID(), false); |