Containerization feature of SO

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

55 files changed, 8198 insertions, 0 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandler/common/ResponseBuilderTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandler/common/ResponseBuilderTest.java
new file mode 100644
index 0000000000..8a45752949
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandler/common/ResponseBuilderTest.java
@@ -0,0 +1,73 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.apihandler.common;
+
+import static org.junit.Assert.assertEquals;
+
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Response;
+
+import org.apache.http.HttpStatus;
+import org.junit.Test;
+import org.onap.so.apihandlerinfra.BaseTest;
+import org.onap.so.apihandlerinfra.exceptions.ApiException;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class ResponseBuilderTest extends BaseTest {
+
+	@Autowired
+	private ResponseBuilder builder;
+	
+    @Test
+    public void testBuildResponseResponse () throws ApiException {
+    	
+    	String requestId = null;
+    	String apiVersion = "1";
+    	String jsonResponse = "Successfully started the process";
+        
+        Response response = builder.buildResponse(HttpStatus.SC_ACCEPTED, requestId, jsonResponse, apiVersion);
+        
+        assertEquals(202, response.getStatus());
+        assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0));
+        assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0));
+        assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0));
+        assertEquals("1.0.0", response.getHeaders().get("X-LatestVersion").get(0));
+        
+    }
+    
+    @Test
+    public void testBuildResponseVersion () throws ApiException {
+    	
+    	String requestId = "123456-67889";
+    	String apiVersion = "v5";
+    	String jsonResponse = "Successfully started the process";       
+        
+        Response response = builder.buildResponse(HttpStatus.SC_CREATED, requestId, jsonResponse, apiVersion);
+        
+        assertEquals(201, response.getStatus());
+        assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0));
+        assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0));
+        assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0));
+        assertEquals("5.0.0", response.getHeaders().get("X-LatestVersion").get(0));
+        
+    }
+    
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandler/filters/RequestUriFilterTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandler/filters/RequestUriFilterTest.java
new file mode 100644
index 0000000000..db3dcb5af5
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandler/filters/RequestUriFilterTest.java
@@ -0,0 +1,57 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.apihandler.filters;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.net.URI;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.core.UriInfo;
+
+import org.junit.Test;
+import org.onap.so.apihandlerinfra.BaseTest;
+
+
+
+public class RequestUriFilterTest extends BaseTest{
+	
+	@Test
+	public void filterTest() throws IOException {
+		RequestUriFilter URIFilter = new RequestUriFilter();
+		URI baseURI = URI.create("http://localhost:58879/");
+		String requestURI = "onap/so/infra/serviceInstances/v5";
+		
+		ContainerRequestContext mockContext = mock(ContainerRequestContext.class);
+		UriInfo mockInfo = mock(UriInfo.class);
+	
+		when(mockContext.getUriInfo()).thenReturn(mockInfo);
+		when(mockInfo.getBaseUri()).thenReturn(baseURI);
+		when(mockInfo.getPath()).thenReturn(requestURI);
+	
+		
+		URIFilter.filter(mockContext);
+		assertEquals("http://localhost:58879/onap/so/infra/serviceInstantiation/v5/serviceInstances", URIFilter.getRequestUri());
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandler/recipe/CamundaClientErrorHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandler/recipe/CamundaClientErrorHandlerTest.java
new file mode 100644
index 0000000000..564121b7b5
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandler/recipe/CamundaClientErrorHandlerTest.java
@@ -0,0 +1,72 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2018 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.apihandler.recipe;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.client.ClientHttpResponse;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class CamundaClientErrorHandlerTest {
+	
+	private ClientHttpResponse clientHttpResponse;
+	private CamundaClientErrorHandler clientErrorHandler;
+	
+	@Before
+	public void before() {
+		clientHttpResponse = Mockito.mock(ClientHttpResponse.class);
+		clientErrorHandler = new CamundaClientErrorHandler();
+	}
+	
+	@Test
+	public void handleError_SERVER_ERROR_Test() throws IOException {
+		Mockito.when(clientHttpResponse.getStatusCode()).thenReturn(HttpStatus.INTERNAL_SERVER_ERROR);
+		Mockito.when(clientHttpResponse.getBody()).thenReturn(new ByteArrayInputStream("{}".getBytes())); 
+		clientErrorHandler.handleError(clientHttpResponse);
+		boolean serverHasError = clientErrorHandler.hasError(clientHttpResponse);
+		assertEquals(true, serverHasError);
+	}
+	
+	@Test
+	public void handleError_CLIENT_ERROR_Test() throws IOException {
+		Mockito.when(clientHttpResponse.getStatusCode()).thenReturn(HttpStatus.BAD_REQUEST);
+		Mockito.when(clientHttpResponse.getBody()).thenReturn(new ByteArrayInputStream("{}".getBytes())); 
+		clientErrorHandler.handleError(clientHttpResponse);
+		boolean clientHasError = clientErrorHandler.hasError(clientHttpResponse);
+		assertEquals(true, clientHasError);
+	}	
+	
+	@Test
+	public void handleError_SUCCESS_Test() throws IOException {
+		Mockito.when(clientHttpResponse.getStatusCode()).thenReturn(HttpStatus.ACCEPTED);
+		Mockito.when(clientHttpResponse.getBody()).thenReturn(new ByteArrayInputStream("{}".getBytes())); 
+		clientErrorHandler.handleError(clientHttpResponse);
+		boolean hasNoError = clientErrorHandler.hasError(clientHttpResponse);
+		assertEquals(false, hasNoError);
+	}	
+	
+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/AllTestsTestSuite.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/AllTestsTestSuite.java
new file mode 100644
index 0000000000..68869b77d4
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/AllTestsTestSuite.java
@@ -0,0 +1,32 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.apihandlerinfra;
+import org.junit.runner.RunWith;
+
+import com.googlecode.junittoolbox.SuiteClasses;
+import com.googlecode.junittoolbox.WildcardPatternSuite;
+
+@RunWith(WildcardPatternSuite.class)
+@SuiteClasses("**/*Test.class")
+public class AllTestsTestSuite {
+  // the class remains empty,
+  // used only as a holder for the above annotations
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ApiExceptionMapperTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ApiExceptionMapperTest.java
new file mode 100644
index 0000000000..95daf2e501
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ApiExceptionMapperTest.java
@@ -0,0 +1,102 @@
+/*-
+ * ============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.apihandlerinfra;
+
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.StringStartsWith.startsWith;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.anyObject;
+
+import java.io.IOException;
+
+import javax.ws.rs.core.Response;
+
+import org.apache.http.HttpStatus;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.onap.so.apihandler.common.ErrorNumbers;
+import org.onap.so.apihandlerinfra.exceptions.ApiException;
+import org.onap.so.apihandlerinfra.exceptions.ApiExceptionMapper;
+import org.onap.so.apihandlerinfra.exceptions.BPMNFailureException;
+import org.onap.so.apihandlerinfra.exceptions.ClientConnectionException;
+import org.onap.so.apihandlerinfra.exceptions.DuplicateRequestException;
+import org.onap.so.apihandlerinfra.exceptions.ValidateException;
+import org.onap.so.apihandlerinfra.exceptions.VfModuleNotFoundException;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class ApiExceptionMapperTest extends BaseTest {
+
+    ApiExceptionMapper mapper = new ApiExceptionMapper();
+
+
+    @Test
+    public void testObjectMapperError() throws JsonProcessingException {
+        ObjectMapper mockedMapper = Mockito.mock(ObjectMapper.class);
+        Mockito.when(mockedMapper.writeValueAsString(anyObject())).thenThrow(JsonProcessingException.class);
+        ValidateException validateException = new ValidateException.Builder("Test", 0 , null).build();
+        ApiExceptionMapper mockedException = Mockito.spy(new ApiExceptionMapper());
+        Mockito.doReturn(mockedMapper).when(mockedException).createObjectMapper();
+        Response resp = mockedException.toResponse((ApiException) validateException);
+
+       /// assertEquals(resp.getStatus(), HttpStatus.SC_BAD_REQUEST);
+        assertThat(resp.getEntity().toString(),startsWith("Exception in buildServiceErrorResponse writing exceptionType to string"));
+    }
+
+    @Test
+    public void testValidateResponse(){
+        ValidateException validateException = new ValidateException.Builder("Test Message", HttpStatus.SC_BAD_REQUEST, ErrorNumbers.SVC_BAD_PARAMETER).build();
+        Response resp = mapper.toResponse((ApiException) validateException);
+
+        assertEquals(resp.getStatus(), HttpStatus.SC_BAD_REQUEST);
+    }
+
+    @Test
+    public void testBPMNFailureResponse(){
+        BPMNFailureException bpmnException = new BPMNFailureException.Builder("Test Message", HttpStatus.SC_NOT_FOUND, ErrorNumbers.SVC_BAD_PARAMETER).build();
+        Response resp = mapper.toResponse((ApiException) bpmnException);
+
+        assertEquals(resp.getStatus(), HttpStatus.SC_NOT_FOUND);
+    }
+    @Test
+    public void testClientConnectionResponse(){
+        ClientConnectionException clientConnectionException = new ClientConnectionException.Builder("test", HttpStatus.SC_INTERNAL_SERVER_ERROR,ErrorNumbers.SVC_BAD_PARAMETER).build();
+        Response resp =  mapper.toResponse((ApiException) clientConnectionException);
+
+        assertEquals(resp.getStatus(), HttpStatus.SC_INTERNAL_SERVER_ERROR);
+    }
+    @Test
+    public void testVFModuleResponse() {
+        VfModuleNotFoundException vfModuleException = new VfModuleNotFoundException.Builder("Test Message", HttpStatus.SC_CONFLICT,ErrorNumbers.SVC_BAD_PARAMETER).build();
+        Response resp =  mapper.toResponse((ApiException) vfModuleException);
+
+        assertEquals(resp.getStatus(), HttpStatus.SC_CONFLICT);
+    }
+    @Test
+    public void testDuplicateRequestResponse() throws IOException {
+        DuplicateRequestException duplicateRequestException = new DuplicateRequestException.Builder("Test1", "Test2","Test3","Test4", HttpStatus.SC_BAD_GATEWAY,ErrorNumbers.SVC_BAD_PARAMETER).build();
+        Response resp =  mapper.toResponse((ApiException) duplicateRequestException);
+
+        assertEquals(resp.getStatus(), HttpStatus.SC_BAD_GATEWAY);
+    }
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ApiExceptionTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ApiExceptionTest.java
new file mode 100644
index 0000000000..4e3a930955
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ApiExceptionTest.java
@@ -0,0 +1,128 @@
+/*-
+ * ============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.apihandlerinfra;
+
+import org.apache.http.HttpStatus;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.onap.so.apihandler.common.ErrorNumbers;
+import org.onap.so.apihandlerinfra.exceptions.*;
+import org.onap.so.apihandlerinfra.logging.AlarmLoggerInfo;
+import org.onap.so.apihandlerinfra.logging.ErrorLoggerInfo;
+import org.onap.so.logger.MessageEnum;
+import org.onap.so.logger.MsoAlarmLogger;
+import org.onap.so.logger.MsoLogger;
+
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+
+import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
+import static org.hamcrest.Matchers.hasProperty;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.startsWith;
+
+
+public class ApiExceptionTest extends BaseTest {
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Test
+    public void testRecipeNotFoundException() throws ApiException {
+        thrown.expect(RecipeNotFoundException.class);
+        thrown.expectMessage("Message rewritten");
+        thrown.expect(hasProperty("httpResponseCode", is(HttpStatus.SC_NOT_FOUND)));
+        thrown.expect(hasProperty("messageID", is(ErrorNumbers.SVC_BAD_PARAMETER)));
+        RecipeNotFoundException testException = new RecipeNotFoundException.Builder("Test Message", HttpStatus.SC_NOT_FOUND,ErrorNumbers.SVC_BAD_PARAMETER).message("Message rewritten").build();
+        throw testException;
+    }
+
+
+    @Test
+    public void testBPMNFailureException() throws ApiException {
+        List<String> testVariables = new LinkedList<>();
+        testVariables.add("hello");
+        thrown.expect(BPMNFailureException.class);
+        thrown.expectMessage(startsWith("Request Failed due to BPEL error with HTTP Status ="));
+        thrown.expect(hasProperty("httpResponseCode", is(HttpStatus.SC_NOT_FOUND)));
+        thrown.expect(hasProperty("messageID", is(ErrorNumbers.SVC_BAD_PARAMETER)));
+        thrown.expect(hasProperty("variables",sameBeanAs(testVariables)));
+        BPMNFailureException testException = new BPMNFailureException.Builder("Test Message", HttpStatus.SC_NOT_FOUND,ErrorNumbers.SVC_BAD_PARAMETER).variables(testVariables).build();
+        throw testException;
+    }
+
+
+    @Test
+    public void testClientConnectionException() throws ApiException {
+        IOException ioException = new IOException();
+        thrown.expect(ClientConnectionException.class);
+        thrown.expectMessage("Client from test failed to connect");
+        thrown.expect(hasProperty("httpResponseCode", is(HttpStatus.SC_NOT_FOUND)));
+        thrown.expect(hasProperty("messageID", is(ErrorNumbers.SVC_BAD_PARAMETER)));
+        thrown.expect(hasProperty("httpResponseCode", is(HttpStatus.SC_NOT_FOUND)));
+        thrown.expect(hasProperty("messageID", is(ErrorNumbers.SVC_BAD_PARAMETER)));
+        thrown.expect(hasProperty("cause", sameBeanAs(ioException)));
+        ClientConnectionException testException = new ClientConnectionException.Builder("test", HttpStatus.SC_NOT_FOUND,ErrorNumbers.SVC_BAD_PARAMETER).cause(ioException).build();
+        throw testException;
+    }
+
+
+    @Test
+    public void testDuplicateRequestException() throws ApiException {
+        ErrorLoggerInfo testLog = new ErrorLoggerInfo.Builder(MessageEnum.APIH_DB_ATTRIBUTE_NOT_FOUND, MsoLogger.ErrorCode.DataError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
+        thrown.expect(DuplicateRequestException.class);
+        thrown.expectMessage(startsWith("Error: Locked instance"));
+        thrown.expect(hasProperty("httpResponseCode", is(HttpStatus.SC_NOT_FOUND)));
+        thrown.expect(hasProperty("messageID", is(ErrorNumbers.SVC_BAD_PARAMETER)));
+        thrown.expect(hasProperty("errorLoggerInfo", sameBeanAs(testLog)));
+        DuplicateRequestException testException = new DuplicateRequestException.Builder("Test1", "Test2","Test3","Test4", HttpStatus.SC_NOT_FOUND,ErrorNumbers.SVC_BAD_PARAMETER).errorInfo(testLog).build();
+        throw testException;
+    }
+
+
+    @Test
+    public void testValidateException() throws ApiException {
+        AlarmLoggerInfo testLog = new AlarmLoggerInfo.Builder("MsoConfigurationError", MsoAlarmLogger.CRITICAL,
+                Messages.errors.get(ErrorNumbers.NO_COMMUNICATION_TO_SDNC_ADAPTER)).build();
+        thrown.expect(ValidateException.class);
+        thrown.expectMessage("Test Message");
+        thrown.expect(hasProperty("httpResponseCode", is(HttpStatus.SC_NOT_FOUND)));
+        thrown.expect(hasProperty("messageID", is(ErrorNumbers.SVC_DETAILED_SERVICE_ERROR)));
+        thrown.expect(hasProperty("alarmLoggerInfo", sameBeanAs(testLog)));
+        ValidateException testException = new ValidateException.Builder("Test Message", HttpStatus.SC_NOT_FOUND,ErrorNumbers.SVC_BAD_PARAMETER).messageID(ErrorNumbers.SVC_DETAILED_SERVICE_ERROR).alarmInfo(testLog).build();
+        throw testException;
+    }
+
+
+    @Test
+    public void testVfModuleNotFoundException() throws ApiException {
+        thrown.expect(VfModuleNotFoundException.class);
+        thrown.expectMessage("Test Message");
+        thrown.expect(hasProperty("httpResponseCode", is(HttpStatus.SC_CONFLICT)));
+        thrown.expect(hasProperty("messageID", is(ErrorNumbers.SVC_BAD_PARAMETER)));
+        VfModuleNotFoundException testException = new VfModuleNotFoundException.Builder("Test Message", HttpStatus.SC_NOT_FOUND,ErrorNumbers.SVC_BAD_PARAMETER).httpResponseCode(HttpStatus.SC_CONFLICT).build();
+        throw testException;
+    }
+
+
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/BaseTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/BaseTest.java
new file mode 100644
index 0000000000..d0426bf69f
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/BaseTest.java
@@ -0,0 +1,90 @@
+/*-
+ * ============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.apihandlerinfra;
+
+import java.io.File;
+import java.io.IOException;
+
+import javax.transaction.Transactional;
+
+import org.junit.After;
+import org.junit.runner.RunWith;
+import org.onap.so.db.request.data.repository.InfraActiveRequestsRepository;
+import org.onap.so.logger.MsoLogger;
+import org.onap.so.logger.MsoLogger.Catalog;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
+import org.springframework.core.env.Environment;
+import org.springframework.http.HttpHeaders;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.jdbc.Sql;
+import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.tomakehurst.wiremock.client.WireMock;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = ApiHandlerApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@ActiveProfiles("test")
+@ContextConfiguration
+@Transactional
+@Sql(executionPhase=ExecutionPhase.AFTER_TEST_METHOD,scripts="classpath:InfraActiveRequestsReset.sql")
+@AutoConfigureWireMock(port = 0)
+public abstract class BaseTest {
+	
+	protected MsoLogger logger = MsoLogger.getMsoLogger(Catalog.GENERAL, BaseTest.class);
+	protected TestRestTemplate restTemplate = new TestRestTemplate("test", "test");
+
+	protected HttpHeaders headers = new HttpHeaders();	
+
+	@Autowired
+	protected Environment env;
+	
+	@Autowired
+	protected InfraActiveRequestsRepository iar;
+	
+	@LocalServerPort
+	private int port;
+	
+	protected String readJsonFileAsString(String fileLocation) throws JsonParseException, JsonMappingException, IOException{
+		ObjectMapper mapper = new ObjectMapper();
+		JsonNode jsonNode = mapper.readTree(new File(fileLocation));
+		return jsonNode.asText();
+	}
+	
+	protected String createURLWithPort(String uri) {
+		return "http://localhost:" + port + uri;
+	}
+	
+	@After
+	public void tearDown(){
+		iar.deleteAll();
+		WireMock.reset();
+	}
+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/BeanMultiTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/BeanMultiTest.java
new file mode 100644
index 0000000000..68c5c918ba
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/BeanMultiTest.java
@@ -0,0 +1,67 @@
+package org.onap.so.apihandlerinfra;
+/*-
+ * ============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=========================================================
+ */
+import org.junit.Before;
+import org.junit.Test;
+
+import com.openpojo.reflection.PojoClass;
+import com.openpojo.reflection.PojoClassFilter;
+import com.openpojo.reflection.filters.FilterEnum;
+import com.openpojo.validation.Validator;
+import com.openpojo.validation.ValidatorBuilder;
+import com.openpojo.validation.rule.impl.GetterMustExistRule;
+import com.openpojo.validation.rule.impl.SetterMustExistRule;
+import com.openpojo.validation.test.impl.GetterTester;
+import com.openpojo.validation.test.impl.SetterTester;
+
+public class BeanMultiTest {
+
+	Validator validator;
+	PojoClassFilter enumFilter;
+	private PojoClassFilter filterTestClasses = new FilterTestClasses();
+
+	@Before
+	public void setup(){
+		enumFilter = new FilterEnum();
+		validator = ValidatorBuilder.create()
+				.with(new SetterMustExistRule(),
+						new GetterMustExistRule())
+				.with(new SetterTester(),
+						new GetterTester())
+				.build();
+	}
+	@Test
+	public void validateBeansMsoApihandlerBeans() {
+		test("org.onap.so.apihandlerinfra.e2eserviceinstancebeans");		
+		test("org.onap.so.apihandlerinfra.tasksbeans");
+		test("org.onap.so.apihandlerinfra.vnfbeans");
+		test("org.onap.so.apihandlerinfra.tenantisolationbeans");
+	}
+
+	private void test(String packageName) {
+		validator.validate(packageName, enumFilter, filterTestClasses);
+
+	}
+	private static class FilterTestClasses implements PojoClassFilter {
+		public boolean include(PojoClass pojoClass) {
+			return !pojoClass.getSourcePath().contains("/test-classes/");
+		}
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/E2EServiceInstancesTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/E2EServiceInstancesTest.java
new file mode 100644
index 0000000000..2baa54fdec
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/E2EServiceInstancesTest.java
@@ -0,0 +1,229 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.apihandlerinfra;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.onap.so.serviceinstancebeans.RequestError;
+import org.onap.so.serviceinstancebeans.ServiceException;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.tomakehurst.wiremock.http.Fault;
+
+public class E2EServiceInstancesTest extends BaseTest {
+private ObjectMapper mapper = new ObjectMapper();	
+	
+	private final String e2eServInstancesUri = "/e2eServiceInstances/";
+	
+	public String inputStream(String JsonInput)throws IOException{
+		JsonInput = "src/test/resources/E2EServiceInstancesTest" + JsonInput;
+		String input = new String(Files.readAllBytes(Paths.get(JsonInput)));
+		return input;
+	}
+	public ResponseEntity<String> sendRequest(String requestJson, String uriPath, HttpMethod reqMethod){		 
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type",MediaType.APPLICATION_JSON);
+		
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(uriPath));
+		HttpEntity<String> request = new HttpEntity<String>(requestJson, headers);  
+		ResponseEntity<String> response = restTemplate.exchange(builder.toUriString(),
+				reqMethod, request, String.class);
+		
+		return response;
+	}
+	//Currently returning a 500 response
+	@Ignore
+	@Test
+	public void createE2EServiceInstanceNoRequestInfo() throws JsonParseException, JsonMappingException, IOException{
+		String uri = e2eServInstancesUri + "v5";
+		ResponseEntity<String> response = sendRequest(inputStream("/Request.json"), uri, HttpMethod.POST);
+		
+		assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value());
+	}
+	@Test
+	public void updateE2EServiceInstanceJSONMappingError() throws JsonParseException, JsonMappingException, IOException{
+		String uri = e2eServInstancesUri + "v5/9b9f02c0-298b-458a-bc9c-be3692e4f35e";
+		ResponseEntity<String> response = sendRequest(inputStream("/CompareModelRequest.json"), uri, HttpMethod.PUT);
+		
+		assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value());
+		RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class);
+		assertTrue(realResponse.getServiceException().getText().contains("Mapping of request to JSON object failed"));
+	}
+	@Test
+	public void updateE2EServiceInstanceNoRequestorId() throws JsonParseException, JsonMappingException, IOException{
+		RequestError expectedResponse = new RequestError();
+		ServiceException exception = new ServiceException();
+		exception.setMessageId("SVC0002");
+		exception.setText("Error parsing request.  Error parsing request: No valid requestorId is specified");
+		expectedResponse.setServiceException(exception);
+		
+		String uri = e2eServInstancesUri + "v5/9b9f02c0-298b-458a-bc9c-be3692e4f35e";
+		ResponseEntity<String> response = sendRequest(inputStream("/Request.json"), uri, HttpMethod.PUT);
+		
+		assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value());
+		RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse));
+	}
+	@Test
+	public void deleteE2EServiceInstanceNoRecipe() throws JsonParseException, JsonMappingException, IOException{
+		RequestError expectedResponse = new RequestError();
+		ServiceException exception = new ServiceException();
+		exception.setMessageId("SVC1000");
+		exception.setText("No communication to catalog DB null");
+		expectedResponse.setServiceException(exception);
+		
+		String uri = e2eServInstancesUri + "v5/9b9f02c0-298b-458a-bc9c-be3692e4f35e";
+		ResponseEntity<String> response = sendRequest(inputStream("/DeleteRequest.json"), uri, HttpMethod.DELETE);
+		
+		assertEquals(Response.Status.NOT_FOUND.getStatusCode(), response.getStatusCode().value());
+		RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse));
+	}
+	@Test
+	public void deleteE2EServiceInstanceNotValid() throws JsonParseException, JsonMappingException, IOException{
+		String uri = e2eServInstancesUri + "v5/9b9f02c0-298b-458a-bc9c-be3692e4f35e";
+		ResponseEntity<String> response = sendRequest(inputStream("/Request.json"), uri, HttpMethod.DELETE);
+		
+		assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value());
+		RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class);
+		assertTrue(realResponse.getServiceException().getText().contains("Mapping of request to JSON object failed"));
+	}
+	@Test
+	public void getE2EServiceInstanceNullOperationalStatus() throws JsonParseException, JsonMappingException, IOException{
+		String uri = e2eServInstancesUri + "v5/9b9f02c0-298b-458a-bc9c-be3692e4f35e/operations/9b9f02c0-298b-458a-bc9c-be3692e4f35e";
+		ResponseEntity<String> response = sendRequest(inputStream("/Request.json"), uri, HttpMethod.GET);
+		
+		assertEquals(Response.Status.NO_CONTENT.getStatusCode(), response.getStatusCode().value());
+	}
+	@Test
+	public void scaleE2EServiceInstanceMappingError() throws JsonParseException, JsonMappingException, IOException{
+		String uri = e2eServInstancesUri + "v5/9b9f02c0-298b-458a-bc9c-be3692e4f35e/scale";
+		ResponseEntity<String> response = sendRequest(inputStream("/Request.json"), uri, HttpMethod.POST);
+		
+		assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value());
+		RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class);
+		assertTrue(realResponse.getServiceException().getText().contains("Mapping of request to JSON object failed"));
+	}
+	@Test
+	public void scaleE2EServiceInstance() throws JsonParseException, JsonMappingException, IOException{
+		RequestError expectedResponse = new RequestError();
+		ServiceException exception = new ServiceException();
+		exception.setMessageId("SVC1000");
+		exception.setText("No communication to catalog DB null");
+		expectedResponse.setServiceException(exception);
+		
+		String uri = e2eServInstancesUri + "v5/9b9f02c0-298b-458a-bc9c-be3692e4f35e/scale";
+		ResponseEntity<String> response = sendRequest(inputStream("/ScaleRequest.json"), uri, HttpMethod.POST);
+		
+		assertEquals(Response.Status.NOT_FOUND.getStatusCode(), response.getStatusCode().value());
+		RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse));
+	}
+	@Test
+	public void compareModelWithTargetVersionBadRequest() throws JsonParseException, JsonMappingException, IOException{
+		String uri = e2eServInstancesUri + "v5/9b9f02c0-298b-458a-bc9c-be3692e4f35e/modeldifferences";
+		ResponseEntity<String> response = sendRequest(inputStream("/Request.json"), uri, HttpMethod.POST);
+		
+		assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value());
+		RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class);
+		assertTrue(realResponse.getServiceException().getText().contains("Mapping of request to JSON object failed"));
+	}
+	@Test
+	public void compareModelWithTargetVersion() throws JsonParseException, JsonMappingException, IOException{
+		stubFor(post(urlPathEqualTo("/mso/async/services/CompareModelofE2EServiceInstance"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/SuccessfulResponse.json").withStatus(org.apache.http.HttpStatus.SC_ACCEPTED)));
+		
+		String expectedResponse = "success";
+		String uri = e2eServInstancesUri + "v5/9b9f02c0-298b-458a-bc9c-be3692e4f35e/modeldifferences";
+		ResponseEntity<String> response = sendRequest(inputStream("/CompareModelRequest.json"), uri, HttpMethod.POST);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		String actualResponse = response.getBody();
+		assertEquals(expectedResponse, actualResponse);
+	}
+	@Test
+	public void compareModelWithTargetVersionEmptyResponse() throws JsonParseException, JsonMappingException, IOException{
+		stubFor(post(urlPathEqualTo("/mso/async/services/CompareModelofE2EServiceInstance"))
+				.willReturn(aResponse().withFault(Fault.EMPTY_RESPONSE)));
+		
+		RequestError expectedResponse = new RequestError();
+		ServiceException exception = new ServiceException();
+		exception.setMessageId("SVC1000");
+		exception.setText("Failed calling bpmn localhost:" + env.getProperty("wiremock.server.port") + " failed to respond");
+		expectedResponse.setServiceException(exception);
+		
+		String uri = e2eServInstancesUri + "v5/9b9f02c0-298b-458a-bc9c-be3692e4f35e/modeldifferences";
+		ResponseEntity<String> response = sendRequest(inputStream("/CompareModelRequest.json"), uri, HttpMethod.POST);
+		
+		assertEquals(Response.Status.BAD_GATEWAY.getStatusCode(), response.getStatusCode().value());
+		RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse));
+	}
+	@Test
+	public void compareModelWithTargetVersionBadBpelResponse() throws JsonParseException, JsonMappingException, IOException{
+		stubFor(post(urlPathEqualTo("/mso/async/services/CompareModelofE2EServiceInstance"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_BAD_GATEWAY)));
+		
+		String uri = e2eServInstancesUri + "v5/9b9f02c0-298b-458a-bc9c-be3692e4f35e/modeldifferences";
+		ResponseEntity<String> response = sendRequest(inputStream("/CompareModelRequest.json"), uri, HttpMethod.POST);
+		
+		assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatusCode().value());
+		RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class);
+		assertTrue(realResponse.getServiceException().getText().contains("Request Failed due to BPEL error with HTTP Status"));
+	}
+	@Test
+	public void compareModelWithTargetVersionNoBPELResponse() throws JsonParseException, JsonMappingException, IOException{
+		stubFor(post(urlPathEqualTo("/mso/async/services/CompareModelofE2EServiceInstance"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBody("{}").withStatus(org.apache.http.HttpStatus.SC_BAD_GATEWAY)));
+
+		String uri = e2eServInstancesUri + "v5/9b9f02c0-298b-458a-bc9c-be3692e4f35e/modeldifferences";
+		ResponseEntity<String> response = sendRequest(inputStream("/CompareModelRequest.json"), uri, HttpMethod.POST);
+		
+		assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatusCode().value());
+		RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class);
+		assertTrue(realResponse.getServiceException().getText().contains("Request Failed due to BPEL error with HTTP Status"));
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/EmbeddedCatalogDbConfig.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/EmbeddedCatalogDbConfig.java
new file mode 100644
index 0000000000..f504d88008
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/EmbeddedCatalogDbConfig.java
@@ -0,0 +1,102 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.apihandlerinfra;
+import ch.vorburger.exec.ManagedProcessException;
+import ch.vorburger.mariadb4j.DBConfigurationBuilder;
+import ch.vorburger.mariadb4j.springframework.MariaDB4jSpringService;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
+import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import javax.persistence.EntityManagerFactory;
+import javax.sql.DataSource;
+
+@Configuration
+@Profile({"test"})
+@EnableTransactionManagement
+@EnableJpaRepositories(
+		entityManagerFactoryRef = "entityManagerFactory",
+		basePackages = {"org.onap.so.db.catalog.data.repository"}
+		)
+public class EmbeddedCatalogDbConfig {
+
+    @Bean
+    MariaDB4jSpringService mariaDB4jSpringService() {
+        return new MariaDB4jSpringService();
+    }
+
+	@Primary
+	@Bean(name = "dataSource")
+    DataSource dataSource(MariaDB4jSpringService mariaDB4jSpringService,
+                          @Value("${mariaDB4j.databaseName}") String databaseName,
+                          @Value("${spring.datasource.username}") String datasourceUsername,
+                          @Value("${spring.datasource.password}") String datasourcePassword,
+                          @Value("${spring.datasource.driver-class-name}") String datasourceDriver) throws ManagedProcessException {
+        //Create our database with default root user and no password
+        mariaDB4jSpringService.getDB().createDB(databaseName);
+
+        DBConfigurationBuilder config = mariaDB4jSpringService.getConfiguration();
+
+        return DataSourceBuilder
+                .create()
+                .username(datasourceUsername)
+                .password(datasourcePassword)
+                .url(config.getURL(databaseName))
+                .driverClassName(datasourceDriver)
+                .build();
+    }
+	
+
+	@Primary
+	@Bean(name = "entityManagerFactory")
+	public LocalContainerEntityManagerFactoryBean 
+	entityManagerFactory(
+			EntityManagerFactoryBuilder builder,
+			@Qualifier("dataSource") DataSource dataSource
+			) {
+		return builder
+				.dataSource(dataSource)
+				.packages("org.onap.so.db.catalog.beans")
+				.persistenceUnit("catalogDB")
+				.build();
+	}
+
+	@Primary
+	@Bean(name = "transactionManager")
+	public PlatformTransactionManager transactionManager(
+			@Qualifier("entityManagerFactory") EntityManagerFactory 
+			entityManagerFactory
+			) {
+		return new JpaTransactionManager(entityManagerFactory);
+	}
+
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/EmbeddedRequestDbConfig.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/EmbeddedRequestDbConfig.java
new file mode 100644
index 0000000000..d150fd773a
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/EmbeddedRequestDbConfig.java
@@ -0,0 +1,102 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.apihandlerinfra;
+import ch.vorburger.exec.ManagedProcessException;
+import ch.vorburger.mariadb4j.DBConfigurationBuilder;
+import ch.vorburger.mariadb4j.springframework.MariaDB4jSpringService;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import javax.persistence.EntityManagerFactory;
+import javax.sql.DataSource;
+
+@Configuration
+@Profile({"test"})
+@EnableTransactionManagement
+@EnableJpaRepositories(
+		entityManagerFactoryRef = "requestEntityManagerFactory",transactionManagerRef = "requestTransactionManager",
+		basePackages = { "org.onap.so.db.request.data.repository" }
+		)
+public class EmbeddedRequestDbConfig {
+
+    @Bean
+    MariaDB4jSpringService mariaDB4jSpringService() {
+        return new MariaDB4jSpringService();
+    }
+
+
+   	@Bean(name = "requestDataSource")
+   	@ConfigurationProperties(prefix = "request.datasource")
+    DataSource dataSource(MariaDB4jSpringService mariaDB4jSpringService,
+                          @Value("${mariaDB4j.databaseName2}") String databaseName,
+                          @Value("${spring.datasource.username}") String datasourceUsername,
+                          @Value("${spring.datasource.password}") String datasourcePassword,
+                          @Value("${spring.datasource.driver-class-name}") String datasourceDriver) throws ManagedProcessException {
+        //Create our database with default root user and no password
+        mariaDB4jSpringService.getDB().createDB(databaseName);
+
+        DBConfigurationBuilder config = mariaDB4jSpringService.getConfiguration();
+
+        return DataSourceBuilder
+                .create()
+                .username(datasourceUsername)
+                .password(datasourcePassword)
+                .url(config.getURL(databaseName))
+                .driverClassName(datasourceDriver)
+                .build();
+    }
+
+
+	@Bean(name = "requestEntityManagerFactory")
+	public LocalContainerEntityManagerFactoryBean 
+	entityManagerFactory(
+			EntityManagerFactoryBuilder builder,
+			@Qualifier("requestDataSource") DataSource dataSource
+			) {
+		return builder
+				.dataSource(dataSource)
+				.packages("org.onap.so.db.request.beans")
+				.persistenceUnit("requestDB")
+				.build();
+	}
+
+
+	@Bean(name = "requestTransactionManager")
+	public PlatformTransactionManager transactionManager(
+			@Qualifier("requestEntityManagerFactory") EntityManagerFactory 
+			entityManagerFactory
+			) {
+		return new JpaTransactionManager(entityManagerFactory);
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/HealthCheckHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/HealthCheckHandlerTest.java
new file mode 100644
index 0000000000..e16f265a2e
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/HealthCheckHandlerTest.java
@@ -0,0 +1,55 @@
+/*-
+ * ============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.apihandlerinfra;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
+import javax.ws.rs.core.Response;
+
+import org.json.JSONException;
+import org.junit.Test;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+
+
+public class HealthCheckHandlerTest extends BaseTest{
+		
+	@Test
+	public void testHealthcheckGet() throws JSONException {
+
+		HttpEntity<String> entity = new HttpEntity<String>(null, headers);
+
+		ResponseEntity<String> response = restTemplate.exchange(
+				createURLWithPort("/manage/health"),
+				HttpMethod.GET, entity, String.class);
+		
+		assertEquals(Response.Status.OK.getStatusCode(),response.getStatusCode().value());
+		assertThat(response.getBody(), containsString("UP"));
+	
+	}
+
+
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ManualTasksTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ManualTasksTest.java
new file mode 100644
index 0000000000..c9d83efced
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ManualTasksTest.java
@@ -0,0 +1,118 @@
+/*-
+ * ============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.apihandlerinfra;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+import java.util.Map;
+
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.http.HttpStatus;
+import org.apache.log4j.MDC;
+import org.junit.Test;
+import org.onap.so.apihandlerinfra.tasksbeans.RequestDetails;
+import org.onap.so.apihandlerinfra.tasksbeans.RequestInfo;
+import org.onap.so.apihandlerinfra.tasksbeans.TaskRequestReference;
+import org.onap.so.apihandlerinfra.tasksbeans.TasksRequest;
+import org.onap.so.apihandlerinfra.tasksbeans.ValidResponses;
+import org.onap.so.logger.MsoLogger;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+
+
+public class ManualTasksTest extends BaseTest{
+
+	private final String basePath = "/tasks/v1/";
+	
+
+	
+	@Test
+	public void testCreateOpEnvObjectMapperError() throws IOException {
+		TestAppender.events.clear();
+		stubFor(post(urlPathEqualTo("/sobpmnengine/task/55/complete"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_OK)));
+		
+		String taskId = "55";
+		TasksRequest taskReq = new TasksRequest();
+		RequestDetails reqDetail = new RequestDetails();
+		RequestInfo reqInfo = new RequestInfo();
+		reqInfo.setRequestorId("testId");
+		reqInfo.setSource("testSource");	
+		reqInfo.setResponseValue(ValidResponses.skip);
+		reqDetail.setRequestInfo(reqInfo);
+		taskReq.setRequestDetails(reqDetail);
+		
+		//expected response
+		TaskRequestReference expectedResponse = new TaskRequestReference();
+		expectedResponse.setTaskId(taskId);	
+		
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		headers.set(MsoLogger.ECOMP_REQUEST_ID, "987654321");
+		headers.set(MsoLogger.CLIENT_ID, "VID");
+		HttpEntity<TasksRequest> entity = new HttpEntity<TasksRequest>(taskReq, headers);
+		
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(basePath) + taskId + "/complete");	       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.POST, entity, String.class);
+
+	
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true);
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+		TaskRequestReference realResponse = mapper.readValue(response.getBody(), TaskRequestReference.class);
+		
+		
+		//then		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());	
+		assertThat(realResponse, sameBeanAs(expectedResponse));	
+		ILoggingEvent logEvent = TestAppender.events.get(0);
+        Map<String,String> mdc = logEvent.getMDCPropertyMap();
+        assertEquals("987654321", mdc.get(MsoLogger.REQUEST_ID));
+        assertEquals("VID", mdc.get(MsoLogger.CLIENT_ID));        
+        assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0));
+        assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0));
+        assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0));
+        assertEquals("1.0.0", response.getHeaders().get("X-LatestVersion").get(0));
+        assertEquals("987654321", response.getHeaders().get("X-TransactionID").get(0));
+        MDC.remove(MsoLogger.CLIENT_ID);
+		
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/MsoRequestTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/MsoRequestTest.java
new file mode 100644
index 0000000000..7feea9a456
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/MsoRequestTest.java
@@ -0,0 +1,467 @@
+/*-
+ * ============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.apihandlerinfra;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Response;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.apache.http.HttpStatus;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.onap.so.apihandler.common.ErrorNumbers;
+import org.onap.so.exceptions.ValidationException;
+import org.onap.so.serviceinstancebeans.ServiceInstancesRequest;
+import org.springframework.test.context.junit4.rules.SpringClassRule;
+import org.springframework.test.context.junit4.rules.SpringMethodRule;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+
+@RunWith(JUnitParamsRunner.class)
+public class MsoRequestTest extends BaseTest {
+	private ObjectMapper mapper = new ObjectMapper();
+	private HashMap<String, String> instanceIdMapTest = new HashMap<String, String>();
+	private ServiceInstancesRequest sir;
+	private MsoRequest msoRequest;
+	private Action action;
+	private String version;
+	private int reqVersion;
+	private String originalRequestJSON;
+	private String requestJSON;
+	private boolean expected;
+	private String expectedException;
+	
+	@ClassRule
+    public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
+
+    @Rule
+    public final SpringMethodRule springMethodRule = new SpringMethodRule();
+    
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+	
+	public String inputStream(String JsonInput)throws IOException{
+		JsonInput = "src/test/resources/MsoRequestTest" + JsonInput;
+		String input = new String(Files.readAllBytes(Paths.get(JsonInput)));
+		return input;
+	}
+	//Tests for successful validation of incoming JSON requests through the parse method
+	@Test
+	@Parameters(method = "successParameters")
+	public void successTest(ServiceInstancesRequest sir, HashMap<String, String> instanceIdMapTest, Action action, int reqVersion) throws ValidationException, IOException{
+		this.sir = sir;
+		this.instanceIdMapTest = instanceIdMapTest;
+		this.action = action;
+		this.reqVersion = reqVersion;
+		this.version = "v" + reqVersion;
+		this.instanceIdMapTest.put("serviceInstanceId", "ff305d54-75b4-431b-adb2-eb6b9e5ff000");
+		this.instanceIdMapTest.put("vnfInstanceId", "ff305d54-75b4-431b-adb2-eb6b9e5ff000");
+		this.instanceIdMapTest.put("vfModuleInstanceId", "ff305d54-75b4-431b-adb2-eb6b9e5ff000");
+		this.instanceIdMapTest.put("volumeGroupInstanceId", "ff305d54-75b4-431b-adb2-eb6b9e5ff000");
+		this.instanceIdMapTest.put("networkInstanceId", "ff305d54-75b4-431b-adb2-eb6b9e5ff000");
+		this.instanceIdMapTest.put("configurationInstanceId", "ff305d54-75b4-431b-adb2-eb6b9e5ff000");
+		this.msoRequest = new MsoRequest();
+		this.msoRequest.parse(sir, instanceIdMapTest, action, version, originalRequestJSON, reqVersion, false);
+	}
+	@Parameters
+	private Collection<Object[]> successParameters() throws JsonParseException, JsonMappingException, IOException{
+		return Arrays.asList(new Object[][]{
+			{mapper.readValue(inputStream("/CloudConfiguration/EmptyCloudConfiguration.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.updateInstance, "3"},
+			{mapper.readValue(inputStream("/ProjectAndOwningEntity/EmptyOwningEntityName.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, "5"},
+			{mapper.readValue(inputStream("/PlatformAndLineOfBusiness/OptionalLineOfBusiness.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, "6"},
+			{mapper.readValue(inputStream("/ProjectAndOwningEntity/OptionalProject.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, "6"},
+			{mapper.readValue(inputStream("/PlatformAndLineOfBusiness/PlatformTest.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.updateInstance, "5"},	
+			{mapper.readValue(inputStream("/RequestInfo/EmptyRequestorId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, "3"},
+			{mapper.readValue(inputStream("/RequestInfo/ServiceProductFamilyIdFlag.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.updateInstance, "5"},		
+			{mapper.readValue(inputStream("/RequestInfo/ServiceProductFamilyIdUpdate.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.updateInstance, "5"},
+			{mapper.readValue(inputStream("/ModelInfo/ModelCustomizationIdUsingPreload.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.replaceInstance, "5"},
+			{mapper.readValue(inputStream("/ModelInfo/ModelInvariantIdConfigurationDelete.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.deleteInstance, "3"},
+			{mapper.readValue(inputStream("/ModelInfo/ModelInvariantIdService.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.deactivateInstance, "4"},
+			{mapper.readValue(inputStream("/ModelInfo/ModelVersionNetwork.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.deleteInstance, "3"},
+			{mapper.readValue(inputStream("/ModelInfo/VnfModelCustomizationIdEmpty.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.deleteInstance, "5"},
+			{mapper.readValue(inputStream("/ModelInfo/VnfModelCustomizationNameNull.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.replaceInstance, "5"},
+			{mapper.readValue(inputStream("/ModelInfo/VnfModelCustomizationTest.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.replaceInstance, "5"},
+			{mapper.readValue(inputStream("/ModelInfo/ServiceModelNameEmptyOnActivate.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.activateInstance, "2"},
+			{mapper.readValue(inputStream("/ModelInfo/ServiceModelNameEmptyOnDelete.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.deleteInstance, "2"},
+			{mapper.readValue(inputStream("/ModelInfo/ValidModelCustomizationId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, "4"},
+			{mapper.readValue(inputStream("/ModelInfo/ValidModelCustomizationId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.replaceInstance, "5"},
+			{mapper.readValue(inputStream("/ModelInfo/ValidModelCustomizationIdService.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.replaceInstance, "5"},
+			{mapper.readValue(inputStream("/RelatedInstances/RelatedInstances.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.activateInstance, "5"},
+			{mapper.readValue(inputStream("/RelatedInstances/RelatedInstancesModelInvariantId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.deleteInstance, "5"},
+			{mapper.readValue(inputStream("/RelatedInstances/RelatedInstancesVfModule.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.activateInstance, "5"},
+			{mapper.readValue(inputStream("/SuccessfulValidation/ServiceInPlaceSoftwareUpdate.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.inPlaceSoftwareUpdate, "6"},
+			{mapper.readValue(inputStream("/SuccessfulValidation/ServiceInPlaceSoftwareUpdate.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.applyUpdatedConfig, "6"},
+			{mapper.readValue(inputStream("/SuccessfulValidation/v5EnableService.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.enablePort, "5"},
+			{mapper.readValue(inputStream("/SuccessfulValidation/VnfActivate.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.activateInstance, "6"},
+			{mapper.readValue(inputStream("/RequestParameters/VnfRequestParameters.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.deleteInstance, "6"},
+			{mapper.readValue(inputStream("/SuccessfulValidation/v3DeleteNetwork.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.deleteInstance, "3"},
+			{mapper.readValue(inputStream("/SuccessfulValidation/v3UpdateNetwork.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.updateInstance, "3"},
+			{mapper.readValue(inputStream("/SuccessfulValidation/v5CreateConfiguration.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, "5"},
+			{mapper.readValue(inputStream("/SuccessfulValidation/v6CreateConfiguration.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, "6"},
+			{mapper.readValue(inputStream("/SuccessfulValidation/v5EnableConfiguration.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.enablePort, "5"},
+			{mapper.readValue(inputStream("/SuccessfulValidation/v5EnableConfiguration.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.disablePort, "5"},
+			{mapper.readValue(inputStream("/SuccessfulValidation/v5ActivateConfiguration.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.activateInstance, "5"},
+			{mapper.readValue(inputStream("/RelatedInstances/v5ActivateNoRelatedInstance.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.activateInstance, "5"},
+			{mapper.readValue(inputStream("/SuccessfulValidation/v5DeactivateConfiguration.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.deactivateInstance, "5"},
+			{mapper.readValue(inputStream("/RelatedInstances/v5DeactivateNoRelatedInstance.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.deactivateInstance, "5"},
+			{mapper.readValue(inputStream("/SuccessfulValidation/v6AddRelationships.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.addRelationships, "6"},
+			{mapper.readValue(inputStream("/SuccessfulValidation/UserParams.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.addRelationships, "5"},
+			{mapper.readValue(inputStream("/SuccessfulValidation/ServiceAssign.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.assignInstance, "7"},
+			{mapper.readValue(inputStream("/SuccessfulValidation/ServiceUnassign.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.unassignInstance, "7"}
+		});
+	}
+	@Test
+	@Parameters(method = "aLaCarteParameters")
+	public void aLaCarteFlagTest(boolean expected, ServiceInstancesRequest sir) throws JsonParseException, IOException, ValidationException{
+		this.expected = expected;
+		this.sir = sir;
+		this.msoRequest = new MsoRequest();		
+		assertEquals(expected, msoRequest.getAlacarteFlag(sir));
+	}
+	@Parameters
+	private Collection<Object[]> aLaCarteParameters() throws IOException{
+		return Arrays.asList(new Object[][] {
+			{false, mapper.readValue(inputStream("/RequestParameters/RequestParametersNull.json"), ServiceInstancesRequest.class)},
+			{true, mapper.readValue(inputStream("/RequestParameters/RequestParametersALaCarteTrue.json"), ServiceInstancesRequest.class)}
+		});
+	}
+	//Tests various scenarios ensuring that requests containing missing or invalid information will throw a ValidationException
+	@Test
+	@Parameters(method = "validationParameters")
+	public void validationFailureTest(String expectedException, ServiceInstancesRequest sir, HashMap<String,String> instanceIdMapTest, Action action, int reqVersion) throws JsonParseException, JsonMappingException, IOException, ValidationException{
+		this.expectedException = expectedException;
+		this.sir = sir;
+		this.instanceIdMapTest = instanceIdMapTest;
+		this.action = action;
+		this.reqVersion = reqVersion;
+		this.version = "v" + reqVersion;
+		this.instanceIdMapTest.put("serviceInstanceId", "ff305d54-75b4-431b-adb2-eb6b9e5ff000");
+		this.instanceIdMapTest.put("vnfInstanceId", "ff305d54-75b4-431b-adb2-eb6b9e5ff000");
+		thrown.expect(ValidationException.class);
+		thrown.expectMessage(expectedException);
+		this.msoRequest = new MsoRequest();
+		this.msoRequest.parse(sir, instanceIdMapTest, action, version, originalRequestJSON, reqVersion, false);
+	}
+	@Parameters
+	private Collection<Object[]> validationParameters() throws IOException{
+		return Arrays.asList(new Object[][] {
+			//ValidationException for CloudConfiguration
+			{"No valid cloudConfiguration is specified", mapper.readValue(inputStream("/CloudConfiguration/CloudConfiguration.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 4},
+			{"No valid cloudConfiguration is specified", mapper.readValue(inputStream("/CloudConfiguration/CloudConfigurationNetwork.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid cloudConfiguration is specified", mapper.readValue(inputStream("/CloudConfiguration/CloudConfigurationVnf.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.replaceInstance, 5},
+			{"No valid cloudConfiguration is specified", mapper.readValue(inputStream("/CloudConfiguration/CloudConfigurationConfig.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.enablePort, 5},
+			{"No valid cloudConfiguration is specified", mapper.readValue(inputStream("/CloudConfiguration/InPlaceSoftwareUpdateCloudConfiguration.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.inPlaceSoftwareUpdate, 6},
+			{"No valid cloudConfiguration is specified", mapper.readValue(inputStream("/CloudConfiguration/DeactivateAndCloudDeleteCloudConfiguration.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.deactivateAndCloudDelete, 7},
+			{"No valid lcpCloudRegionId is specified", mapper.readValue(inputStream("/CloudConfiguration/EmptyLcpCloudConfiguration.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid lcpCloudRegionId is specified", mapper.readValue(inputStream("/CloudConfiguration/InPlaceSoftwareUpdateCloudRegionId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.inPlaceSoftwareUpdate, 6},
+			{"No valid tenantId is specified", mapper.readValue(inputStream("/CloudConfiguration/EmptyTenantId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid tenantId is specified", mapper.readValue(inputStream("/CloudConfiguration/InPlaceSoftwareUpdateTenantId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.inPlaceSoftwareUpdate, 6},
+			//ValidationException for ModelInfo
+			{"No valid modelCustomizationId is specified", mapper.readValue(inputStream("/ModelInfo/ModelCustomizationId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.replaceInstance, 5},
+			{"No valid modelCustomizationId is specified", mapper.readValue(inputStream("/ModelInfo/v5CreateConfigurationModelCustomizationId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid modelCustomizationId is specified", mapper.readValue(inputStream("/ModelInfo/v4CreateVfModuleMissingModelCustomizationId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 4},
+			{"No valid modelCustomizationId or modelCustomizationName is specified", mapper.readValue(inputStream("/ModelInfo/VnfModelCustomizationId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid modelCustomizationId or modelCustomizationName is specified", mapper.readValue(inputStream("/ModelInfo/VnfModelCustomizationIdPreload.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.replaceInstance, 5},
+			{"No valid modelCustomizationId or modelCustomizationName is specified", mapper.readValue(inputStream("/ModelInfo/ModelCustomizationName.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.activateInstance, 5},
+			{"No valid modelCustomizationId or modelCustomizationName is specified", mapper.readValue(inputStream("/ModelInfo/ModelCustomization.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.replaceInstance, 6},
+			{"No valid modelCustomizationId or modelCustomizationName is specified", mapper.readValue(inputStream("/ModelInfo/ModelCustomization.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.updateInstance, 6},
+			{"No valid modelCustomizationId or modelCustomizationName is specified", mapper.readValue(inputStream("/ModelInfo/VnfModelCustomizationId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.replaceInstance, 5},
+			{"No valid model-info is specified", mapper.readValue(inputStream("/ModelInfo/ModelInfoNull.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid modelInvariantId format is specified", mapper.readValue(inputStream("/ModelInfo/InvalidModelInvariantId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 2},
+			{"No valid modelInvariantId is specified", mapper.readValue(inputStream("/ModelInfo/ModelInvariantId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.deactivateInstance, 4},
+			{"No valid modelInvariantId is specified", mapper.readValue(inputStream("/ModelInfo/v5ModelInvariantIdNetwork.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.enablePort, 5},
+			{"No valid modelInvariantId is specified", mapper.readValue(inputStream("/ModelInfo/v5ModelInvariantIdDisablePort.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.disablePort, 5},
+			{"No valid modelInvariantId is specified", mapper.readValue(inputStream("/ModelInfo/ModelInvariantIdVnf.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.updateInstance, 3},
+			{"No valid modelInvariantId is specified", mapper.readValue(inputStream("/ModelInfo/ModelInvariantIdConfiguration.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.activateInstance, 3},
+			{"No valid modelInvariantId is specified", mapper.readValue(inputStream("/ModelInfo/v5DeactivateModelInvariantId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.deactivateInstance, 5},
+			{"No valid modelInvariantId is specified", mapper.readValue(inputStream("/ModelInfo/v3UpdateNetworkBad.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.updateInstance, 4},
+			{"No valid modelName is specified", mapper.readValue(inputStream("/ModelInfo/VfModuleModelName.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.deleteInstance, 4},
+			{"No valid modelType is specified", mapper.readValue(inputStream("/ModelInfo/ModelTypeNull.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid modelVersion is specified", mapper.readValue(inputStream("/ModelInfo/ModelVersionService.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.updateInstance, 3},
+			{"No valid modelVersion is specified", mapper.readValue(inputStream("/ModelInfo/ModelVersionVfModule.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 3},
+			{"No valid modelVersion is specified", mapper.readValue(inputStream("/ModelInfo/ModelVersionServiceCreate.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 3},
+			{"No valid modelVersionId is specified", mapper.readValue(inputStream("/ModelInfo/ModelVersionId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid modelVersionId is specified", mapper.readValue(inputStream("/ModelInfo/ConfigurationModelVersionId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.activateInstance, 5},
+			{"No valid modelVersionId is specified", mapper.readValue(inputStream("/ModelInfo/v2ModelVersionId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.activateInstance, 4},
+			{"No valid modelVersionId is specified", mapper.readValue(inputStream("/ModelInfo/v2ModelVersionId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.deactivateInstance, 4},
+			{"No valid modelVersionId is specified", mapper.readValue(inputStream("/ModelInfo/v2ModelVersionId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.updateInstance, 5},
+			{"No valid modelVersionId is specified", mapper.readValue(inputStream("/ModelInfo/v2ModelVersionId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.enablePort, 5},
+			{"No valid modelVersionId is specified", mapper.readValue(inputStream("/ModelInfo/v2ModelVersionId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.disablePort, 5},
+			{"No valid modelVersionId is specified", mapper.readValue(inputStream("/ModelInfo/ModelVersionIdCreate.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid modelVersionId is specified", mapper.readValue(inputStream("/ModelInfo/v5ActivateModelVersionId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.activateInstance, 5},
+			//ValidationException for Platform and LineOfBusiness
+			{"No valid lineOfBusinessName is specified", mapper.readValue(inputStream("/PlatformAndLineOfBusiness/EmptyLineOfBusiness.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid platform is specified", mapper.readValue(inputStream("/PlatformAndLineOfBusiness/Platform.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 6},
+			{"No valid platformName is specified", mapper.readValue(inputStream("/PlatformAndLineOfBusiness/EmptyPlatformName.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			//ValidationException for Project and OwningEntity
+			{"No valid owningEntity is specified", mapper.readValue(inputStream("/ProjectAndOwningEntity/OwningEntity.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 6},
+			{"No valid owningEntityId is specified", mapper.readValue(inputStream("/ProjectAndOwningEntity/EmptyOwningEntityId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},			
+			{"No valid projectName is specified", mapper.readValue(inputStream("/ProjectAndOwningEntity/EmptyProjectName.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid owningEntity is specified", mapper.readValue(inputStream("/ProjectAndOwningEntity/ServiceAssignNoOE.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.assignInstance, 7},
+			//ValidationException for RelatedInstances
+			{"No valid connectionPoint relatedInstance for Port Configuration is specified", mapper.readValue(inputStream("/RelatedInstances/v5EnablePortNoConnectionPoint.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.disablePort, 5},
+			{"No valid connectionPoint relatedInstance for Port Configuration is specified", mapper.readValue(inputStream("/RelatedInstances/v5EnablePortNoConnectionPoint.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.enablePort, 5},
+			{"No valid destination vnf relatedInstance for Port Configuration is specified", mapper.readValue(inputStream("/RelatedInstances/v5CreateNoDestinationRelatedInstance.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid instanceId format in relatedInstance is specified", mapper.readValue(inputStream("/RelatedInstances/RelatedInstancesIdFormat.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},			
+			{"No valid instanceId in relatedInstance is specified", mapper.readValue(inputStream("/RelatedInstances/RelatedInstancesId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid instanceName format in relatedInstance is specified", mapper.readValue(inputStream("/RelatedInstances/RelatedInstancesNameFormat.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid instanceName in relatedInstance for pnf modelType is specified", mapper.readValue(inputStream("/RelatedInstances/v6AddRelationshipsInstanceName.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.removeRelationships, 6},
+			{"No valid instanceName in relatedInstance for pnf modelType is specified", mapper.readValue(inputStream("/RelatedInstances/v6AddRelationshipsInstanceName.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.addRelationships, 6},
+			{"No valid modelCustomizationName or modelCustomizationId in relatedInstance of vnf is specified", mapper.readValue(inputStream("/RelatedInstances/RelatedInstancesModelCustomizationId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.activateInstance, 5},
+			{"No valid modelInfo in relatedInstance is specified", mapper.readValue(inputStream("/RelatedInstances/RelatedInstancesModelInfo.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid modelInvariantId format in relatedInstance is specified", mapper.readValue(inputStream("/RelatedInstances/RelatedInstancesModelInvariantIdFormat.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid modelInvariantId in relatedInstance is specified", mapper.readValue(inputStream("/RelatedInstances/RelatedInstancesModelInvariantId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid modelName in relatedInstance is specified", mapper.readValue(inputStream("/RelatedInstances/RelatedInstancesModelName.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid modelType in relatedInstance is specified", mapper.readValue(inputStream("/RelatedInstances/RelatedInstancesModelType.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid modelVersion in relatedInstance is specified", mapper.readValue(inputStream("/RelatedInstances/RelatedInstancesModelVersion.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid modelVersionId in relatedInstance is specified", mapper.readValue(inputStream("/RelatedInstances/RelatedInstancesModelVersionId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid related instances is specified", mapper.readValue(inputStream("/RelatedInstances/ServiceNoRelatedInstance.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.addRelationships, 2},
+			{"No valid related instances is specified", mapper.readValue(inputStream("/RelatedInstances/ServiceNoRelatedInstance.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.removeRelationships, 2},			
+			{"No valid related instances is specified", mapper.readValue(inputStream("/RelatedInstances/v5EnablePortNoRelatedInstance.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.disablePort, 2},
+			{"No valid related instances is specified", mapper.readValue(inputStream("/RelatedInstances/v5EnablePortNoRelatedInstance.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.enablePort, 5},			
+			{"No valid related instances is specified", mapper.readValue(inputStream("/RelatedInstances/v5CreateNoRelatedInstances.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid related instances is specified", mapper.readValue(inputStream("/RelatedInstances/v4RelatedInstancesNull.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.updateInstance, 4},
+			{"No valid related service instance for vfModule request is specified", mapper.readValue(inputStream("/RelatedInstances/VfModuleRelatedInstancesService.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.activateInstance, 5},
+			{"No valid related service instance for vnf request is specified", mapper.readValue(inputStream("/RelatedInstances/VnfRelatedInstancesService.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.activateInstance, 5},			
+			{"No valid related service instance for volumeGroup request is specified", mapper.readValue(inputStream("/RelatedInstances/RelatedInstancesServiceInstance.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.activateInstance, 5},
+			{"No valid related vnf instance for vfModule request is specified", mapper.readValue(inputStream("/RelatedInstances/VfModuleRelatedInstancesVnf.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.activateInstance, 5},
+			{"No valid related vnf instance for volumeGroup request is specified", mapper.readValue(inputStream("/RelatedInstances/RelatedInstancesVnfInstance.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.activateInstance, 5},
+			{"No valid serviceInstanceId matching the serviceInstanceId in request URI is specified", mapper.readValue(inputStream("/RelatedInstances/RelatedInstancesInstanceId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.activateInstance, 5},
+			{"No valid serviceInstanceId matching the serviceInstanceId in request URI is specified", mapper.readValue(inputStream("/RelatedInstances/v6VnfDeleteInstance.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.deleteInstance, 6},
+			{"No valid source vnf relatedInstance for Port Configuration is specified", mapper.readValue(inputStream("/RelatedInstances/v5CreateNoSourceRelatedInstance.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid vnfInstanceId matching the vnfInstanceId in request URI is specified", mapper.readValue(inputStream("/RelatedInstances/RelatedInstancesVnfInstanceId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.activateInstance, 5},
+			{"No valid instanceName format is specified", mapper.readValue(inputStream("/RelatedInstances/InvalidInstanceName.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 2},
+			//ValidationException for RequestInfo
+			{"No valid requestInfo is specified", mapper.readValue(inputStream("/RequestInfo/RequestInfoNull.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid requestInfo is specified", mapper.readValue(inputStream("/RequestInfo/RequestInfo.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.applyUpdatedConfig, 6},
+			{"No valid requestInfo is specified", mapper.readValue(inputStream("/RequestInfo/RequestInfo.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.inPlaceSoftwareUpdate, 6},
+			{"No valid productFamilyId is specified", mapper.readValue(inputStream("/RequestInfo/VnfProductFamilyId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 3},
+			{"No valid productFamilyId is specified", mapper.readValue(inputStream("/RequestInfo/NetworkProductFamilyId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 3},
+			{"No valid productFamilyId is specified", mapper.readValue(inputStream("/RequestInfo/NetworkProductFamilyId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.updateInstance, 3},
+			{"No valid productFamilyId is specified", mapper.readValue(inputStream("/RequestInfo/ServiceProductFamilyId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},			
+			{"No valid requestorId is specified", mapper.readValue(inputStream("/RequestInfo/EmptyRequestorId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid requestorId is specified", mapper.readValue(inputStream("/RequestInfo/RequestorId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.applyUpdatedConfig, 6},
+			{"No valid requestorId is specified", mapper.readValue(inputStream("/RequestInfo/RequestorId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.inPlaceSoftwareUpdate, 6},
+			//ValidationException for RequestParameters
+			{"No valid aLaCarte in requestParameters", mapper.readValue(inputStream("/RequestParameters/RequestParametersNull.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.addRelationships, 4},
+			{"No valid requestParameters is specified", mapper.readValue(inputStream("/RequestParameters/RequestParametersNull.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid requestParameters is specified", mapper.readValue(inputStream("/RequestParameters/RequestParameters.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.applyUpdatedConfig, 6},
+			{"No valid requestParameters is specified", mapper.readValue(inputStream("/RequestParameters/RequestParameters.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.inPlaceSoftwareUpdate, 6},
+			{"No valid requestParameters is specified", mapper.readValue(inputStream("/RequestParameters/AssignEmptyReqParameters.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.assignInstance, 7},
+			//ValidationException for SubscriberInfo
+			{"No valid globalSubscriberId is specified", mapper.readValue(inputStream("/SubscriberInfo/EmptyGlobalSubscriberId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid subscriberInfo is specified", mapper.readValue(inputStream("/SubscriberInfo/EmptySubscriberInfo.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid subscriptionServiceType is specified", mapper.readValue(inputStream("/SubscriberInfo/EmptySubscriptionServiceType.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.createInstance, 5},
+			{"No valid subscriberInfo is specified", mapper.readValue(inputStream("/SubscriberInfo/AssignEmptySubscriberInfo.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.assignInstance, 7},
+			//Validation for UserParams
+			{"No valid cloudConfiguration in userParams vnf resources is specified", mapper.readValue(inputStream("/RequestParameters/AssignCloudConfigVnf.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.assignInstance, 7},
+			{"No valid cloudConfiguration in userParams network resources is specified", mapper.readValue(inputStream("/RequestParameters/NetworkCloudConfig.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.assignInstance, 7},
+			{"No valid model-info in userParams is specified", mapper.readValue(inputStream("/RequestParameters/UserParamsModelInfo.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.assignInstance, 7},
+			{"No valid model-info in userParams vnf resources is specified", mapper.readValue(inputStream("/RequestParameters/UserParamsVnfModelInfo.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.assignInstance, 7},
+			{"No valid modelVersionId in userParams is specified", mapper.readValue(inputStream("/RequestParameters/UserParamsModelVersionId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.assignInstance, 7},
+			{"No valid modelVersionId in userParams vnf resources is specified", mapper.readValue(inputStream("/RequestParameters/VnfModelVersionId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.assignInstance, 7},
+			{"No valid modelVersionId in userParams vfModule resources is specified", mapper.readValue(inputStream("/RequestParameters/VfModuleModelVersionId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.assignInstance, 7},
+			{"No valid modelVersionId in userParams network resources is specified", mapper.readValue(inputStream("/RequestParameters/NetworkModelVersionId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.assignInstance, 7},
+			{"No valid platform in userParams vnf resources is specified", mapper.readValue(inputStream("/RequestParameters/UserParamsPlatform.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.assignInstance, 7},
+			{"No valid platformName in userParams vnf resources is specified", mapper.readValue(inputStream("/RequestParameters/UserParamsPlatformName.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.assignInstance, 7},
+			{"No valid productFamilyId in userParams vnf resources is specified", mapper.readValue(inputStream("/RequestParameters/ProductFamilyId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.assignInstance, 7},
+			{"No valid vfModules in userParams vnf resources is specified", mapper.readValue(inputStream("/RequestParameters/VfModules.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.assignInstance, 7},
+			{"No valid model-info in userParams vfModules resources is specified", mapper.readValue(inputStream("/RequestParameters/VfModulesModelInfo.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.assignInstance, 7},
+			{"No valid model-info in userParams network resources is specified", mapper.readValue(inputStream("/RequestParameters/Network.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.assignInstance, 7},	
+			{"No valid modelCustomizationId in userParams vfModule resources is specified", mapper.readValue(inputStream("/RequestParameters/VfModuleModelCustomizationId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.assignInstance, 7},
+			{"No valid modelCustomizationId in userParams vnf resources is specified", mapper.readValue(inputStream("/RequestParameters/VnfModelCustomizationId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.assignInstance, 7},
+			{"No valid modelCustomizationId in userParams network resources is specified", mapper.readValue(inputStream("/RequestParameters/NetworkModelCustomizationId.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.assignInstance, 7}
+		});
+	}
+	@Test
+	public void nullInstanceIdMapTest() throws JsonParseException, JsonMappingException, IOException, ValidationException{
+		this.sir = mapper.readValue(inputStream("/RequestParameters/RequestParametersNull.json"), ServiceInstancesRequest.class);
+		this.instanceIdMapTest = null;
+		this.reqVersion = 5;
+		this.version = "v" + reqVersion;
+		thrown.expect(NullPointerException.class);
+		this.msoRequest = new MsoRequest();
+		this.msoRequest.parse(sir, instanceIdMapTest, action, version, originalRequestJSON, reqVersion, false);
+	}
+	
+	@Test
+	public void serviceInstanceIdHashMapFailureTest() throws JsonParseException, JsonMappingException, IOException, ValidationException{
+		this.sir = mapper.readValue(inputStream("/SuccessfulValidation/InstanceIdHashMap.json"), ServiceInstancesRequest.class);
+		this.instanceIdMapTest.put("serviceInstanceId", "test");
+		this.action = Action.createInstance;
+		this.reqVersion = 5;
+		this.version = "v" + reqVersion;
+		thrown.expect(ValidationException.class);
+		thrown.expectMessage("No valid serviceInstanceId is specified");
+		this.msoRequest = new MsoRequest();
+		this.msoRequest.parse(sir, instanceIdMapTest, action, version, originalRequestJSON, reqVersion, false);
+	}
+	@Test
+	public void vnfInstanceIdHashMapFailureTest() throws JsonParseException, JsonMappingException, IOException, ValidationException{
+		this.sir = mapper.readValue(inputStream("/SuccessfulValidation/InstanceIdHashMap.json"), ServiceInstancesRequest.class);
+		this.instanceIdMapTest.put("vnfInstanceId", "test");
+		this.action = Action.createInstance;
+		this.reqVersion = 5;
+		this.version = "v" + reqVersion;
+		thrown.expect(ValidationException.class);
+		thrown.expectMessage("No valid vnfInstanceId is specified");
+		this.msoRequest = new MsoRequest();
+		this.msoRequest.parse(sir, instanceIdMapTest, action, version, originalRequestJSON, reqVersion, false);
+	}
+	@Test
+	public void vfModuleInstanceIdHashMapFailureTest() throws JsonParseException, JsonMappingException, IOException, ValidationException{
+		this.sir = mapper.readValue(inputStream("/SuccessfulValidation/InstanceIdHashMap.json"), ServiceInstancesRequest.class);
+		this.instanceIdMapTest.put("vfModuleInstanceId", "test");
+		this.action = Action.createInstance;
+		this.reqVersion = 5;
+		this.version = "v" + reqVersion;
+		thrown.expect(ValidationException.class);
+		thrown.expectMessage("No valid vfModuleInstanceId is specified");
+		this.msoRequest = new MsoRequest();
+		this.msoRequest.parse(sir, instanceIdMapTest, action, version, originalRequestJSON, reqVersion, false);
+	}
+	@Test
+	public void volumeGroupInstanceIdHashMapFailureTest() throws JsonParseException, JsonMappingException, IOException, ValidationException{
+		this.sir = mapper.readValue(inputStream("/SuccessfulValidation/InstanceIdHashMap.json"), ServiceInstancesRequest.class);
+		this.instanceIdMapTest.put("volumeGroupInstanceId", "test");
+		this.action = Action.createInstance;
+		this.reqVersion = 5;
+		this.version = "v" + reqVersion;
+		thrown.expect(ValidationException.class);
+		thrown.expectMessage("No valid volumeGroupInstanceId is specified");
+		this.msoRequest = new MsoRequest();
+		this.msoRequest.parse(sir, instanceIdMapTest, action, version, originalRequestJSON, reqVersion, false);
+	}
+	@Test
+	public void networkInstanceIdHashMapFailureTest() throws JsonParseException, JsonMappingException, IOException, ValidationException{
+		this.sir = mapper.readValue(inputStream("/SuccessfulValidation/InstanceIdHashMap.json"), ServiceInstancesRequest.class);
+		this.instanceIdMapTest.put("networkInstanceId", "test");
+		this.action = Action.createInstance;
+		this.reqVersion = 5;
+		this.version = "v" + reqVersion;
+		thrown.expect(ValidationException.class);
+		thrown.expectMessage("No valid networkInstanceId is specified");
+		this.msoRequest = new MsoRequest();
+		this.msoRequest.parse(sir, instanceIdMapTest, action, version, originalRequestJSON, reqVersion, false);
+	}
+	@Test
+	public void configurationInstanceIdHashMapFailureTest() throws JsonParseException, JsonMappingException, IOException, ValidationException{
+		this.sir = mapper.readValue(inputStream("/SuccessfulValidation/InstanceIdHashMap.json"), ServiceInstancesRequest.class);
+		this.instanceIdMapTest.put("configurationInstanceId", "test");
+		this.action = Action.createInstance;
+		thrown.expect(ValidationException.class);
+		this.reqVersion = 5;
+		this.version = "v" + reqVersion;
+		thrown.expectMessage("No valid configurationInstanceId is specified");
+		this.msoRequest = new MsoRequest();
+		this.msoRequest.parse(sir, instanceIdMapTest, action, version, originalRequestJSON, reqVersion, false);
+	}
+	@Test
+	public void testVfModuleV4UsePreLoad() throws JsonParseException, JsonMappingException, IOException, ValidationException {
+		this.requestJSON = inputStream("/SuccessfulValidation/v4CreateVfModule.json");
+		this.instanceIdMapTest.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
+		this.instanceIdMapTest.put("vnfInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
+		this.reqVersion = 4;
+		this.version = "v" + reqVersion;
+		this.sir  = mapper.readValue(requestJSON, ServiceInstancesRequest.class);
+		this.msoRequest = new MsoRequest ();
+		msoRequest.parse(sir, instanceIdMapTest, Action.createInstance, version, originalRequestJSON, reqVersion, false);
+		
+		this.requestJSON = inputStream("/ModelInfo/v4CreateVfModuleNoCustomizationId.json");
+		this.instanceIdMapTest.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
+		this.instanceIdMapTest.put("vnfInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
+		this.sir  = mapper.readValue(requestJSON, ServiceInstancesRequest.class);
+		msoRequest = new MsoRequest ();
+		msoRequest.parse(sir, instanceIdMapTest, Action.createInstance, version, originalRequestJSON, reqVersion, false);
+	}
+	@Test
+	public void buildServiceErrorResponseTest() throws JsonParseException, JsonMappingException, IOException, ValidationException{
+		this.sir = mapper.readValue(inputStream("/SuccessfulValidation/InstanceIdHashMap.json"), ServiceInstancesRequest.class);
+		this.instanceIdMapTest.put("serviceInstanceId", "test");
+		this.action = Action.createInstance;
+		this.reqVersion = 5;
+		this.version = "v" + reqVersion;
+		thrown.expect(ValidationException.class);
+		thrown.expectMessage("No valid serviceInstanceId is specified");
+		this.msoRequest = new MsoRequest();
+		this.msoRequest.parse(sir, instanceIdMapTest, action, version, originalRequestJSON, reqVersion, false);
+		Response response = msoRequest.buildServiceErrorResponse(HttpStatus.SC_BAD_REQUEST,
+				MsoException.ServiceException, "Mapping of request to JSON object failed.  ",
+				ErrorNumbers.SVC_BAD_PARAMETER, null, version);
+        assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0));
+        assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0));
+        assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0));
+        assertEquals("7.0.0", response.getHeaders().get("X-LatestVersion").get(0));
+	}
+	@Test
+	public void buildServiceErrorPolicyExceptionResponseTest() throws JsonParseException, JsonMappingException, IOException, ValidationException{
+		this.sir = mapper.readValue(inputStream("/SuccessfulValidation/InstanceIdHashMap.json"), ServiceInstancesRequest.class);
+		this.instanceIdMapTest.put("serviceInstanceId", "test");
+		this.action = Action.createInstance;
+		this.reqVersion = 5;
+		this.version = "v" + reqVersion;
+		thrown.expect(ValidationException.class);
+		thrown.expectMessage("No valid serviceInstanceId is specified");
+		this.msoRequest = new MsoRequest();
+
+		
+		this.msoRequest.parse(sir, instanceIdMapTest, action, version, originalRequestJSON, reqVersion, false);
+		Response response = msoRequest.buildServiceErrorResponse(HttpStatus.SC_BAD_REQUEST,
+				MsoException.PolicyException, "Mapping of request to JSON object failed. ",
+				ErrorNumbers.SVC_BAD_PARAMETER, null, version);
+        assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0));
+        assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0));
+        assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0));
+        assertEquals("7.0.0", response.getHeaders().get("X-LatestVersion").get(0));
+	}
+
+    @Test
+    public void domToStrTest() throws Exception {
+        String xmlStr = "<dummy><service-instance-id>1234</service-instance-id></dummy>";
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder builder = factory.newDocumentBuilder();
+        Document document = builder.parse(new InputSource(new StringReader(xmlStr)));
+        String result = MsoRequest.domToStr(document);
+        assertNotNull(result);
+    }
+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsTest.java
new file mode 100644
index 0000000000..c1ee40f911
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsTest.java
@@ -0,0 +1,389 @@
+/*-
+ * ============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.apihandlerinfra;
+
+import static com.shazam.shazamcrest.MatcherAssert.assertThat;
+import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.http.HttpStatus;
+import org.junit.Test;
+import org.onap.so.apihandler.common.ErrorNumbers;
+import org.onap.so.db.request.beans.InfraActiveRequests;
+import org.onap.so.db.request.data.repository.InfraActiveRequestsRepository;
+import org.onap.so.exceptions.ValidationException;
+import org.onap.so.serviceinstancebeans.GetOrchestrationListResponse;
+import org.onap.so.serviceinstancebeans.GetOrchestrationResponse;
+import org.onap.so.serviceinstancebeans.Request;
+import org.onap.so.serviceinstancebeans.RequestError;
+import org.onap.so.serviceinstancebeans.ServiceException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+
+@Transactional
+public class OrchestrationRequestsTest extends BaseTest {
+
+	@Autowired
+	private InfraActiveRequestsRepository iar;
+	
+	private static final String CHECK_HTML = "<!DOCTYPE html><html><head><meta charset=\"ISO-8859-1\"><title></title></head><body></body></html>";
+	public static final Response RESPONSE = Response.status(HttpStatus.SC_OK).entity(CHECK_HTML).build();
+	private static final GetOrchestrationListResponse ORCHESTRATION_LIST = generateOrchestrationList();
+	private static final String INVALID_REQUEST_ID = "invalid-request-id";
+
+	private static GetOrchestrationListResponse generateOrchestrationList() {
+		GetOrchestrationListResponse list = null;
+		try {
+			ObjectMapper mapper = new ObjectMapper();
+			list = mapper.readValue(new File("src/test/resources/OrchestrationRequest/OrchestrationList.json"),
+					GetOrchestrationListResponse.class);
+		} catch (JsonParseException jpe) {
+			jpe.printStackTrace();
+		} catch (JsonMappingException jme) {
+			jme.printStackTrace();
+		} catch (IOException ioe) {
+			ioe.printStackTrace();
+		}
+		return list;
+	}
+	
+	@Test
+	public void testGetOrchestrationRequest() {
+				
+		// TEST VALID REQUEST
+		GetOrchestrationResponse testResponse = new GetOrchestrationResponse();
+		
+		Request request = ORCHESTRATION_LIST.getRequestList().get(1).getRequest();
+		testResponse.setRequest(request);
+		String testRequestId = request.getRequestId();
+
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<Request> entity = new HttpEntity<Request>(null, headers);
+		
+		UriComponentsBuilder builder = UriComponentsBuilder
+				.fromHttpUrl(createURLWithPort("/onap/so/infra/orchestrationRequests/v7/" + testRequestId));
+
+		ResponseEntity<GetOrchestrationResponse> response = restTemplate.exchange(builder.toUriString(), HttpMethod.GET,
+				entity, GetOrchestrationResponse.class);
+
+		assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value());
+		assertThat(response.getBody(),
+		sameBeanAs(testResponse).ignoring("request.startTime").ignoring("request.requestStatus.finishTime"));
+        assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0));
+        assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0));
+        assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0));
+        assertEquals("7.0.0", response.getHeaders().get("X-LatestVersion").get(0));
+        assertEquals("00032ab7-na18-42e5-965d-8ea592502018", response.getHeaders().get("X-TransactionID").get(0));
+	}
+
+	@Test
+	public void testGetOrchestrationRequestRequestDetails() {
+		//Test request with modelInfo request body
+		GetOrchestrationResponse testResponse = new GetOrchestrationResponse();
+		
+		Request request = ORCHESTRATION_LIST.getRequestList().get(0).getRequest();
+		testResponse.setRequest(request);
+		String testRequestId = request.getRequestId();
+
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<Request> entity = new HttpEntity<Request>(null, headers);
+		
+		UriComponentsBuilder builder = UriComponentsBuilder
+				.fromHttpUrl(createURLWithPort("/onap/so/infra/orchestrationRequests/v7/" + testRequestId));
+
+		ResponseEntity<GetOrchestrationResponse> response = restTemplate.exchange(builder.toUriString(), HttpMethod.GET,
+				entity, GetOrchestrationResponse.class);
+
+		assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value());
+		assertThat(response.getBody(),
+		sameBeanAs(testResponse).ignoring("request.startTime").ignoring("request.requestStatus.finishTime"));
+        assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0));
+        assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0));
+        assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0));
+        assertEquals("7.0.0", response.getHeaders().get("X-LatestVersion").get(0));
+        assertEquals("00032ab7-3fb3-42e5-965d-8ea592502017", response.getHeaders().get("X-TransactionID").get(0));
+	}
+
+	@Test
+    public void testGetOrchestrationRequestNoRequestID() {
+
+        HttpEntity<Request> entity = new HttpEntity<Request>(null, headers);
+        headers.set("Accept", MediaType.APPLICATION_JSON);
+
+        UriComponentsBuilder builder = UriComponentsBuilder
+                .fromHttpUrl(createURLWithPort("/onap/so/infra/orchestrationRequests/v6/"));
+
+        ResponseEntity<GetOrchestrationListResponse> response = restTemplate.exchange(builder.toUriString(),
+                HttpMethod.GET, entity, GetOrchestrationListResponse.class);        
+        assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value());
+    }
+
+	@Test
+    public void testGetOrchestrationRequestFilter() {
+		List<String> values = new ArrayList<>();
+		values.add("EQUALS");
+		values.add("vfModule");
+		
+		Map<String, List<String>> orchestrationMap = new HashMap<>();
+		orchestrationMap.put("modelType", values);
+		
+		List<InfraActiveRequests> requests = iar.getOrchestrationFiltersFromInfraActive(orchestrationMap);
+        HttpEntity<Request> entity = new HttpEntity<Request>(null, headers);
+        headers.set("Accept", MediaType.APPLICATION_JSON);
+
+        UriComponentsBuilder builder = UriComponentsBuilder
+                .fromHttpUrl(createURLWithPort("/onap/so/infra/orchestrationRequests/v6?filter=modelType:EQUALS:vfModule"));
+
+        ResponseEntity<GetOrchestrationListResponse> response = restTemplate.exchange(builder.toUriString(),
+                HttpMethod.GET, entity, GetOrchestrationListResponse.class);        
+        assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value());
+        assertEquals(requests.size(), response.getBody().getRequestList().size());
+    }
+	
+	@Test
+	public void testUnlockOrchestrationRequest()
+			throws JsonParseException, JsonMappingException, IOException, ValidationException {
+
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true);
+		String requestJSON = new String(Files.readAllBytes(Paths.get("src/test/resources/OrchestrationRequest/Request.json")));
+
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<String> entity = new HttpEntity<String>(requestJSON, headers);
+
+		UriComponentsBuilder builder;
+		ResponseEntity<String> response;
+		RequestError expectedRequestError;
+		RequestError actualRequestError;
+		ServiceException se;
+
+		// Test invalid JSON		
+		expectedRequestError = new RequestError();
+		se = new ServiceException();
+		se.setMessageId(ErrorNumbers.SVC_DETAILED_SERVICE_ERROR);
+		se.setText("Orchestration RequestId 0017f68c-eb2d-45bb-b7c7-ec31b37dc349 has a status of UNLOCKED and can not be unlocked");
+		expectedRequestError.setServiceException(se);
+
+		builder = UriComponentsBuilder.fromHttpUrl(
+				createURLWithPort("/onap/so/infra/orchestrationRequests/v6/0017f68c-eb2d-45bb-b7c7-ec31b37dc349/unlock"));
+
+		response = restTemplate.exchange(builder.toUriString(), HttpMethod.POST, entity, String.class);
+		actualRequestError = mapper.readValue(response.getBody(), RequestError.class);
+
+		assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value());
+		assertThat(actualRequestError, sameBeanAs(expectedRequestError));
+	}
+	
+	@Test
+	public void testUnlockOrchestrationRequest_invalid_Json()
+			throws JsonParseException, JsonMappingException, IOException, ValidationException {
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true);
+		String requestJSON = new String(Files.readAllBytes(Paths.get("src/test/resources/OrchestrationRequest/Request.json")));
+
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<String> entity = new HttpEntity<String>(requestJSON, headers);
+
+		UriComponentsBuilder builder;
+		ResponseEntity<String> response;
+		RequestError expectedRequestError;
+		RequestError actualRequestError;
+		ServiceException se;
+		
+		// Test invalid requestId
+		expectedRequestError = new RequestError();
+		se = new ServiceException();
+		se.setMessageId(ErrorNumbers.SVC_DETAILED_SERVICE_ERROR);
+		se.setText("Null response from RequestDB when searching by RequestId");
+		expectedRequestError.setServiceException(se);
+
+		builder = UriComponentsBuilder.fromHttpUrl(
+				createURLWithPort("/onap/so/infra/orchestrationRequests/v6/" + INVALID_REQUEST_ID + "/unlock"));
+
+		response = restTemplate.exchange(builder.toUriString(), HttpMethod.POST, entity, String.class);
+		actualRequestError = mapper.readValue(response.getBody(), RequestError.class);
+
+		assertEquals(Response.Status.NOT_FOUND.getStatusCode(), response.getStatusCode().value());
+		assertThat(actualRequestError, sameBeanAs(expectedRequestError));
+	}
+
+	@Test
+	public void testUnlockOrchestrationRequest_Valid_Status()
+			throws JsonParseException, JsonMappingException, IOException, ValidationException {
+		
+		ObjectMapper mapper = new ObjectMapper();
+		String requestJSON = new String(Files.readAllBytes(Paths.get("src/test/resources/OrchestrationRequest/Request.json")));
+
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<String> entity = new HttpEntity<String>(requestJSON, headers);
+
+		UriComponentsBuilder builder;
+		ResponseEntity<String> response;
+		Request request;
+
+		// Test valid status
+		request = ORCHESTRATION_LIST.getRequestList().get(1).getRequest();
+		builder = UriComponentsBuilder.fromHttpUrl(
+				createURLWithPort("/onap/so/infra/orchestrationRequests/v7/" + "5ffbabd6-b793-4377-a1ab-082670fbc7ac" + "/unlock"));
+
+		response = restTemplate.exchange(builder.toUriString(), HttpMethod.POST, entity, String.class);
+
+		String status = iar.findOneByRequestId("5ffbabd6-b793-4377-a1ab-082670fbc7ac").getRequestStatus();
+	
+		assertEquals("UNLOCKED", status);
+		assertEquals(Response.Status.NO_CONTENT.getStatusCode(), response.getStatusCode().value());
+		assertEquals(response.getBody(), null);
+	}
+	
+	@Test
+	public void testUnlockOrchestrationRequest_invalid_Status()
+			throws JsonParseException, JsonMappingException, IOException, ValidationException {
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true);
+		String requestJSON = new String(Files.readAllBytes(Paths.get("src/test/resources/OrchestrationRequest/Request.json")));
+
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<String> entity = new HttpEntity<String>(requestJSON, headers);
+
+		UriComponentsBuilder builder;
+		ResponseEntity<String> response;
+		Request request;
+		RequestError expectedRequestError;
+		RequestError actualRequestError;
+		ServiceException se;
+		// Update UNLOCKED Request
+		request = ORCHESTRATION_LIST.getRequestList().get(1).getRequest();
+		request.getRequestStatus().setRequestState(Status.UNLOCKED.toString());
+		request.getRequestStatus().setStatusMessage(null);
+		request.getRequestStatus().setPercentProgress(null);
+		request.setRequestDetails(null);
+		request.setRequestScope(null);
+		request.setRequestType(null);
+
+		// Test invalid status
+		request = ORCHESTRATION_LIST.getRequestList().get(0).getRequest();
+		expectedRequestError = new RequestError();
+		se = new ServiceException();
+		se.setMessageId(ErrorNumbers.SVC_DETAILED_SERVICE_ERROR);
+		se.setText("Orchestration RequestId " + request.getRequestId() + " has a status of "
+				+ request.getRequestStatus().getRequestState() + " and can not be unlocked");
+		expectedRequestError.setServiceException(se);
+
+		builder = UriComponentsBuilder.fromHttpUrl(
+				createURLWithPort("/onap/so/infra/orchestrationRequests/v6/" + request.getRequestId() + "/unlock"));
+
+		response = restTemplate.exchange(builder.toUriString(), HttpMethod.POST, entity, String.class);
+		actualRequestError = mapper.readValue(response.getBody(), RequestError.class);
+
+		assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value());
+		assertThat(actualRequestError, sameBeanAs(expectedRequestError));
+	}
+	
+	@Test
+	public void testGetOrchestrationRequestRequestDetailsWhiteSpace() {
+		InfraActiveRequests requests = new InfraActiveRequests();
+		requests.setAction("create");
+		requests.setRequestBody("  ");
+		requests.setRequestId("requestId");
+		requests.setRequestScope("service");
+		requests.setRequestType("createInstance");
+		iar.save(requests);
+
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<Request> entity = new HttpEntity<Request>(null, headers);
+		
+		UriComponentsBuilder builder = UriComponentsBuilder
+				.fromHttpUrl(createURLWithPort("/onap/so/infra/orchestrationRequests/v7/requestId"));
+
+		ResponseEntity<GetOrchestrationResponse> response = restTemplate.exchange(builder.toUriString(), HttpMethod.GET,
+				entity, GetOrchestrationResponse.class);
+
+		assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value());
+        assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0));
+        assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0));
+        assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0));
+        assertEquals("7.0.0", response.getHeaders().get("X-LatestVersion").get(0));
+        assertEquals("requestId", response.getHeaders().get("X-TransactionID").get(0));
+	}
+	
+	@Test
+	public void testGetOrchestrationRequestRequestDetailsAlaCarte() throws IOException {
+		InfraActiveRequests requests = new InfraActiveRequests();
+		
+		String requestJSON = new String(Files.readAllBytes(Paths.get("src/test/resources/OrchestrationRequest/AlaCarteRequest.json")));
+		
+		requests.setAction("create");
+		requests.setRequestBody(requestJSON);
+		requests.setRequestId("requestId");
+		requests.setRequestScope("service");
+		requests.setRequestType("createInstance");
+		iar.save(requests);
+
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<Request> entity = new HttpEntity<Request>(null, headers);
+		
+		UriComponentsBuilder builder = UriComponentsBuilder
+				.fromHttpUrl(createURLWithPort("/onap/so/infra/orchestrationRequests/v7/requestId"));
+
+		ResponseEntity<GetOrchestrationResponse> response = restTemplate.exchange(builder.toUriString(), HttpMethod.GET,
+				entity, GetOrchestrationResponse.class);
+
+		assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value());
+        assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0));
+        assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0));
+        assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0));
+        assertEquals("7.0.0", response.getHeaders().get("X-LatestVersion").get(0));
+        assertEquals("requestId", response.getHeaders().get("X-TransactionID").get(0));
+	}
+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/RequestActionMapTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/RequestActionMapTest.java
new file mode 100644
index 0000000000..57513088b4
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/RequestActionMapTest.java
@@ -0,0 +1,36 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2018 Huawei 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.apihandlerinfra;
+
+import org.junit.Test;
+
+public class RequestActionMapTest {
+    // TODO: currently test case is done for coverage
+    // later, it should be modified properly.
+
+    RequestActionMap test = new RequestActionMap();
+
+    @Test
+    public void getMappedRequestActionTest() throws Exception {
+
+        test.getMappedRequestAction("action");
+    }
+
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstanceBeansTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstanceBeansTest.java
new file mode 100644
index 0000000000..33d9d413d6
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstanceBeansTest.java
@@ -0,0 +1,50 @@
+/*-
+ * ============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.apihandlerinfra;
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.openpojo.reflection.PojoClass;
+import com.openpojo.reflection.filters.FilterEnum;
+import com.openpojo.reflection.impl.PojoClassFactory;
+import com.openpojo.validation.Validator;
+import com.openpojo.validation.ValidatorBuilder;
+import com.openpojo.validation.rule.impl.*;
+import com.openpojo.validation.test.impl.*;
+
+
+public class ServiceInstanceBeansTest extends BaseTest{
+	List<PojoClass> pojoClasses;  
+	@Before
+	public void setup() {
+		pojoClasses = PojoClassFactory.getPojoClassesRecursively("org.onap.so.serviceinstancebeans", new FilterEnum());
+	}
+	@Test
+	public void validateGettersAndSetters() {
+		Validator validator = ValidatorBuilder.create().with(new SetterMustExistRule(), new GetterMustExistRule())
+                            .with(new SetterTester(), new GetterTester()).build();
+		validator.validate(pojoClasses);
+	}
+}
+
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java
new file mode 100644
index 0000000000..1ab66561b0
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java
@@ -0,0 +1,1407 @@
+/*-
+ * ============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.apihandlerinfra;
+
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Map;
+
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.log4j.MDC;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.onap.so.db.request.beans.InfraActiveRequests;
+import org.onap.so.db.request.data.repository.InfraActiveRequestsRepository;
+import org.onap.so.logger.MsoLogger;
+import org.onap.so.serviceinstancebeans.CloudConfiguration;
+import org.onap.so.serviceinstancebeans.ModelInfo;
+import org.onap.so.serviceinstancebeans.RequestError;
+import org.onap.so.serviceinstancebeans.RequestParameters;
+import org.onap.so.serviceinstancebeans.RequestReferences;
+import org.onap.so.serviceinstancebeans.ServiceInstancesRequest;
+import org.onap.so.serviceinstancebeans.ServiceInstancesResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.tomakehurst.wiremock.http.Fault;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+
+
+public class ServiceInstancesTest extends BaseTest{
+	
+	@Autowired
+	private InfraActiveRequestsRepository iar;
+	
+	@Autowired
+	private ServiceInstances servInstances;
+
+	private final String servInstanceuri = "/onap/so/infra/serviceInstantiation/";
+	private final String servInstanceUriPrev7 = "/onap/so/infra/serviceInstances/";
+	private String uri;
+	
+	public String inputStream(String JsonInput)throws IOException{
+		JsonInput = "src/test/resources/ServiceInstanceTest" + JsonInput;
+		String input = new String(Files.readAllBytes(Paths.get(JsonInput)));
+		return input;
+	}
+	
+	public ResponseEntity<String> sendRequest(String requestJson, String uriPath, HttpMethod reqMethod){		 
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type",MediaType.APPLICATION_JSON);
+		
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(uriPath));
+		
+		HttpEntity<String> request = new HttpEntity<String>(requestJson, headers);  
+		ResponseEntity<String> response = restTemplate.exchange(builder.toUriString(),
+				reqMethod, request, String.class);
+		
+		return response;
+	}
+	
+	@Test
+	public void test_mapJSONtoMSOStyle() throws IOException{
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.setSerializationInclusion(Include.NON_NULL);
+		String testRequest= inputStream("/ServiceInstanceDefault.json");
+		String resultString = servInstances.mapJSONtoMSOStyle(testRequest, null, false, null);
+    	ServiceInstancesRequest sir = mapper.readValue(resultString, ServiceInstancesRequest.class);
+    	ModelInfo modelInfo = sir.getRequestDetails().getModelInfo();
+    	assertEquals("f7ce78bb-423b-11e7-93f8-0050569a796",modelInfo.getModelCustomizationUuid());
+    	assertEquals("modelInstanceName",modelInfo.getModelInstanceName());
+    	assertEquals("f7ce78bb-423b-11e7-93f8-0050569a7965",modelInfo.getModelInvariantUuid());
+    	assertEquals("10",modelInfo.getModelUuid());
+    	
+	}
+	@Test
+	public void createServiceInstanceVIDDefault() throws JsonParseException, JsonMappingException, IOException{
+		TestAppender.events.clear();
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+			
+		headers.set(MsoLogger.TRANSACTION_ID, "32807a28-1a14-4b88-b7b3-2950918aa76d");
+		headers.set(MsoLogger.CLIENT_ID, "VID");
+		//expect
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v5/serviceInstances";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstanceDefault.json"), uri, HttpMethod.POST);
+				
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+	
+		//then		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+		ILoggingEvent logEvent = TestAppender.events.get(0);
+        Map<String,String> mdc = logEvent.getMDCPropertyMap();
+        assertEquals("32807a28-1a14-4b88-b7b3-2950918aa76d", mdc.get(MsoLogger.REQUEST_ID));
+        assertEquals("VID", mdc.get(MsoLogger.CLIENT_ID));
+        MDC.remove(MsoLogger.CLIENT_ID);
+        assertTrue(response.getBody().contains("1882939"));
+        assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0));
+        assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0));
+        assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0));
+        assertEquals("5.0.0", response.getHeaders().get("X-LatestVersion").get(0));
+        assertEquals("32807a28-1a14-4b88-b7b3-2950918aa76d", response.getHeaders().get("X-TransactionID").get(0));
+        
+      //ExpectedRecord
+      		InfraActiveRequests expectedRecord = new InfraActiveRequests();
+      		expectedRecord.setRequestStatus("IN_PROGRESS");
+      		expectedRecord.setRequestBody(inputStream("/ServiceInstanceDefault.json"));
+      		expectedRecord.setAction("createInstance");
+      		expectedRecord.setSource("VID");
+      		expectedRecord.setVnfId("1882938");
+      		expectedRecord.setLastModifiedBy("APIH");
+      		expectedRecord.setServiceInstanceId("1882939");
+      		expectedRecord.setServiceInstanceName("testService9");
+      		expectedRecord.setRequestScope("service");
+      		expectedRecord.setRequestorId("xxxxxx");
+      		expectedRecord.setRequestAction("createInstance");
+      		expectedRecord.setRequestId("32807a28-1a14-4b88-b7b3-2950918aa76d");
+      		
+      		//ActualRecord
+      		InfraActiveRequests requestRecord = iar.findOneByRequestId("32807a28-1a14-4b88-b7b3-2950918aa76d");
+      		assertEquals(sameBeanAs(expectedRecord).toString(), sameBeanAs(requestRecord).ignoring("startTime").ignoring("modifyTime").toString());
+      	
+	}
+	@Test
+	public void createServiceInstanceServiceInstancesUri() throws JsonParseException, JsonMappingException, IOException{
+		stubFor(post(urlPathEqualTo("/mso/async/services/CreateGenericALaCarteServiceInstance"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expect
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceUriPrev7 + "v5";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstancePrev7.json"), uri, HttpMethod.POST);
+				
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+	
+		//then		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	@Test
+	public void createServiceInstanceBpelStatusError() throws JsonParseException, JsonMappingException, IOException{
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_BAD_GATEWAY)));
+
+		uri = servInstanceuri + "v5/serviceInstances";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstanceStatusError.json"), uri, HttpMethod.POST);
+		
+		assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatusCode().value());
+	}
+	@Test
+	public void createServiceInstanceBadGateway() throws JsonParseException, JsonMappingException, IOException{
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withStatus(org.apache.http.HttpStatus.SC_BAD_GATEWAY).withBody("{}")));
+	
+		uri = servInstanceuri + "v5/serviceInstances";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstanceBadGateway.json"), uri, HttpMethod.POST);
+	
+		assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatusCode().value());
+	}
+	@Test
+	public void createServiceInstanceEmptyResponse() throws JsonParseException, JsonMappingException, IOException{
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withFault(Fault.EMPTY_RESPONSE)));
+		
+		uri = servInstanceuri + "v5/serviceInstances";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstanceEmpty.json"), uri, HttpMethod.POST);
+				
+		assertEquals(Response.Status.BAD_GATEWAY.getStatusCode(), response.getStatusCode().value());
+	}
+	@Test
+	public void activateServiceInstanceNoRecipeALaCarte() throws JsonParseException, JsonMappingException, IOException{
+		uri = servInstanceuri + "v5" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/activate";
+		headers.set("X-ECOMP-RequestID", "32807a28-1a14-4b88-b7b3-2950918aa76d");
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstanceALaCarteTrueNoRecipe.json"), uri, HttpMethod.POST);
+		
+		//ExpectedRecord
+		InfraActiveRequests expectedRecord = new InfraActiveRequests();
+		expectedRecord.setRequestStatus("FAILED");
+		expectedRecord.setAction("activateInstance");
+		expectedRecord.setStatusMessage("Recipe could not be retrieved from catalog DB.");
+		expectedRecord.setProgress(new Long(100));
+		expectedRecord.setSource("VID");
+		expectedRecord.setVnfId("1882938");
+		expectedRecord.setRequestBody(inputStream("/ServiceInstanceALaCarteTrueNoRecipe.json"));
+		expectedRecord.setLastModifiedBy("APIH");
+		expectedRecord.setServiceInstanceId("f7ce78bb-423b-11e7-93f8-0050569a7968");
+		expectedRecord.setServiceInstanceName("testService7");
+		expectedRecord.setRequestScope("service");
+		expectedRecord.setRequestAction("activateInstance");
+		expectedRecord.setRequestorId("xxxxxx");
+		expectedRecord.setRequestId("32807a28-1a14-4b88-b7b3-2950918aa76d");
+	
+		//ActualRecord
+		InfraActiveRequests requestRecord = iar.findOneByRequestId("32807a28-1a14-4b88-b7b3-2950918aa76d");
+		assertEquals(sameBeanAs(expectedRecord).toString(), sameBeanAs(requestRecord).ignoring("startTime").ignoring("endTime").ignoring("modifyTime").toString());
+		assertEquals(Response.Status.NOT_FOUND.getStatusCode(), response.getStatusCode().value());
+	}
+	@Test
+	public void activateServiceInstanceNoRecipe() throws JsonParseException, JsonMappingException, IOException{
+		uri = servInstanceuri + "v5" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/activate";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstanceNoRecipe.json"), uri, HttpMethod.POST);
+	
+		assertEquals(Response.Status.NOT_FOUND.getStatusCode(), response.getStatusCode().value());
+	}
+	@Test
+	public void activateServiceInstance() throws JsonParseException, JsonMappingException, IOException{
+		stubFor(post(urlPathEqualTo("/mso/async/services/ActivateInstance"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+
+		headers.set("X-TransactionID", "32807a28-1a14-4b88-b7b3-2950918aa76d");
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/activate";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstanceActivate.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	@Test
+	public void deactivateServiceInstance() throws JsonParseException, JsonMappingException, IOException{
+		stubFor(post(urlPathEqualTo("/mso/async/services/DeactivateInstance"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/deactivate";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstanceDeactivate.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	@Test
+	public void deleteServiceInstance() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/DeleteInstance"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a8868/";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstanceDelete.json"), uri, HttpMethod.DELETE);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	@Test
+	public void assignServiceInstance() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/AssignServiceInstance"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/assign";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceAssign.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	
+	@Test
+	public void unassignServiceInstance() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/UnassignServiceInstance"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/ff305d54-75b4-431b-adb2-eb6b9e5ff000/unassign";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceUnassign.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	@Test
+	public void createPortConfiguration() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		headers.set("X-TransactionID", "32807a28-1a14-4b88-b7b3-2950918aa76d");
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v5" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/configurations";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstancePortConfiguration.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));		
+		assertTrue(response.getBody().contains("1882939"));
+	}
+	@Test
+	public void createPortConfigurationEmptyProductFamilyId() throws JsonParseException, JsonMappingException, IOException {
+		uri = servInstanceuri + "v5" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/configurations";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstanceParseFail.json"), uri, HttpMethod.POST);
+		
+		assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value());	
+	}
+	@Test
+	public void deletePortConfiguration() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		headers.set("X-ECOMP-RequestID", "32807a28-1a14-4b88-b7b3-2950918aa76d");
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/configurations/f7ce78bb-423b-11e7-93f8-0050569a7970";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstance.json"), uri, HttpMethod.DELETE);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));		
+	}
+	@Test
+	public void enablePort() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/configurations/f7ce78bb-423b-11e7-93f8-0050569a7970/enablePort";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstanceEnablePort.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));
+	}
+	@Test
+	public void disablePort() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/configurations/f7ce78bb-423b-11e7-93f8-0050569a7970/disablePort";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstanceDisablePort.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));
+	}
+	@Test
+	public void activatePort() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/configurations/f7ce78bb-423b-11e7-93f8-0050569a7970/activate";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstanceActivatePort.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));
+	}
+	@Test
+	public void deactivatePort() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/configurations/f7ce78bb-423b-11e7-93f8-0050569a7970/deactivate";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstanceDeactivatePort.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));
+	}
+	@Test
+	public void addRelationships() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/addRelationships";
+		ResponseEntity<String> response = sendRequest(inputStream("/AddRelationships.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	@Test
+	public void removeRelationships() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/removeRelationships";
+		ResponseEntity<String> response = sendRequest(inputStream("/RemoveRelationships.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	@Test
+	public void createVnfInstanceNoALaCarte() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/49585b36-2b5a-443a-8b10-c75d34bb5e46/vnfs";
+		ResponseEntity<String> response = sendRequest(inputStream("/VnfCreateDefault.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	@Test
+	public void createVnfInstance() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		String requestId = "b7a6b76f-2ee2-416c-971b-548472a8c5c3";
+		headers.set(MsoLogger.TRANSACTION_ID, requestId);
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/ff305d54-75b4-431b-adb2-eb6b9e5ff000/vnfs";
+		ResponseEntity<String> response = sendRequest(inputStream("/VnfWithServiceRelatedInstance.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		InfraActiveRequests record = iar.findOneByRequestId(requestId);
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+		assertTrue(response.getBody().contains("1882939"));
+		assertEquals(record.getVnfType(), "vSAMP12/test");
+	}
+	@Test
+	public void createVnfWithServiceRelatedInstanceFail() throws JsonParseException, JsonMappingException, IOException {
+		uri = servInstanceUriPrev7 + "v6" + "/f7ce78bb-423b-11e7-93f8-0050569a7968/vnfs";
+		ResponseEntity<String> response = sendRequest(inputStream("/VnfWithServiceRelatedInstanceFail.json"), uri, HttpMethod.POST);
+		
+		assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value());
+	}
+	@Test
+	public void createVnfInstanceInvalidVnfResource() throws JsonParseException, JsonMappingException, IOException {		
+		uri = servInstanceuri + "v7" + "/serviceInstances/ff305d54-75b4-431b-adb2-eb6b9e5ff000/vnfs";
+		ResponseEntity<String> response = sendRequest(inputStream("/NoVnfResource.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true);
+		
+		assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value());
+		RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class);
+		assertTrue(realResponse.getServiceException().getText().equals("No valid vnfResource is specified"));
+	}
+	@Test
+	public void replaceVnfInstance() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/vnfs/ff305d54-75b4-431b-adb2-eb6b9e5ff000/replace";
+		ResponseEntity<String> response = sendRequest(inputStream("/ReplaceVnf.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	@Test
+	public void replaceVnfRecreateInstance() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/RecreateInfraVce"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/vnfs/ff305d54-75b4-431b-adb2-eb6b9e5ff000/replace";
+		ResponseEntity<String> response = sendRequest(inputStream("/ReplaceVnfRecreate.json"), uri, HttpMethod.POST);
+		logger.debug(response.getBody());
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	@Test
+	public void updateVnfInstance() throws JsonParseException, JsonMappingException, IOException {	
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/vnfs/ff305d54-75b4-431b-adb2-eb6b9e5ff000";
+		ResponseEntity<String> response = sendRequest(inputStream("/UpdateVnf.json"), uri, HttpMethod.PUT);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	@Test
+	public void applyUpdatedConfig() throws JsonParseException, JsonMappingException, IOException {			
+		stubFor(post(urlPathEqualTo("/mso/async/services/VnfConfigUpdate"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		String requestId = "b7a6b76f-2ee2-416c-971b-548472a8c5c5";
+		headers.set(MsoLogger.TRANSACTION_ID, requestId);
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/vnfs/ff305d54-75b4-431b-adb2-eb6b9e5ff000/applyUpdatedConfig";
+		ResponseEntity<String> response = sendRequest(inputStream("/ApplyUpdatedConfig.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		InfraActiveRequests record = iar.findOneByRequestId(requestId);
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+		assertNull(record.getVnfType());
+	}
+	@Test
+	public void deleteVnfInstanceV5() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v5" + "/serviceInstances/e446b97d-9c35-437a-95a2-6b4c542c4507/vnfs/49befbfe-fccb-421d-bb4c-0734a43f5ea0";
+		ResponseEntity<String> response = sendRequest(inputStream("/DeleteVnfV5.json"), uri, HttpMethod.DELETE);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));
+	}
+	@Test
+	public void createVfModuleInstance() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/CreateVfModuleInfra"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/7a88cbeb-0ec8-4765-a271-4f9e90c3da7b/vnfs/cbba721b-4803-4df7-9347-307c9a955426/vfModules";
+		ResponseEntity<String> response = sendRequest(inputStream("/VfModuleWithRelatedInstances.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+		assertTrue(response.getBody().contains("1882939"));
+	}
+	@Test
+	public void createVfModuleInstanceNoModelCustomization() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v6" + "/serviceInstances/ff305d54-75b4-431b-adb2-eb6b9e5ff000/vnfs/ff305d54-75b4-431b-adb2-eb6b9e5ff000/vfModules";
+		ResponseEntity<String> response = sendRequest(inputStream("/VfModuleNoModelCustomization.json"), uri, HttpMethod.POST);
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ObjectMapper mapper = new ObjectMapper();
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	@Test
+	public void deleteVfModuleInstanceNoMatchingModelUUD() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v6" + "/serviceInstances/ff305d54-75b4-431b-adb2-eb6b9e5ff000/vnfs/ff305d54-75b4-431b-adb2-eb6b9e5ff000/vfModules/ff305d54-75b4-431b-adb2-eb6b9e5ff000";
+		ResponseEntity<String> response = sendRequest(inputStream("/VfModuleNoMatchingModelUUID.json"), uri, HttpMethod.DELETE);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ObjectMapper mapper = new ObjectMapper();
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	@Test
+	public void createVfModuleInstanceNoRecipe() throws JsonParseException, JsonMappingException, IOException {
+		uri = servInstanceuri + "v6" + "/serviceInstances/ff305d54-75b4-431b-adb2-eb6b9e5ff000/vnfs/ff305d54-75b4-431b-adb2-eb6b9e5ff000/vfModules";
+		ResponseEntity<String> response = sendRequest(inputStream("/VfModuleInvalid.json"), uri, HttpMethod.POST);
+		
+		assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value());
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE,  true);
+		RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class);
+		assertTrue(realResponse.getServiceException().getText().equals("No valid vfModuleCustomization is specified"));
+	}
+	@Test
+	public void replaceVfModuleInstance() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/vnfs/ff305d54-75b4-431b-adb2-eb6b9e5ff000/vfModules/ff305d54-75b4-431b-adb2-eb6b9e5ff000/replace";
+		ResponseEntity<String> response = sendRequest(inputStream("/ReplaceVfModule.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	@Test
+	public void updateVfModuleInstance() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/vnfs/ff305d54-75b4-431b-adb2-eb6b9e5ff000/vfModules/ff305d54-75b4-431b-adb2-eb6b9e5ff000";
+		ResponseEntity<String> response = sendRequest(inputStream("/UpdateVfModule.json"), uri, HttpMethod.PUT);
+		logger.debug(response.getBody());
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	@Test
+	public void createVfModuleNoModelType() throws JsonParseException, JsonMappingException, IOException{
+		headers.set(MsoLogger.TRANSACTION_ID, "32807a28-1a14-4b88-b7b3-2950918aa76d");
+		InfraActiveRequests expectedRecord = new InfraActiveRequests();
+		expectedRecord.setRequestStatus("FAILED");
+		expectedRecord.setAction("createInstance");
+		expectedRecord.setStatusMessage("Error parsing request: No valid modelType is specified");
+		expectedRecord.setProgress(new Long(100));
+		expectedRecord.setSource("VID");
+		expectedRecord.setRequestBody(inputStream("/VfModuleNoModelType.json"));
+		expectedRecord.setLastModifiedBy("APIH");
+		expectedRecord.setVfModuleName("testVfModule2");
+		expectedRecord.setVfModuleModelName("serviceModel");
+		expectedRecord.setRequestScope("vfModule");
+		expectedRecord.setRequestAction("createInstance");
+		expectedRecord.setRequestorId("zz9999");
+		expectedRecord.setRequestId("32807a28-1a14-4b88-b7b3-2950918aa76d");
+		//VnfType is not sent in this request, should be blank in db
+		expectedRecord.setVnfType("");
+		uri = servInstanceuri + "v5/serviceInstances/32807a28-1a14-4b88-b7b3-2950918aa76d/vnfs/32807a28-1a14-4b88-b7b3-2950918aa76d/vfModules";
+		
+		ResponseEntity<String> response = sendRequest(inputStream("/VfModuleNoModelType.json"), uri, HttpMethod.POST);
+		//ActualRecord
+		InfraActiveRequests requestRecord = iar.findOneByRequestId("32807a28-1a14-4b88-b7b3-2950918aa76d");
+		assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value());
+		assertEquals(sameBeanAs(expectedRecord).toString(), sameBeanAs(requestRecord).ignoring("startTime").ignoring("endTime").ignoring("modifyTime").toString());
+		assertNotNull(requestRecord.getStartTime());
+		assertNotNull(requestRecord.getEndTime());
+	}
+	@Test
+	public void inPlaceSoftwareUpdate() throws JsonParseException, JsonMappingException, IOException {			
+		stubFor(post(urlPathEqualTo("/mso/async/services/VnfInPlaceUpdate"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/vnfs/ff305d54-75b4-431b-adb2-eb6b9e5ff000/inPlaceSoftwareUpdate";
+		ResponseEntity<String> response = sendRequest(inputStream("/InPlaceSoftwareUpdate.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	
+	@Test
+	public void inPlaceSoftwareUpdateDuplicate() throws JsonParseException, JsonMappingException, IOException {			
+		stubFor(post(urlPathEqualTo("/mso/async/services/VnfInPlaceUpdate"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		InfraActiveRequests req = new InfraActiveRequests();
+		req.setRequestStatus("IN_PROGRESS");
+		req.setAction("inPlaceSoftwareUpdate");
+		req.setProgress(new Long(10));
+		req.setRequestBody(inputStream("/ServiceInstanceALaCarteTrueNoRecipe.json"));
+		req.setServiceInstanceId("f7ce78bb-423b-11e7-93f8-0050569a7908");
+		req.setVnfId("ff305d54-75b4-431b-adb2-eb6b9e5ff033");
+		req.setRequestScope("vnf");
+		req.setVnfName("duplicateCheck123");
+		req.setRequestAction("inPlaceSoftwareUpdate");
+		req.setRequestId("32807a28-1a14-4b88-b7b3-2950918aa76d");
+		iar.save(req);
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7908/vnfs/ff305d54-75b4-431b-adb2-eb6b9e5ff033/inPlaceSoftwareUpdate";
+		ResponseEntity<String> response = sendRequest(inputStream("/InPlaceSoftwareUpdate2.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.CONFLICT.getStatusCode(), response.getStatusCode().value());
+		
+		InfraActiveRequests newRecord = iar.findOneByRequestBody(inputStream("/InPlaceSoftwareUpdate2.json"));
+		
+		assertNotNull(newRecord.getServiceInstanceId());
+		assertNotNull(newRecord.getVnfId());
+		
+	}
+	
+	@Test
+	public void deleteVfModuleInstance() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/vnfs/ff305d54-75b4-431b-adb2-eb6b9e5ff000/vfModules/ff305d54-75b4-431b-adb2-eb6b9e5ff000";
+		ResponseEntity<String> response = sendRequest(inputStream("/DeleteVfModule.json"), uri, HttpMethod.DELETE);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	@Test
+	public void deactivateAndCloudDeleteVfModuleInstance() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/vnfs/ff305d54-75b4-431b-adb2-eb6b9e5ff000/vfModules/ff305d54-75b4-431b-adb2-eb6b9e5ff000/deactivateAndCloudDelete";
+		ResponseEntity<String> response = sendRequest(inputStream("/DeactivateAndCloudDeleteVfModule.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	@Test
+	public void createVolumeGroupInstance() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/vnfs/ff305d54-75b4-431b-adb2-eb6b9e5ff000/volumeGroups";
+		ResponseEntity<String> response = sendRequest(inputStream("/VolumeGroup.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+		assertTrue(response.getBody().contains("1882939"));
+	}
+	@Test
+	public void updateVolumeGroupInstance() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/vnfs/ff305d54-75b4-431b-adb2-eb6b9e5ff000/volumeGroups/ff305d54-75b4-431b-adb2-eb6b9e5ff000";
+		ResponseEntity<String> response = sendRequest(inputStream("/UpdateVolumeGroup.json"), uri, HttpMethod.PUT);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	@Test
+	public void deleteVolumeGroupInstance() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/vnfs/ff305d54-75b4-431b-adb2-eb6b9e5ff000/volumeGroups/ff305d54-75b4-431b-adb2-eb6b9e5ff000";
+		ResponseEntity<String> response = sendRequest(inputStream("/DeleteVolumeGroup.json"), uri, HttpMethod.DELETE);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	@Test
+	public void createNetworkInstance() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		String requestId = "b7a6b76f-2ee2-416c-971b-548472a8c5c4";
+		headers.set(MsoLogger.TRANSACTION_ID, requestId);
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7969/networks";
+		ResponseEntity<String> response = sendRequest(inputStream("/NetworkCreate.json"), uri, HttpMethod.POST);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		InfraActiveRequests record = iar.findOneByRequestId(requestId);
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+		assertEquals(record.getNetworkType(), "TestNetworkType");
+	}
+	@Test
+	public void updateNetworkInstance() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7969/networks/1710966e-097c-4d63-afda-e0d3bb7015fb";
+		ResponseEntity<String> response = sendRequest(inputStream("/UpdateNetwork.json"), uri, HttpMethod.PUT);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+		assertTrue(response.getBody().contains("1882939"));
+	}
+	@Test
+	public void deleteNetworkInstance() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7969/networks/1710966e-097c-4d63-afda-e0d3bb7015fb";
+		ResponseEntity<String> response = sendRequest(inputStream("/NetworkInstance.json"), uri, HttpMethod.DELETE);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	@Test
+	public void deleteNetworkInstanceNoReqParams() throws JsonParseException, JsonMappingException, IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v6" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7969/networks/1710966e-097c-4d63-afda-e0d3bb7015fb";
+		ResponseEntity<String> response = sendRequest(inputStream("/NetworkInstanceNoReqParams.json"), uri, HttpMethod.DELETE);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	@Test
+	public void convertJsonToServiceInstanceRequestFail() throws JsonParseException, JsonMappingException, IOException {
+		headers.set(MsoLogger.TRANSACTION_ID, "32807a28-1a14-4b88-b7b3-2950918aa76d");
+		//ExpectedRecord
+		InfraActiveRequests expectedRecord = new InfraActiveRequests();
+		expectedRecord.setRequestStatus("FAILED");
+		expectedRecord.setStatusMessage("Error mapping request: ");
+		expectedRecord.setProgress(new Long(100));
+		expectedRecord.setRequestBody(inputStream("/ConvertRequestFail.json"));
+		expectedRecord.setLastModifiedBy("APIH");
+		expectedRecord.setRequestScope("network");
+		expectedRecord.setRequestAction("deleteInstance");
+		expectedRecord.setRequestId("32807a28-1a14-4b88-b7b3-2950918aa76d");
+	
+		uri = servInstanceuri + "v6" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7969/networks/1710966e-097c-4d63-afda-e0d3bb7015fb";
+		ResponseEntity<String> response = sendRequest(inputStream("/ConvertRequestFail.json"), uri, HttpMethod.DELETE);
+	
+		//ActualRecord
+		InfraActiveRequests requestRecord = iar.findOneByRequestId("32807a28-1a14-4b88-b7b3-2950918aa76d");
+		
+		assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value());
+		assertThat(expectedRecord, sameBeanAs(requestRecord).ignoring("startTime").ignoring("endTime").ignoring("modifyTime").ignoring("statusMessage"));
+		assertThat(requestRecord.getStatusMessage(), containsString("Error mapping request: "));
+		assertNotNull(requestRecord.getStartTime());
+		assertNotNull(requestRecord.getEndTime());
+	}
+	@Test
+	public void convertJsonToServiceInstanceRequestConfigurationFail() throws JsonParseException, JsonMappingException, IOException {
+		uri = servInstanceuri + "v5" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7969/configurations/test/enablePort";
+		ResponseEntity<String> response = sendRequest(inputStream("/ConvertRequestFail.json"), uri, HttpMethod.POST);
+	
+		assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value());
+	}
+	
+	@Test
+	public void creatServiceInstanceGRTestApiNoCustomRecipeFound() throws IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		uri = servInstanceuri + "v7" + "/serviceInstances";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstanceMacro.json"), uri, HttpMethod.POST);
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	
+	@Test
+	public void createNetworkInstanceTestApiUndefinedUsePropertiesDefault() throws IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7969/networks";
+		ResponseEntity<String> response = sendRequest(inputStream("/NetworkCreateAlternateInstanceName.json"), uri, HttpMethod.POST);
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	
+	@Test
+	public void createNetworkInstanceTestApiIncorrectUsePropertiesDefault() throws IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7969/networks";
+		ResponseEntity<String> response = sendRequest(inputStream("/NetworkCreateTestApiIncorrect.json"), uri, HttpMethod.POST);
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatusCode().value());
+	}
+	
+	@Test
+	public void createNetworkInstanceTestApiGrApi() throws IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7969/networks";
+		ResponseEntity<String> response = sendRequest(inputStream("/NetworkCreateTestApiGrApi.json"), uri, HttpMethod.POST);
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	
+	@Test
+	public void createNetworkInstanceTestApiVnfApi() throws IOException {
+		stubFor(post(urlPathEqualTo("/mso/async/services/CreateNetworkInstance"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		uri = servInstanceuri + "v7" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7969/networks";
+		ResponseEntity<String> response = sendRequest(inputStream("/NetworkCreateTestApiVnfApi.json"), uri, HttpMethod.POST);
+		
+		//expected response
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	
+	@Test
+	public void activateServiceInstanceRequestStatus() throws JsonParseException, JsonMappingException, IOException{
+		stubFor(post(urlPathEqualTo("/mso/async/services/ActivateInstance"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		headers.set("X-ECOMP-RequestID", "32807a28-1a14-4b88-b7b3-2950918aa76d");
+		
+		InfraActiveRequests expectedRecord = new InfraActiveRequests();
+		expectedRecord.setRequestStatus("FAILED");
+		expectedRecord.setAction("activateInstance");
+		expectedRecord.setStatusMessage("Recipe could not be retrieved from catalog DB.");
+		expectedRecord.setProgress(new Long(100));
+		expectedRecord.setSource("VID");
+		expectedRecord.setRequestBody(inputStream("/ServiceInstanceALaCarteTrueNoRecipe.json"));
+		expectedRecord.setLastModifiedBy("APIH");
+		expectedRecord.setServiceInstanceId("f7ce78bb-423b-11e7-93f8-0050569a7999");
+		expectedRecord.setServiceInstanceName("testService1234");
+		expectedRecord.setRequestScope("service");
+		expectedRecord.setRequestAction("activateInstance");
+		expectedRecord.setRequestorId("xxxxxx");
+		expectedRecord.setRequestId("32807a28-1a14-4b88-b7b3-2950918aa76d");
+		
+		//expect
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceuri + "v5" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7999/activate";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstancePrev8.json"), uri, HttpMethod.POST);
+				
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		
+		InfraActiveRequests requestRecord = iar.findOneByRequestId("32807a28-1a14-4b88-b7b3-2950918aa76d");
+		
+		//then		
+		assertEquals(Status.IN_PROGRESS.name(), requestRecord.getRequestStatus());
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	
+	@Test
+	public void invalidRequestId() throws IOException {
+		String illegalRequestId = "1234";
+		headers.set("X-ECOMP-RequestID", illegalRequestId);
+
+		uri = servInstanceuri + "v5/serviceInstances";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstanceDefault.json"), uri, HttpMethod.POST);
+		
+		assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatusCode().value());
+		assertTrue(response.getBody().contains("Request Id " + illegalRequestId + " is not a valid UUID"));
+	}
+	@Test
+	public void invalidBPELResponse() throws IOException{
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponseInvalid2.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		uri = servInstanceuri + "v5/serviceInstances";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstanceDefault.json"), uri, HttpMethod.POST);
+				
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true);
+	
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class);
+		assertEquals("Request Failed due to BPEL error with HTTP Status = 202{\"instanceId\": \"1882939\"}", realResponse.getServiceException().getText());
+	}
+	
+	@Test
+	public void invalidBPELResponse2() throws IOException{
+		stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponseInvalid.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		uri = servInstanceuri + "v5/serviceInstances";
+		ResponseEntity<String> response = sendRequest(inputStream("/ServiceInstanceDefault.json"), uri, HttpMethod.POST);
+				
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true);
+	
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class);
+		assertTrue(realResponse.getServiceException().getText().contains("<aetgt:ErrorMessage>Exception in create execution list 500"));
+	}
+	
+	@Test
+	public void createMacroServiceInstance() throws JsonParseException, JsonMappingException, IOException{
+		stubFor(post(urlPathEqualTo("/mso/async/services/CreateMacroServiceNetworkVnf"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json")
+						.withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+		
+		//expect
+		ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+		RequestReferences requestReferences = new RequestReferences();
+		requestReferences.setInstanceId("1882939");
+		expectedResponse.setRequestReferences(requestReferences);
+		uri = servInstanceUriPrev7 + "v5";
+		ResponseEntity<String> response = sendRequest(inputStream("/MacroServiceInstance.json"), uri, HttpMethod.POST);
+				
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+	
+		//then		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+		ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+	}
+	
+	@Test
+	public void testUserParams() throws JsonParseException, JsonMappingException, IOException {
+		ObjectMapper mapper = new ObjectMapper();
+		ServiceInstancesRequest request = mapper.readValue(inputStream("/MacroServiceInstance.json"), ServiceInstancesRequest.class);
+		RequestParameters requestParameters = request.getRequestDetails().getRequestParameters();
+		String userParamsTxt = inputStream("/userParams.txt");
+		
+		List<Map<String, Object>> userParams = servInstances.configureUserParams(requestParameters);
+		System.out.println(userParams);
+		assertTrue(userParams.size() > 0);
+		assertTrue(userParams.get(0).containsKey("name"));
+		assertTrue(userParams.get(0).containsKey("value"));
+		assertTrue(userParamsTxt.replaceAll("\\s+","").equals(userParams.toString().replaceAll("\\s+","")));
+	}
+	
+	@Test
+	public void testConfigureCloudConfig() throws IOException {
+		ObjectMapper mapper = new ObjectMapper();
+		ServiceInstancesRequest request = mapper.readValue(inputStream("/MacroServiceInstance.json"), ServiceInstancesRequest.class);
+		CloudConfiguration cloudConfig = servInstances.configureCloudConfig(request.getRequestDetails().getRequestParameters());
+		
+		assertEquals("mdt25b", cloudConfig.getLcpCloudRegionId());
+		assertEquals("aefb697db6524ddebfe4915591b0a347", cloudConfig.getTenantId());
+	}
+	
+	@Test
+	public void testMapToLegacyRequest() throws IOException {
+		ObjectMapper mapper = new ObjectMapper();
+		ServiceInstancesRequest request = mapper.readValue(inputStream("/MacroServiceInstance.json"), ServiceInstancesRequest.class);
+		ServiceInstancesRequest expected = mapper.readValue(inputStream("/LegacyMacroServiceInstance.json"), ServiceInstancesRequest.class);
+		servInstances.mapToLegacyRequest(request.getRequestDetails());
+		System.out.println(mapper.writerWithDefaultPrettyPrinter().writeValueAsString(request));
+		assertThat(request, sameBeanAs(expected));
+	}
+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/TasksHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/TasksHandlerTest.java
new file mode 100644
index 0000000000..459214b4ce
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/TasksHandlerTest.java
@@ -0,0 +1,123 @@
+/*-
+ * ============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.apihandlerinfra;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.http.HttpStatus;
+import org.json.JSONException;
+import org.junit.Test;
+import org.onap.so.apihandlerinfra.tasksbeans.TaskList;
+import org.onap.so.apihandlerinfra.tasksbeans.TasksGetResponse;
+import org.onap.so.apihandlerinfra.tasksbeans.ValidResponses;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class TasksHandlerTest extends BaseTest{
+	
+	private final String basePath = "onap/so/infra/tasks/v1";
+	
+	@Test
+	public void getTasksTestByOriginalRequestId() throws ParseException, JSONException, JsonParseException, JsonMappingException, IOException{
+		stubFor(post(urlPathEqualTo("/sobpmnengine/task"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withBodyFile("Camunda/GetTaskResponse.json").withStatus(HttpStatus.SC_OK)));
+				
+		stubFor(get(urlPathEqualTo("/sobpmnengine/task/b5fa707a-f55a-11e7-a796-005056856d52/variables"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withBodyFile("Camunda/GetTaskVariablesResponse.json").withStatus(HttpStatus.SC_OK)));
+		
+		String requestId = "4f6fe9ac-800c-4540-a93e-10d179fa1b0a";
+		
+		//expected response
+		TasksGetResponse expectedResponse = new TasksGetResponse();
+	
+		List<TaskList> taskList = new ArrayList<TaskList>();
+		TaskList taskList1 = new TaskList();
+		List<String> validEntries = new ArrayList<String>();
+		validEntries.add(ValidResponses.rollback.toString());
+		validEntries.add(ValidResponses.skip.toString());
+		validEntries.add(ValidResponses.manual.toString());
+		validEntries.add(ValidResponses.abort.toString());
+		taskList1.setBuildingBlockName("UpdateConfigurationState");
+		taskList1.setBuildingBlockStep("Configurationactivate SDNO Post-Check");
+		taskList1.setErrorCode("1002");
+		taskList1.setErrorSource("SDNO"); 
+		taskList1.setErrorMessage("SDN-O exception: failed with message FAIL - AnsibleOperations exception: Failed : HTTP error code : 400 - Error Msg : no node list provided and no inventory file found");
+		taskList1.setNfRole("VPROBE");
+		taskList1.setType("fallout");
+		taskList1.setOriginalRequestId(requestId);
+		taskList1.setOriginalRequestorId("VID");
+		taskList1.setSubscriptionServiceType("PORT-MIRROR");
+		taskList1.setTaskId("b5fa707a-f55a-11e7-a796-005056856d52");
+		taskList1.setValidResponses(validEntries);		
+		taskList.add(taskList1);
+	
+		expectedResponse.setTaskList(taskList);
+				
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<String> entity = new HttpEntity<String>(null, headers);
+		
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(basePath))
+				.queryParam("taskId", "b5fa707a-f55a-11e7-a796-005056856d52");
+		
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.GET, entity, String.class);
+	
+		ObjectMapper mapper = new ObjectMapper();
+		
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+		
+		//then		
+		assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());	
+		TasksGetResponse realResponse = mapper.readValue(response.getBody(), TasksGetResponse.class);
+		assertThat(realResponse, sameBeanAs(expectedResponse));	
+        assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0));
+        assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0));
+        assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0));
+        assertEquals("1.0.0", response.getHeaders().get("X-LatestVersion").get(0));
+	}
+
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/TestAppender.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/TestAppender.java
new file mode 100644
index 0000000000..48711a2595
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/TestAppender.java
@@ -0,0 +1,37 @@
+/*-
+ * ============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.apihandlerinfra;
+
+import java.util.ArrayList;
+import java.util.List;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
+
+
+
+public class TestAppender  extends AppenderBase<ILoggingEvent> {
+    public static List<ILoggingEvent> events = new ArrayList<>();
+ 
+	@Override
+	protected void append(ILoggingEvent loggingEvent) {
+		events.add(loggingEvent);		
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/e2eserviceinstancebeans/DelE2ESvcRespTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/e2eserviceinstancebeans/DelE2ESvcRespTest.java
new file mode 100644
index 0000000000..96ac02ae75
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/e2eserviceinstancebeans/DelE2ESvcRespTest.java
@@ -0,0 +1,38 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2018 Huawei 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.apihandlerinfra.e2eserviceinstancebeans;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class DelE2ESvcRespTest {
+
+    DelE2ESvcResp test = new DelE2ESvcResp();
+
+    @Test
+    public void verifyDelE2ESvcResp() throws Exception {
+        test.setOperationId("operationId");
+        assertEquals(test.getOperationId(),"operationId");
+    }
+
+
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/e2eserviceinstancebeans/E2ERequestTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/e2eserviceinstancebeans/E2ERequestTest.java
new file mode 100644
index 0000000000..7cfee66d48
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/e2eserviceinstancebeans/E2ERequestTest.java
@@ -0,0 +1,54 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2018 Huawei 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.apihandlerinfra.e2eserviceinstancebeans;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class E2ERequestTest {
+
+    E2ERequest test = new E2ERequest();
+
+    @Test
+    public void verifyE2ERequest() throws Exception {
+
+        test.setOperationId("operationId");
+        assertEquals(test.getOperationId(),"operationId");
+        test.setOperation("operation");
+        assertEquals(test.getOperation(),"operation");
+        test.setResult("result");
+        assertEquals(test.getResult(),"result");
+        test.setReason("test");
+        assertEquals(test.getReason(),"test");
+        test.setUserId("userId");
+        assertEquals(test.getUserId(),"userId");
+        test.setOperationContent("operation");
+        assertEquals(test.getOperationContent(),"operation");
+        test.setProgress(123);
+        assertEquals(test.getProgress(),123);
+        test.setOperateAt("operate");
+        assertEquals(test.getOperateAt(),"operate");
+        test.setFinishedAt("finished");
+        assertEquals(test.getFinishedAt(),"finished");
+    }
+
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/e2eserviceinstancebeans/E2EServiceInstanceDeleteRequestTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/e2eserviceinstancebeans/E2EServiceInstanceDeleteRequestTest.java
new file mode 100644
index 0000000000..a3bab01dfd
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/e2eserviceinstancebeans/E2EServiceInstanceDeleteRequestTest.java
@@ -0,0 +1,41 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2018 Huawei 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.apihandlerinfra.e2eserviceinstancebeans;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class E2EServiceInstanceDeleteRequestTest {
+
+
+    E2EServiceInstanceDeleteRequest test = new E2EServiceInstanceDeleteRequest();
+
+    @Test
+    public void verifyE2ESerInstanceDelReq() throws Exception {
+
+        test.setGlobalSubscriberId("id");
+        assertEquals(test.getGlobalSubscriberId(),"id");
+        test.setServiceType("type");
+        assertEquals(test.getServiceType(),"type");
+    }
+
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/e2eserviceinstancebeans/E2EUserParamTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/e2eserviceinstancebeans/E2EUserParamTest.java
new file mode 100644
index 0000000000..59bfa2a1d2
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/e2eserviceinstancebeans/E2EUserParamTest.java
@@ -0,0 +1,48 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2018 Huawei 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.apihandlerinfra.e2eserviceinstancebeans;
+
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+
+public class E2EUserParamTest {
+
+    E2EUserParam test = new E2EUserParam();
+
+    @Test
+    public void verifyE2EParam() throws Exception {
+
+        test.setName("name");
+        assertEquals(test.getName(),"name");
+        test.setValue("value");
+        assertEquals(test.getValue(),"value");
+        Map<String, Object> additionalProperties = new HashMap<>();
+        additionalProperties.put("name", test);
+        test.setAdditionalProperty("name",test);
+        assertEquals(test.getAdditionalProperties(),additionalProperties);
+
+    }
+
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/e2eserviceinstancebeans/NsParametersTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/e2eserviceinstancebeans/NsParametersTest.java
new file mode 100644
index 0000000000..59e10b3938
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/e2eserviceinstancebeans/NsParametersTest.java
@@ -0,0 +1,52 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2018 Huawei 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.apihandlerinfra.e2eserviceinstancebeans;
+
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+
+public class NsParametersTest {
+
+    NsParameters test = new NsParameters();
+
+
+    @Test
+    public void verifyNsParameters() throws Exception {
+
+        LocationConstraint obj =new LocationConstraint();
+        List<LocationConstraint> locationConstraints = new ArrayList<LocationConstraint>();
+        locationConstraints.add(obj);
+        test.setLocationConstraints(locationConstraints);
+        assertEquals(test.getLocationConstraints(),locationConstraints);
+        Map<String, Object> additionalParamForNs = new HashMap<String,Object>();
+        additionalParamForNs.put("1",test);
+        test.setAdditionalParamForNs(additionalParamForNs);
+        assertEquals(test.getAdditionalParamForNs(),additionalParamForNs);
+    }
+
+
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/RequestDetailsTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/RequestDetailsTest.java
new file mode 100644
index 0000000000..80cd0fac2f
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/RequestDetailsTest.java
@@ -0,0 +1,71 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.apihandlerinfra.tasksbeans;
+
+import org.junit.After;
+import static org.junit.Assert.assertTrue;
+import org.junit.Before;
+import org.junit.Test;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+public class RequestDetailsTest {
+
+	RequestDetails _requestDetails;
+	RequestInfo _requestInfo;
+
+	public RequestDetailsTest() {
+	}
+
+	@Before
+	public void setUp() {
+		_requestDetails = mock(RequestDetails.class);
+		_requestInfo = new RequestInfo();
+		when(_requestDetails.getRequestInfo()).thenReturn(_requestInfo);
+	}
+
+	@After
+	public void tearDown() {
+		_requestDetails = null;
+		_requestInfo = null;
+	}
+
+	/**
+	 * Test of getRequestInfo method
+	 */
+	@Test
+	public void testGetRequestInfo() {
+		_requestDetails.setRequestInfo(_requestInfo);
+		assertTrue(_requestDetails.getRequestInfo().equals(_requestInfo));
+
+	}
+
+	/**
+	 * Test setRequestInfo
+	 */
+	@Test
+	public void testSetRequestInfo() {
+		_requestDetails.setRequestInfo(_requestInfo);
+		verify(_requestDetails).setRequestInfo(_requestInfo);
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/RequestInfoTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/RequestInfoTest.java
new file mode 100644
index 0000000000..852376eb7a
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/RequestInfoTest.java
@@ -0,0 +1,118 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.apihandlerinfra.tasksbeans;
+
+import org.junit.After;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class RequestInfoTest {
+
+	RequestInfo _requestInfo;
+	String _source;
+	ValidResponses _responseValue;
+	String _requestorId;
+
+	public RequestInfoTest() {
+	}
+
+	@Before
+	public void setUp() {
+		_requestInfo = mock(RequestInfo.class);
+		_responseValue = ValidResponses.abort;
+		_requestorId = "xxxxxx";
+		_source = "VID";
+		when(_requestInfo.getRequestorId()).thenReturn(_requestorId);
+		when(_requestInfo.getSource()).thenReturn(_source);
+		when(_requestInfo.getResponseValue()).thenReturn(_responseValue);
+
+	}
+
+	@After
+	public void tearDown() {
+		_requestInfo = null;
+		_responseValue = null;
+	}
+
+	/**
+	 * Test of getSource method
+	 */
+	@Test
+	public void testGetSource() {
+	        String result = _requestInfo.getSource();
+	        assertEquals(_source, result);
+
+	}
+
+	/**
+	 * Test setSource
+	 */
+	@Test
+	public void testSetSource() {
+		_requestInfo.setSource("VID");
+		verify(_requestInfo).setSource(_source);
+	}
+	
+	/**
+	 * Test of getRequestorId method
+	 */
+	@Test
+	public void testGetRequestorId() {
+	        String result = _requestInfo.getRequestorId();
+	        assertEquals(_requestorId, result);
+
+	}
+
+	/**
+	 * Test setRequestInfo
+	 */
+	@Test
+	public void testSetRequestorId() {
+		_requestInfo.setRequestorId(_requestorId);
+		verify(_requestInfo).setRequestorId(_requestorId);
+	}
+	
+
+	/**
+	 * Test of getResponseValue method
+	 */
+	@Test
+	public void testGetResponseValue() {
+		ValidResponses result = _requestInfo.getResponseValue();
+	        assertEquals(_responseValue, result);
+
+	}
+
+	/**
+	 * Test setResponseValues method
+	 */
+	@Test
+	public void testSetResponseValue() {
+		_requestInfo.setResponseValue(ValidResponses.abort);
+		verify(_requestInfo).setResponseValue(_responseValue);
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/TaskListTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/TaskListTest.java
new file mode 100644
index 0000000000..62bfee989b
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/TaskListTest.java
@@ -0,0 +1,247 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.apihandlerinfra.tasksbeans;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TaskListTest {
+
+	TaskList _taskList;
+	protected String _taskId;
+	protected String _type;
+	protected String _nfRole;
+	protected String _subscriptionServiceType;
+	protected String _originalRequestId;
+	protected String _originalRequestorId;
+	protected String _errorSource;
+	protected String _errorCode;
+	protected String _errorMessage;
+	protected String _buildingBlockName;
+	protected String _buildingBlockStep;
+	protected List<String> _validResponses;
+
+	public TaskListTest() {
+	}
+
+	@Before
+	public void setUp() {
+		_taskList = mock(TaskList.class);
+		_taskId = "_taskid";
+		_type = "type";
+		_nfRole = "nfrole";
+		_subscriptionServiceType = "subscriptionservicetype";
+		_originalRequestId = "originalrequestid";
+		_originalRequestorId = "originalrequestorid";
+		_errorSource = "errorsource";
+		_errorCode = "errorcode";
+		_errorMessage = "errormessage";
+		_buildingBlockName = "buildingblockname";
+		_buildingBlockStep = "buildingblockstep";
+		_validResponses = mock(List.class);
+
+		when(_taskList.getTaskId()).thenReturn(_taskId);
+		when(_taskList.getType()).thenReturn(_type);
+		when(_taskList.getNfRole()).thenReturn(_nfRole);
+		when(_taskList.getSubscriptionServiceType()).thenReturn(_subscriptionServiceType);
+		when(_taskList.getOriginalRequestId()).thenReturn(_originalRequestId);
+		when(_taskList.getOriginalRequestorId()).thenReturn(_originalRequestorId);
+		when(_taskList.getErrorSource()).thenReturn(_errorSource);
+		when(_taskList.getErrorCode()).thenReturn(_errorCode);
+		when(_taskList.getErrorMessage()).thenReturn(_errorMessage);
+		when(_taskList.getBuildingBlockName()).thenReturn(_buildingBlockName);
+		when(_taskList.getBuildingBlockStep()).thenReturn(_buildingBlockStep);
+		when(_taskList.getValidResponses()).thenReturn(_validResponses);
+	}
+
+	@After
+	public void tearDown() {
+		_taskList = null;
+		_validResponses = null;
+	}
+
+	@Test
+	public void testGetTaskId() {
+		String result = _taskList.getTaskId();
+		assertEquals(_taskId, result);
+
+	}
+
+	@Test
+	public void testSetTaskId() {
+		_taskList.setTaskId("_taskid");
+		verify(_taskList).setTaskId(_taskId);
+	}
+
+	@Test
+	public void testGetType() {
+		String result = _taskList.getType();
+		assertEquals(_type, result);
+
+	}
+
+	@Test
+	public void testSetType() {
+		_taskList.setType(_type);
+		verify(_taskList).setType(_type);
+	}
+
+	@Test
+	public void testGetNfRole() {
+		String result = _taskList.getNfRole();
+		assertEquals(_nfRole, result);
+
+	}
+
+	@Test
+	public void testSetNfRole() {
+		_taskList.setType(_nfRole);
+		verify(_taskList).setType(_nfRole);
+	}
+
+	@Test
+	public void testGetSubscriptionServiceType() {
+		String result = _taskList.getSubscriptionServiceType();
+		assertEquals(_subscriptionServiceType, result);
+
+	}
+
+	@Test
+	public void testSetSubscriptionServiceType() {
+		_taskList.setSubscriptionServiceType(_subscriptionServiceType);
+		verify(_taskList).setSubscriptionServiceType(_subscriptionServiceType);
+	}
+
+	@Test
+	public void testGetOriginalRequestId() {
+		String result = _taskList.getOriginalRequestId();
+		assertEquals(_originalRequestId, result);
+
+	}
+
+	@Test
+	public void testSetOriginalRequestId() {
+		_taskList.setOriginalRequestId(_originalRequestId);
+		verify(_taskList).setOriginalRequestId(_originalRequestId);
+	}
+
+	@Test
+	public void testGetOriginalRequestorId() {
+		String result = _taskList.getOriginalRequestorId();
+		assertEquals(_originalRequestorId, result);
+
+	}
+
+	@Test
+	public void testSetOriginalRequestorId() {
+		_taskList.setOriginalRequestorId(_originalRequestorId);
+		verify(_taskList).setOriginalRequestorId(_originalRequestorId);
+	}
+
+	@Test
+	public void testGetErrorSource() {
+		String result = _taskList.getErrorSource();
+		assertEquals(_errorSource, result);
+
+	}
+
+	@Test
+	public void testSetErrorSource() {
+		_taskList.setErrorSource(_errorSource);
+		verify(_taskList).setErrorSource(_errorSource);
+	}
+
+	@Test
+	public void testGetErrorCode() {
+		String result = _taskList.getErrorCode();
+		assertEquals(_errorCode, result);
+
+	}
+
+	@Test
+	public void testSetErrorCode() {
+		_taskList.setErrorCode(_errorCode);
+		verify(_taskList).setErrorCode(_errorCode);
+	}
+
+	@Test
+	public void testGetErrorMessage() {
+		String result = _taskList.getErrorMessage();
+		assertEquals(_errorMessage, result);
+
+	}
+
+	@Test
+	public void testSetErrorMessage() {
+		_taskList.setErrorMessage(_errorMessage);
+		verify(_taskList).setErrorMessage(_errorMessage);
+	}
+
+	@Test
+	public void testGetBuildingBlockName() {
+		String result = _taskList.getBuildingBlockName();
+		assertEquals(_buildingBlockName, result);
+
+	}
+
+	@Test
+	public void testSetBuildingBlockName() {
+		_taskList.setBuildingBlockName(_buildingBlockName);
+		verify(_taskList).setBuildingBlockName(_buildingBlockName);
+	}
+
+	@Test
+	public void testGetBuildingBlockStep() {
+		String result = _taskList.getBuildingBlockStep();
+		assertEquals(_buildingBlockStep, result);
+
+	}
+
+	@Test
+	public void testSetBuildingBlockStep() {
+		_taskList.setBuildingBlockStep(_buildingBlockStep);
+		verify(_taskList).setBuildingBlockStep(_buildingBlockStep);
+	}
+
+	@Test
+	public void testGetValidResponses() {
+
+		List<String> result = _taskList.getValidResponses();
+		assertEquals(_validResponses, result);
+
+	}
+	
+	@Test
+	public void testSetValidResponses() {
+		_taskList.setValidResponses(_validResponses);
+		verify(_taskList).setValidResponses(_validResponses);
+	}
+
+
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/TaskRequestReferenceTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/TaskRequestReferenceTest.java
new file mode 100644
index 0000000000..043f4ea93d
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/TaskRequestReferenceTest.java
@@ -0,0 +1,71 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.apihandlerinfra.tasksbeans;
+
+import org.junit.After;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class TaskRequestReferenceTest {
+
+	TaskRequestReference _taskRequestReference;
+
+    protected String _taskId;
+	public TaskRequestReferenceTest() {
+	}
+	
+	@Before
+	public void setUp() {
+		_taskRequestReference = mock(TaskRequestReference.class);
+		_taskId = "taskid";
+	
+		when(_taskRequestReference.getTaskId()).thenReturn(_taskId);
+	}
+
+	@After
+	public void tearDown() {
+		_taskRequestReference = null;
+	}
+
+	/**
+	 * Test getTaskRequestReference 
+	 */
+	@Test
+	public void taskGetRequestReference() {
+		String result = _taskRequestReference.getTaskId();
+        assertEquals(_taskId, result);
+	}
+
+	/**
+	 * Test setTaskRequestReference
+	 */
+	@Test
+	public void testSetRequestInfo() {
+		_taskRequestReference.setTaskId(_taskId);
+		verify(_taskRequestReference).setTaskId(_taskId);
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/TaskVariableValueTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/TaskVariableValueTest.java
new file mode 100644
index 0000000000..bc6a5ab890
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/TaskVariableValueTest.java
@@ -0,0 +1,113 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.apihandlerinfra.tasksbeans;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class TaskVariableValueTest {
+	TaskVariableValue _taskVariableValue;
+	protected String _name;
+	protected String _value;
+	protected String _operator;
+
+	public TaskVariableValueTest() {
+	}
+
+	@Before
+	public void setUp() {
+		_taskVariableValue = mock(TaskVariableValue.class);
+		_name = "name";
+		_value = "value";
+		_operator = "operator";
+		when(_taskVariableValue.getName()).thenReturn(_name);
+		when(_taskVariableValue.getValue()).thenReturn(_value);
+		when(_taskVariableValue.getOperator()).thenReturn(_operator);
+	}
+
+	@After
+	public void tearDown() {
+		_taskVariableValue = null;
+	}
+
+	/**
+	 * Test of getName method
+	 */
+	@Test
+	public void testGetName() {
+		_taskVariableValue.setName(_name);
+		assertEquals(_taskVariableValue.getName(),_name);
+
+	}
+
+	/**
+	 * Test setName
+	 */
+	@Test
+	public void testSetName() {
+		_taskVariableValue.setName(_name);
+		verify(_taskVariableValue).setName(_name);
+	}
+	
+	/**
+	 * Test of getName method
+	 */
+	@Test
+	public void testGetValue() {
+		_taskVariableValue.setValue(_value);
+		assertEquals(_taskVariableValue.getValue(),_value);
+
+	}
+
+	/**
+	 * Test setName
+	 */
+	@Test
+	public void testSetValue() {
+		_taskVariableValue.setValue(_value);
+		verify(_taskVariableValue).setValue(_value);
+	}
+	
+	/**
+	 * Test of getName method
+	 */
+	@Test
+	public void testGetOperator() {
+		_taskVariableValue.setOperator(_operator);
+		assertEquals(_taskVariableValue.getOperator(),_operator);
+
+	}
+
+	/**
+	 * Test setName
+	 */
+	@Test
+	public void testSetRequestDetails() {
+		_taskVariableValue.setOperator(_operator);
+		verify(_taskVariableValue).setOperator(_operator);
+	}
+
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/TaskVariablesTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/TaskVariablesTest.java
new file mode 100644
index 0000000000..8e2c3ae7da
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/TaskVariablesTest.java
@@ -0,0 +1,69 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.apihandlerinfra.tasksbeans;
+
+import org.junit.After;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.List;
+
+public class TaskVariablesTest {
+
+	TaskVariables _taskVariables;
+	private List<TaskVariableValue> _taskVariableValueList;
+
+	public TaskVariablesTest() {
+	}
+
+	@SuppressWarnings("unchecked")
+	@Before
+	public void setUp() {
+		_taskVariables = mock(TaskVariables.class);
+		_taskVariableValueList  = mock(List.class);
+		when(_taskVariables.getTaskVariables()).thenReturn(_taskVariableValueList);
+	}
+
+	@After
+	public void tearDown() {
+		_taskVariables = null;
+	}
+
+	@Test
+	public void testGetTaskVariables() {
+		List<TaskVariableValue> result = _taskVariables.getTaskVariables();
+		assertEquals(_taskVariableValueList, result);
+
+	}
+
+	@Test
+	public void testSetTaskVariables() {
+		_taskVariables.setTaskVariables(_taskVariableValueList);
+		verify(_taskVariables).setTaskVariables(_taskVariableValueList);
+
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/TasksGetResponseTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/TasksGetResponseTest.java
new file mode 100644
index 0000000000..f4ec27e852
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/TasksGetResponseTest.java
@@ -0,0 +1,69 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.apihandlerinfra.tasksbeans;
+
+import org.junit.After;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.List;
+
+public class TasksGetResponseTest {
+
+	TasksGetResponse _tasksGetResponse;
+	private List<TaskList> _taskList;
+
+	public TasksGetResponseTest() {
+	}
+
+	@SuppressWarnings("unchecked")
+	@Before
+	public void setUp() {
+		_tasksGetResponse = mock(TasksGetResponse.class);
+		_taskList = mock(List.class);
+		when(_tasksGetResponse.getTaskList()).thenReturn(_taskList);
+	}
+
+	@After
+	public void tearDown() {
+		_tasksGetResponse = null;
+	}
+
+	@Test
+	public void testGetTaskList() {
+		List<TaskList> result = _tasksGetResponse.getTaskList();
+		assertEquals(_taskList, result);
+
+	}
+
+	@Test
+	public void testSetTaskList() {
+		_tasksGetResponse.setTaskList(_taskList);
+		verify(_tasksGetResponse).setTaskList(_taskList);
+
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/TasksRequestTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/TasksRequestTest.java
new file mode 100644
index 0000000000..09af2b0a52
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/TasksRequestTest.java
@@ -0,0 +1,70 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.apihandlerinfra.tasksbeans;
+
+import org.junit.After;
+import static org.junit.Assert.assertTrue;
+import org.junit.Before;
+import org.junit.Test;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+public class TasksRequestTest {
+	TasksRequest _tasksRequest;
+	private RequestDetails _requestDetails;
+
+	public TasksRequestTest() {
+	}
+
+	@Before
+	public void setUp() {
+		_tasksRequest = mock(TasksRequest.class);
+		_requestDetails = new RequestDetails();
+		when(_tasksRequest.getRequestDetails()).thenReturn(_requestDetails);
+	}
+
+	@After
+	public void tearDown() {
+		_tasksRequest = null;
+	}
+
+	/**
+	 * Test of getRequestDetails method
+	 */
+	@Test
+	public void testGetRequestDetails() {
+		_tasksRequest.setRequestDetails(_requestDetails);
+		assertTrue(_tasksRequest.getRequestDetails().equals(_requestDetails));
+
+	}
+
+	/**
+	 * Test setRequestDetails
+	 */
+	@Test
+	public void testSetRequestDetails() {
+		_tasksRequest.setRequestDetails(_requestDetails);
+		verify(_tasksRequest).setRequestDetails(_requestDetails);
+	}
+
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/ValueTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/ValueTest.java
new file mode 100644
index 0000000000..dc5cf8ed39
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/ValueTest.java
@@ -0,0 +1,68 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.apihandlerinfra.tasksbeans;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class ValueTest {
+	Value _valueInstance;
+	protected String _value;
+
+	public ValueTest() {
+	}
+
+	@Before
+	public void setUp() {
+		_valueInstance = mock(Value.class);
+		_value = "_value";
+		when(_valueInstance.getValue()).thenReturn(_value);
+	}
+
+	@After
+	public void tearDown() {
+		_valueInstance = null;
+	}
+
+	/**
+	 * Test of getValue method
+	 */
+	@Test
+	public void testGetValue() {
+		_valueInstance.setValue(_value);
+		assertEquals(_valueInstance.getValue(),_value);
+
+	}
+
+	/**
+	 * Test setValue
+	 */
+	@Test
+	public void testSetValue() {
+		_valueInstance.setValue(_value);
+		verify(_valueInstance).setValue(_value);
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/VariablesTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/VariablesTest.java
new file mode 100644
index 0000000000..d79e5f6294
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tasksbeans/VariablesTest.java
@@ -0,0 +1,95 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.apihandlerinfra.tasksbeans;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class VariablesTest {
+
+	Variables _variables;
+	protected Value _source;
+	protected Value _responseValue;
+    protected Value _requestorId;
+   
+    @Before
+	public void setUp() {
+    	_variables = mock(Variables.class);
+        _source = mock(Value.class);
+        _responseValue = mock(Value.class);
+        _requestorId = mock(Value.class);
+        
+		when(_variables.getSource()).thenReturn(_source);
+		when(_variables.getRequestorId()).thenReturn(_requestorId);
+		when(_variables.getResponseValue()).thenReturn(_responseValue);
+		
+	}
+
+	@After
+	public void tearDown() {
+		_variables = null;
+		_source = null;
+		_responseValue = null;
+		_requestorId = null;
+	}
+	
+	@Test
+    public void testGetSource() {
+		_variables.setSource(_source);
+		assertTrue(_variables.getSource().equals(_source));
+    }
+
+	@Test
+	public void testSetSource(){
+		_variables.setSource(_source);
+		verify(_variables).setSource(_source);
+		}	
+	
+	@Test
+    public void testGetResponseValue() {
+		_variables.setResponseValue(_responseValue);
+		assertTrue(_variables.getResponseValue().equals(_responseValue));
+    }
+
+	@Test
+	public void testSetResponseValue(){
+		_variables.setResponseValue(_responseValue);
+		verify(_variables).setResponseValue(_responseValue);
+		}	
+	
+	@Test
+    public void testGetRequestorId() {
+		_variables.setRequestorId(_requestorId);
+		assertTrue(_variables.getRequestorId().equals(_requestorId));
+    }
+
+	@Test
+	public void testSetRequestorId(){
+		_variables.setRequestorId(_requestorId);
+		verify(_variables).setRequestorId(_requestorId);
+		}	
+	
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/CloudOrchestrationTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/CloudOrchestrationTest.java
new file mode 100644
index 0000000000..37813811ee
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/CloudOrchestrationTest.java
@@ -0,0 +1,289 @@
+/*-
+ * ============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.apihandlerinfra.tenantisolation;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+
+import javax.ws.rs.core.MediaType;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.CharEncoding;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.onap.so.apihandlerinfra.ApiHandlerApplication;
+import org.onap.so.apihandlerinfra.BaseTest;
+import org.onap.so.apihandlerinfra.Status;
+import org.onap.so.apihandlerinfra.tenantisolationbeans.Action;
+import org.onap.so.apihandlerinfra.tenantisolationbeans.TenantIsolationRequest;
+import org.onap.so.db.request.beans.InfraActiveRequests;
+import org.onap.so.db.request.data.repository.InfraActiveRequestsRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+
+public class CloudOrchestrationTest extends BaseTest {
+	
+	private static final String path = "/onap/so/infra/cloudResources/v1";
+	private HttpHeaders headers = new HttpHeaders();
+
+	
+	@LocalServerPort
+	private int port;
+	
+	@Autowired 
+	private InfraActiveRequestsRepository iarRepo;
+	
+	@Test
+	public void testCreateOpEnvObjectMapperError() throws IOException {
+		
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<String> entity = new HttpEntity<String>(null, headers);
+	
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/operationalEnvironments");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.POST, entity, String.class);
+
+		String body = response.getBody().toString();
+		assertTrue(body.contains("Mapping of request to JSON object failed."));
+		assertEquals(400, response.getStatusCodeValue());
+	}
+	
+	@Test
+	public void testCreateOpEnvError() throws IOException {
+		
+		String request = "{\"requestDetails\":{\"requestInfo\":{\"resourceType\":\"operationalEnvironment\",\"instanceName\": \"myOpEnv\",\"source\": \"VID\",\"requestorId\": \"xxxxxx\"},"
+											+ "	\"requestParameters\": {\"tenantContext\": \"Test\",\"workloadContext\": \"ECOMP_E2E-IST\"}}}";
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<String> entity = new HttpEntity<String>(request, headers);
+	
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/operationalEnvironments");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.POST, entity, String.class);
+
+		String body = response.getBody().toString();
+		assertTrue(body.contains("Mapping of request to JSON object failed"));
+		assertEquals(400, response.getStatusCodeValue());
+	}
+	
+	@Test
+	public void testCreateOpEnvReqRecord() throws IOException {
+		ObjectMapper mapper = new ObjectMapper();
+		TenantIsolationRequest request = mapper.readValue(new File("src/test/resources/TenantIsolation/ECOMPOperationEnvironmentCreate.json"), TenantIsolationRequest.class);
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<TenantIsolationRequest> entity = new HttpEntity<TenantIsolationRequest>(request, headers);
+		
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId("123");
+		iar.setOperationalEnvName("myOpEnv");
+		iar.setRequestScope("create");
+		iar.setRequestStatus("PENDING");
+		iar.setRequestAction("UNKNOWN");
+		iarRepo.saveAndFlush(iar);
+		
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/operationalEnvironments");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.POST, entity, String.class);
+		
+		assertEquals(409, response.getStatusCodeValue());
+	}
+	
+	@Test
+	public void testCreateOperationalEnvironment() throws IOException {
+		ObjectMapper mapper = new ObjectMapper();
+		TenantIsolationRequest request = mapper.readValue(new File("src/test/resources/TenantIsolation/ECOMPOperationEnvironmentCreate.json"), TenantIsolationRequest.class);
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		headers.set("X-TransactionID", "987654321");
+		HttpEntity<TenantIsolationRequest> entity = new HttpEntity<TenantIsolationRequest>(request, headers);
+	
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/operationalEnvironments");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.POST, entity, String.class);
+		InfraActiveRequests iar = iarRepo.findOneByRequestId("987654321");
+		assertEquals(iar.getRequestBody(), mapper.writeValueAsString(request.getRequestDetails()));
+		assertEquals(200, response.getStatusCodeValue());
+	}
+	
+	@Test
+	public void testCreateVNFDuplicateCheck() throws IOException {
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId("requestId");
+		iar.setOperationalEnvName("myVnfOpEnv");
+		iar.setRequestStatus(Status.IN_PROGRESS.toString());
+		iar.setAction(Action.create.toString());
+		iar.setRequestAction(Action.create.toString());
+		iar.setRequestScope("UNKNOWN");
+		iarRepo.saveAndFlush(iar);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		TenantIsolationRequest request = mapper.readValue(new File("src/test/resources/TenantIsolation/VNFOperationEnvironmentCreate.json"), TenantIsolationRequest.class);
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<TenantIsolationRequest> entity = new HttpEntity<TenantIsolationRequest>(request, headers);
+	
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/operationalEnvironments");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.POST, entity, String.class);
+		assertEquals(409, response.getStatusCodeValue());
+	}
+	
+	@Test
+	public void testCreateVNF() throws IOException {
+		ObjectMapper mapper = new ObjectMapper();
+		TenantIsolationRequest request = mapper.readValue(new File("src/test/resources/TenantIsolation/VNFOperationEnvironmentCreate.json"), TenantIsolationRequest.class);
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<TenantIsolationRequest> entity = new HttpEntity<TenantIsolationRequest>(request, headers);
+	
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/operationalEnvironments");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.POST, entity, String.class);
+		assertEquals(200, response.getStatusCodeValue());
+	}
+	
+	@Test
+	public void testActivate() throws IOException {
+		ObjectMapper mapper = new ObjectMapper();
+		TenantIsolationRequest request = mapper.readValue(new File("src/test/resources/TenantIsolation/ActivateOperationEnvironment.json"), TenantIsolationRequest.class);
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<TenantIsolationRequest> entity = new HttpEntity<TenantIsolationRequest>(request, headers);
+	
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/operationalEnvironments/ff3514e3-5a33-55df-13ab-12abad84e7ff/activate");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.POST, entity, String.class);
+		
+		assertEquals(200, response.getStatusCodeValue());
+	}
+	
+	@Test
+	public void testDeactivate() throws IOException {
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId("ff3514e3-5a33-55df-13ab-12abad84e7fa");
+		iar.setRequestStatus(Status.COMPLETE.toString());
+		iar.setRequestAction("UNKNOWN");
+		iar.setRequestScope("UNKNOWN");
+		iarRepo.saveAndFlush(iar);
+		
+				
+		ObjectMapper mapper = new ObjectMapper();
+		TenantIsolationRequest request = mapper.readValue(new File("src/test/resources/TenantIsolation/DeactivateOperationEnvironment.json"), TenantIsolationRequest.class);
+		
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<TenantIsolationRequest> entity = new HttpEntity<TenantIsolationRequest>(request, headers);
+
+	
+	
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/operationalEnvironments/ff3514e3-5a33-55df-13ab-12abad84e7fa/deactivate");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.POST, entity, String.class);
+		
+		assertEquals(200, response.getStatusCodeValue());
+	}
+	
+	@Test
+	public void testDeactivateThreadException() throws IOException {
+		//need to simulate a 500 error
+		/*CloudOrchestration co = new CloudOrchestration();
+		TenantIsolationRequest tenantIsolationRequest = mock(TenantIsolationRequest.class);
+		RequestsDatabase reqDB = mock(RequestsDatabase.class);
+		TenantIsolationRunnable thread = mock(TenantIsolationRunnable.class);
+		Response res = Response.status(500).entity("Failed creating a Thread").build();
+		
+		co.setRequestsDatabase(reqDB);
+		co.setThread(thread);
+		co.setTenantIsolationRequest(tenantIsolationRequest);
+		String request = IOUtils.toString(ClassLoader.class.getResourceAsStream ("/DeactivateOperationEnvironment.json"), CharEncoding.UTF_8);
+		when(reqDB.checkInstanceNameDuplicate(null, "myVnfOpEnv", "operationalEnvironment")).thenReturn(null);
+		doNothing().when(tenantIsolationRequest).createRequestRecord(Status.IN_PROGRESS, Action.deactivate);
+		doThrow(Exception.class).when(thread).run();
+		when(tenantIsolationRequest.buildServiceErrorResponse(any(Integer.class), any(MsoException.class), any(String.class), any(String.class), any(List.class))).thenReturn(res);
+
+		Response response = co.activateOperationEnvironment(request, null, "ff3514e3-5a33-55df-13ab-12abad84e7ff");
+		assertEquals(500, response.getStatus());*/
+	}
+	
+	@Test
+	@Ignore
+	public void testDeactivateDupCheck() throws IOException {
+		
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId("requestId");
+		iar.setOperationalEnvName("myVnfOpEnv");
+		iar.setRequestStatus(Status.IN_PROGRESS.toString());
+		iar.setAction(Action.create.toString());
+		iar.setRequestAction(Action.create.toString());
+		iar.setRequestScope("UNKNOWN");
+		iarRepo.saveAndFlush(iar);
+		ObjectMapper mapper = new ObjectMapper();
+		String request = mapper.readValue(new File("src/test/resources/TenantIsolation/DeactivateOperationEnvironment.json"), String.class);
+		
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<String> entity = new HttpEntity<String>(request, headers);
+	
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/operationalEnvironments/ff3514e3-5a33-55df-13ab-12abad84e7ff/deactivate");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.POST, entity, String.class);
+		assertEquals(409, response.getStatusCodeValue());
+	}
+	
+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/CloudResourcesOrchestrationTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/CloudResourcesOrchestrationTest.java
new file mode 100644
index 0000000000..cc0b9f64e4
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/CloudResourcesOrchestrationTest.java
@@ -0,0 +1,401 @@
+/*-
+ * ============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.apihandlerinfra.tenantisolation;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import javax.ws.rs.core.MediaType;
+
+import org.junit.Test;
+import org.onap.so.apihandlerinfra.BaseTest;
+import org.onap.so.db.request.beans.InfraActiveRequests;
+import org.onap.so.db.request.data.repository.InfraActiveRequestsRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.util.UriComponentsBuilder;
+
+
+public class CloudResourcesOrchestrationTest extends BaseTest{
+	
+	@Autowired
+	private InfraActiveRequestsRepository iarRepo;
+	private String requestJSON = "{\"requestDetails\":{\"requestInfo\":{\"source\":\"VID\",\"requestorId\":\"xxxxxx\" } } }";
+	private static final String path = "/onap/so/infra/cloudResourcesRequests";
+	
+	@LocalServerPort
+	private int port;
+
+
+
+	HttpHeaders headers = new HttpHeaders();
+
+	@Test
+	public void testUnlockFailObjectMapping() {
+		
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<String> entity = new HttpEntity<String>(null, headers);
+	
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/test/unlock");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.POST, entity, String.class);
+		
+		String body = response.getBody();
+		assertTrue(body.contains("Mapping of request to JSON object failed."));
+		assertEquals(400, response.getStatusCodeValue());
+	}
+	
+	@Test
+	public void testParseOrchestrationError1() {
+		String requestJSON = "{\"requestDetails\": null }";
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<String> entity = new HttpEntity<String>(requestJSON, headers);
+		
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/test/unlock");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.POST, entity, String.class);
+		String body = response.getBody();
+		assertTrue(body.contains("No valid requestDetails is specified"));
+		assertEquals(400, response.getStatusCodeValue());
+	}
+	
+	@Test
+	public void testParseOrchestrationError2() {
+		String requestJSON = "{\"requestDetails\":{\"requestInfo\":{\"source\":\"\",\"requestorId\":\"xxxxxx\" } } }";
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<String> entity = new HttpEntity<String>(requestJSON, headers);
+
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/test/unlock");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.POST, entity, String.class);
+		String body = response.getBody();
+		assertTrue(body.contains("No valid source is specified"));
+		assertEquals(400, response.getStatusCodeValue());
+	}
+	
+	@Test
+	public void testParseOrchestrationError3() {
+		String requestJSON = "{\"requestDetails\":{\"requestInfo\":{\"source\":\"VID\",\"requestorId\":\"\" } } }";
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<String> entity = new HttpEntity<String>(requestJSON, headers);
+
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/test/unlock");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.POST, entity, String.class);
+		String body = response.getBody();
+		assertTrue(body.contains("No valid requestorId is specified"));
+		assertEquals(400, response.getStatusCodeValue());
+	}
+	
+	@Test
+	public void testGetInfraActiveRequestNull() {
+		
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<String> entity = new HttpEntity<String>(requestJSON, headers);
+
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/request-id-null-check/unlock");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.POST, entity, String.class);
+		String body = response.getBody();
+		assertTrue(body.contains("Orchestration RequestId request-id-null-check is not found in DB"));
+		assertEquals(400, response.getStatusCodeValue());
+
+	}
+	
+	@Test
+	public void testUnlockError() {
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId("requestIdtestUnlockError");
+		iar.setRequestScope("requestScope");
+		iar.setRequestType("requestType");
+		iar.setOperationalEnvId("operationalEnvironmentId");
+		iar.setOperationalEnvName("operationalEnvName");
+		iar.setRequestorId("xxxxxx");
+		iar.setRequestBody("");
+		iar.setRequestStatus("IN_PROGRESS");
+		iar.setRequestAction("TEST");
+		
+		iarRepo.saveAndFlush(iar);
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<String> entity = new HttpEntity<>(requestJSON, headers);
+	
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/requestId/unlock");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.POST, entity, String.class);
+		
+		assertEquals(400, response.getStatusCodeValue());
+	}
+	
+	@Test
+	public void testUnlock() throws ParseException {
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId("requestIdtestUnlock");
+		iar.setRequestScope("requestScope");
+		iar.setRequestType("requestType");
+		iar.setOperationalEnvId("operationalEnvironmentId");
+		iar.setOperationalEnvName("operationalEnvName");
+		iar.setRequestorId("xxxxxx");
+		iar.setRequestBody("{}");
+		iar.setRequestStatus("IN_PROGRESS");
+		iar.setRequestAction("TEST");
+		
+		DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+		Date date = dateFormat.parse("23/09/2007");
+		long time = date.getTime();
+		iar.setStartTime(new Timestamp(time));
+		
+		iarRepo.saveAndFlush(iar);
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<String> entity = new HttpEntity<>(requestJSON, headers);
+	
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/requestIdtestUnlock/unlock");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.POST, entity, String.class);
+		
+		assertEquals(204, response.getStatusCodeValue());
+	}
+	
+	@Test
+	public void testUnlockComplete() throws ParseException {
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId("requestIdtestUnlockComplete");
+		iar.setRequestScope("requestScope");
+		iar.setRequestType("requestType");
+		iar.setOperationalEnvId("operationalEnvironmentId");
+		iar.setOperationalEnvName("operationalEnvName");
+		iar.setRequestorId("xxxxxx");
+		iar.setRequestBody("{}");
+		iar.setRequestStatus("COMPLETE");
+		iar.setRequestAction("TEST");
+		
+		DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+		Date date = dateFormat.parse("23/09/2007");
+		long time = date.getTime();
+		iar.setStartTime(new Timestamp(time));
+		
+		iarRepo.saveAndFlush(iar);
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<String> entity = new HttpEntity<>(requestJSON, headers);
+	
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/requestIdtestUnlockComplete/unlock");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.POST, entity, String.class);
+		String body = response.getBody().toString();
+		assertTrue(body.contains("Orchestration RequestId requestIdtestUnlockComplete has a status of COMPLETE and can not be unlocked"));
+		assertEquals(400, response.getStatusCodeValue());
+	}
+	
+	@Test
+	public void testGetOperationalEnvFilter() {
+		
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<String> entity = new HttpEntity<>(null, headers);
+	
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1");
+		
+		builder.queryParam("requestId", "not-there");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.GET, entity, String.class);
+		
+		//204s cannot have a body
+		//assertTrue(response.getBody().contains("Orchestration RequestId not-there is not found in DB"));
+		assertEquals(204, response.getStatusCodeValue());
+	}
+	
+	@Test
+	public void testGetOperationalEnvSuccess() throws ParseException {
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId("90c56827-1c78-4827-bc4d-6afcdb37a51f");
+		iar.setRequestScope("requestScope");
+		iar.setRequestType("requestType");
+		iar.setOperationalEnvId("operationalEnvironmentId");
+		iar.setOperationalEnvName("operationalEnvName");
+		iar.setRequestorId("xxxxxx");
+		iar.setRequestBody("{}");
+		iar.setRequestStatus("COMPLETE");
+		iar.setRequestAction("TEST");
+		
+		DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+		Date date = dateFormat.parse("23/09/2007");
+		long time = date.getTime();
+		iar.setStartTime(new Timestamp(time));
+		
+		iarRepo.saveAndFlush(iar);
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<String> entity = new HttpEntity<>("", headers);
+	
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1");
+		
+		builder.queryParam("requestId", "90c56827-1c78-4827-bc4d-6afcdb37a51f");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.GET, entity, String.class);
+		
+		assertEquals(200, response.getStatusCodeValue());
+        assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0));
+        assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0));
+        assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0));
+        assertEquals("1.0.0", response.getHeaders().get("X-LatestVersion").get(0));
+        assertEquals("90c56827-1c78-4827-bc4d-6afcdb37a51f", response.getHeaders().get("X-TransactionID").get(0));
+	}
+	
+	@Test
+	public void testGetOperationalEnvFilterSuccess() throws ParseException {
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId("requestIdtestGetOperationalEnvFilterSuccess");
+		iar.setRequestScope("requestScope");
+		iar.setRequestType("requestType");
+		iar.setOperationalEnvId("operationalEnvironmentId");
+		iar.setOperationalEnvName("myVnfOpEnv");
+		iar.setRequestorId("xxxxxx");
+		iar.setRequestBody("");
+		iar.setRequestStatus("COMPLETE");
+		iar.setStatusMessage("status Message");
+		iar.setProgress(20L);
+		iar.setRequestAction("TEST");
+		
+		DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+		Date date = dateFormat.parse("23/09/2007");
+		long time = date.getTime();
+		iar.setStartTime(new Timestamp(time));
+		iar.setEndTime(new Timestamp(time));
+		
+		iarRepo.saveAndFlush(iar);
+
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<String> entity = new HttpEntity<>(null, headers);
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1");
+		
+		builder.queryParam("requestId", "requestIdtestGetOperationalEnvFilterSuccess");
+		builder.queryParam("operationalEnvironmentName", "myVnfOpEnv");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.GET, entity, String.class);
+		
+		assertEquals(200, response.getStatusCodeValue());
+        assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0));
+        assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0));
+        assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0));
+        assertEquals("1.0.0", response.getHeaders().get("X-LatestVersion").get(0));
+
+	}
+	
+	@Test
+	public void testGetOperationalEnvFilterException1() throws ParseException {
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId("requestId-getOpEnvFilterEx1");
+		iar.setRequestScope("requestScope");
+		iar.setRequestType("requestType");
+		iar.setOperationalEnvId("operationalEnvironmentId");
+		iar.setOperationalEnvName("operationalEnvName");
+		iar.setRequestorId("xxxxxx");
+		iar.setRequestBody("");
+		iar.setRequestStatus("COMPLETE");
+		iar.setRequestAction("TEST");
+		
+		iarRepo.saveAndFlush(iar);
+
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<String> entity = new HttpEntity<>("", headers);
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1");
+		
+		builder.queryParam("filter", "operationalEnvironmentName:EQUALS:myVnfOpEnv");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.GET, entity, String.class);
+		assertEquals(500, response.getStatusCodeValue());
+	}
+	
+	@Test
+	public void testGetOperationalEnvFilterException2() throws ParseException {
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId("requestIdFilterException2");
+		iar.setRequestScope("requestScope");
+		iar.setRequestType("requestType");
+		iar.setOperationalEnvId("operationalEnvId");
+		iar.setOperationalEnvName("operationalEnvName");
+		iar.setRequestorId("xxxxxx");
+		iar.setRequestBody("");
+		iar.setRequestStatus("COMPLETE");
+		iar.setRequestAction("TEST");
+		
+		iarRepo.saveAndFlush(iar);
+
+		headers.set("Accept", MediaType.APPLICATION_JSON);
+		headers.set("Content-Type", MediaType.APPLICATION_JSON);
+		HttpEntity<String> entity = new HttpEntity<>(null, headers);
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1");
+		
+		builder.queryParam("operationalEnvironmentName", "");
+		       
+		ResponseEntity<String> response = restTemplate.exchange(
+				builder.toUriString(),
+				HttpMethod.GET, entity, String.class);
+		
+		
+		assertEquals(500, response.getStatusCodeValue());
+		assertTrue(response.getBody().toString().contains("No valid operationalEnvironmentName value is specified"));
+	}
+
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/ModelDistributionRequestTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/ModelDistributionRequestTest.java
new file mode 100644
index 0000000000..37ec14a0b5
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/ModelDistributionRequestTest.java
@@ -0,0 +1,114 @@
+/*-
+ * ============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.apihandlerinfra.tenantisolation;
+
+import static org.hamcrest.Matchers.hasProperty;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.startsWith;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.contains;
+import static org.mockito.Mockito.doNothing;
+
+import javax.inject.Provider;
+import javax.ws.rs.core.Response;
+
+import org.apache.http.HttpStatus;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.onap.so.apihandler.common.ErrorNumbers;
+import org.onap.so.apihandlerinfra.ApiHandlerApplication;
+import org.onap.so.apihandlerinfra.BaseTest;
+import org.onap.so.apihandlerinfra.exceptions.ApiException;
+import org.onap.so.apihandlerinfra.exceptions.ValidateException;
+import org.onap.so.apihandlerinfra.tenantisolationbeans.Action;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+
+
+public class ModelDistributionRequestTest extends BaseTest{
+
+	private static final String requestJSON = "{\"status\": \"DISTRIBUTION_COMPLETE_ERROR\", \"errorReason\": \"Distribution failed in AAI\" }";
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+	@Mock
+	private Provider<TenantIsolationRunnable> thread;
+	@InjectMocks
+	@Spy
+	private ModelDistributionRequest request = new ModelDistributionRequest();
+	@Mock
+	private TenantIsolationRunnable runnable = new TenantIsolationRunnable();
+	
+	@Before
+	public void beforeTest() {
+		Mockito.when(thread.get()).thenReturn(runnable);
+	}
+	
+	@Test
+	public void testObjectMapperError() throws ApiException{
+        thrown.expect(ValidateException.class);
+        thrown.expectMessage(startsWith("Mapping of request to JSON object failed"));
+        thrown.expect(hasProperty("httpResponseCode", is(HttpStatus.SC_BAD_REQUEST)));
+        thrown.expect(hasProperty("messageID", is(ErrorNumbers.SVC_BAD_PARAMETER)));
+        request.updateModelDistributionStatus("", null, null);
+	}
+	
+	@Test
+	public void testParseError1() throws ApiException{
+        thrown.expect(ValidateException.class);
+        thrown.expectMessage(startsWith("No valid status is specified"));
+        thrown.expect(hasProperty("httpResponseCode", is(HttpStatus.SC_BAD_REQUEST)));
+        thrown.expect(hasProperty("messageID", is(ErrorNumbers.SVC_BAD_PARAMETER)));
+        String requestErrorJSON = "{\"errorReason\": \"Distribution failed in AAI\" }";
+        request.updateModelDistributionStatus(requestErrorJSON, null, null);
+	}
+	
+	@Test
+	public void testParseError2() throws ApiException{
+        thrown.expect(ValidateException.class);
+        thrown.expectMessage(startsWith("No valid errorReason is specified"));
+        thrown.expect(hasProperty("httpResponseCode", is(HttpStatus.SC_BAD_REQUEST)));
+        thrown.expect(hasProperty("messageID", is(ErrorNumbers.SVC_BAD_PARAMETER)));
+        String requestErrorJSON = "{\"status\": \"DISTRIBUTION_COMPLETE_ERROR\"}";
+        request.updateModelDistributionStatus(requestErrorJSON, null, null);
+	}
+	
+	@Test
+	public void testSuccess() throws ApiException{
+		doNothing().when(runnable).run(any(Action.class), anyString(), any(CloudOrchestrationRequest.class), anyString());
+		
+		Response response = request.updateModelDistributionStatus(requestJSON, null, null);
+		
+		assertEquals(200, response.getStatus());
+	}
+
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/TenantIsolationRequestTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/TenantIsolationRequestTest.java
new file mode 100644
index 0000000000..426be98486
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/TenantIsolationRequestTest.java
@@ -0,0 +1,143 @@
+/*-
+ * ============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.apihandlerinfra.tenantisolation;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.HashMap;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.onap.so.apihandlerinfra.BaseTest;
+import org.onap.so.apihandlerinfra.tenantisolationbeans.Action;
+import org.onap.so.exceptions.ValidationException;
+import org.springframework.test.context.ActiveProfiles;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class TenantIsolationRequestTest extends BaseTest{
+
+	@Rule
+	public ExpectedException expectedException = ExpectedException.none();
+	
+	@Test
+	public void testParseCloudResourceECOMP() throws Exception{
+		try {
+			String requestJSON = new String(Files.readAllBytes(Paths.get("src/test/resources/TenantIsolation/ECOMPOperationEnvironmentCreate.json")));
+			ObjectMapper mapper = new ObjectMapper();
+			HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+			CloudOrchestrationRequest cor  = mapper.readValue(requestJSON, CloudOrchestrationRequest.class);
+			TenantIsolationRequest request = new TenantIsolationRequest ("1234");
+			request.parse(cor, instanceIdMap, Action.create);
+			assertNotNull(request.getRequestId());
+		} catch(ValidationException e) {
+			fail(e.getMessage());
+		}
+	}
+	
+	@Test
+	public void testParseCloudResourceVNF() throws Exception{
+		try {
+			String requestJSON = new String(Files.readAllBytes(Paths.get("src/test/resources/TenantIsolation/VNFOperationEnvironmentCreate.json")));
+			ObjectMapper mapper = new ObjectMapper();
+			HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+			CloudOrchestrationRequest cor  = mapper.readValue(requestJSON, CloudOrchestrationRequest.class);
+			TenantIsolationRequest request = new TenantIsolationRequest ("1234");
+			request.parse(cor, instanceIdMap, Action.create);
+			assertNotNull(request.getRequestId());
+		} catch(ValidationException e) {
+			fail(e.getMessage());
+		}
+	}
+	
+	@Test
+	public void testParseCloudResourceVNFInvalid() throws Exception {
+		expectedException.expect(ValidationException.class);
+		
+		String requestJSON = new String(Files.readAllBytes(Paths.get("src/test/resources/TenantIsolation/VNFOperationEnvironmentCreateInvalid.json")));
+		ObjectMapper mapper = new ObjectMapper();
+		HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+		CloudOrchestrationRequest cor  = mapper.readValue(requestJSON, CloudOrchestrationRequest.class);
+		TenantIsolationRequest request = new TenantIsolationRequest ("1234");
+		request.parse(cor, instanceIdMap, Action.create);
+		assertNotNull(request.getRequestId());
+	}
+	
+	@Test
+	public void testParseActivateCloudResource() throws Exception{
+		try {
+			String requestJSON = new String(Files.readAllBytes(Paths.get("src/test/resources/TenantIsolation/ActivateOperationEnvironment.json")));
+			ObjectMapper mapper = new ObjectMapper();
+			HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+			CloudOrchestrationRequest cor  = mapper.readValue(requestJSON, CloudOrchestrationRequest.class);
+			TenantIsolationRequest request = new TenantIsolationRequest ("1234");
+			request.parse(cor, instanceIdMap, Action.activate);
+			assertNotNull(request.getRequestId());
+		} catch(ValidationException e) {
+			fail(e.getMessage());
+		}
+	}
+	
+	@Test
+	public void testParseActivateCloudResourceInvalid() throws Exception{
+		expectedException.expect(ValidationException.class);
+		
+		String requestJSON = new String(Files.readAllBytes(Paths.get("src/test/resources/TenantIsolation/ActivateOperationEnvironmentInvalid.json")));
+		ObjectMapper mapper = new ObjectMapper();
+		HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+		CloudOrchestrationRequest cor  = mapper.readValue(requestJSON, CloudOrchestrationRequest.class);
+		TenantIsolationRequest request = new TenantIsolationRequest ("1234");
+		request.parse(cor, instanceIdMap, Action.activate);
+		assertNotNull(request.getRequestId());
+	}
+	
+	@Test
+	public void testParseDeactivateCloudResource() throws Exception{
+		try {
+			String requestJSON = new String(Files.readAllBytes(Paths.get("src/test/resources/TenantIsolation/DeactivateOperationEnvironment.json")));
+			ObjectMapper mapper = new ObjectMapper();
+			HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+			CloudOrchestrationRequest cor  = mapper.readValue(requestJSON, CloudOrchestrationRequest.class);
+			TenantIsolationRequest request = new TenantIsolationRequest ("1234");
+			request.parse(cor, instanceIdMap, Action.deactivate);
+			assertNotNull(request.getRequestId());
+		} catch(ValidationException e) {
+			fail(e.getMessage());
+		}
+	}
+	
+	@Test
+	public void testParseDeactivateCloudResourceInvalid() throws Exception{
+		expectedException.expect(ValidationException.class);
+		
+		String requestJSON = new String(Files.readAllBytes(Paths.get("src/test/resources/TenantIsolation/DeactivateOperationEnvironmentInvalid.json")));
+		ObjectMapper mapper = new ObjectMapper();
+		HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+		CloudOrchestrationRequest cor  = mapper.readValue(requestJSON, CloudOrchestrationRequest.class);
+		TenantIsolationRequest request = new TenantIsolationRequest ("1234");
+		request.parse(cor, instanceIdMap, Action.deactivate);
+		assertNotNull(request.getRequestId());
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/dmaap/DmaapOperationalEnvClientTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/dmaap/DmaapOperationalEnvClientTest.java
new file mode 100644
index 0000000000..ef57fa1a76
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/dmaap/DmaapOperationalEnvClientTest.java
@@ -0,0 +1,72 @@
+/*-
+ * ============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.apihandlerinfra.tenantisolation.dmaap;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.text.ParseException;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.onap.so.apihandlerinfra.ApiHandlerApplication;
+import org.onap.so.apihandlerinfra.BaseTest;
+import org.onap.so.apihandlerinfra.exceptions.ApiException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class DmaapOperationalEnvClientTest extends BaseTest{
+	
+	private final String fileLocation = "src/test/resources/org/onap/so/client/asdc/create-ecompoe/";
+	private static final String operationalEnvironmentId = "28122015552391";
+	private static final String operationalEnvironmentName = "OpEnv-name";
+	private static final String operationalEnvironmentType = "VNF";
+	private static final String tenantContext = "Test";
+	private static final String workloadContext = "VNF_E2E-IST";
+	private static final String action = "Create";
+	@Autowired
+	private DmaapOperationalEnvClient client;
+	
+	@Test
+	public void verifyCreateEcompOperationEnvironmentRequest() throws IOException, ApiException {
+		String content = this.getJson("ecomp-openv-request.json");
+		ObjectMapper mapper = new ObjectMapper();
+		CreateEcompOperationEnvironmentBean expected = mapper.readValue(content, CreateEcompOperationEnvironmentBean.class);
+		
+		String actual = client.buildRequest(operationalEnvironmentId, operationalEnvironmentName, operationalEnvironmentType, 
+				tenantContext, workloadContext, action);
+		
+		assertEquals("payloads are equal", mapper.writeValueAsString(expected), actual);
+	}
+	
+	
+	private String getJson(String filename) throws IOException {
+		return new String(Files.readAllBytes(Paths.get(fileLocation + filename)));
+	}
+	
+}
+	
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/dmaap/OperationalEnvironmentPublisherTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/dmaap/OperationalEnvironmentPublisherTest.java
new file mode 100644
index 0000000000..59df7ae960
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/dmaap/OperationalEnvironmentPublisherTest.java
@@ -0,0 +1,51 @@
+/*-
+ * ============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.apihandlerinfra.tenantisolation.dmaap;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.onap.so.apihandlerinfra.ApiHandlerApplication;
+import org.onap.so.apihandlerinfra.BaseTest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+
+public class OperationalEnvironmentPublisherTest extends BaseTest {
+
+	@Autowired
+	private OperationalEnvironmentPublisher publisher;
+	
+	@Test
+	public void getProperties() throws FileNotFoundException, IOException {
+		
+		assertEquals("testuser", publisher.getUserName());
+		assertEquals("VjR5NDcxSzA=", publisher.getPassword());
+		assertEquals("test.operationalEnvironmentEvent", publisher.getTopic());
+		assertEquals("http://localhost:" + env.getProperty("wiremock.server.port"), publisher.getHost().get());
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/dmaap/SDCDmaapClientTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/dmaap/SDCDmaapClientTest.java
new file mode 100644
index 0000000000..3fcfa5dfa8
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/dmaap/SDCDmaapClientTest.java
@@ -0,0 +1,70 @@
+/*-
+ * ============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.apihandlerinfra.tenantisolation.dmaap;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.text.ParseException;
+
+import org.junit.Test;
+import org.onap.so.apihandlerinfra.BaseTest;
+import org.onap.so.apihandlerinfra.tenantisolation.dmaap.CreateEcompOperationEnvironmentBean;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class SDCDmaapClientTest extends BaseTest{
+	
+	private final String fileLocation = "src/test/resources/org/onap/so/client/asdc/create-ecompoe/";
+		
+	private static final String operationalEnvironmentId =  "28122015552391";
+	private static final String operationalEnvironmentName = "Operational Environment Name";
+	private static final String operationalEnvironmentType = "ECOMP";
+	private static final String tenantContext = "TEST";
+	private static final String workloadContext = "ECOMP_E2E-IST";
+	private static final String action = "Create" ;	
+	
+
+	
+	@Test
+	public void verifyasdcCreateoeRequest() throws IOException, ParseException{
+		
+		ObjectMapper mapper = new ObjectMapper();
+	
+		String expected = "{\"operationalEnvironmentId\":\"28122015552391\",\"operationalEnvironmentName\":\"Operational Environment Name\",\"operationalEnvironmentType\":\"ECOMP\",\"tenantContext\":\"TEST\",\"workloadContext\":\"ECOMP_E2E-IST\",\"action\":\"Create\"}";
+	
+		
+		CreateEcompOperationEnvironmentBean cBean = new CreateEcompOperationEnvironmentBean();
+		cBean.setOperationalEnvironmentId(operationalEnvironmentId);
+		cBean.setoperationalEnvironmentName(operationalEnvironmentName);
+		cBean.setoperationalEnvironmentType(operationalEnvironmentType);
+		cBean.settenantContext(tenantContext);
+		cBean.setworkloadContext(workloadContext);
+		cBean.setaction(action);
+		
+		String actual = mapper.writeValueAsString(cBean);
+		
+		assertEquals("payloads are equal", expected, actual);
+	}
+	
+	
+	
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/exceptions/SDCClientCallFailedTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/exceptions/SDCClientCallFailedTest.java
new file mode 100644
index 0000000000..5ee2eeaeba
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/exceptions/SDCClientCallFailedTest.java
@@ -0,0 +1,45 @@
+/*-
+ * ============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.apihandlerinfra.tenantisolation.exceptions;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.onap.so.apihandlerinfra.BaseTest;
+
+public class SDCClientCallFailedTest extends BaseTest{
+	
+	@Test
+	public void testAsdcException() {
+		SDCClientCallFailed asdc = new SDCClientCallFailed("failed");
+		
+		assertEquals("failed", asdc.getMessage());
+	}
+	
+	@Test
+	public void testAsdcExceptionWithCause() {
+		SDCClientCallFailed asdc = new SDCClientCallFailed("failed", new Throwable("throwable"));
+		
+		assertEquals("failed", asdc.getMessage());
+		assertEquals("throwable", asdc.getCause().getMessage());
+	}
+
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/exceptions/TenantIsolationExceptionTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/exceptions/TenantIsolationExceptionTest.java
new file mode 100644
index 0000000000..f73a194a7b
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/exceptions/TenantIsolationExceptionTest.java
@@ -0,0 +1,45 @@
+/*-
+ * ============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.apihandlerinfra.tenantisolation.exceptions;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.onap.so.apihandlerinfra.BaseTest;
+
+public class TenantIsolationExceptionTest extends BaseTest{
+	
+	@Test
+	public void testTenantIsolation() {
+		TenantIsolationException exception = new TenantIsolationException();
+		
+		assertNotNull(exception);
+	}
+	
+	@Test
+	public void testTenantIsolationException() {
+		TenantIsolationException exception = new TenantIsolationException("exception");
+		
+		assertEquals("Tenant Isolation error: exception", exception.getMessage());
+	}
+
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/helpers/AAIClientHelperTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/helpers/AAIClientHelperTest.java
new file mode 100644
index 0000000000..9aa961c665
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/helpers/AAIClientHelperTest.java
@@ -0,0 +1,147 @@
+/*-
+ * ============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.apihandlerinfra.tenantisolation.helpers;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.put;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import org.apache.http.HttpStatus;
+import org.junit.Test;
+import org.onap.so.apihandlerinfra.BaseTest;
+import org.onap.so.client.aai.AAIVersion;
+import org.onap.so.client.aai.entities.AAIResultWrapper;
+import org.onap.so.client.aai.objects.AAIOperationalEnvironment;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+
+public class AAIClientHelperTest extends BaseTest{
+    
+	@Autowired
+	private AAIClientHelper clientHelper;
+	
+	@Test
+	public void testGetAaiOperationalEnvironmentSuccess() throws Exception { 
+		stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withBodyFile("vnfoperenv/ecompOperationalEnvironment.json").withStatus(HttpStatus.SC_ACCEPTED)));
+		
+		AAIResultWrapper wrapper = clientHelper.getAaiOperationalEnvironment("EMOE-001");
+		Optional<AAIOperationalEnvironment> aaiOpEnv = wrapper.asBean(AAIOperationalEnvironment.class);
+		assertEquals("EMOE-001", aaiOpEnv.get().getOperationalEnvironmentId());
+	}
+	
+	@Test
+	public void testUpdateSuccess() { 
+		stubFor(post(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_ACCEPTED)));
+		
+		AAIOperationalEnvironment ecompEnv = new AAIOperationalEnvironment();
+		ecompEnv.setTenantContext("Test");
+		ecompEnv.setWorkloadContext("ECOMPL_PSL");
+		
+		try {
+			AAIClientHelper clientHelper = mock(AAIClientHelper.class);
+			doNothing().when(clientHelper).updateAaiOperationalEnvironment(any(String.class), any(AAIOperationalEnvironment.class));
+			clientHelper.updateAaiOperationalEnvironment("EMOE-001", ecompEnv);
+			
+			verify(clientHelper, times(1)).updateAaiOperationalEnvironment("EMOE-001", ecompEnv);
+		} catch(Exception e) {
+			fail("shouldn't reach here");
+		}
+	}
+	
+	@Test
+	public void testUpdateMapSuccess() { 
+		stubFor(post(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_ACCEPTED)));
+		
+		Map<String, String> payload = new HashMap<String, String>();
+		payload.put("tenant-context", "Test");
+		payload.put("workload-context", "ECOMPL_PSL");
+		
+		try {
+			AAIClientHelper clientHelper = mock(AAIClientHelper.class);
+			doNothing().when(clientHelper).updateAaiOperationalEnvironment("EMOE-001", payload);
+			clientHelper.updateAaiOperationalEnvironment("EMOE-001", payload);
+			
+			verify(clientHelper, times(1)).updateAaiOperationalEnvironment("EMOE-001", payload);
+		} catch(Exception e) {
+			fail("shouldn't reach here");
+		}
+	}	
+	
+	@Test
+	public void testCreateSuccess() { 
+		stubFor(put(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_ACCEPTED)));
+		
+		AAIOperationalEnvironment ecompEnv = new AAIOperationalEnvironment();
+		ecompEnv.setOperationalEnvironmentId("opeEvnId");
+		ecompEnv.setTenantContext("Test");
+		ecompEnv.setWorkloadContext("ECOMPL_PSL");
+		
+		try {
+			AAIClientHelper clientHelper = mock(AAIClientHelper.class);
+			doNothing().when(clientHelper).createOperationalEnvironment(any(AAIOperationalEnvironment.class));
+			clientHelper.createOperationalEnvironment(ecompEnv);
+			
+			verify(clientHelper, times(1)).createOperationalEnvironment(ecompEnv);
+		} catch(Exception e) {
+			fail("shouldn't reach here");
+		}
+	}
+	
+	@Test
+	public void testcreateRelationshipSuccess() { 
+		stubFor(put(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_ACCEPTED)));
+		
+		AAIOperationalEnvironment ecompEnv = new AAIOperationalEnvironment();
+		ecompEnv.setTenantContext("Test");
+		ecompEnv.setWorkloadContext("ECOMPL_PSL");
+		
+		try {
+			AAIClientHelper clientHelper = mock(AAIClientHelper.class);
+			doNothing().when(clientHelper).createRelationship(anyString(), anyString());
+			clientHelper.createRelationship("managingEcomp", "vnfOp");
+			
+			verify(clientHelper, times(1)).createRelationship("managingEcomp", "vnfOp");
+		} catch(Exception e) {
+			fail("shouldn't reach here");
+		}
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/helpers/AAIClientObjectBuilderTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/helpers/AAIClientObjectBuilderTest.java
new file mode 100644
index 0000000000..cf6facc59f
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/helpers/AAIClientObjectBuilderTest.java
@@ -0,0 +1,69 @@
+/*-
+ * ============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.apihandlerinfra.tenantisolation.helpers;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.so.apihandlerinfra.BaseTest;
+import org.onap.so.apihandlerinfra.tenantisolation.CloudOrchestrationRequest;
+import org.onap.so.apihandlerinfra.tenantisolationbeans.OperationalEnvironment;
+import org.onap.so.apihandlerinfra.tenantisolationbeans.RequestDetails;
+import org.onap.so.apihandlerinfra.tenantisolationbeans.RequestInfo;
+import org.onap.so.apihandlerinfra.tenantisolationbeans.RequestParameters;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class AAIClientObjectBuilderTest extends BaseTest{
+
+	private String expectedAAIObject = "{\"operational-environment-name\":\"TEST_ECOMP_ENVIRONMENT\",\"operational-environment-type\":\"ECOMP\",\"operational-environment-status\":\"Active\",\"tenant-context\":\"TEST\",\"workload-context\":\"ECOMP_TEST\"}";
+	private CloudOrchestrationRequest request;
+	private ObjectMapper mapper = new ObjectMapper();
+	
+	@Before
+    public void testSetUp() {
+		request = getCloudOrchestrationRequest();
+	}
+
+	public CloudOrchestrationRequest getCloudOrchestrationRequest() {
+		CloudOrchestrationRequest cor = new CloudOrchestrationRequest();
+		RequestDetails reqDetails = new RequestDetails();
+		RequestInfo reqInfo = new RequestInfo();
+		RequestParameters reqParams = new RequestParameters();
+		reqParams.setTenantContext("TEST");
+		reqParams.setWorkloadContext("ECOMP_TEST");
+		reqParams.setOperationalEnvironmentType(OperationalEnvironment.ECOMP);
+		reqInfo.setInstanceName("TEST_ECOMP_ENVIRONMENT");
+		reqDetails.setRequestInfo(reqInfo);
+		reqDetails.setRequestParameters(reqParams);
+		cor.setRequestDetails(reqDetails);
+		return cor;
+	}
+	
+	@Test
+	public void testGetAaiClientObjectBuilder() throws Exception {
+		AAIClientObjectBuilder builder = new AAIClientObjectBuilder();
+		assertEquals(expectedAAIObject, mapper.writeValueAsString(builder.buildAAIOperationalEnvironment("Active", request)));
+	}
+	
+	
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/helpers/ActivateVnfDBHelperTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/helpers/ActivateVnfDBHelperTest.java
new file mode 100644
index 0000000000..3e06275fca
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/helpers/ActivateVnfDBHelperTest.java
@@ -0,0 +1,142 @@
+/*-
+ * ============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.apihandlerinfra.tenantisolation.helpers;
+
+import static org.junit.Assert.assertThat;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.onap.so.apihandlerinfra.ApiHandlerApplication;
+import org.onap.so.apihandlerinfra.BaseTest;
+import org.onap.so.apihandlerinfra.tenantisolationbeans.DistributionStatus;
+import org.onap.so.db.request.beans.OperationalEnvDistributionStatus;
+import org.onap.so.db.request.beans.OperationalEnvServiceModelStatus;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
+
+
+public class ActivateVnfDBHelperTest extends BaseTest{
+
+	String operationalEnvironmentId = "TEST_operationalEnvironmentId";
+	String requestId = "TEST_requestId";
+	String origRequestId = "TEST_requestId";
+
+	String workloadContext1 = "TEST_workloadContext1";
+	String serviceModelVersionId1 = "TEST_serviceModelVersionId1";	
+	String distributionId1 = "TEST_distributionId1";
+	String errorReason = "ABORTED";
+	int retryCountThree = 3;
+	int retryCountZero = 0;
+	String recoveryActionRetry  = "RETRY";
+	String statusOk = DistributionStatus.DISTRIBUTION_COMPLETE_OK.toString();
+	String statusError = DistributionStatus.DISTRIBUTION_COMPLETE_ERROR.toString();
+	String statusSent = "SENT";
+
+	OperationalEnvDistributionStatus expectedDistStatus;
+	OperationalEnvServiceModelStatus expectedServiceModelStatus;	
+	
+	@Autowired
+	private ActivateVnfDBHelper dbHelper;
+	
+	@Before
+	public void testSetUp() {
+		// prepare expected OperationalEnvDistributionStatus object 
+		expectedDistStatus = new OperationalEnvDistributionStatus(); 
+		expectedDistStatus.setDistributionId(distributionId1);
+		expectedDistStatus.setOperationalEnvId(operationalEnvironmentId);
+		expectedDistStatus.setServiceModelVersionId(serviceModelVersionId1);
+		expectedDistStatus.setDistributionIdStatus(statusOk);
+		expectedDistStatus.setRequestId(requestId);
+		expectedDistStatus.setDistributionIdErrorReason("");
+
+		// prepare expected OperationalEnvServiceModelStatus object		
+		expectedServiceModelStatus = new OperationalEnvServiceModelStatus();
+		expectedServiceModelStatus.setRequestId(requestId);
+		expectedServiceModelStatus.setOperationalEnvId(operationalEnvironmentId);
+		expectedServiceModelStatus.setServiceModelVersionId(serviceModelVersionId1);
+		expectedServiceModelStatus.setServiceModelVersionDistrStatus(statusOk);
+		expectedServiceModelStatus.setRecoveryAction(recoveryActionRetry);
+		expectedServiceModelStatus.setRetryCount(new Integer(retryCountThree));
+		expectedServiceModelStatus.setWorkloadContext(workloadContext1);
+	}	
+	
+	@Test
+	public void testOperationalEnvDistributionStatusDbMethods() throws Exception {
+
+		// test insert method 
+		OperationalEnvDistributionStatus distStatus1 = 
+				dbHelper.insertRecordToOperationalEnvDistributionStatus(distributionId1, 
+																		operationalEnvironmentId, 
+																		serviceModelVersionId1,
+																		requestId,																		
+																		statusOk, 
+																		"");
+		assertThat(distStatus1, sameBeanAs(expectedDistStatus));		
+		
+		// prepare updated expected object
+		OperationalEnvDistributionStatus expectedUpdatedDistStatus = expectedDistStatus;
+		expectedUpdatedDistStatus.setDistributionIdStatus(statusError);
+		expectedUpdatedDistStatus.setDistributionIdErrorReason(errorReason);		
+		
+		// test update method - statusOk to statusError
+		OperationalEnvDistributionStatus distStatus2 = 
+				dbHelper.updateStatusInOperationalEnvDistributionStatus(distStatus1, 
+																		statusError,
+																		errorReason
+																		);
+		assertThat(distStatus2, sameBeanAs(expectedUpdatedDistStatus));
+	
+	}
+
+	@Test
+	public void testOperationalEnvServiceModelStatusDbMethods() throws Exception {
+
+		// test insert method  
+		OperationalEnvServiceModelStatus serviceModelStatus1 = 
+				dbHelper.insertRecordToOperationalEnvServiceModelStatus(requestId, 
+																		operationalEnvironmentId, 
+																		serviceModelVersionId1, 
+																		statusOk, 
+																		recoveryActionRetry, 
+																		retryCountThree, 
+																		workloadContext1);
+		assertThat(serviceModelStatus1, sameBeanAs(expectedServiceModelStatus));
+		
+		// prepare updated expected object		
+		OperationalEnvServiceModelStatus expectedUpdatedServiceModelStatus = serviceModelStatus1;
+		expectedUpdatedServiceModelStatus.setServiceModelVersionDistrStatus(statusError);
+		expectedUpdatedServiceModelStatus.setRetryCount(new Integer(retryCountZero));
+		
+		// test update method - update statusOk to statusError & retryCountThree to retryCountZero   
+		OperationalEnvServiceModelStatus serviceModelStatus2 = 
+				dbHelper.updateRetryCountAndStatusInOperationalEnvServiceModelStatus(serviceModelStatus1, 
+																					 statusError, 
+																					 retryCountZero);
+		assertThat(serviceModelStatus2, sameBeanAs(expectedUpdatedServiceModelStatus));	
+	
+	}	
+	
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/helpers/SDCClientHelperTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/helpers/SDCClientHelperTest.java
new file mode 100644
index 0000000000..7fd92d2d7e
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/helpers/SDCClientHelperTest.java
@@ -0,0 +1,194 @@
+/*-
+ * ============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.apihandlerinfra.tenantisolation.helpers;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import org.apache.http.HttpStatus;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.Test;
+import org.onap.so.apihandlerinfra.BaseTest;
+import org.onap.so.apihandlerinfra.exceptions.ApiException;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class SDCClientHelperTest extends BaseTest{
+
+	String serviceModelVersionId = "TEST_uuid1";
+	String operationalEnvironmentId = "TEST_operationalEnvironmentId";
+	String workloadContext = "TEST_workloadContext";
+
+	@Autowired 
+	private SDCClientHelper sdcClientUtils;		
+	
+	@Test
+	public void postActivateOperationalEnvironment_Test() throws ApiException {
+
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("statusCode", "202");
+		jsonObject.put("message", "Success");
+		jsonObject.put("distributionId", "TEST_distributionId");
+		
+		stubFor(post(urlPathMatching("/sdc/v1/catalog/services/TEST_uuid1/distr.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(jsonObject.toString()).withStatus(HttpStatus.SC_ACCEPTED)));
+		
+	    JSONObject jsonResponse = sdcClientUtils.postActivateOperationalEnvironment(serviceModelVersionId, operationalEnvironmentId, workloadContext);
+	    
+	    assertEquals("202", jsonResponse.get("statusCode"));
+	    assertEquals("Success", jsonResponse.get("message"));
+
+	}		
+	
+	@Test
+	public void postActivateOperationalEnvironment_InvalidJson_Test() throws ApiException {
+		
+		// ERROR in asdc response, invalid json object
+		JSONObject jsonErrorResponse = new JSONObject();
+		jsonErrorResponse.put("requestError", ""); 
+		
+		stubFor(post(urlPathMatching("/sdc/v1/catalog/services/TEST_uuid1/distr.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(jsonErrorResponse.toString()).withStatus(HttpStatus.SC_BAD_REQUEST)));
+		
+	    JSONObject jsonResponse = sdcClientUtils.postActivateOperationalEnvironment(serviceModelVersionId, operationalEnvironmentId, workloadContext);
+	    
+	    assertEquals("500", jsonResponse.get("statusCode"));
+	    assertEquals("", jsonResponse.get("messageId"));
+	    assertEquals(" Encountered Error while calling SDC POST Activate. JSONObject[\"requestError\"] is not a JSONObject.", jsonResponse.get("message"));
+
+	}		
+	
+	@Test
+	public void buildUriBuilderTest() {
+		
+		try {  
+		String url = sdcClientUtils.buildUriBuilder(serviceModelVersionId, operationalEnvironmentId);
+			assertEquals("http://localhost:" + env.getProperty("wiremock.server.port") + "/sdc/v1/catalog/services/TEST_uuid1/distribution/TEST_operationalEnvironmentId/activate", url);
+			
+		} catch (Exception e) {
+			fail("Exception caught: " + e.getMessage());
+
+		}	
+	}	
+
+	
+	@Test
+	public void buildJsonWorkloadContextTest() throws JSONException {
+		
+			String jsonPayload = sdcClientUtils.buildJsonWorkloadContext(workloadContext);
+			assertEquals("{\"workloadContext\":\"TEST_workloadContext\"}", jsonPayload);
+			
+	}		
+	
+	@Test
+	public void enhanceJsonResponseTest_Success() throws JSONException {
+		
+			// build success response data
+			JSONObject sdcResponseJsonObj = new JSONObject();
+			sdcResponseJsonObj.put("distributionId", "TEST_distributionId");
+
+			int statusCode = 202;
+			sdcResponseJsonObj = sdcClientUtils.enhanceJsonResponse(sdcResponseJsonObj, statusCode);
+			
+			assertEquals("202", sdcResponseJsonObj.getString("statusCode"));
+			assertEquals("", sdcResponseJsonObj.getString("messageId"));
+			assertEquals("Success", sdcResponseJsonObj.getString("message"));
+			assertEquals("TEST_distributionId", sdcResponseJsonObj.getString("distributionId"));
+			
+	}	
+	
+	@Test
+	public void enhanceJsonResponseTest_Error() throws JSONException {
+		
+			// build error response data
+			JSONObject jsonMessages = new JSONObject();
+			jsonMessages.put("messageId", "SVC4675");
+			jsonMessages.put("text", "Error: Service state is invalid for this action.");
+			JSONObject jsonServException = new JSONObject();
+			jsonServException.put("serviceException", jsonMessages);
+			JSONObject jsonErrorRequest = new JSONObject();
+			jsonErrorRequest.put("requestError", jsonServException);
+
+			String responseData =  jsonErrorRequest.toString();
+			
+			JSONObject sdcResponseJsonObj = new JSONObject(responseData);
+			int statusCode = 409;
+			sdcResponseJsonObj = sdcClientUtils.enhanceJsonResponse(sdcResponseJsonObj, statusCode);
+			
+			assertEquals("409", sdcResponseJsonObj.getString("statusCode"));
+			assertEquals("SVC4675", sdcResponseJsonObj.getString("messageId"));
+			assertEquals("Error: Service state is invalid for this action.", sdcResponseJsonObj.getString("message"));
+			
+	}		
+
+	@Test
+	public void enhanceJsonResponseTest_Error_policyException() throws JSONException {
+		
+			// build error response data
+			JSONObject jsonMessages = new JSONObject();
+			jsonMessages.put("messageId", "POL5003");
+			jsonMessages.put("text", "Error: Not authorized to use the API.");
+			JSONObject jsonServException = new JSONObject();
+			jsonServException.put("policyException", jsonMessages);
+			JSONObject jsonErrorRequest = new JSONObject();
+			jsonErrorRequest.put("requestError", jsonServException);
+
+			String responseData =  jsonErrorRequest.toString();
+			
+			JSONObject sdcResponseJsonObj = new JSONObject(responseData);
+			int statusCode = 403;
+			sdcResponseJsonObj = sdcClientUtils.enhanceJsonResponse(sdcResponseJsonObj, statusCode);
+			
+			assertEquals("403", sdcResponseJsonObj.getString("statusCode"));
+			assertEquals("POL5003", sdcResponseJsonObj.getString("messageId"));
+			assertEquals("Error: Not authorized to use the API.", sdcResponseJsonObj.getString("message"));
+			
+	}			
+	
+	@Test
+	public void enhanceJsonResponseTest_Error_UnexpectedFormat() throws JSONException {
+		
+			// build error response data
+			JSONObject jsonMessages = new JSONObject();
+			jsonMessages.put("messageId", "POL5003");
+			jsonMessages.put("text", "Error: Not authorized to use the API.");
+			JSONObject jsonServException = new JSONObject();
+			jsonServException.put("policyException", jsonMessages);
+			JSONObject jsonErrorRequest = new JSONObject();
+			jsonErrorRequest.put("unexpectedResponseTag", jsonServException);
+
+			String responseData =  jsonErrorRequest.toString();
+			
+			JSONObject sdcResponseJsonObj = new JSONObject(responseData);
+			int statusCode = 403;
+			sdcResponseJsonObj = sdcClientUtils.enhanceJsonResponse(sdcResponseJsonObj, statusCode);
+			
+			assertEquals("500", sdcResponseJsonObj.getString("statusCode"));
+			assertEquals("Undefined Error Message!", sdcResponseJsonObj.getString("messageId"));
+			assertEquals("Unexpected response format from SDC.", sdcResponseJsonObj.getString("message"));
+	
+	}		
+	
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/ActivateVnfOperationalEnvironmentTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/ActivateVnfOperationalEnvironmentTest.java
new file mode 100644
index 0000000000..3c991ef0c5
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/ActivateVnfOperationalEnvironmentTest.java
@@ -0,0 +1,238 @@
+/*-
+ * ============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.apihandlerinfra.tenantisolation.process;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.http.HttpStatus;
+import org.json.JSONObject;
+import org.junit.After;
+import org.junit.Test;
+import org.onap.so.apihandlerinfra.BaseTest;
+import org.onap.so.apihandlerinfra.tenantisolation.CloudOrchestrationRequest;
+import org.onap.so.apihandlerinfra.tenantisolation.helpers.AAIClientHelper;
+import org.onap.so.apihandlerinfra.tenantisolationbeans.Manifest;
+import org.onap.so.apihandlerinfra.tenantisolationbeans.RecoveryAction;
+import org.onap.so.apihandlerinfra.tenantisolationbeans.RequestDetails;
+import org.onap.so.apihandlerinfra.tenantisolationbeans.RequestParameters;
+import org.onap.so.apihandlerinfra.tenantisolationbeans.ServiceModelList;
+import org.onap.so.client.aai.AAIVersion;
+import org.onap.so.client.aai.entities.AAIResultWrapper;
+import org.onap.so.client.aai.objects.AAIOperationalEnvironment;
+import org.onap.so.db.request.beans.InfraActiveRequests;
+import org.onap.so.db.request.beans.OperationalEnvDistributionStatus;
+import org.onap.so.db.request.beans.OperationalEnvServiceModelStatus;
+import org.onap.so.db.request.data.repository.InfraActiveRequestsRepository;
+import org.onap.so.db.request.data.repository.OperationalEnvDistributionStatusRepository;
+import org.onap.so.db.request.data.repository.OperationalEnvServiceModelStatusRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+public class ActivateVnfOperationalEnvironmentTest extends BaseTest{
+
+	@Autowired
+	private OperationalEnvDistributionStatusRepository distributionDbRepository;
+	@Autowired
+	private OperationalEnvServiceModelStatusRepository serviceModelDbRepository;
+	@Autowired
+	private ActivateVnfOperationalEnvironment activateVnf;
+	@Autowired
+	private InfraActiveRequestsRepository infraActiveRequestsRepository;	
+	@Autowired
+	private AAIClientHelper clientHelper;
+
+	String requestId = "TEST_requestId";
+	String operationalEnvironmentId = "EMOE-001";	
+	CloudOrchestrationRequest request = new CloudOrchestrationRequest();
+	String workloadContext = "PVT";
+	String recoveryActionRetry  = "RETRY";
+	String serviceModelVersionId = "TEST_serviceModelVersionId";	
+	int retryCount = 3;
+	String sdcDistributionId = "TEST_distributionId";
+	String statusSent = "SENT";
+
+	@After
+	public void after() throws Exception {
+		distributionDbRepository.deleteAll();
+		serviceModelDbRepository.deleteAll();		
+	}
+
+	@Test
+	public void getAAIOperationalEnvironmentTest() throws Exception {
+
+		AAIOperationalEnvironment aaiOpEnv = null;
+
+		stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withBodyFile("vnfoperenv/ecompOperationalEnvironment.json").withStatus(HttpStatus.SC_ACCEPTED)));
+		
+		AAIResultWrapper wrapper = clientHelper.getAaiOperationalEnvironment("EMOE-001");
+		aaiOpEnv = wrapper.asBean(AAIOperationalEnvironment.class).get();
+		assertEquals("EMOE-001", aaiOpEnv.getOperationalEnvironmentId());			
+		assertNotNull(activateVnf.getAAIOperationalEnvironment(operationalEnvironmentId));	
+		assertEquals( "EMOE-001", activateVnf.getAAIOperationalEnvironment(operationalEnvironmentId).getOperationalEnvironmentId());		
+		
+	}	
+		
+	@Test
+	public void executionTest() throws Exception {
+
+		List<ServiceModelList> serviceModelVersionIdList = new ArrayList<ServiceModelList>();
+		ServiceModelList serviceModelList1 = new ServiceModelList(); 
+		serviceModelList1.setRecoveryAction(RecoveryAction.retry);
+		serviceModelList1.setServiceModelVersionId(serviceModelVersionId);
+		serviceModelVersionIdList.add(serviceModelList1);
+		
+		RequestDetails requestDetails = new RequestDetails();
+		RequestParameters requestParameters = new RequestParameters();
+		Manifest manifest = new Manifest();
+		manifest.setServiceModelList(serviceModelVersionIdList);
+		requestParameters.setManifest(manifest);
+		requestParameters.setWorkloadContext(workloadContext);
+		requestDetails.setRequestParameters(requestParameters);
+		
+		request.setOperationalEnvironmentId(operationalEnvironmentId);
+		request.setRequestDetails(requestDetails);
+		
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("statusCode", "202");
+		jsonObject.put("message", "Success");
+		jsonObject.put("distributionId", sdcDistributionId);
+		
+		stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withBodyFile("vnfoperenv/ecompOperationalEnvironment.json").withStatus(HttpStatus.SC_ACCEPTED)));
+		stubFor(post(urlPathMatching("/sdc/v1/catalog/services/TEST_serviceModelVersionId/distr.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(jsonObject.toString()).withStatus(HttpStatus.SC_ACCEPTED)));
+		
+		
+		activateVnf.execute(requestId, request, distributionDbRepository, serviceModelDbRepository);
+		
+		// insert record, status sent
+		OperationalEnvDistributionStatus distStatus = distributionDbRepository.findOne(sdcDistributionId);
+		assertNotNull(distStatus);
+		assertEquals(operationalEnvironmentId, distStatus.getOperationalEnvId());
+		assertEquals(statusSent, distStatus.getDistributionIdStatus());
+		
+		// insert record, status sent		
+		OperationalEnvServiceModelStatus servStatus = serviceModelDbRepository.findOneByOperationalEnvIdAndServiceModelVersionId(operationalEnvironmentId, serviceModelVersionId);
+		assertNotNull(servStatus);
+		assertEquals(statusSent, servStatus.getServiceModelVersionDistrStatus());
+		assertEquals(operationalEnvironmentId, servStatus.getOperationalEnvId());
+
+	}			
+	
+	@Test
+	public void processActivateSDCRequestTest_202() throws Exception {
+
+		String distributionId = "TEST_distributionId";
+		
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("statusCode", "202");
+		jsonObject.put("message", "Success");
+		jsonObject.put("distributionId", distributionId);
+		
+		// prepare request detail
+		List<ServiceModelList> serviceModelVersionIdList = new ArrayList<ServiceModelList>();
+		ServiceModelList serviceModelList1 = new ServiceModelList(); 
+		serviceModelList1.setRecoveryAction(RecoveryAction.retry);
+		serviceModelList1.setServiceModelVersionId(serviceModelVersionId);
+		serviceModelVersionIdList.add(serviceModelList1);
+		
+		stubFor(post(urlPathMatching("/sdc/v1/catalog/services/TEST_serviceModelVersionId/distr.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(jsonObject.toString()).withStatus(HttpStatus.SC_ACCEPTED)));
+		
+		activateVnf.processActivateSDCRequest(requestId, operationalEnvironmentId, serviceModelVersionIdList, workloadContext, 
+													distributionDbRepository, serviceModelDbRepository);
+		
+		// insert record, status sent		
+		OperationalEnvDistributionStatus distStatus = distributionDbRepository.findOne(sdcDistributionId);
+		assertNotNull(distStatus);
+		assertEquals(operationalEnvironmentId, distStatus.getOperationalEnvId());
+		assertEquals(statusSent, distStatus.getDistributionIdStatus());		
+		
+		// insert record, status sent		
+		OperationalEnvServiceModelStatus servStatus = serviceModelDbRepository.findOneByOperationalEnvIdAndServiceModelVersionId(operationalEnvironmentId, serviceModelVersionId);
+		assertNotNull(servStatus);
+		assertEquals(statusSent, servStatus.getServiceModelVersionDistrStatus());
+		assertEquals(operationalEnvironmentId, servStatus.getOperationalEnvId());
+		
+	}	
+	
+	@Test 
+	public void processActivateSDCRequestTest_409() throws Exception {
+
+		// ERROR in asdc
+		JSONObject jsonMessages = new JSONObject();
+		jsonMessages.put("message", "Failure");
+		jsonMessages.put("messageId", "SVC4675");
+		jsonMessages.put("text", "Error: Service state is invalid for this action.");
+		JSONObject jsonServException = new JSONObject();
+		jsonServException.put("policyException", jsonMessages);
+		//jsonServException.put("serviceException", jsonMessages);
+		JSONObject jsonErrorResponse = new JSONObject();
+		jsonErrorResponse.put("requestError", jsonServException);
+		
+		// prepare request detail
+		List<ServiceModelList> serviceModelVersionIdList = new ArrayList<ServiceModelList>();
+		ServiceModelList serviceModelList1 = new ServiceModelList(); 
+		serviceModelList1.setRecoveryAction(RecoveryAction.retry);
+		serviceModelList1.setServiceModelVersionId(serviceModelVersionId);
+		serviceModelVersionIdList.add(serviceModelList1);
+		
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId(requestId);
+		iar.setRequestStatus("PENDING");
+		infraActiveRequestsRepository.saveAndFlush(iar);
+		
+		stubFor(post(urlPathMatching("/sdc/v1/catalog/services/TEST_serviceModelVersionId/distr.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(jsonErrorResponse.toString()).withStatus(HttpStatus.SC_CONFLICT)));
+		
+		try {
+			activateVnf.processActivateSDCRequest(requestId, operationalEnvironmentId, serviceModelVersionIdList, workloadContext, 
+													distributionDbRepository, serviceModelDbRepository);
+			
+		} catch (Exception  ex) {
+			
+			// insert record, status sent
+			OperationalEnvServiceModelStatus servStatus = serviceModelDbRepository.findOneByOperationalEnvIdAndServiceModelVersionId(operationalEnvironmentId, serviceModelVersionId);
+			assertNotNull(servStatus);
+			assertEquals(statusSent, servStatus.getServiceModelVersionDistrStatus());
+			
+			InfraActiveRequests infraActiveRequest = infraActiveRequestsRepository.findOne(requestId);
+			assertNotNull(infraActiveRequest);
+			assertTrue(infraActiveRequest.getStatusMessage().contains("FAILURE"));
+			assertTrue(infraActiveRequest.getRequestStatus().contains("FAILED"));			
+			
+		}  
+		
+		infraActiveRequestsRepository.delete(requestId);
+	}		
+	
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/ActivateVnfStatusOperationalEnvironmentTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/ActivateVnfStatusOperationalEnvironmentTest.java
new file mode 100644
index 0000000000..3dcac0da18
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/ActivateVnfStatusOperationalEnvironmentTest.java
@@ -0,0 +1,640 @@
+/*-
+ * ============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.apihandlerinfra.tenantisolation.process;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;
+import static org.hamcrest.Matchers.startsWith;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.http.HttpStatus;
+import org.json.JSONObject;
+import org.junit.After;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.onap.so.apihandler.common.ErrorNumbers;
+import org.onap.so.apihandlerinfra.BaseTest;
+import org.onap.so.apihandlerinfra.exceptions.ApiException;
+import org.onap.so.apihandlerinfra.tenantisolation.CloudOrchestrationRequest;
+import org.onap.so.apihandlerinfra.tenantisolation.helpers.ActivateVnfDBHelper;
+import org.onap.so.apihandlerinfra.tenantisolationbeans.Distribution;
+import org.onap.so.apihandlerinfra.tenantisolationbeans.DistributionStatus;
+import org.onap.so.apihandlerinfra.tenantisolationbeans.Status;
+import org.onap.so.db.request.beans.InfraActiveRequests;
+import org.onap.so.db.request.beans.OperationalEnvDistributionStatus;
+import org.onap.so.db.request.beans.OperationalEnvServiceModelStatus;
+import org.onap.so.db.request.data.repository.InfraActiveRequestsRepository;
+import org.onap.so.db.request.data.repository.OperationalEnvDistributionStatusRepository;
+import org.onap.so.db.request.data.repository.OperationalEnvServiceModelStatusRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class ActivateVnfStatusOperationalEnvironmentTest extends BaseTest{
+
+	@Autowired
+	private OperationalEnvDistributionStatusRepository distributionDbRepository;
+	@Autowired
+	private OperationalEnvServiceModelStatusRepository serviceModelDbRepository;
+	@Autowired
+	private ActivateVnfStatusOperationalEnvironment activateVnfStatus;
+	@Autowired
+	private InfraActiveRequestsRepository infraActiveRequestsRepository;
+	@Autowired
+	private ActivateVnfDBHelper dbHelper;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+	private String requestId = "TEST_requestId";
+	private String requestIdOrig = "TEST_requestIdOrig";	
+	private String operationalEnvironmentId = "TEST_operationalEnvironmentId";	
+	private CloudOrchestrationRequest request = new CloudOrchestrationRequest();
+	private String workloadContext = "TEST_workloadContext";
+	private String recoveryActionRetry  = "RETRY";
+	private String recoveryActionAbort  = "ABORT";
+	private String recoveryActionSkip  = "SKIP";
+	private String serviceModelVersionId = "TEST_serviceModelVersionId";
+	private String serviceModelVersionId1 = "TEST_serviceModelVersionId1";	
+	private int retryCountThree = 3;
+	private int retryCountTwo = 2;	
+	private int retryCountZero = 0;	
+	private String sdcDistributionId = "TEST_distributionId";
+	private String sdcDistributionId1 = "TEST_distributionId1";	
+	private String statusOk = Status.DISTRIBUTION_COMPLETE_OK.toString();
+	private String statusError = DistributionStatus.DISTRIBUTION_COMPLETE_ERROR.toString();
+	private String statusSent = "SENT";
+	 
+	@After
+	public void after() throws Exception {
+		distributionDbRepository.deleteAll();
+		serviceModelDbRepository.deleteAll();		
+	}
+
+	@Test
+	public void checkOrUpdateOverallStatusTest_Ok() throws Exception {
+		
+		// two entries, both status Ok & retry 0
+		OperationalEnvServiceModelStatus serviceModelDb = new OperationalEnvServiceModelStatus();
+		serviceModelDb.setRequestId(requestIdOrig);
+		serviceModelDb.setServiceModelVersionId(serviceModelVersionId);
+		serviceModelDb.setWorkloadContext(workloadContext);
+		serviceModelDb.setRecoveryAction(recoveryActionRetry);
+		serviceModelDb.setOperationalEnvId(operationalEnvironmentId);
+		serviceModelDb.setRetryCount(retryCountZero);
+		serviceModelDb.setServiceModelVersionDistrStatus(statusOk);
+		serviceModelDbRepository.saveAndFlush(serviceModelDb);
+		
+		serviceModelDb.setRequestId(requestIdOrig);
+		serviceModelDb.setServiceModelVersionId(serviceModelVersionId1);
+		serviceModelDb.setWorkloadContext(workloadContext);
+		serviceModelDb.setRecoveryAction(recoveryActionRetry);
+		serviceModelDb.setOperationalEnvId(operationalEnvironmentId);
+		serviceModelDb.setRetryCount(retryCountZero);
+		serviceModelDb.setServiceModelVersionDistrStatus(statusOk);
+		serviceModelDbRepository.saveAndFlush(serviceModelDb);	
+		
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId(requestIdOrig);
+		iar.setRequestStatus("PENDING");
+		infraActiveRequestsRepository.saveAndFlush(iar);
+		
+		activateVnfStatus.checkOrUpdateOverallStatus(operationalEnvironmentId, requestIdOrig, serviceModelDbRepository);
+		
+		// overall is success
+		InfraActiveRequests infraActiveRequest = infraActiveRequestsRepository.findOne(requestIdOrig);
+		assertNotNull(infraActiveRequest);
+		assertTrue(infraActiveRequest.getStatusMessage().contains("SUCCESSFUL"));
+		assertTrue(infraActiveRequest.getRequestStatus().contains("COMPLETE"));
+		
+		// cleanup
+		infraActiveRequestsRepository.delete(requestIdOrig);		
+	}
+
+	@Test
+	public void checkOrUpdateOverallStatusTest_Error() throws Exception {
+		
+		OperationalEnvServiceModelStatus serviceModelDb = new OperationalEnvServiceModelStatus();
+		serviceModelDb.setRequestId(requestIdOrig);
+		serviceModelDb.setServiceModelVersionId(serviceModelVersionId);
+		serviceModelDb.setWorkloadContext(workloadContext);
+		serviceModelDb.setRecoveryAction(recoveryActionRetry);
+		serviceModelDb.setOperationalEnvId(operationalEnvironmentId);
+		serviceModelDb.setRetryCount(retryCountZero);
+		serviceModelDb.setServiceModelVersionDistrStatus(statusError);
+		serviceModelDbRepository.saveAndFlush(serviceModelDb);
+		
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId(requestIdOrig);
+		iar.setRequestStatus("PENDING");
+		infraActiveRequestsRepository.saveAndFlush(iar);
+
+        try {
+            activateVnfStatus.checkOrUpdateOverallStatus(operationalEnvironmentId, requestIdOrig, serviceModelDbRepository);
+        }catch(ApiException e){
+            assertThat(e.getMessage(), startsWith("Overall Activation process is a Failure. "));
+            assertEquals(e.getHttpResponseCode(), HttpStatus.SC_BAD_REQUEST);
+            assertEquals(e.getMessageID(), ErrorNumbers.SVC_DETAILED_SERVICE_ERROR);
+        }
+		
+		// overall is failure
+		InfraActiveRequests infraActiveRequest = infraActiveRequestsRepository.findOne(requestIdOrig);
+		assertNotNull(infraActiveRequest);
+		assertTrue(infraActiveRequest.getStatusMessage().contains("FAILURE"));
+		assertTrue(infraActiveRequest.getRequestStatus().contains("FAILED"));
+		
+		// cleanup		
+		infraActiveRequestsRepository.delete(requestIdOrig);
+	}	
+	
+	@Test
+	public void checkOrUpdateOverallStatusTest_Waiting() throws Exception {
+		
+		OperationalEnvServiceModelStatus serviceModelDb = new OperationalEnvServiceModelStatus();
+		serviceModelDb.setRequestId(requestIdOrig);
+		serviceModelDb.setServiceModelVersionId(serviceModelVersionId);
+		serviceModelDb.setWorkloadContext(workloadContext);
+		serviceModelDb.setRecoveryAction(recoveryActionRetry);
+		serviceModelDb.setOperationalEnvId(operationalEnvironmentId);
+		serviceModelDb.setRetryCount(retryCountTwo);
+		serviceModelDb.setServiceModelVersionDistrStatus(statusError);
+		serviceModelDbRepository.saveAndFlush(serviceModelDb);
+		
+		activateVnfStatus.checkOrUpdateOverallStatus(operationalEnvironmentId, requestIdOrig, serviceModelDbRepository);
+		
+		// do nothing, waiting for more
+		assertNull(infraActiveRequestsRepository.findOne(requestIdOrig));
+	}		
+	
+	@Test
+	public void executionTest_Ok() throws Exception {
+		
+		OperationalEnvServiceModelStatus serviceModelDb = new OperationalEnvServiceModelStatus();
+		serviceModelDb.setRequestId(requestIdOrig);
+		serviceModelDb.setServiceModelVersionId(serviceModelVersionId);
+		serviceModelDb.setWorkloadContext(workloadContext);
+		serviceModelDb.setRecoveryAction(recoveryActionRetry);
+		serviceModelDb.setOperationalEnvId(operationalEnvironmentId);
+		serviceModelDb.setRetryCount(retryCountThree);
+		serviceModelDb.setServiceModelVersionDistrStatus(statusSent);
+		serviceModelDbRepository.saveAndFlush(serviceModelDb);
+
+		OperationalEnvDistributionStatus distributionDb = new OperationalEnvDistributionStatus();
+		distributionDb.setDistributionId(sdcDistributionId);
+		distributionDb.setRequestId(requestIdOrig);
+		distributionDb.setOperationalEnvId(operationalEnvironmentId);
+		distributionDb.setDistributionIdStatus(statusSent);
+		distributionDb.setServiceModelVersionId(serviceModelVersionId);
+		distributionDb.setDistributionIdErrorReason(null);
+		distributionDbRepository.saveAndFlush(distributionDb);
+		
+		
+		
+		// prepare distribution obj
+		Distribution distribution = new Distribution();
+		distribution.setStatus(Status.DISTRIBUTION_COMPLETE_OK);
+		request.setDistribution(distribution);
+		request.setDistributionId(sdcDistributionId);
+		request.setOperationalEnvironmentId(operationalEnvironmentId);
+		
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId(requestIdOrig);
+		iar.setRequestStatus("PENDING");
+		infraActiveRequestsRepository.saveAndFlush(iar);
+		
+		activateVnfStatus.execute(requestId, request, distributionDbRepository, serviceModelDbRepository);		
+		
+		// status ok
+		OperationalEnvDistributionStatus distStatus = distributionDbRepository.findOne(sdcDistributionId);
+		assertNotNull(distStatus);
+		assertEquals(operationalEnvironmentId, distStatus.getOperationalEnvId());
+		assertEquals(statusOk, distStatus.getDistributionIdStatus());
+		assertEquals("", distStatus.getDistributionIdErrorReason());		
+		
+		// status ok		
+		OperationalEnvServiceModelStatus servStatus = serviceModelDbRepository.findOneByOperationalEnvIdAndServiceModelVersionId(operationalEnvironmentId, serviceModelVersionId);
+		assertNotNull(servStatus);
+		assertEquals(operationalEnvironmentId, servStatus.getOperationalEnvId());
+		assertEquals(statusOk, servStatus.getServiceModelVersionDistrStatus());		
+		assertEquals(new Integer(retryCountZero), servStatus.getRetryCount());
+		
+		InfraActiveRequests infraActiveRequest = infraActiveRequestsRepository.findOne(requestIdOrig);
+		assertNotNull(infraActiveRequest);
+		assertTrue(infraActiveRequest.getStatusMessage().contains("SUCCESSFUL"));
+		assertTrue(infraActiveRequest.getRequestStatus().contains("COMPLETE"));
+		
+		// cleanup		
+		infraActiveRequestsRepository.delete(requestIdOrig);
+		
+	}				
+	
+	@Test
+	public void executionTest_ERROR_Status_And_RETRY() throws Exception {
+		
+		OperationalEnvServiceModelStatus serviceModelDb = new OperationalEnvServiceModelStatus();
+		serviceModelDb.setRequestId(requestIdOrig);
+		serviceModelDb.setServiceModelVersionId(serviceModelVersionId);
+		serviceModelDb.setWorkloadContext(workloadContext);
+		serviceModelDb.setRecoveryAction(recoveryActionRetry);
+		serviceModelDb.setOperationalEnvId(operationalEnvironmentId);
+		serviceModelDb.setRetryCount(retryCountThree);
+		serviceModelDb.setServiceModelVersionDistrStatus(statusError);
+		serviceModelDbRepository.saveAndFlush(serviceModelDb);
+		
+		OperationalEnvDistributionStatus distributionDb = new OperationalEnvDistributionStatus();
+		distributionDb.setDistributionId(sdcDistributionId);
+		distributionDb.setRequestId(requestIdOrig);
+		distributionDb.setOperationalEnvId(operationalEnvironmentId);
+		distributionDb.setDistributionIdStatus(statusError);
+		distributionDb.setServiceModelVersionId(serviceModelVersionId);
+		distributionDb.setDistributionIdErrorReason(null);
+		distributionDbRepository.saveAndFlush(distributionDb);
+		
+		
+		
+		// prepare new distribution obj
+		Distribution distribution = new Distribution();
+		distribution.setStatus(Status.DISTRIBUTION_COMPLETE_ERROR);
+		distribution.setErrorReason("Unable to process.");
+		request.setDistribution(distribution);
+		request.setDistributionId(sdcDistributionId);
+		request.setOperationalEnvironmentId(operationalEnvironmentId);
+		
+		// prepare sdc return data
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("statusCode", "202");
+		jsonObject.put("message", "Success");
+		jsonObject.put("distributionId", sdcDistributionId1);
+		
+		stubFor(post(urlPathMatching("/sdc/v1/catalog/services/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(jsonObject.toString()).withStatus(HttpStatus.SC_ACCEPTED)));
+		
+		activateVnfStatus.execute(requestId, request, distributionDbRepository, serviceModelDbRepository);	
+		
+		// old distributionId, status error
+		OperationalEnvDistributionStatus distStatus = distributionDbRepository.findOne(sdcDistributionId);
+		assertNotNull(distStatus);
+		assertEquals(operationalEnvironmentId, distStatus.getOperationalEnvId());
+		assertEquals(statusError, distStatus.getDistributionIdStatus());
+		assertEquals("Unable to process.", distStatus.getDistributionIdErrorReason());		
+		
+		// new distributionId, status sent
+		OperationalEnvDistributionStatus newDistStatus = distributionDbRepository.findOne(sdcDistributionId1);
+		assertNotNull(distStatus);
+		assertEquals(operationalEnvironmentId, newDistStatus.getOperationalEnvId());
+		assertEquals(statusSent, newDistStatus.getDistributionIdStatus());
+		assertEquals("", newDistStatus.getDistributionIdErrorReason());		
+
+		// count is less 1, status sent
+		OperationalEnvServiceModelStatus servStatus = serviceModelDbRepository.findOneByOperationalEnvIdAndServiceModelVersionId(operationalEnvironmentId, serviceModelVersionId);
+		assertNotNull(servStatus);
+		assertEquals(operationalEnvironmentId, servStatus.getOperationalEnvId());
+		assertEquals(statusSent, servStatus.getServiceModelVersionDistrStatus());		
+		assertEquals(new Integer(retryCountTwo), servStatus.getRetryCount());		
+		
+		// no update 
+		assertNull(infraActiveRequestsRepository.findOne(requestIdOrig));
+		
+	}
+
+	@Test
+	public void executionTest_ERROR_Status_And_RETRY_And_RetryZero() throws Exception {
+		
+		OperationalEnvServiceModelStatus serviceModelDb = new OperationalEnvServiceModelStatus();
+		serviceModelDb.setRequestId(requestIdOrig);
+		serviceModelDb.setServiceModelVersionId(serviceModelVersionId);
+		serviceModelDb.setWorkloadContext(workloadContext);
+		serviceModelDb.setRecoveryAction(recoveryActionRetry);
+		serviceModelDb.setOperationalEnvId(operationalEnvironmentId);
+		serviceModelDb.setRetryCount(retryCountZero);
+		serviceModelDb.setServiceModelVersionDistrStatus(statusError);
+		serviceModelDbRepository.saveAndFlush(serviceModelDb);
+		
+		OperationalEnvDistributionStatus distributionDb = new OperationalEnvDistributionStatus();
+		distributionDb.setDistributionId(sdcDistributionId);
+		distributionDb.setRequestId(requestIdOrig);
+		distributionDb.setOperationalEnvId(operationalEnvironmentId);
+		distributionDb.setDistributionIdStatus(statusError);
+		distributionDb.setServiceModelVersionId(serviceModelVersionId);
+		distributionDb.setDistributionIdErrorReason(null);
+		distributionDbRepository.saveAndFlush(distributionDb);
+		
+	
+		
+		// prepare distribution obj
+		Distribution distribution = new Distribution();
+		distribution.setStatus(Status.DISTRIBUTION_COMPLETE_ERROR);
+		request.setDistribution(distribution);
+		request.setDistributionId(sdcDistributionId);
+		request.setOperationalEnvironmentId(operationalEnvironmentId);
+		
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("statusCode", "202");
+		jsonObject.put("message", "Success");
+		jsonObject.put("distributionId", sdcDistributionId);
+		
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId(requestIdOrig);
+		iar.setRequestStatus("PENDING");
+		infraActiveRequestsRepository.saveAndFlush(iar);
+		
+		stubFor(post(urlPathMatching("/sdc/v1/catalog/services/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(jsonObject.toString()).withStatus(HttpStatus.SC_ACCEPTED)));
+
+        try {
+            activateVnfStatus.execute(requestId, request, distributionDbRepository, serviceModelDbRepository);
+        }catch(ApiException e){
+            assertThat(e.getMessage(), startsWith("Overall Activation process is a Failure. "));
+            assertEquals(e.getHttpResponseCode(), HttpStatus.SC_BAD_REQUEST);
+            assertEquals(e.getMessageID(), ErrorNumbers.SVC_DETAILED_SERVICE_ERROR);
+        }
+
+		OperationalEnvDistributionStatus distStatus = distributionDbRepository.findOne(sdcDistributionId);
+		assertNotNull(distStatus);
+		assertEquals(operationalEnvironmentId, distStatus.getOperationalEnvId());
+		assertEquals(statusError, distStatus.getDistributionIdStatus());
+		assertEquals(null, distStatus.getDistributionIdErrorReason());		
+		
+		OperationalEnvServiceModelStatus servStatus = serviceModelDbRepository.findOneByOperationalEnvIdAndServiceModelVersionId(operationalEnvironmentId, serviceModelVersionId);
+		assertNotNull(servStatus);
+		assertEquals(operationalEnvironmentId, servStatus.getOperationalEnvId());
+		assertEquals(statusError, servStatus.getServiceModelVersionDistrStatus());		
+		assertEquals(new Integer(retryCountZero), servStatus.getRetryCount());		
+
+		// Retry count is zero, no more retry. all retry failed. 
+		InfraActiveRequests infraActiveRequest = infraActiveRequestsRepository.findOne(requestIdOrig);
+		assertNotNull(infraActiveRequest);
+		assertTrue(infraActiveRequest.getStatusMessage().contains("FAILURE"));
+		assertTrue(infraActiveRequest.getRequestStatus().contains("FAILED"));
+		
+		// cleanup		
+		infraActiveRequestsRepository.delete(requestIdOrig);		
+		
+	}	
+	
+	@Test
+	public void executionTest_ERROR_Status_And_RETRY_And_ErrorSdc() throws Exception {
+		
+		OperationalEnvServiceModelStatus serviceModelDb = new OperationalEnvServiceModelStatus();
+		serviceModelDb.setRequestId(requestIdOrig);
+		serviceModelDb.setServiceModelVersionId(serviceModelVersionId);
+		serviceModelDb.setWorkloadContext(workloadContext);
+		serviceModelDb.setRecoveryAction(recoveryActionRetry);
+		serviceModelDb.setOperationalEnvId(operationalEnvironmentId);
+		serviceModelDb.setRetryCount(retryCountThree);
+		serviceModelDb.setServiceModelVersionDistrStatus(statusError);
+		serviceModelDbRepository.saveAndFlush(serviceModelDb);
+		
+		OperationalEnvDistributionStatus distributionDb = new OperationalEnvDistributionStatus();
+		distributionDb.setDistributionId(sdcDistributionId);
+		distributionDb.setRequestId(requestIdOrig);
+		distributionDb.setOperationalEnvId(operationalEnvironmentId);
+		distributionDb.setDistributionIdStatus(statusError);
+		distributionDb.setServiceModelVersionId(serviceModelVersionId);
+		distributionDb.setDistributionIdErrorReason(null);
+		distributionDbRepository.saveAndFlush(distributionDb);
+		
+		
+		
+		// prepare distribution obj
+		Distribution distribution = new Distribution();
+		distribution.setStatus(Status.DISTRIBUTION_COMPLETE_ERROR);
+		distribution.setErrorReason("Unable to process.");
+		request.setDistribution(distribution);
+		request.setDistributionId(sdcDistributionId);
+		request.setOperationalEnvironmentId(operationalEnvironmentId);
+		
+		// ERROR in sdc
+		JSONObject jsonMessages = new JSONObject();
+		jsonMessages.put("statusCode", "409");
+		jsonMessages.put("message", "Undefined Error Message!");
+		jsonMessages.put("messageId", "SVC4675");
+		jsonMessages.put("text", "Error: Service state is invalid for this action.");
+		JSONObject jsonServException = new JSONObject();
+		jsonServException.put("serviceException", jsonMessages);
+		JSONObject jsonErrorRequest = new JSONObject();
+		jsonErrorRequest.put("requestError", jsonServException);
+		
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId(requestIdOrig);
+		iar.setRequestStatus("PENDING");
+		infraActiveRequestsRepository.saveAndFlush(iar);
+		
+		stubFor(post(urlPathMatching("/sdc/v1/catalog/services/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(jsonMessages.toString()).withStatus(HttpStatus.SC_CONFLICT)));
+
+		try {
+            activateVnfStatus.execute(requestId, request, distributionDbRepository, serviceModelDbRepository);
+        }catch(ApiException e){
+            assertThat(e.getMessage(), startsWith("Failure calling SDC: statusCode: "));
+            assertEquals(e.getHttpResponseCode(), HttpStatus.SC_BAD_REQUEST);
+            assertEquals(e.getMessageID(), ErrorNumbers.SVC_DETAILED_SERVICE_ERROR);
+        }
+		// status as-is / no changes
+		OperationalEnvDistributionStatus distStatus = distributionDbRepository.findOne(sdcDistributionId);
+		assertNotNull(distStatus);
+		assertEquals(operationalEnvironmentId, distStatus.getOperationalEnvId());
+		assertEquals(statusError, distStatus.getDistributionIdStatus());
+		assertEquals(null, distStatus.getDistributionIdErrorReason());		
+		
+		// status as-is / no changes		
+		OperationalEnvServiceModelStatus servStatus = serviceModelDbRepository.findOneByOperationalEnvIdAndServiceModelVersionId(operationalEnvironmentId, serviceModelVersionId);
+		assertNotNull(servStatus);
+		assertEquals(operationalEnvironmentId, servStatus.getOperationalEnvId());
+		assertEquals(statusError, servStatus.getServiceModelVersionDistrStatus());		
+		assertEquals(new Integer(retryCountThree), servStatus.getRetryCount());
+		
+		InfraActiveRequests infraActiveRequest = infraActiveRequestsRepository.findOne(requestIdOrig);
+		assertNotNull(infraActiveRequest);
+		assertTrue(infraActiveRequest.getStatusMessage().contains("FAILURE"));
+		assertTrue(infraActiveRequest.getRequestStatus().contains("FAILED"));	
+		assertTrue(infraActiveRequest.getStatusMessage().contains("Undefined Error Message!"));
+		
+		// cleanup		
+		infraActiveRequestsRepository.delete(requestIdOrig);
+		
+	}	
+	
+	@Test
+	public void executionTest_ERROR_Status_And_SKIP() throws Exception {
+		
+		OperationalEnvServiceModelStatus serviceModelDb = new OperationalEnvServiceModelStatus();
+		serviceModelDb.setRequestId(requestIdOrig);
+		serviceModelDb.setServiceModelVersionId(serviceModelVersionId);
+		serviceModelDb.setWorkloadContext(workloadContext);
+		serviceModelDb.setRecoveryAction(recoveryActionSkip);
+		serviceModelDb.setOperationalEnvId(operationalEnvironmentId);
+		serviceModelDb.setRetryCount(retryCountThree);
+		serviceModelDb.setServiceModelVersionDistrStatus(statusError);
+		serviceModelDbRepository.saveAndFlush(serviceModelDb);
+		
+		OperationalEnvDistributionStatus distributionDb = new OperationalEnvDistributionStatus();
+		distributionDb.setDistributionId(sdcDistributionId);
+		distributionDb.setRequestId(requestIdOrig);
+		distributionDb.setOperationalEnvId(operationalEnvironmentId);
+		distributionDb.setDistributionIdStatus(statusError);
+		distributionDb.setServiceModelVersionId(serviceModelVersionId);
+		distributionDb.setDistributionIdErrorReason(null);
+		distributionDbRepository.saveAndFlush(distributionDb);
+		
+		
+		
+		// prepare distribution obj
+		Distribution distribution = new Distribution();
+		distribution.setStatus(Status.DISTRIBUTION_COMPLETE_ERROR);
+		request.setDistribution(distribution);
+		request.setDistributionId(sdcDistributionId);
+		request.setOperationalEnvironmentId(operationalEnvironmentId);
+		
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId(requestIdOrig);
+		iar.setRequestStatus("PENDING");
+		infraActiveRequestsRepository.saveAndFlush(iar);
+
+		activateVnfStatus.execute(requestId, request, distributionDbRepository, serviceModelDbRepository);			
+
+		InfraActiveRequests infraActiveRequest = infraActiveRequestsRepository.findOne(requestIdOrig);
+		assertNotNull(infraActiveRequest);
+		assertTrue(infraActiveRequest.getStatusMessage().contains("SUCCESSFUL"));
+		assertTrue(infraActiveRequest.getRequestStatus().contains("COMPLETE"));	
+		
+		// cleanup		
+		infraActiveRequestsRepository.delete(requestIdOrig);
+		
+	}	
+	
+	@Test
+	public void executionTest_ERROR_Status_And_ABORT() throws Exception {
+		
+		OperationalEnvServiceModelStatus serviceModelDb = new OperationalEnvServiceModelStatus();
+		serviceModelDb.setRequestId(requestIdOrig);
+		serviceModelDb.setServiceModelVersionId(serviceModelVersionId);
+		serviceModelDb.setWorkloadContext(workloadContext);
+		serviceModelDb.setRecoveryAction(recoveryActionAbort);
+		serviceModelDb.setOperationalEnvId(operationalEnvironmentId);
+		serviceModelDb.setRetryCount(retryCountThree);
+		serviceModelDb.setServiceModelVersionDistrStatus(statusError);
+		serviceModelDbRepository.saveAndFlush(serviceModelDb);
+		
+		OperationalEnvDistributionStatus distributionDb = new OperationalEnvDistributionStatus();
+		distributionDb.setDistributionId(sdcDistributionId);
+		distributionDb.setRequestId(requestIdOrig);
+		distributionDb.setOperationalEnvId(operationalEnvironmentId);
+		distributionDb.setDistributionIdStatus(statusError);
+		distributionDb.setServiceModelVersionId(serviceModelVersionId);
+		distributionDb.setDistributionIdErrorReason(null);
+		distributionDbRepository.saveAndFlush(distributionDb);
+		
+		
+		
+		// prepare distribution obj
+		Distribution distribution = new Distribution();
+		distribution.setStatus(Status.DISTRIBUTION_COMPLETE_ERROR);
+		request.setDistribution(distribution);
+		request.setDistributionId(sdcDistributionId);
+		request.setOperationalEnvironmentId(operationalEnvironmentId);
+		
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId(requestIdOrig);
+		iar.setRequestStatus("PENDING");
+		infraActiveRequestsRepository.saveAndFlush(iar);
+
+        try {
+            activateVnfStatus.execute(requestId, request, distributionDbRepository, serviceModelDbRepository);
+        }catch(ApiException e){
+            assertThat(e.getMessage(), startsWith("Overall Activation process is a Failure. "));
+            assertEquals(e.getHttpResponseCode(), HttpStatus.SC_BAD_REQUEST);
+            assertEquals(e.getMessageID(), ErrorNumbers.SVC_DETAILED_SERVICE_ERROR);
+        }
+		
+		InfraActiveRequests infraActiveRequest = infraActiveRequestsRepository.findOne(requestIdOrig);
+		assertNotNull(infraActiveRequest);
+		assertTrue(infraActiveRequest.getStatusMessage().contains("FAILURE"));
+		assertTrue(infraActiveRequest.getRequestStatus().contains("FAILED"));
+		
+		// cleanup		
+		infraActiveRequestsRepository.delete(requestIdOrig);
+		
+	}		
+	
+	@Test
+	@Ignore
+	public void callSDClientForRetryTest_202() throws Exception {
+		OperationalEnvServiceModelStatus serviceModelDb = new OperationalEnvServiceModelStatus();
+		serviceModelDb.setRequestId(requestIdOrig);
+		serviceModelDb.setServiceModelVersionId(serviceModelVersionId);
+		serviceModelDb.setWorkloadContext(workloadContext);
+		serviceModelDb.setRecoveryAction(recoveryActionRetry);
+		serviceModelDb.setOperationalEnvId(operationalEnvironmentId);
+		serviceModelDb.setRetryCount(retryCountThree);
+		serviceModelDb.setServiceModelVersionDistrStatus(statusSent);
+
+		OperationalEnvDistributionStatus distributionDb = new OperationalEnvDistributionStatus();
+		distributionDb.setDistributionId(sdcDistributionId);
+		distributionDb.setRequestId(requestIdOrig);
+		distributionDb.setOperationalEnvId(operationalEnvironmentId);
+		distributionDb.setDistributionIdStatus(statusSent);
+		distributionDb.setServiceModelVersionId(serviceModelVersionId);
+		distributionDb.setDistributionIdErrorReason(null);		
+		
+	
+		
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("statusCode", "202");
+		jsonObject.put("message", "Success");
+		jsonObject.put("distributionId", sdcDistributionId1);
+	
+		// prepare distribution obj
+		Distribution distribution = new Distribution();
+		distribution.setStatus(Status.DISTRIBUTION_COMPLETE_OK);
+		request.setDistribution(distribution);
+		request.setDistributionId(sdcDistributionId);
+		request.setOperationalEnvironmentId(operationalEnvironmentId);		
+		
+		stubFor(post(urlPathMatching("/sdc/v1/catalog/services/TEST_serviceModelVersionId/distr.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(jsonObject.toString()).withStatus(HttpStatus.SC_ACCEPTED)));
+		
+		JSONObject jsonResponse = activateVnfStatus.callSDClientForRetry(distributionDb, serviceModelDb, distribution,
+															distributionDbRepository, serviceModelDbRepository); 
+		
+		assertEquals("TEST_distributionId1", jsonResponse.get("distributionId")); 
+		assertEquals("Success", jsonResponse.get("message"));
+		assertEquals("202", jsonResponse.get("statusCode"));		
+
+		// insert new record, status sent
+		OperationalEnvDistributionStatus distStatus = distributionDbRepository.findOne(sdcDistributionId1);
+		assertNotNull(distStatus);
+		assertEquals(operationalEnvironmentId, distStatus.getOperationalEnvId());
+		assertEquals(statusSent, distStatus.getDistributionIdStatus());		
+		
+		// insert new record, status sent		
+		OperationalEnvServiceModelStatus servStatus = serviceModelDbRepository.findOneByOperationalEnvIdAndServiceModelVersionId(operationalEnvironmentId, serviceModelVersionId);
+		assertNotNull(servStatus);
+		assertEquals(statusSent, servStatus.getServiceModelVersionDistrStatus());
+		assertEquals(operationalEnvironmentId, servStatus.getOperationalEnvId());
+		
+	}		
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateEcompOperationalEnvironmentTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateEcompOperationalEnvironmentTest.java
new file mode 100644
index 0000000000..d64cf6106a
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateEcompOperationalEnvironmentTest.java
@@ -0,0 +1,130 @@
+/*-
+ * ============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.apihandlerinfra.tenantisolation.process;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.put;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;
+import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.http.HttpStatus;
+import org.junit.Test;
+import org.onap.so.apihandler.common.ErrorNumbers;
+import org.onap.so.apihandlerinfra.BaseTest;
+import org.onap.so.apihandlerinfra.exceptions.ApiException;
+import org.onap.so.apihandlerinfra.exceptions.ValidateException;
+import org.onap.so.apihandlerinfra.logging.ErrorLoggerInfo;
+import org.onap.so.apihandlerinfra.tenantisolation.CloudOrchestrationRequest;
+import org.onap.so.apihandlerinfra.tenantisolationbeans.OperationalEnvironment;
+import org.onap.so.apihandlerinfra.tenantisolationbeans.RequestDetails;
+import org.onap.so.apihandlerinfra.tenantisolationbeans.RequestInfo;
+import org.onap.so.apihandlerinfra.tenantisolationbeans.RequestParameters;
+import org.onap.so.client.aai.AAIVersion;
+import org.onap.so.db.request.beans.InfraActiveRequests;
+import org.onap.so.db.request.data.repository.InfraActiveRequestsRepository;
+import org.onap.so.logger.MessageEnum;
+import org.onap.so.logger.MsoLogger;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+public class CreateEcompOperationalEnvironmentTest extends BaseTest{
+	
+	@Autowired
+	private CreateEcompOperationalEnvironment createEcompOpEn;
+	@Autowired
+	private InfraActiveRequestsRepository infraActiveRequestsRepository;
+	
+	public CloudOrchestrationRequest getCloudOrchestrationRequest() {
+		CloudOrchestrationRequest request = new CloudOrchestrationRequest();
+		RequestDetails reqDetails = new RequestDetails();
+		RequestInfo reqInfo = new RequestInfo();
+		RequestParameters reqParams = new RequestParameters();
+		reqParams.setTenantContext("TEST");
+		reqParams.setWorkloadContext("ECOMP_TEST");
+		reqParams.setOperationalEnvironmentType(OperationalEnvironment.ECOMP);
+		reqInfo.setInstanceName("TEST_ECOMP_ENVIRONMENT");
+		reqDetails.setRequestInfo(reqInfo);
+		reqDetails.setRequestParameters(reqParams);
+		request.setRequestDetails(reqDetails);
+		request.setOperationalEnvironmentId("operationalEnvId");
+		
+		return request;
+	}
+	
+	@Test
+	public void testProcess() throws ApiException {
+		stubFor(put(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_ACCEPTED)));
+		stubFor(post(urlPathMatching("/events/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_ACCEPTED)));
+		
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId("123");
+		iar.setOperationalEnvName("myOpEnv");
+		iar.setRequestScope("create");
+		iar.setRequestStatus("PENDING");
+		iar.setRequestAction("UNKNOWN");
+		infraActiveRequestsRepository.saveAndFlush(iar);
+		
+		createEcompOpEn.execute("123", getCloudOrchestrationRequest());
+		
+		InfraActiveRequests infraActiveRequest = infraActiveRequestsRepository.findOneByRequestId("123");
+		assertNotNull(infraActiveRequest);
+		assertTrue(infraActiveRequest.getStatusMessage().contains("SUCCESS"));	
+		assertTrue(infraActiveRequest.getRequestStatus().equals("COMPLETE"));
+	}
+	
+	@Test
+	public void testProcessException() {
+		stubFor(put(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_ACCEPTED)));
+		stubFor(post(urlPathMatching("/events/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_NOT_FOUND)));
+        ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_GENERAL_EXCEPTION, MsoLogger.ErrorCode.DataError).build();
+        ValidateException expectedException = new ValidateException.Builder("Could not publish DMaap", HttpStatus.SC_BAD_REQUEST, ErrorNumbers.SVC_BAD_PARAMETER)
+                .errorInfo(errorLoggerInfo).build();
+        
+        InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId("123");
+		iar.setOperationalEnvName("myOpEnv");
+		iar.setRequestScope("create");
+		iar.setRequestStatus("PENDING");
+		iar.setRequestAction("UNKNOWN");
+		infraActiveRequestsRepository.saveAndFlush(iar);
+	
+		try {
+            createEcompOpEn.execute("123", getCloudOrchestrationRequest());
+        }catch(ApiException e){
+            assertThat(e, sameBeanAs((ApiException) expectedException).ignoring("cause"));
+        }
+
+		InfraActiveRequests infraActiveRequest = infraActiveRequestsRepository.findOneByRequestId("123");
+		assertNotNull(infraActiveRequest);
+		assertTrue(infraActiveRequest.getStatusMessage().contains("FAILURE"));	
+		assertTrue(infraActiveRequest.getRequestStatus().equals("FAILED"));
+	}
+
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateVnfOperationalEnvironmentTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateVnfOperationalEnvironmentTest.java
new file mode 100644
index 0000000000..8fe40f31a4
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateVnfOperationalEnvironmentTest.java
@@ -0,0 +1,146 @@
+/*-
+ * ============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.apihandlerinfra.tenantisolation.process;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.put;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.http.HttpStatus;
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.so.apihandlerinfra.BaseTest;
+import org.onap.so.apihandlerinfra.exceptions.ApiException;
+import org.onap.so.apihandlerinfra.tenantisolation.CloudOrchestrationRequest;
+import org.onap.so.client.aai.AAIVersion;
+import org.onap.so.client.aai.objects.AAIOperationalEnvironment;
+import org.onap.so.client.grm.beans.Property;
+import org.onap.so.client.grm.beans.ServiceEndPointList;
+import org.onap.so.db.request.beans.InfraActiveRequests;
+import org.onap.so.db.request.data.repository.InfraActiveRequestsRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+
+public class CreateVnfOperationalEnvironmentTest extends BaseTest{
+	
+	private CloudOrchestrationRequest request;
+	private ServiceEndPointList serviceEndpoints;
+	
+	@Autowired
+	private CreateVnfOperationalEnvironment createVnfOpEnv;
+	@Autowired
+	private InfraActiveRequestsRepository infraActiveRequestsRepository;
+	
+	@Before
+	public void testSetUp() throws Exception {
+		ObjectMapper mapper = new ObjectMapper();
+		String jsonRequest = getFileContentsAsString("__files/vnfoperenv/createVnfOperationalEnvironmentRequest.json");
+		request = mapper.readValue(jsonRequest, CloudOrchestrationRequest.class);
+		String jsonServiceEndpoints = getFileContentsAsString("__files/vnfoperenv/endpoints.json");
+		serviceEndpoints = mapper.readValue(jsonServiceEndpoints, ServiceEndPointList.class);
+	}
+	
+	@Test
+	public void testGetEcompManagingEnvironmentId() throws Exception { 
+		createVnfOpEnv.setRequest(request);
+		assertEquals("ff305d54-75b4-431b-adb2-eb6b9e5ff000", createVnfOpEnv.getEcompManagingEnvironmentId());
+	}
+	
+	@Test
+	public void testGetTenantContext() throws Exception { 
+		createVnfOpEnv.setRequest(request);
+		assertEquals("Test", createVnfOpEnv.getTenantContext());
+	}
+	
+	@Test
+	public void testGetEnvironmentName() throws Exception {
+		createVnfOpEnv.setRequest(request);
+		List<Property> props = serviceEndpoints.getServiceEndPointList().get(0).getProperties();
+		assertEquals("DEV", createVnfOpEnv.getEnvironmentName(props));
+	}
+	
+	@Test 
+	public void testBuildServiceNameForVnf() throws Exception {
+		createVnfOpEnv.setRequest(request);
+		assertEquals("Test.VNF_E2E-IST.Inventory", createVnfOpEnv.buildServiceNameForVnf("TEST.ECOMP_PSL.Inventory"));
+	}
+	
+	@Test
+	public void testGetSearchKey() {
+		createVnfOpEnv.setRequest(request);
+		AAIOperationalEnvironment ecompEnv = new AAIOperationalEnvironment();
+		ecompEnv.setTenantContext("Test");
+		ecompEnv.setWorkloadContext("ECOMPL_PSL");
+		assertEquals("Test.ECOMPL_PSL.*", createVnfOpEnv.getSearchKey(ecompEnv));
+	}
+	
+	public String getFileContentsAsString(String fileName) {
+		String content = "";
+		try {
+			ClassLoader classLoader = this.getClass().getClassLoader();
+			File file = new File(classLoader.getResource(fileName).getFile());
+			content = new String(Files.readAllBytes(file.toPath()));
+		}
+		catch(Exception e) {
+			e.printStackTrace();
+			System.out.println("Exception encountered reading " + fileName + ". Error: " + e.getMessage());
+		}
+		return content;
+	}
+	
+	@Test
+	public void testExecute() throws ApiException{
+		stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withBodyFile("vnfoperenv/ecompOperationalEnvironment.json").withStatus(HttpStatus.SC_ACCEPTED)));
+		stubFor(post(urlPathMatching("/GRMLWPService/v1/serviceEndPoint/findRunning"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withBodyFile("vnfoperenv/endpoints.json").withStatus(HttpStatus.SC_ACCEPTED)));
+		stubFor(post(urlPathMatching("/GRMLWPService/v1/serviceEndPoint/add"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_ACCEPTED)));
+		stubFor(put(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withBodyFile("vnfoperenv/ecompOperationalEnvironment.json").withStatus(HttpStatus.SC_ACCEPTED)));
+		String requestId = UUID.randomUUID().toString();
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId(requestId);
+		iar.setOperationalEnvName("myOpEnv");
+		iar.setRequestScope("create");
+		iar.setRequestStatus("PENDING");
+		iar.setRequestAction("UNKNOWN");
+		infraActiveRequestsRepository.saveAndFlush(iar);
+		createVnfOpEnv.execute(requestId, request);
+		
+		InfraActiveRequests infraActiveRequest = infraActiveRequestsRepository.findOne(requestId);
+		assertNotNull(infraActiveRequest);
+		assertTrue(infraActiveRequest.getStatusMessage().contains("SUCCESS"));
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/DeactivateVnfOperationalEnvironmentTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/DeactivateVnfOperationalEnvironmentTest.java
new file mode 100644
index 0000000000..a9be10c3f4
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/DeactivateVnfOperationalEnvironmentTest.java
@@ -0,0 +1,160 @@
+/*-
+ * ============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.apihandlerinfra.tenantisolation.process;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.put;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;
+import static org.hamcrest.Matchers.hasProperty;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.startsWith;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.http.HttpStatus;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.onap.so.apihandler.common.ErrorNumbers;
+import org.onap.so.apihandlerinfra.BaseTest;
+import org.onap.so.apihandlerinfra.exceptions.ValidateException;
+import org.onap.so.apihandlerinfra.tenantisolation.CloudOrchestrationRequest;
+import org.onap.so.client.aai.AAIVersion;
+import org.onap.so.db.request.beans.InfraActiveRequests;
+import org.onap.so.db.request.data.repository.InfraActiveRequestsRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class DeactivateVnfOperationalEnvironmentTest extends BaseTest{
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+	@Autowired
+	private DeactivateVnfOperationalEnvironment deactivate;
+	@Autowired
+	private InfraActiveRequestsRepository infraActiveRequestsRepository;
+	
+	private CloudOrchestrationRequest request = new CloudOrchestrationRequest();
+	private String operationalEnvironmentId = "ff3514e3-5a33-55df-13ab-12abad84e7ff";
+	private String requestId = "ff3514e3-5a33-55df-13ab-12abad84e7fe";
+	
+	@Test
+	public void testDeactivateOperationalEnvironment() throws Exception {
+		request.setOperationalEnvironmentId(operationalEnvironmentId);
+		request.setRequestDetails(null);
+
+		String json = "{\"operational-environment-status\" : \"ACTIVE\"}";
+		
+		stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(json).withStatus(HttpStatus.SC_ACCEPTED)));
+		stubFor(put(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_ACCEPTED)));
+		stubFor(post(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_ACCEPTED)));
+		
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId(requestId);
+		iar.setOperationalEnvName("myOpEnv");
+		iar.setRequestScope("create");
+		iar.setRequestStatus("PENDING");
+		iar.setRequestAction("UNKNOWN");
+		infraActiveRequestsRepository.saveAndFlush(iar);
+		
+		deactivate.execute(requestId, request);
+		
+		InfraActiveRequests infraActiveRequest = infraActiveRequestsRepository.findOne(requestId);
+		assertNotNull(infraActiveRequest);
+		assertTrue(infraActiveRequest.getStatusMessage().contains("SUCCESSFUL"));
+
+	}
+	
+	@Test
+	public void testDeactivateInvalidStatus() throws Exception {
+		request.setOperationalEnvironmentId(operationalEnvironmentId);
+		request.setRequestDetails(null);
+
+		String json = "{\"operational-environment-status\" : \"SUCCESS\"}";
+		
+		stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(json).withStatus(HttpStatus.SC_ACCEPTED)));
+
+        thrown.expect(ValidateException.class);
+        thrown.expectMessage(startsWith("Invalid OperationalEnvironmentStatus on OperationalEnvironmentId: "));
+        thrown.expect(hasProperty("httpResponseCode", is(HttpStatus.SC_BAD_REQUEST)));
+        thrown.expect(hasProperty("messageID", is(ErrorNumbers.SVC_DETAILED_SERVICE_ERROR)));
+        
+        InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId(requestId);
+		iar.setOperationalEnvName("myOpEnv");
+		iar.setRequestScope("create");
+		iar.setRequestStatus("PENDING");
+		iar.setRequestAction("UNKNOWN");
+		infraActiveRequestsRepository.saveAndFlush(iar);
+		
+        deactivate.execute(requestId, request);
+	}
+	
+	@Test
+	public void testDeactivateInactiveStatus() throws Exception {
+		request.setOperationalEnvironmentId(operationalEnvironmentId);
+		request.setRequestDetails(null);
+
+		String json = "{\"operational-environment-status\" : \"INACTIVE\"}";
+		
+		stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(json).withStatus(HttpStatus.SC_ACCEPTED)));
+		
+		InfraActiveRequests iar = new InfraActiveRequests();
+		iar.setRequestId(requestId);
+		iar.setOperationalEnvName("myOpEnv");
+		iar.setRequestScope("create");
+		iar.setRequestStatus("PENDING");
+		iar.setRequestAction("UNKNOWN");
+		infraActiveRequestsRepository.saveAndFlush(iar);
+		
+		deactivate.execute(requestId, request);
+		
+		InfraActiveRequests infraActiveRequest = infraActiveRequestsRepository.findOne(requestId);
+		assertNotNull(infraActiveRequest);
+		assertTrue(infraActiveRequest.getStatusMessage().contains("SUCCESS"));
+	}
+	
+	@Test
+	public void testDeactivateNullStatus() throws Exception {
+		request.setOperationalEnvironmentId(operationalEnvironmentId);
+		request.setRequestDetails(null);
+
+		String json = "{\"operational-environment-status\" : \"\"}";
+		
+		stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(json).withStatus(HttpStatus.SC_ACCEPTED)));
+
+        thrown.expect(ValidateException.class);
+        thrown.expectMessage(startsWith("OperationalEnvironmentStatus is null on OperationalEnvironmentId: "));
+        thrown.expect(hasProperty("httpResponseCode", is(HttpStatus.SC_BAD_REQUEST)));
+        thrown.expect(hasProperty("messageID", is(ErrorNumbers.SVC_DETAILED_SERVICE_ERROR)));
+        deactivate.execute(requestId, request);
+	}
+}
+
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolationbeans/TenantIsolationBeansTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolationbeans/TenantIsolationBeansTest.java
new file mode 100644
index 0000000000..8236e6766f
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolationbeans/TenantIsolationBeansTest.java
@@ -0,0 +1,87 @@
+/*-
+ * ============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.apihandlerinfra.tenantisolationbeans;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.onap.so.apihandlerinfra.BaseTest;
+
+import com.openpojo.reflection.PojoClass;
+import com.openpojo.reflection.filters.FilterPackageInfo;
+import com.openpojo.reflection.impl.PojoClassFactory;
+import com.openpojo.validation.Validator;
+import com.openpojo.validation.ValidatorBuilder;
+import com.openpojo.validation.affirm.Affirm;
+import com.openpojo.validation.rule.impl.GetterMustExistRule;
+import com.openpojo.validation.rule.impl.SetterMustExistRule;
+import com.openpojo.validation.test.impl.GetterTester;
+import com.openpojo.validation.test.impl.SetterTester;
+
+public class TenantIsolationBeansTest extends BaseTest{
+	
+	private static final int EXPECTED_CLASS_COUNT = 25;
+	private static final String POJO_PACKAGE = "org.onap.so.apihandlerinfra.tenantisolationbeans";
+
+	@Test
+	public void ensureExpectedPojoCount() {
+		List<PojoClass> pojoClasses = PojoClassFactory.getPojoClasses(	POJO_PACKAGE,
+																		new FilterPackageInfo());
+		Affirm.affirmEquals("Classes added / removed?", EXPECTED_CLASS_COUNT, pojoClasses.size());
+	}
+
+	@Test
+	public void testPojoStructureAndBehavior() {
+		Validator validator = ValidatorBuilder.create()
+								.with(new GetterMustExistRule())
+								.with(new SetterMustExistRule())
+								.with(new SetterTester())
+								.with(new GetterTester())
+								.build();
+
+		validator.validate(POJO_PACKAGE, new FilterPackageInfo());
+	}
+	
+	@Test
+	public void testTenantIsolationToString() {
+		TenantIsolationRequest request = new TenantIsolationRequest();
+		request.setRequestId("requestId");
+		request.setRequestScope("scope");
+		request.setRequestType("type");
+		request.setStartTime("time");
+		request.setRequestDetails(new RequestDetails());
+		request.setRequestStatus(new RequestStatus());
+		
+		assertNotNull(request.toString());
+	}
+	
+	@Test
+	public void testRequestListToString() {
+		RequestList list = new RequestList();
+		list.setRequest(new Request());
+		list.setRequestStatus(new RequestStatus());
+		
+		assertNotNull(list.toString());
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/validation/RelatedInstancesValidationTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/validation/RelatedInstancesValidationTest.java
new file mode 100644
index 0000000000..93542c0a76
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/validation/RelatedInstancesValidationTest.java
@@ -0,0 +1,55 @@
+/*-
+ * ============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.apihandlerinfra.validation;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.HashMap;
+
+import org.junit.Test;
+import org.onap.so.apihandlerinfra.Action;
+import org.onap.so.apihandlerinfra.BaseTest;
+import org.onap.so.exceptions.ValidationException;
+import org.onap.so.serviceinstancebeans.ServiceInstancesRequest;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class RelatedInstancesValidationTest extends BaseTest{
+
+	@Test
+	public void testCreateVnfNetworkCollection() throws IOException, ValidationException {
+		String requestJson = new String(Files.readAllBytes(Paths.get("src/test/resources/MsoRequestTest/RelatedInstances/v7CreateVnfNetworkCollection.json")));
+		ObjectMapper mapper = new ObjectMapper();
+		ServiceInstancesRequest sir  = mapper.readValue(requestJson, ServiceInstancesRequest.class);
+		ValidationInformation info = new ValidationInformation(sir, new HashMap<String, String>(), Action.createInstance, 
+																6, false, sir.getRequestDetails().getRequestParameters());
+		info.setRequestScope("vnf");
+		sir.setServiceInstanceId("0fd90c0c-0e3a-46e2-abb5-4c4820d5985b");
+		sir.getRequestDetails().getModelInfo().setModelCustomizationName("name");
+		RelatedInstancesValidation validation = new RelatedInstancesValidation();
+		validation.validate(info);
+		
+		assertEquals(info.getVnfType(), "Test/name");
+	}
+}