aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn/so-bpmn-tasks/src/main
diff options
context:
space:
mode:
authorBoslet, Cory <cory.boslet@att.com>2020-10-20 11:38:11 -0400
committerBenjamin, Max (mb388a) <mb388a@att.com>2020-10-21 16:20:20 -0400
commit1b0033ac8a578730ba95e48f7a7ab73e49380b51 (patch)
tree29b7e93e525645a29e1b7cd87391c6dbc4d17c44 /bpmn/so-bpmn-tasks/src/main
parent7396509f9c11cc4e9651210cf8a290679bb17fd5 (diff)
Removed audit code
Updated to error on inventory therefore no longer need audit Removed the audit UT test from source Removed the audit from the task services. Updated the BB unit test to not have audit anymore Changed robots to fix for create inventory. Delete the vnfc by id after each robot Create pserver in aai that ci is using Continue to fix robot test for heat bridge Continue to fix robots due to heatbridge enabled More changes to simulator to account for heatbridge for replace scenrios Added get resources scenrio for heatbridge Added header and added version to simulator Added correct response file and header for base module id Fixed the remaining failing service instance robots Changed to get tenant id else where when null Fixed the macro robots for heatbridge and getting resources Added scenrios that are still needed for heatbridge Added to connect when already exist and missing relationships Updated unit test to account for change to code. Issue-ID: SO-3316 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I8cefebd91261fcb8ff03d582afb48517dd34625a
Diffstat (limited to 'bpmn/so-bpmn-tasks/src/main')
-rw-r--r--bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/vfmodule/CreateVFModule.java6
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"));