helm name check added 56/114656/1
authorarun chapagain <arun.chapagain@huawei.com>
Fri, 6 Nov 2020 12:50:38 +0000 (18:20 +0530)
committerarun chapagain <arun.chapagain@huawei.com>
Fri, 6 Nov 2020 12:50:38 +0000 (18:20 +0530)
Issue-ID: SO-3336

Signed-off-by: arun chapagain <arun.chapagain@huawei.com>
Change-Id: Ibecaaf7178d22b81bd968b6f8e81d682844f871f

bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java

index 7c4f735..561ae55 100644 (file)
@@ -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);