Add the query to AAI for SI with customer info

added in the same block of code to getSIHelper method

Change-Id: I512898d86b5bfd10d1cbbdfeaaa5f2b8cf71510a
Issue-ID: SO-1326
Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>

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 b794e41..985b53d 100644 (file)
--- 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
@@ -1285,7 +1285,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);