aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2018-12-13 15:18:38 +0000
committerGerrit Code Review <gerrit@onap.org>2018-12-13 15:18:38 +0000
commit6e071febcb82bab59c65a0bb0af171fb05cbc222 (patch)
treeea5343ea865deeea03b0fd1110159b55cc27b250
parentc08a515bbb5a63401f13d260e2d41c6e472caf95 (diff)
parenta18e125482abe346fd1006ef69457398ae35011e (diff)
Merge "Add the query to AAI for SI with customer info"
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java7
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);