diff options
| author |   Rob Daugherty <rd472p@att.com> | 2018-12-13 15:18:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-12-13 15:18:38 +0000 |
| commit | 6e071febcb82bab59c65a0bb0af171fb05cbc222 (patch) | |
| tree | ea5343ea865deeea03b0fd1110159b55cc27b250 /bpmn/MSOCommonBPMN/src/main | |
| parent | c08a515bbb5a63401f13d260e2d41c6e472caf95 (diff) | |
| parent | a18e125482abe346fd1006ef69457398ae35011e (diff) | |
Merge "Add the query to AAI for SI with customer info"
Diffstat (limited to 'bpmn/MSOCommonBPMN/src/main')
| -rw-r--r-- | bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java index 0017c4eeb1..63f832d706 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java @@ -1301,7 +1301,12 @@ public class BBInputSetup implements JavaDelegate { .getAAIServiceInstanceByName(requestDetails.getRequestInfo().getInstanceName(), customer); } if (serviceInstanceId != null && serviceInstanceAAI == null) { - serviceInstanceAAI = bbInputSetupUtils.getAAIServiceInstanceById(serviceInstanceId); + if(customer != null && customer.getServiceSubscription() != null) { + serviceInstanceAAI = bbInputSetupUtils.getAAIServiceInstanceByIdAndCustomer(customer.getGlobalCustomerId(), + customer.getServiceSubscription().getServiceType(), serviceInstanceId); + } else { + serviceInstanceAAI = bbInputSetupUtils.getAAIServiceInstanceById(serviceInstanceId); + } } if (serviceInstanceAAI != null) { lookupKeyMap.put(ResourceKey.SERVICE_INSTANCE_ID, serviceInstanceId); |