Merge "Removed audit code"

1 files changed, 5 insertions, 1 deletions

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/vfmodule/CreateVFModule.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/vfmodule/CreateVFModule.java
index f7c42b97e9..b706be92cb 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/vfmodule/CreateVFModule.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/vfmodule/CreateVFModule.java
@@ -44,7 +44,11 @@ public class CreateVFModule {
             CloudInformation cloudInformation = new CloudInformation();
             cloudInformation.setOwner(gBBInput.getCloudRegion().getCloudOwner());
             cloudInformation.setRegionId(gBBInput.getCloudRegion().getLcpCloudRegionId());
-            cloudInformation.setTenantId(gBBInput.getTenant().getTenantId());
+            String tenantId = gBBInput.getTenant().getTenantId();
+            if (tenantId == null) {
+                tenantId = gBBInput.getCloudRegion().getTenantId();
+            }
+            cloudInformation.setTenantId(tenantId);
             cloudInformation.setTenantName(gBBInput.getTenant().getTenantName());
             cloudInformation.setTenantContext(gBBInput.getTenant().getTenantContext());
             cloudInformation.setTemplateInstanceId(execution.getVariable("heatStackId"));