From: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
Date: Tue, 11 Dec 2018 15:50:04 +0000 (-0500)
Subject: fix lookup of si if customer exists
X-Git-Tag: 1.4.1~413^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F74505%2F1;p=so.git

fix lookup of si if customer exists

fix lookup of service instance in aai if customer exists
remove the unwanted mock in the bb input setup test

Change-Id: I12a666fef771c127a69eef254228753204cadd73
Issue-ID: SO-1321
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 b794e4174b..513a19be0a 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
@@ -865,8 +865,13 @@ public class BBInputSetup implements JavaDelegate {
 			String serviceInstanceId, boolean aLaCarte, String bbName) throws Exception {
 		ServiceInstance serviceInstance = this.getServiceInstanceHelper(requestDetails, customer, project, owningEntity,
 				lookupKeyMap, serviceInstanceId, aLaCarte, service, bbName);
-		org.onap.aai.domain.yang.ServiceInstance serviceInstanceAAI = this.bbInputSetupUtils
-				.getAAIServiceInstanceById(serviceInstanceId);
+		org.onap.aai.domain.yang.ServiceInstance serviceInstanceAAI = null;
+		if(customer != null && customer.getServiceSubscription() != null) {
+			serviceInstanceAAI = bbInputSetupUtils.getAAIServiceInstanceByIdAndCustomer(customer.getGlobalCustomerId(), 
+					customer.getServiceSubscription().getServiceType(), serviceInstanceId);
+		} else {
+			serviceInstanceAAI = bbInputSetupUtils.getAAIServiceInstanceById(serviceInstanceId);
+		}
 		if (serviceInstanceAAI != null
 				&& !serviceInstanceAAI.getModelVersionId().equalsIgnoreCase(service.getModelUUID())) {
 			Service tempService = this.bbInputSetupUtils
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
index f6e433bf38..a04c38d18d 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
@@ -1314,7 +1314,6 @@ public class BBInputSetupTest {
 		doReturn(vnf2AAI).when(SPY_bbInputSetupUtils).getAAIGenericVnf(vnf2.getVnfId());
 		doNothing().when(SPY_bbInputSetup).mapCatalogVnf(vnf2, modelInfo, service);
 		doNothing().when(SPY_bbInputSetup).mapNetworkCollectionInstanceGroup(vnf2, "{instanceGroupId}");
-		doNothing().when(SPY_bbInputSetup).mapVnfcCollectionInstanceGroup(vnf2, modelInfo, service);
 		SPY_bbInputSetup.populateGenericVnf(modelInfo, instanceName, platform, lineOfBusiness, service, bbName,
 				serviceInstance, lookupKeyMap, requestDetails.getRelatedInstanceList(), resourceId, vnfType, null);
 		verify(SPY_bbInputSetup, times(2)).mapCatalogVnf(vnf2, modelInfo, service);