diff options
| author |   Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com> | 2018-12-11 11:52:11 -0500 |
|---|---|---|
| committer | Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com> | 2018-12-12 10:14:14 -0500 |
| commit | a18e125482abe346fd1006ef69457398ae35011e (patch) | |
| tree | 692aacb7019d14da9d560b1b4273f3d87b77079c /bpmn/MSOCommonBPMN/src/main | |
| parent | 533311a4934838b67ffd0ca49d7958f69059bccd (diff) | |
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>
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 b794e4174b..985b53d0ce 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 @@ -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); |