From: arun chapagain <arun.chapagain@huawei.com>
Date: Fri, 6 Nov 2020 12:50:38 +0000 (+0530)
Subject:  helm name check added
X-Git-Tag: 1.7.9~7^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F56%2F114656%2F1;p=so.git

 helm name check added
Issue-ID: SO-3336

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

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);