Merge "Change serviceInstance CM retrieval" into dublin

2 files changed, 19 insertions, 2 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/ExtractPojosForBB.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/ExtractPojosForBB.java
index 86bbead9a4..b76316bf0e 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/ExtractPojosForBB.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/ExtractPojosForBB.java
@@ -57,8 +57,13 @@ public class ExtractPojosForBB {
             GenericVnf vnf;
             switch (key) {
                 case SERVICE_INSTANCE_ID:
-                    result = lookupObjectInList(gBBInput.getCustomer().getServiceSubscription().getServiceInstances(),
-                            value);
+                    if (gBBInput.getCustomer().getServiceSubscription() == null
+                            && gBBInput.getServiceInstance() != null) {
+                        result = Optional.of((T) gBBInput.getServiceInstance());
+                    } else {
+                        result = lookupObjectInList(
+                                gBBInput.getCustomer().getServiceSubscription().getServiceInstances(), value);
+                    }
                     break;
                 case GENERIC_VNF_ID:
                     serviceInstance = extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID);
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/ExtractPojosForBBTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/ExtractPojosForBBTest.java
index 8ab2c8e155..7bd2beeb92 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/ExtractPojosForBBTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/ExtractPojosForBBTest.java
@@ -227,4 +227,16 @@ public class ExtractPojosForBBTest extends BaseTest {
         gBBInput.setCustomer(customer);
         extractPojos.extractByKey(execution, ResourceKey.VPN_BONDING_LINK_ID);
     }
+
+    @Test
+    public void getServiceInstanceWithNoCustomer() throws BBObjectNotFoundException {
+        ServiceInstance serviceInstancePend = new ServiceInstance();
+        serviceInstancePend.setServiceInstanceId("abc");
+        lookupKeyMap.put(ResourceKey.SERVICE_INSTANCE_ID, serviceInstancePend.getServiceInstanceId());
+        Customer customer = new Customer();
+        gBBInput.setCustomer(customer);
+        gBBInput.setServiceInstance(serviceInstancePend);
+        ServiceInstance extractServPend = extractPojos.extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID);
+        assertEquals(extractServPend.getServiceInstanceId(), serviceInstancePend.getServiceInstanceId());
+    }
 }