diff options
| author |   arun chapagain <arun.chapagain@huawei.com> | 2020-11-06 18:20:38 +0530 |
|---|---|---|
| committer | arun chapagain <arun.chapagain@huawei.com> | 2020-11-06 18:20:38 +0530 |
| commit | 6647c1dba9b6030573df6a1bfb1b4502a303b3e5 (patch) | |
| tree | 6ed4ba99f8bd51cd8331a4a3790df969ed7b119c | |
| parent | 9e49f2787a413b49ab0274e9ce8aebe9e6dc155b (diff) | |
helm name check added
Issue-ID: SO-3336
Signed-off-by: arun chapagain <arun.chapagain@huawei.com>
Change-Id: Ibecaaf7178d22b81bd968b6f8e81d682844f871f
| -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); |