Refactored references to AaiUtils

to use AAIResourceClient
updated bpmn, removed Generic AAI flows, and removed dead useless code
Did not modify E2E Delete Service Instance flow as it has changed
significantly


Issue-ID: SO-813
Change-Id: I1a6bc5353ef89e2ce4359be2654395f7ce060aba
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

1 files changed, 0 insertions, 560 deletions

diff --git a/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/GenericGetServiceIT.java b/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/GenericGetServiceIT.java
deleted file mode 100644
index 38d05fe28e..0000000000
--- a/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/GenericGetServiceIT.java
+++ /dev/null
@@ -1,560 +0,0 @@
-/*
- * © 2014 AT&T Intellectual Property. All rights reserved. Used under license from AT&T Intellectual Property.
- */
-/*- 
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. 
- * ================================================================================ 
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
- * You may obtain a copy of the License at 
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0 
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
- * limitations under the License. 
- * ============LICENSE_END========================================================= 
- */ 
-
-package org.onap.so.bpmn.common;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.onap.so.bpmn.mock.StubResponseAAI.MockGetServiceInstance;
-import static org.onap.so.bpmn.mock.StubResponseAAI.MockGetServiceInstance_404;
-import static org.onap.so.bpmn.mock.StubResponseAAI.MockGetServiceInstance_500;
-import static org.onap.so.bpmn.mock.StubResponseAAI.MockGetServiceSubscription;
-import static org.onap.so.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById;
-import static org.onap.so.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById_404;
-import static org.onap.so.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById_500;
-import static org.onap.so.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceByName;
-import static org.onap.so.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceByName_404;
-import static org.onap.so.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceByName_500;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.junit.Test;
-import org.onap.so.BaseIntegrationTest;
-
-
-/**
- * Unit Test for the GenericGetService Sub Flow
- */
-
-public class GenericGetServiceIT extends BaseIntegrationTest {
-
-
-	@Test
-	public void testGenericGetService_success_serviceInstance() throws Exception{
-		MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");
-		Map<String, Object> variables = new HashMap<>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");
-		String processId = invokeSubProcess( "GenericGetService", variables);
-		
-		String successIndicator = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_SuccessIndicator",processId);
-		String found = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_FoundIndicator",processId);
-		String obtainUrl = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainObjectsUrl",processId);
-		String byName = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName",processId);
-		String response = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowResponse",processId);
-		String workflowException = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowException",processId);
-		assertEquals("true", successIndicator);
-		assertEquals("true", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertNotNull(response);
-		assertEquals(null, workflowException);
-	}
-
-
-	@Test
-	
-	public void testGenericGetService_success_serviceSubscription() throws Exception{
-
-		MockGetServiceSubscription("1604-MVM-26", "SDN-ETHERNET-INTERNET", "GenericFlows/getServiceSubscription.xml");
-
-		Map<String, Object> variables = new HashMap<>();
-		setVariablesSubscription(variables, "", null , "1604-MVM-26", "SDN-ETHERNET-INTERNET");
-
-		String processId = invokeSubProcess( "GenericGetService", variables);
-		
-
-		String successIndicator = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_SuccessIndicator",processId);
-		String found = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_FoundIndicator",processId);
-		String obtainUrl = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainObjectsUrl",processId);
-		String byName = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName",processId);
-		String response = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowResponse",processId);
-		String workflowException = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowException",processId);
-
-		assertEquals("true", successIndicator);
-		assertEquals("true", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertNotNull(response);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	
-	public void testGenericGetService_success_serviceInstance_byName() throws Exception{
-
-		MockNodeQueryServiceInstanceByName("1604-MVM-26", "GenericFlows/getSIUrlByName.xml");
-		MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");
-
-		Map<String, Object> variables = new HashMap<>();
-		setVariablesInstance(variables, null, "1604-MVM-26", null, null);
-
-		String processId = invokeSubProcess( "GenericGetService", variables);
-		
-
-		String successIndicator = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_SuccessIndicator",processId);
-		String found = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_FoundIndicator",processId);
-		String obtainUrl = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainObjectsUrl",processId);
-		String byName = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName",processId);
-		String response = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowResponse",processId);
-		String workflowException = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowException",processId);
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainSIUrlResponseCode",processId);
-
-		assertEquals("true", successIndicator);
-		assertEquals("true", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("true", byName);
-		assertNotNull(response);
-		assertEquals("200", siUrlResponseCode);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	
-	public void testGenericGetService_success_serviceInstance_byId() throws Exception{
-
-		MockNodeQueryServiceInstanceById("MIS%2F1604%2F0026%2FSW_INTERNET", "GenericFlows/getSIUrlById.xml");
-		MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");
-
-		Map<String, Object> variables = new HashMap<>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);
-
-		String processId = invokeSubProcess( "GenericGetService", variables);
-		
-
-		String successIndicator = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_SuccessIndicator",processId);
-		String found = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_FoundIndicator",processId);
-		String obtainUrl = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainObjectsUrl",processId);
-		String byName = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName",processId);
-		String response = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowResponse",processId);
-		String workflowException = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowException",processId);
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_genericQueryResponseCode",processId);
-
-		assertEquals("true", successIndicator);
-		assertEquals("true", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("false", byName);
-		assertNotNull(response);
-		assertEquals("200", siUrlResponseCode);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	
-	public void testGenericGetService_success_serviceInstance_404Response() throws Exception{
-
-		MockGetServiceInstance_404("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET");
-
-		Map<String, Object> variables = new HashMap<>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");
-
-		String processId = invokeSubProcess( "GenericGetService", variables);
-		
-
-		String successIndicator = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_SuccessIndicator",processId);
-		String found = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_FoundIndicator",processId);
-		String obtainUrl = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainObjectsUrl",processId);
-		String byName = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName",processId);
-		String workflowException = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowException",processId);
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	
-	public void testGenericGetService_success_serviceSubscription404() throws Exception{
-		MockGetServiceSubscription("SDN-ETHERNET-INTERNET", "1604-MVM-26", 404);
-		
-		Map<String, Object> variables = new HashMap<>();
-		setVariablesSubscription(variables, "", "", "SDN-ETHERNET-INTERNET", "1604-MVM-26");
-
-		String processId = invokeSubProcess( "GenericGetService", variables);
-		
-
-		String successIndicator = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_SuccessIndicator",processId);
-		String found = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_FoundIndicator",processId);
-		String obtainUrl = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainObjectsUrl",processId);
-		String byName = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName",processId);
-		String response = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowResponse",processId);
-		String workflowException = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowException",processId);
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertNotNull(response);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	
-	public void testGenericGetService_success_serviceInstanceByName404() throws Exception{
-
-		MockNodeQueryServiceInstanceByName_404("1604-MVM-26");
-
-		Map<String, Object> variables = new HashMap<>();
-		setVariablesInstance(variables, "", "1604-MVM-26", null, null);
-
-		String processId = invokeSubProcess( "GenericGetService", variables);
-		
-
-		String successIndicator = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_SuccessIndicator",processId);
-		String found = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_FoundIndicator",processId);
-		String obtainUrl = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainObjectsUrl",processId);
-		String byName = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName",processId);
-		String workflowException = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowException",processId);
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainSIUrlResponseCode",processId);
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("true", byName);
-		assertEquals("404", siUrlResponseCode);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	
-	public void testGenericGetService_success_serviceInstanceById404() throws Exception{
-
-		MockNodeQueryServiceInstanceById_404("MIS%2F1604%2F0026%2FSW_INTERNET");
-
-		Map<String, Object> variables = new HashMap<>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);
-
-		String processId = invokeSubProcess( "GenericGetService", variables);
-		
-
-		String successIndicator = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_SuccessIndicator",processId);
-		String found = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_FoundIndicator",processId);
-		String obtainUrl = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainObjectsUrl",processId);
-		String byName = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName",processId);
-		String workflowException = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowException",processId);
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_genericQueryResponseCode",processId);
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals("404", siUrlResponseCode);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	
-	public void testGenericGetService_success_serviceInstanceEmptyResponse() throws Exception{
-
-		MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET");
-
-		Map<String, Object> variables = new HashMap<>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");
-
-		String processId = invokeSubProcess( "GenericGetService", variables);
-		
-
-		String successIndicator = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_SuccessIndicator",processId);
-		String found = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_FoundIndicator",processId);
-		String obtainUrl = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainObjectsUrl",processId);
-		String byName = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName",processId);
-		String workflowException = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowException",processId);
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	
-	public void testGenericGetService_success_serviceInstanceByNameEmpty() throws Exception{
-		MockNodeQueryServiceInstanceByName("1604-MVM-26", "");
-		
-		Map<String, Object> variables = new HashMap<>();
-		setVariablesInstance(variables, "", "1604-MVM-26", null, null);
-
-		String processId = invokeSubProcess( "GenericGetService", variables);
-		
-
-		String successIndicator = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_SuccessIndicator",processId);
-		String found = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_FoundIndicator",processId);
-		String obtainUrl = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainObjectsUrl",processId);
-		String byName = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName",processId);
-		String workflowException = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowException",processId);
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainSIUrlResponseCode",processId);
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("true", byName);
-		assertEquals("200", siUrlResponseCode);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	
-	public void testGenericGetService_success_serviceInstanceByIdEmpty() throws Exception{
-
-	        MockNodeQueryServiceInstanceById("MIS[%]2F1604[%]2F0026[%]2FSW_INTERNET", "");
-
-		Map<String, Object> variables = new HashMap<>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);
-
-		String processId = invokeSubProcess( "GenericGetService", variables);
-		
-
-		String successIndicator = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_SuccessIndicator",processId);
-		String found = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_FoundIndicator",processId);
-		String obtainUrl = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainObjectsUrl",processId);
-		String byName = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName",processId);
-		String workflowException = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowException",processId);
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_genericQueryResponseCode",processId);
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals("200", siUrlResponseCode);
-		assertEquals(null, workflowException);
-	}
-
-
-	@Test
-	
-	public void testGenericGetService_error_serviceInstanceInvalidVariables() throws Exception{
-
-		Map<String, Object> variables = new HashMap<>();
-		setVariablesInstance(variables, null, null, "SDN-ETHERNET-INTERNET", null);
-
-		String processId = invokeSubProcess( "GenericGetService", variables);
-		
-
-		String successIndicator = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_SuccessIndicator",processId);
-		String found = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_FoundIndicator",processId);
-		String workflowException = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowException",processId);
-		String obtainUrl = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainObjectsUrl",processId);
-		String byName = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName",processId);
-
-		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Incoming serviceInstanceId and serviceInstanceName are null. ServiceInstanceId or ServiceInstanceName is required to Get a service-instance.,workStep=*]";
-
-		assertEquals("false", successIndicator);
-		assertEquals("false", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals(expectedWorkflowException, workflowException);
-	}
-
-	@Test
-	
-	public void testGenericGetService_success_serviceSubscriptionInvalidVariables() throws Exception{
-
-		Map<String, Object> variables = new HashMap<>();
-		setVariablesSubscription(variables, "", "", "SDN-ETHERNET-INTERNET", null);
-
-		String processId = invokeSubProcess( "GenericGetService", variables);
-		
-
-		String successIndicator = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_SuccessIndicator",processId);
-		String found = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_FoundIndicator",processId);
-		String obtainUrl = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainObjectsUrl",processId);
-		String byName = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName",processId);
-		String workflowException = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowException",processId);
-
-		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Incoming ServiceType or GlobalCustomerId is null. These variables are required to Get a service-subscription.,workStep=*]";
-
-
-		assertEquals("false", successIndicator);
-		assertEquals("false", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals(expectedWorkflowException, workflowException);
-	}
-
-	@Test
-	
-	public void testGenericGetService_error_serviceInstance_getSIBadResponse() throws Exception{
-
-		MockGetServiceInstance_500("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET");
-
-		Map<String, Object> variables = new HashMap<>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "123456789");
-
-		String processId = invokeSubProcess( "GenericGetService", variables);
-		
-
-		String successIndicator = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_SuccessIndicator",processId);
-		String found = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_FoundIndicator",processId);
-		String workflowException = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowException",processId);
-		String obtainUrl = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainObjectsUrl",processId);
-		String byName = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName",processId);
-
-		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Received a bad response from AAI,workStep=*]";
-
-		assertEquals("false", successIndicator);
-		assertEquals("false", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals(expectedWorkflowException, workflowException);
-	}
-
-	@Test
-	
-	public void testGenericGetService_error_serviceInstance_getUrlByIdBadResponse() throws Exception{
-
-		MockNodeQueryServiceInstanceById_500("MIS%2F1604%2F0026%2FSW_INTERNET");
-
-		Map<String, Object> variables = new HashMap<>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);
-
-		String processId = invokeSubProcess( "GenericGetService", variables);
-		
-
-		String successIndicator = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_SuccessIndicator",processId);
-		String found = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_FoundIndicator",processId);
-		String workflowException = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowException",processId);
-		String obtainUrl = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainObjectsUrl",processId);
-		String byName = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName",processId);
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_genericQueryResponseCode",processId);
-
-		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Received a bad response from AAI,workStep=*]";
-
-		assertEquals("false", successIndicator);
-		assertEquals("false", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals("500", siUrlResponseCode);
-		assertEquals(expectedWorkflowException, workflowException);
-	}
-
-	@Test
-	
-	public void testGenericGetService_error_serviceInstance_getUrlByNameBadResponse() throws Exception{
-
-		MockNodeQueryServiceInstanceByName_500("1604-MVM-26");
-
-		Map<String, Object> variables = new HashMap<>();
-		setVariablesInstance(variables, null, "1604-MVM-26", null, null);
-
-		String processId = invokeSubProcess( "GenericGetService", variables);
-		
-
-		String successIndicator = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_SuccessIndicator",processId);
-		String found = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_FoundIndicator",processId);
-		String workflowException = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowException",processId);
-		String obtainUrl = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainObjectsUrl",processId);
-		String byName = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName",processId);
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainSIUrlResponseCode",processId);
-
-		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Received a bad response from AAI,workStep=*]";
-
-		assertEquals("false", successIndicator);
-		assertEquals("false", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("true", byName);
-		assertEquals("500", siUrlResponseCode);
-		assertEquals(expectedWorkflowException, workflowException);
-	}
-
-    @Test
-    
-    public void testGenericGetService_success_serviceInstance_byNameServicePresent() throws Exception{
-
-        MockNodeQueryServiceInstanceByName("1604-MVM-26", "GenericFlows/getSIUrlByNameMultiCustomer.xml");
-        MockGetServiceInstance("AbcBank", "ABC-ST", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");
-
-        Map<String, Object> variables = new HashMap<>();
-        setVariablesInstance(variables, null, "1604-MVM-26", "XyCorporation", null);
-
-        String processId = invokeSubProcess( "GenericGetService", variables);
-        
-
-        String successIndicator = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_SuccessIndicator",processId);
-        String found = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_FoundIndicator",processId);
-        String resourceLink = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_resourceLink",processId);
-        String response = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowResponse",processId);
-        String workflowException = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowException",processId);
-        String siUrlResponseCode = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainSIUrlResponseCode",processId);
-
-        assertEquals("true", successIndicator);
-        assertEquals("true", found);
-		assertNotNull(resourceLink);
-        assertNotNull(response);
-        assertEquals("200", siUrlResponseCode);
-        assertEquals(null, workflowException);
-    }
-
-	@Test
-	
-	public void testGenericGetService_success_serviceInstance_byNameServiceNotPresent() throws Exception{
-
-		MockNodeQueryServiceInstanceByName("1604-MVM-26", "GenericFlows/getSIUrlByNameMultiCustomer.xml");
-		MockGetServiceInstance("CorporationNotPresent", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");
-
-		Map<String, Object> variables = new HashMap<>();
-		setVariablesInstance(variables, null, "1604-MVM-26", "CorporationNotPresent", null);
-
-		String processId = invokeSubProcess( "GenericGetService", variables);
-		
-
-		String successIndicator = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_SuccessIndicator",processId);
-		String found = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_FoundIndicator",processId);
-		String resourceLink = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_resourceLink",processId);
-		String response = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowResponse",processId);
-		String workflowException = BPMNUtil.getVariable(processEngine, "GenericGetService", "WorkflowException",processId);
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngine, "GenericGetService", "GENGS_obtainSIUrlResponseCode",processId);
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals(null, resourceLink);
-		assertEquals("  ", response);
-		assertEquals("200", siUrlResponseCode);
-		assertEquals(null, workflowException);
-	}
-
-	private void setVariablesInstance(Map<String, Object> variables, String siId, String siName, String globalCustId, String serviceType) {
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("GENGS_serviceInstanceId", siId);
-		variables.put("GENGS_serviceInstanceName", siName);
-		variables.put("GENGS_globalCustomerId",globalCustId);
-		variables.put("GENGS_serviceType", serviceType);
-		variables.put("GENGS_type", "service-instance");
-		variables.put("mso-request-id", UUID.randomUUID().toString());
-	}
-
-	private void setVariablesSubscription(Map<String, Object> variables, String siId, String siName, String globalCustId, String serviceType) {
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("GENGS_serviceInstanceId", siId);
-		variables.put("GENGS_serviceInstanceName", siName);
-		variables.put("GENGS_globalCustomerId",globalCustId);
-		variables.put("GENGS_serviceType", serviceType);
-		variables.put("GENGS_type", "service-subscription");
-		variables.put("mso-request-id", UUID.randomUUID().toString());
-	}
-
-
-}