<groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
                          </plugin>
+                         <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>default-test</id>
+                                               <goals>
+                                                       <goal>test</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <includes>
+                                                               <include>**/AllTestsTestSuite.java</include>
+                                                       </includes>
+                                                       <parallel>suites</parallel>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
                </plugins>
        </build>
 
 
--- /dev/null
+/*-
+ * ============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;
+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
+}
 
 package org.onap.so;
 
 
-import com.github.tomakehurst.wiremock.client.WireMock;
+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.urlPathEqualTo;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+
+import javax.ws.rs.core.MediaType;
+
 import org.apache.http.HttpHeaders;
 import org.apache.http.HttpStatus;
 import org.junit.After;
 import org.onap.so.db.catalog.beans.CloudIdentity;
 import org.onap.so.db.catalog.beans.CloudSite;
 import org.onap.so.db.catalog.beans.ServerType;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import javax.ws.rs.core.MediaType;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = TestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 
        @Value("${wiremock.server.port}")
        protected int wireMockPort;
+       @Autowired
+       protected WireMockServer wireMockServer;
        
        @After
        public void after() {
-               WireMock.reset();
+               wireMockServer.resetAll();
        }
 
        protected static String getBody(String body, int port, String urlPath) throws IOException {
        }
 
        private void mockCloud(CloudIdentity identity, CloudSite cloudSite) throws IOException {
-               stubFor(get(urlPathEqualTo("/cloudSite/MTN13")).willReturn(aResponse()
+               wireMockServer.stubFor(get(urlPathEqualTo("/cloudSite/MTN13")).willReturn(aResponse()
                                .withBody(getBody(mapper.writeValueAsString(cloudSite),wireMockPort, ""))
                                .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(get(urlPathEqualTo("/cloudSite/DEFAULT")).willReturn(aResponse()
+               wireMockServer.stubFor(get(urlPathEqualTo("/cloudSite/DEFAULT")).willReturn(aResponse()
                                .withBody(getBody(mapper.writeValueAsString(cloudSite),wireMockPort, ""))
                                .withHeader(HttpHeaders.CONTENT_TYPE,MediaType.APPLICATION_JSON)
                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(get(urlPathEqualTo("/cloudIdentity/mtn13")).willReturn(aResponse()
+               wireMockServer.stubFor(get(urlPathEqualTo("/cloudIdentity/mtn13")).willReturn(aResponse()
                                .withBody(getBody(mapper.writeValueAsString(identity),wireMockPort, ""))
                                .withHeader(HttpHeaders.CONTENT_TYPE,MediaType.APPLICATION_JSON)
                                .withStatus(HttpStatus.SC_OK)));
 
 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.urlMatching;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
+
 import org.apache.http.HttpStatus;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+
 public class StubOpenStack {
 
-    public static void mockOpenStackResponseAccess(int port) throws IOException {
-        stubFor(post(urlPathEqualTo("/v2.0/tokens")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+    public static void mockOpenStackResponseAccess(WireMockServer wireMockServer, int port) throws IOException {
+        wireMockServer.stubFor(post(urlPathEqualTo("/v2.0/tokens")).willReturn(aResponse().withHeader("Content-Type", "application/json")
                 .withBody(getBodyFromFile("OpenstackResponse_Access.json", port, "/mockPublicUrl"))
                 .withStatus(HttpStatus.SC_OK)));
     }
 
-    public static void mockOpenStackResponseUnauthorized(int port) throws IOException {
-        stubFor(
+    public static void mockOpenStackResponseUnauthorized(WireMockServer wireMockServer, int port) throws IOException {
+        wireMockServer.stubFor(
             post(urlPathEqualTo("/v2.0/tokens"))
                 .willReturn(aResponse().withHeader("Content-Type", "application/json")
                     .withBody(getBodyFromFile("OpenstackResponse_Access.json", port, "/mockPublicUrl"))
                     .withStatus(HttpStatus.SC_UNAUTHORIZED)));
     }
 
-    public static void mockOpenStackDelete(String id) {
-        stubFor(delete(urlMatching("/mockPublicUrl/stacks/" + id)).willReturn(aResponse()
+    public static void mockOpenStackDelete(WireMockServer wireMockServer, String id) {
+        wireMockServer.stubFor(delete(urlMatching("/mockPublicUrl/stacks/" + id)).willReturn(aResponse()
                 .withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_OK)));
     }
 
-    public static void mockOpenStackGet(String id) {
-        stubFor(
+    public static void mockOpenStackGet(WireMockServer wireMockServer, String id) {
+        wireMockServer.stubFor(
             get(urlPathEqualTo("/mockPublicUrl/stacks/" + id))
                 .willReturn(aResponse().withHeader("Content-Type", "application/json")
                     .withBodyFile("OpenstackResponse_Stack_Created.json")
     }
 
 
-    public static void mockOpenStackPostStack_200(String filename) {
-        stubFor(post(urlPathEqualTo("/mockPublicUrl/stacks")).willReturn(aResponse()
+    public static void mockOpenStackPostStack_200(WireMockServer wireMockServer, String filename) {
+        wireMockServer.stubFor(post(urlPathEqualTo("/mockPublicUrl/stacks")).willReturn(aResponse()
                 .withHeader("Content-Type", "application/json")
                 .withBodyFile(filename).withStatus(HttpStatus.SC_OK)));
     }
 
-    public static void mockOpenStackPostTenantWithBodyFile_200() throws IOException {
-        stubFor(post(urlPathEqualTo("/mockPublicUrl/tenants"))
+    public static void mockOpenStackPostTenantWithBodyFile_200(WireMockServer wireMockServer) throws IOException {
+        wireMockServer.stubFor(post(urlPathEqualTo("/mockPublicUrl/tenants"))
                 .willReturn(aResponse().withBodyFile("OpenstackResponse_Tenant.json").withStatus(HttpStatus.SC_OK)));
     }
 
-    public static void mockOpenStackGetTenantByName(String tenantName) throws IOException {
-        stubFor(get(urlMatching("/mockPublicUrl/tenants/[?]name=" + tenantName))
+    public static void mockOpenStackGetTenantByName(WireMockServer wireMockServer, String tenantName) throws IOException {
+        wireMockServer.stubFor(get(urlMatching("/mockPublicUrl/tenants/[?]name=" + tenantName))
                 .willReturn(aResponse().withBodyFile("OpenstackResponse_Tenant.json").withStatus(HttpStatus.SC_OK)));
     }
 
-    public static void mockOpenStackGetTenantById(String tenantId) throws IOException {
-        stubFor(get(urlPathEqualTo("/mockPublicUrl/tenants/tenantId"))
+    public static void mockOpenStackGetTenantById(WireMockServer wireMockServer, String tenantId) throws IOException {
+        wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/tenants/tenantId"))
                 .willReturn(aResponse().withBodyFile("OpenstackResponse_Tenant.json").withStatus(HttpStatus.SC_OK)));
     }
 
-    public static void mockOpenStackDeleteTenantById_200(String tenantId) {
-        stubFor(delete(urlPathEqualTo("/mockPublicUrl/tenants/" + tenantId)).willReturn(aResponse()
+    public static void mockOpenStackDeleteTenantById_200(WireMockServer wireMockServer, String tenantId) {
+        wireMockServer.stubFor(delete(urlPathEqualTo("/mockPublicUrl/tenants/" + tenantId)).willReturn(aResponse()
                 .withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_OK)));
     }
 
-    public static void mockOpenStackGetUserById(String user) {
-        stubFor(get(urlPathEqualTo("/mockPublicUrl/users/" + user)).willReturn(aResponse()
+    public static void mockOpenStackGetUserById(WireMockServer wireMockServer, String user) {
+        wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/users/" + user)).willReturn(aResponse()
                 .withHeader("Content-Type", "application/json")
                 .withBodyFile("OpenstackResponse_User.json").withStatus(HttpStatus.SC_OK)));
     }
 
-    public static void mockOpenStackGetUserByName(String userName) {
-        stubFor(get(urlMatching("/mockPublicUrl/users/[?]name=" + userName)).willReturn(aResponse()
+    public static void mockOpenStackGetUserByName(WireMockServer wireMockServer, String userName) {
+        wireMockServer.stubFor(get(urlMatching("/mockPublicUrl/users/[?]name=" + userName)).willReturn(aResponse()
                 .withHeader("Content-Type", "application/json")
                 .withBodyFile("OpenstackResponse_User.json").withStatus(HttpStatus.SC_OK)));
     }
 
-    public static void mockOpenStackGetUserByName_500(String userName) {
-        stubFor(get(urlMatching("/mockPublicUrl/users/[?]name=" + userName)).willReturn(aResponse()
+    public static void mockOpenStackGetUserByName_500(WireMockServer wireMockServer, String userName) {
+        wireMockServer.stubFor(get(urlMatching("/mockPublicUrl/users/[?]name=" + userName)).willReturn(aResponse()
                 .withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
     }
 
-    public static void mockOpenStackGetRoles_200(String roleFor) {
-        stubFor(get(urlPathEqualTo("/mockPublicUrl/" + roleFor + "/roles")).willReturn(aResponse()
+    public static void mockOpenStackGetRoles_200(WireMockServer wireMockServer, String roleFor) {
+        wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/" + roleFor + "/roles")).willReturn(aResponse()
                 .withHeader("Content-Type", "application/json")
                 .withBodyFile("OpenstackResponse_Roles.json").withStatus(HttpStatus.SC_OK)));
     }
 
-    public static void mockOpenstackPostNetwork(String responseFile) {
-        stubFor(post(urlPathEqualTo("/mockPublicUrl/v2.0/networks")).willReturn(aResponse()
+    public static void mockOpenstackPostNetwork(WireMockServer wireMockServer, String responseFile) {
+        wireMockServer.stubFor(post(urlPathEqualTo("/mockPublicUrl/v2.0/networks")).willReturn(aResponse()
                 .withHeader("Content-Type", "application/json")
                 .withBodyFile(responseFile)
                 .withStatus(HttpStatus.SC_OK)));
     }
 
-    public static void mockOpenstackPutNetwork(String responseFile, String networkId) {
-        stubFor(put(urlPathEqualTo("/mockPublicUrl/v2.0/networks/"+networkId)).willReturn(aResponse()
+    public static void mockOpenstackPutNetwork(WireMockServer wireMockServer, String responseFile, String networkId) {
+        wireMockServer.stubFor(put(urlPathEqualTo("/mockPublicUrl/v2.0/networks/"+networkId)).willReturn(aResponse()
                 .withHeader("Content-Type", "application/json")
                 .withBodyFile(responseFile)
                 .withStatus(HttpStatus.SC_OK)));
     }
     
-    public static void mockOpenStackGetNeutronNetwork(String filename,String networkId) {
-        stubFor(get(urlPathEqualTo("/mockPublicUrl/v2.0/networks/"+ networkId))
+    public static void mockOpenStackGetNeutronNetwork(WireMockServer wireMockServer, String filename,String networkId) {
+        wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/v2.0/networks/"+ networkId))
                 .willReturn(aResponse().withHeader("Content-Type", "application/json")
                         .withBodyFile(filename).withStatus(HttpStatus.SC_OK)));
     }
 
-    public static void mockOpenStackGetNeutronNetwork_500(String networkId) {
-        stubFor(get(urlPathEqualTo("/mockPublicUrl/v2.0/networks/"+ networkId))
+    public static void mockOpenStackGetNeutronNetwork_500(WireMockServer wireMockServer, String networkId) {
+        wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/v2.0/networks/"+ networkId))
                 .willReturn(aResponse().withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
     }
 
-    public static void mockOpenStackDeleteNeutronNetwork(String networkId) {
-        stubFor(delete(urlPathEqualTo("/mockPublicUrl/v2.0/networks/" + networkId))
+    public static void mockOpenStackDeleteNeutronNetwork(WireMockServer wireMockServer, String networkId) {
+        wireMockServer.stubFor(delete(urlPathEqualTo("/mockPublicUrl/v2.0/networks/" + networkId))
                 .willReturn(aResponse().withStatus(HttpStatus.SC_OK)));
     }
 
 
 
 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.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 import static com.shazam.shazamcrest.MatcherAssert.assertThat;
 import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
 import static org.junit.Assert.assertNotNull;
 
-import com.woorea.openstack.heat.Heat;
-import com.woorea.openstack.heat.model.CreateStackParam;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.http.HttpStatus;
 import org.junit.Assert;
 import org.junit.Test;
 import org.onap.so.openstack.exceptions.MsoOpenstackException;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.woorea.openstack.heat.Heat;
+import com.woorea.openstack.heat.model.CreateStackParam;
+
 public class MsoHeatUtilsTest extends BaseTest{
 
        @Autowired
                Map<String, Object> inputs = new HashMap<>();
                boolean rollbackOnFailure = true;
 
-               StubOpenStack.mockOpenStackResponseAccess(wireMockPort);
-               StubOpenStack.mockOpenStackPostStack_200("OpenstackResponse_Stack_Created.json");
+               StubOpenStack.mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+               StubOpenStack.mockOpenStackPostStack_200(wireMockServer, "OpenstackResponse_Stack_Created.json");
                
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/instanceName/stackId"))
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/instanceName/stackId"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBodyFile("OpenstackResponse_StackId.json")
                                                .withStatus(HttpStatus.SC_OK)));
                cloudInfo.setTenantId("tenantId");
                String instanceId = "instanceId";
 
-               StubOpenStack.mockOpenStackResponseAccess(wireMockPort);
-               StubOpenStack.mockOpenStackPostStack_200("OpenstackResponse_Stack_Created.json");
+               StubOpenStack.mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+               StubOpenStack.mockOpenStackPostStack_200(wireMockServer, "OpenstackResponse_Stack_Created.json");
 
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/instanceId"))
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/instanceId"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBodyFile("OpenstackResponse_StackId.json")
                                                .withStatus(HttpStatus.SC_OK)));
 
                int timeoutInMinutes = 1;
 
-               StubOpenStack.mockOpenStackResponseAccess(wireMockPort);
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/instanceId")).willReturn(aResponse().withBodyFile("OpenstackResponse_StackId.json").withStatus(HttpStatus.SC_OK)));
-               StubOpenStack.mockOpenStackDelete("name/da886914-efb2-4917-b335-c8381528d90b");
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/name/da886914-efb2-4917-b335-c8381528d90b")).willReturn(aResponse().withBodyFile("OpenstackResponse_Stack_DeleteComplete.json").withStatus(HttpStatus.SC_OK)));
+               StubOpenStack.mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/instanceId")).willReturn(aResponse().withBodyFile("OpenstackResponse_StackId.json").withStatus(HttpStatus.SC_OK)));
+               StubOpenStack.mockOpenStackDelete(wireMockServer, "name/da886914-efb2-4917-b335-c8381528d90b");
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/name/da886914-efb2-4917-b335-c8381528d90b")).willReturn(aResponse().withBodyFile("OpenstackResponse_Stack_DeleteComplete.json").withStatus(HttpStatus.SC_OK)));
                
                VduInstance actual = heatUtils.deleteVdu(cloudInfo, instanceId, timeoutInMinutes);
                
     @Test
     public final void getHeatClientSuccessTest() throws MsoException, IOException {
         CloudSite cloudSite = getCloudSite(getCloudIdentity());
-        StubOpenStack.mockOpenStackResponseAccess(wireMockPort);
+        StubOpenStack.mockOpenStackResponseAccess(wireMockServer, wireMockPort);
         Heat heatClient = heatUtils.getHeatClient(cloudSite, "TEST-tenant");
         assertNotNull(heatClient);
     }
     @Test(expected = MsoAdapterException.class)
     public final void getHeatClientOpenStackResponseException401Test() throws MsoException, IOException {
         CloudSite cloudSite = getCloudSite(getCloudIdentity());
-        StubOpenStack.mockOpenStackResponseUnauthorized(wireMockPort);
+        StubOpenStack.mockOpenStackResponseUnauthorized(wireMockServer, wireMockPort);
         heatUtils.getHeatClient(cloudSite, "TEST-tenant");
     }
 
     @Test
     public final void createStackSuccessTest() throws MsoException, IOException {
         CloudSite cloudSite = getCloudSite(getCloudIdentity());
-        StubOpenStack.mockOpenStackResponseAccess(wireMockPort);
-        StubOpenStack.mockOpenStackPostStack_200("OpenstackResponse_Stack_Created.json");
-        StubOpenStack.mockOpenStackGet("TEST-stack/stackId");
+        StubOpenStack.mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+        StubOpenStack.mockOpenStackPostStack_200(wireMockServer, "OpenstackResponse_Stack_Created.json");
+        StubOpenStack.mockOpenStackGet(wireMockServer, "TEST-stack/stackId");
         StackInfo stackInfo = heatUtils.createStack(cloudSite.getId(), "CloudOwner", "tenantId", "TEST-stack", null,
             "TEST-heat", new HashMap<>(), false, 1, "TEST-env",
             new HashMap<>(), new HashMap<>(), false);
 
 
     @Before
     public void before() throws IOException {
-        StubOpenStack.mockOpenStackResponseAccess(wireMockPort);
+        StubOpenStack.mockOpenStackResponseAccess(wireMockServer, wireMockPort);
     }
 
     @Test
     public void createTenantTest() throws Exception {
-        StubOpenStack.mockOpenStackPostTenantWithBodyFile_200();
+        StubOpenStack.mockOpenStackPostTenantWithBodyFile_200(wireMockServer);
 
-        StubOpenStack.mockOpenStackGetUserById("john");
-        StubOpenStack.mockOpenStackGetRoles_200("OS-KSADM");
+        StubOpenStack.mockOpenStackGetUserById(wireMockServer, "john");
+        StubOpenStack.mockOpenStackGetRoles_200(wireMockServer, "OS-KSADM");
         String response = msoKeystoneUtils.createTenant("tenant", "MTN13", new HashMap<>(), true);
 
         Assert.assertEquals("tenantId", response);
 
     @Test
     public void createTenantTest_FindUserByName() throws Exception {
-        StubOpenStack.mockOpenStackPostTenantWithBodyFile_200();
+        StubOpenStack.mockOpenStackPostTenantWithBodyFile_200(wireMockServer);
 
-        StubOpenStack.mockOpenStackGetUserByName("john");
-        StubOpenStack.mockOpenStackGetRoles_200("OS-KSADM");
+        StubOpenStack.mockOpenStackGetUserByName(wireMockServer, "john");
+        StubOpenStack.mockOpenStackGetRoles_200(wireMockServer, "OS-KSADM");
         String response = msoKeystoneUtils.createTenant("tenant", "MTN13", new HashMap<>(), true);
         Assert.assertEquals("tenantId", response);
 
     @Test
     public void createTenantTest_Exception() throws Exception {
         expectedException.expect(MsoException.class);
-        StubOpenStack.mockOpenStackPostTenantWithBodyFile_200();
-        StubOpenStack.mockOpenStackGetUserByName_500("john");
-        StubOpenStack.mockOpenStackGetRoles_200("OS-KSADM");
+        StubOpenStack.mockOpenStackPostTenantWithBodyFile_200(wireMockServer);
+        StubOpenStack.mockOpenStackGetUserByName_500(wireMockServer, "john");
+        StubOpenStack.mockOpenStackGetRoles_200(wireMockServer, "OS-KSADM");
         msoKeystoneUtils.createTenant("tenant", "Test", new HashMap<>(), true);
     }
 
     @Test
     public void queryTenantTest() throws Exception {
-        StubOpenStack.mockOpenStackGetTenantById("tenantId");
+        StubOpenStack.mockOpenStackGetTenantById(wireMockServer, "tenantId");
 
         MsoTenant msoTenant = msoKeystoneUtils.queryTenant("tenantId", "MTN13");
 
 
     @Test
     public void queryTenantByNameTest() throws Exception {
-        StubOpenStack.mockOpenStackGetTenantByName("tenant");
+        StubOpenStack.mockOpenStackGetTenantByName(wireMockServer, "tenant");
 
         MsoTenant msoTenant = msoKeystoneUtils.queryTenantByName("tenant", "MTN13");
 
 
     @Test
     public void deleteTenantTest() throws Exception {
-        StubOpenStack.mockOpenStackGetTenantById("tenantId");
-        StubOpenStack.mockOpenStackDeleteTenantById_200("tenantId");
+        StubOpenStack.mockOpenStackGetTenantById(wireMockServer, "tenantId");
+        StubOpenStack.mockOpenStackDeleteTenantById_200(wireMockServer, "tenantId");
         boolean result = msoKeystoneUtils.deleteTenant("tenantId", "MTN13");
 
         Assert.assertTrue(result);
 
     @Test
     public void deleteTenantByNameTest() throws Exception {
-        StubOpenStack.mockOpenStackGetTenantByName("tenant");
-        StubOpenStack.mockOpenStackDeleteTenantById_200("tenantId");
+        StubOpenStack.mockOpenStackGetTenantByName(wireMockServer, "tenant");
+        StubOpenStack.mockOpenStackDeleteTenantById_200(wireMockServer, "tenantId");
         boolean result = msoKeystoneUtils.deleteTenantByName("tenant", "MTN13");
 
         Assert.assertTrue(result);
 
 
 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 org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Optional;
+
 import org.apache.http.HttpStatus;
 import org.junit.Test;
 import org.mockito.InjectMocks;
 
     @Test
     public void createStackSuccess() throws MsoException, IOException {
-        stubFor(post(urlPathEqualTo("/v2.0"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/v2.0"))
             .willReturn(aResponse().withHeader("Content-Type", "application/json")
                 .withBody(CREATE_STACK_RESPONSE)
                 .withStatus(HttpStatus.SC_CREATED)));
     @Test
     public void createStackBadRequest() {
         try {
-            stubFor(post(urlPathEqualTo("/v2.0"))
+            wireMockServer.stubFor(post(urlPathEqualTo("/v2.0"))
                 .willReturn(aResponse().withHeader("Content-Type", "application/json")
                     .withStatus(HttpStatus.SC_BAD_REQUEST)));
             multicloudUtils.createStack("MTN13", "CloudOwner", "TEST-tenant", "TEST-stack", new VduModelInfo(),
 
     @Test
     public void createStackEmptyResponseEntity() throws MsoException {
-        stubFor(post(urlPathEqualTo("/v2.0"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/v2.0"))
             .willReturn(aResponse().withHeader("Content-Type", "application/json")
                 .withStatus(HttpStatus.SC_CREATED)));
         StackInfo result = multicloudUtils.createStack("MTN13", "CloudOwner", "TEST-tenant", "TEST-stack", new VduModelInfo(),
 
     public void before() throws IOException {
         vlans = new ArrayList<>();
         vlans.add(3014);
-        StubOpenStack.mockOpenStackResponseAccess(wireMockPort);
+        StubOpenStack.mockOpenStackResponseAccess(wireMockServer, wireMockPort);
     }
     
     @Test
 
     @Test
     public void createNetworkTest_NetworkTypeAsMultiProvider() throws Exception {
-        StubOpenStack.mockOpenstackPostNetwork("OpenstackCreateNeutronNetworkResponse.json");
+        StubOpenStack.mockOpenstackPostNetwork(wireMockServer, "OpenstackCreateNeutronNetworkResponse.json");
         NetworkInfo networkInfo = msoNeutronUtils.createNetwork("MTN13", "tenantId",
                 MsoNeutronUtils.NetworkType.MULTI_PROVIDER,"networkName","PROVIDER", vlans);
 
 
     @Test
     public void createNetworkTest() throws Exception {
-        StubOpenStack.mockOpenstackPostNetwork("OpenstackCreateNeutronNetworkResponse.json");
+        StubOpenStack.mockOpenstackPostNetwork(wireMockServer, "OpenstackCreateNeutronNetworkResponse.json");
         NetworkInfo networkInfo = msoNeutronUtils.createNetwork("MTN13", "tenantId",
                 MsoNeutronUtils.NetworkType.PROVIDER,"networkName","PROVIDER", vlans);
 
 
     @Test
     public void queryNetworkTest() throws Exception {
-        StubOpenStack.mockOpenStackGetNeutronNetwork("GetNeutronNetwork.json", "43173f6a-d699-414b-888f-ab243dda6dfe");
+        StubOpenStack.mockOpenStackGetNeutronNetwork(wireMockServer, "GetNeutronNetwork.json", "43173f6a-d699-414b-888f-ab243dda6dfe");
         NetworkInfo networkInfo = msoNeutronUtils.queryNetwork("43173f6a-d699-414b-888f-ab243dda6dfe", "tenantId","MTN13");
 
         Assert.assertEquals("net1",networkInfo.getName());
     @Test
     public void queryNetworkTest_500() throws Exception {
         expectedException.expect(MsoException.class);
-        StubOpenStack.mockOpenStackGetNeutronNetwork_500("43173f6a-d699-414b-888f-ab243dda6dfe");
+        StubOpenStack.mockOpenStackGetNeutronNetwork_500(wireMockServer, "43173f6a-d699-414b-888f-ab243dda6dfe");
         msoNeutronUtils.queryNetwork("43173f6a-d699-414b-888f-ab243dda6dfe", "tenantId","MTN13");
 
     }
 
     @Test
     public void deleteNetworkkTest() throws Exception {
-        StubOpenStack.mockOpenStackGetNeutronNetwork("GetNeutronNetwork.json", "43173f6a-d699-414b-888f-ab243dda6dfe");
-        StubOpenStack.mockOpenStackDeleteNeutronNetwork("43173f6a-d699-414b-888f-ab243dda6dfe");
+        StubOpenStack.mockOpenStackGetNeutronNetwork(wireMockServer, "GetNeutronNetwork.json", "43173f6a-d699-414b-888f-ab243dda6dfe");
+        StubOpenStack.mockOpenStackDeleteNeutronNetwork(wireMockServer, "43173f6a-d699-414b-888f-ab243dda6dfe");
         Boolean result = msoNeutronUtils.deleteNetwork("43173f6a-d699-414b-888f-ab243dda6dfe", "tenantId","MTN13");
 
         Assert.assertTrue(result);
 
     @Test
     public void updateNetworkTest() throws Exception {
-        StubOpenStack.mockOpenStackGetNeutronNetwork("GetNeutronNetwork.json", "43173f6a-d699-414b-888f-ab243dda6dfe");
-        StubOpenStack.mockOpenstackPutNetwork("OpenstackCreateNeutronNetworkResponse.json", "43173f6a-d699-414b-888f-ab243dda6dfe");
+        StubOpenStack.mockOpenStackGetNeutronNetwork(wireMockServer, "GetNeutronNetwork.json", "43173f6a-d699-414b-888f-ab243dda6dfe");
+        StubOpenStack.mockOpenstackPutNetwork(wireMockServer, "OpenstackCreateNeutronNetworkResponse.json", "43173f6a-d699-414b-888f-ab243dda6dfe");
         NetworkInfo networkInfo = msoNeutronUtils.updateNetwork("MTN13", "tenantId",
                 "43173f6a-d699-414b-888f-ab243dda6dfe",MsoNeutronUtils.NetworkType.PROVIDER,"PROVIDER", vlans);
 
 
     @Test
     public void updateNetworkTest_NetworkTypeAsMultiProvider() throws Exception {
-        StubOpenStack.mockOpenStackGetNeutronNetwork("GetNeutronNetwork.json", "43173f6a-d699-414b-888f-ab243dda6dfe");
-        StubOpenStack.mockOpenstackPutNetwork("OpenstackCreateNeutronNetworkResponse.json", "43173f6a-d699-414b-888f-ab243dda6dfe");
+        StubOpenStack.mockOpenStackGetNeutronNetwork(wireMockServer, "GetNeutronNetwork.json", "43173f6a-d699-414b-888f-ab243dda6dfe");
+        StubOpenStack.mockOpenstackPutNetwork(wireMockServer, "OpenstackCreateNeutronNetworkResponse.json", "43173f6a-d699-414b-888f-ab243dda6dfe");
         NetworkInfo networkInfo = msoNeutronUtils.updateNetwork("MTN13", "tenantId",
                 "43173f6a-d699-414b-888f-ab243dda6dfe",MsoNeutronUtils.NetworkType.MULTI_PROVIDER,"PROVIDER", vlans);
 
 
                                        </compilerArgs>
                                </configuration>
                        </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>default-test</id>
+                                               <goals>
+                                                       <goal>test</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <includes>
+                                                               <include>**/AllTestsTestSuite.java</include>
+                                                       </includes>
+                                                       <parallel>suites</parallel>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
                </plugins>
                <pluginManagement>
                        <plugins>
 
--- /dev/null
+/*-
+ * ============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.adapters.catalogdb;
+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
+}
 
--- /dev/null
+package org.onap.so.adapters.catalogdb;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = CatalogDBApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@ActiveProfiles("test")
+public class CatalogDbAdapterBaseTest {
+
+       @LocalServerPort
+       protected int port;
+       
+       
+       @Test
+    public void testNothing(){}
+}
 
 
 package org.onap.so.adapters.catalogdb.catalogrest;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.onap.so.logger.MdcConstants.ENDTIME;
 import static org.onap.so.logger.MdcConstants.INVOCATION_ID;
 import static org.onap.so.logger.MdcConstants.PARTNERNAME;
 import static org.onap.so.logger.MdcConstants.SERVICE_NAME;
 import static org.onap.so.logger.MdcConstants.STATUSCODE;
 
-
 import java.io.IOException;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-
 import org.json.JSONException;
-import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.onap.logging.ref.slf4j.ONAPLogConstants;
-import org.onap.so.adapters.catalogdb.CatalogDBApplication;
-
+import org.onap.so.adapters.catalogdb.CatalogDbAdapterBaseTest;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
-import org.springframework.boot.web.server.LocalServerPort;
-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.annotation.DirtiesContext;
-import org.springframework.test.annotation.DirtiesContext.ClassMode;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.util.UriComponentsBuilder;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
 
 
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = CatalogDBApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-public class CatalogDBRestTest {
+public class CatalogDBRestTest extends CatalogDbAdapterBaseTest {
 
        private static final String ECOMP_MSO_CATALOG_V2_VF_MODULES = "ecomp/mso/catalog/v2/vfModules";
 
 
        private static final String ECOMP_MSO_CATALOG_V2_SERVICE_RESOURCES = "ecomp/mso/catalog/v2/serviceResources";
 
-       @LocalServerPort
-       private int port;
-
        TestRestTemplate restTemplate = new TestRestTemplate("test", "test");
 
        HttpHeaders headers = new HttpHeaders();
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.so.adapters.catalogdb.CatalogDBApplication;
+import org.onap.so.adapters.catalogdb.CatalogDbAdapterBaseTest;
 import org.onap.so.db.catalog.beans.AuthenticationType;
 import org.onap.so.db.catalog.beans.CloudIdentity;
 import org.onap.so.db.catalog.beans.CloudSite;
 import static com.shazam.shazamcrest.MatcherAssert.assertThat;
 import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
 
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = CatalogDBApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-public class CloudConfigTest {
+public class CloudConfigTest extends CatalogDbAdapterBaseTest {
 
     protected TestRestTemplate restTemplate = new TestRestTemplate("test", "test");
 
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.so.adapters.catalogdb.CatalogDBApplication;
+import org.onap.so.adapters.catalogdb.CatalogDbAdapterBaseTest;
 import org.onap.so.db.catalog.beans.ConfigurationResource;
 import org.onap.so.db.catalog.beans.CvnfcCustomization;
 import org.onap.so.db.catalog.beans.VfModule;
 
 import org.springframework.beans.BeanUtils;
 
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = CatalogDBApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-public class CvnfcCatalogDbQueryTest {
+public class CvnfcCatalogDbQueryTest extends CatalogDbAdapterBaseTest {
 
     @Autowired
     private CvnfcCustomizationRepository cvnfcCustomizationRepository;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.so.adapters.catalogdb.CatalogDBApplication;
+import org.onap.so.adapters.catalogdb.CatalogDbAdapterBaseTest;
 import org.onap.so.db.catalog.beans.BuildingBlockDetail;
 import org.onap.so.db.catalog.beans.CollectionNetworkResourceCustomization;
 import org.onap.so.db.catalog.beans.CollectionResourceCustomization;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = CatalogDBApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-public class NetworkCollectionCatalogDbQueryTest {
+public class NetworkCollectionCatalogDbQueryTest extends CatalogDbAdapterBaseTest {
 
        private static final Logger logger = LoggerFactory.getLogger(NetworkCollectionCatalogDbQueryTest.class);
        private static final String NETWORKCOLLECTION = "NetworkCollection";
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.so.adapters.catalogdb.CatalogDBApplication;
+import org.onap.so.adapters.catalogdb.CatalogDbAdapterBaseTest;
 import org.onap.so.db.catalog.beans.AuthenticationType;
 import org.onap.so.db.catalog.beans.CloudIdentity;
 import org.onap.so.db.catalog.beans.CloudSite;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = CatalogDBApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-public class CatalogDbClientTest {
+public class CatalogDbClientTest extends CatalogDbAdapterBaseTest {
 
     public static final String MTN13 = "mtn13";
 
 
                                        </execution>
                                </executions>
                        </plugin>
+                        <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>default-test</id>
+                                               <goals>
+                                                       <goal>test</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <includes>
+                                                               <include>**/AllTestsTestSuite.java</include>
+                                                       </includes>
+                                                       <parallel>suites</parallel>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
 
 <!--  run the following plugin only when there's a wsdl change and you need to recompile the java classes
                        <plugin>
 
 
        @Test
        public void createNetworkByModelNameNeutronModeGetNetworkException() throws IOException{
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenstackGet("/mockPublicUrl/v2.0/networks",HttpStatus.SC_INTERNAL_SERVER_ERROR);
+               mockOpenstackGet(wireMockServer, "/mockPublicUrl/v2.0/networks",HttpStatus.SC_INTERNAL_SERVER_ERROR);
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void createNetworkByModelNameNeutronModeCreateNetworkException() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetNeutronNetwork_404("dvspg-VCE_VPE-mtjnj40avbc");
+               mockOpenStackGetNeutronNetwork_404(wireMockServer, "dvspg-VCE_VPE-mtjnj40avbc");
 
-               mockOpenStackGetAllNeutronNetworks_404();
+               mockOpenStackGetAllNeutronNetworks_404(wireMockServer);
 
-               mockOpenstackPost("/mockPublicUrl/v2.0/networks", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+               mockOpenstackPost(wireMockServer, "/mockPublicUrl/v2.0/networks", HttpStatus.SC_INTERNAL_SERVER_ERROR);
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void createNetworkByModelNameNeutronMode() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetNeutronNetwork_404("dvspg-VCE_VPE-mtjnj40avbc");
+               mockOpenStackGetNeutronNetwork_404(wireMockServer, "dvspg-VCE_VPE-mtjnj40avbc");
 
-               mockOpenStackGetAllNeutronNetworks_404();
+               mockOpenStackGetAllNeutronNetworks_404(wireMockServer);
 
-               mockOpenStackPostNeutronNetwork_200("OpenstackCreateNeutronNetworkResponse.json");
+               mockOpenStackPostNeutronNetwork_200(wireMockServer, "OpenstackCreateNeutronNetworkResponse.json");
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void createNetworkByModelNameAlreadyExistNeutronMode() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetAllNeutronNetworks_200("OpenstackGetNeutronNetworks.json");
+               mockOpenStackGetAllNeutronNetworks_200(wireMockServer, "OpenstackGetNeutronNetworks.json");
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void createNetworkByModelNameAlreadyExistNeutronModeFailIfExistTrue() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetAllNeutronNetworks_200("OpenstackGetNeutronNetworks.json");
+               mockOpenStackGetAllNeutronNetworks_200(wireMockServer, "OpenstackGetNeutronNetworks.json");
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void createNetworkByModelNameHeatMode() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetStack_404("dvspg-VCE_VPE-mtjnj40avbc");
+               mockOpenStackGetStack_404(wireMockServer, "dvspg-VCE_VPE-mtjnj40avbc");
 
-               mockOpenStackPostStack_200("OpenstackResponse_Stack.json");
+               mockOpenStackPostStack_200(wireMockServer, "OpenstackResponse_Stack.json");
 
-               mockOpenStackGetStackCreated_200("OpenstackResponse_Stack_Created.json", "dvspg-VCE_VPE-mtjnj40avbc/stackId");
+               mockOpenStackGetStackCreated_200(wireMockServer, "OpenstackResponse_Stack_Created.json", "dvspg-VCE_VPE-mtjnj40avbc/stackId");
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void createNetworkByModelNameAlreadyExistHeatMode() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackPostStack_200("OpenstackResponse_Stack.json");
+               mockOpenStackPostStack_200(wireMockServer, "OpenstackResponse_Stack.json");
 
-               mockOpenStackGetStackCreated_200("OpenstackResponse_Stack_Created.json", "dvspg-VCE_VPE-mtjnj40avbc");
+               mockOpenStackGetStackCreated_200(wireMockServer, "OpenstackResponse_Stack_Created.json", "dvspg-VCE_VPE-mtjnj40avbc");
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void createNetworkByModelNameAlreadyExistHeatModeFailIfExistTrue() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetStackCreated_200("OpenstackResponse_Stack_Created.json", "dvspg-VCE_VPE-mtjnj40avbc");
+               mockOpenStackGetStackCreated_200(wireMockServer, "OpenstackResponse_Stack_Created.json", "dvspg-VCE_VPE-mtjnj40avbc");
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void createNetworkByModelNameHeatModeQueryNetworkException() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenstackGet("/mockPublicUrl/stacks/dvspg-VCE_VPE-mtjnj40avbc",HttpStatus.SC_INTERNAL_SERVER_ERROR);
+               mockOpenstackGet(wireMockServer, "/mockPublicUrl/stacks/dvspg-VCE_VPE-mtjnj40avbc",HttpStatus.SC_INTERNAL_SERVER_ERROR);
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void createNetworkByModelNameHeatModeCreateNetworkException() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetStack_404("dvspg-VCE_VPE-mtjnj40avbc");
+               mockOpenStackGetStack_404(wireMockServer, "dvspg-VCE_VPE-mtjnj40avbc");
 
-               mockOpenstackPost("/mockPublicUrl/stacks",HttpStatus.SC_INTERNAL_SERVER_ERROR);
+               mockOpenstackPost(wireMockServer, "/mockPublicUrl/stacks",HttpStatus.SC_INTERNAL_SERVER_ERROR);
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void createNetworkByModelNameCloudSiteNotPresentError() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackPostStack_200("OpenstackResponse_Stack.json");
+               mockOpenStackPostStack_200(wireMockServer, "OpenstackResponse_Stack.json");
 
-               mockOpenStackGetStackCreated_200("OpenstackResponse_Stack_Created.json", "dvspg-VCE_VPE-mtjnj40avbc");
+               mockOpenStackGetStackCreated_200(wireMockServer, "OpenstackResponse_Stack_Created.json", "dvspg-VCE_VPE-mtjnj40avbc");
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void deleteNetworkHeatModeSuccess() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetStackDeleteOrUpdateComplete_200("OpenstackResponse_Stack_DeleteComplete.json");
+               mockOpenStackGetStackDeleteOrUpdateComplete_200(wireMockServer, "OpenstackResponse_Stack_DeleteComplete.json");
 
-               mockOpenStackDeleteStack_200();
+               mockOpenStackDeleteStack_200(wireMockServer);
 
-               mockOpenStackGetStackCreated_200("OpenstackResponse_Stack_Created.json", "43173f6a-d699-414b-888f-ab243dda6dfe");
+               mockOpenStackGetStackCreated_200(wireMockServer, "OpenstackResponse_Stack_Created.json", "43173f6a-d699-414b-888f-ab243dda6dfe");
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void deleteNetworkDeleteStackException() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetStackDeleteOrUpdateComplete_200("OpenstackResponse_Stack_DeleteComplete.json");
+               mockOpenStackGetStackDeleteOrUpdateComplete_200(wireMockServer, "OpenstackResponse_Stack_DeleteComplete.json");
 
-               mockOpenStackDeleteStack_500();
+               mockOpenStackDeleteStack_500(wireMockServer);
 
-               mockOpenStackGetStackCreated_200("OpenstackResponse_Stack_Created.json", "43173f6a-d699-414b-888f-ab243dda6dfe");
+               mockOpenStackGetStackCreated_200(wireMockServer, "OpenstackResponse_Stack_Created.json", "43173f6a-d699-414b-888f-ab243dda6dfe");
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void deleteNetworkError() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetStackDeleteOrUpdateComplete_200("OpenstackResponse_Stack_DeleteComplete.json");
+               mockOpenStackGetStackDeleteOrUpdateComplete_200(wireMockServer, "OpenstackResponse_Stack_DeleteComplete.json");
 
-               mockOpenStackDeleteStack_200();
+               mockOpenStackDeleteStack_200(wireMockServer);
 
-               mockOpenStackGetStackCreated_200("OpenstackResponse_Stack_Created.json", "43173f6a-d699-414b-888f-ab243dda6dfe");
+               mockOpenStackGetStackCreated_200(wireMockServer, "OpenstackResponse_Stack_Created.json", "43173f6a-d699-414b-888f-ab243dda6dfe");
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void deleteNetworkNeureonMode() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetNeutronNetwork("GetNeutronNetwork.json",NETWORK_ID,HttpStatus.SC_OK);
+               mockOpenStackGetNeutronNetwork(wireMockServer, "GetNeutronNetwork.json",NETWORK_ID,HttpStatus.SC_OK);
 
-               mockOpenStackDeleteNeutronNetwork(NETWORK_ID,HttpStatus.SC_OK);
+               mockOpenStackDeleteNeutronNetwork(wireMockServer, NETWORK_ID,HttpStatus.SC_OK);
                
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void deleteNetworkNeutronModeDeleteStackException() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetNeutronNetwork("GetNeutronNetwork.json",NETWORK_ID,HttpStatus.SC_OK);
+               mockOpenStackGetNeutronNetwork(wireMockServer, "GetNeutronNetwork.json",NETWORK_ID,HttpStatus.SC_OK);
 
-               mockOpenStackDeleteNeutronNetwork(NETWORK_ID,HttpStatus.SC_INTERNAL_SERVER_ERROR);
+               mockOpenStackDeleteNeutronNetwork(wireMockServer, NETWORK_ID,HttpStatus.SC_INTERNAL_SERVER_ERROR);
 
                //mockOpenStackGetStackCreated_200("OpenstackResponse_Stack_Created.json", NETWORK_ID);
 
        @Test
        public void updateNetworkNeutronModeSuccess() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetNeutronNetwork("GetNeutronNetwork.json",NETWORK_ID,HttpStatus.SC_OK);
-               mockOpenStackPutNeutronNetwork_200("OpenstackCreateNeutronNetworkResponse.json",NETWORK_ID);
+               mockOpenStackGetNeutronNetwork(wireMockServer, "GetNeutronNetwork.json",NETWORK_ID,HttpStatus.SC_OK);
+               mockOpenStackPutNeutronNetwork_200(wireMockServer, "OpenstackCreateNeutronNetworkResponse.json",NETWORK_ID);
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void updateNetworkNeutronUpdateException() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetNeutronNetwork("GetNeutronNetwork.json",NETWORK_ID,HttpStatus.SC_OK);
-               mockOpenStackPutNeutronNetwork(NETWORK_ID,HttpStatus.SC_INTERNAL_SERVER_ERROR);
+               mockOpenStackGetNeutronNetwork(wireMockServer, "GetNeutronNetwork.json",NETWORK_ID,HttpStatus.SC_OK);
+               mockOpenStackPutNeutronNetwork(wireMockServer, NETWORK_ID,HttpStatus.SC_INTERNAL_SERVER_ERROR);
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void updateNetworkHeatUpdateException() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetStackCreated_200("OpenstackResponse_Stack_Created.json", NETWORK_NAME);
+               mockOpenStackGetStackCreated_200(wireMockServer, "OpenstackResponse_Stack_Created.json", NETWORK_NAME);
 
-               mockOpenStackPutStack(NETWORK_ID,HttpStatus.SC_INTERNAL_SERVER_ERROR);
+               mockOpenStackPutStack(wireMockServer, NETWORK_ID,HttpStatus.SC_INTERNAL_SERVER_ERROR);
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void updateNetworkHeatQueryException() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetStack_500(NETWORK_NAME);
+               mockOpenStackGetStack_500(wireMockServer, NETWORK_NAME);
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void updateNetworkHeatStackNotFound() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetStack_404(NETWORK_NAME);
+               mockOpenStackGetStack_404(wireMockServer, NETWORK_NAME);
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void updateNetworkNeutronQueryException() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetNeutronNetwork(NETWORK_ID,HttpStatus.SC_INTERNAL_SERVER_ERROR);
+               mockOpenStackGetNeutronNetwork(wireMockServer, NETWORK_ID,HttpStatus.SC_INTERNAL_SERVER_ERROR);
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void updateNetworkNeutronStackNotFound() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetNeutronNetwork(NETWORK_ID,HttpStatus.SC_NOT_FOUND);
+               mockOpenStackGetNeutronNetwork(wireMockServer, NETWORK_ID,HttpStatus.SC_NOT_FOUND);
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void queryNetworkHeatModesuccess() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetStackCreated_200("OpenstackResponse_Stack_Created.json", NETWORK_ID);
+               mockOpenStackGetStackCreated_200(wireMockServer, "OpenstackResponse_Stack_Created.json", NETWORK_ID);
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void queryNetworkHeatModeQueryException() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetStack_500(NETWORK_ID);
+               mockOpenStackGetStack_500(wireMockServer, NETWORK_ID);
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void queryNetworkNeutronModeSuccess() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetNeutronNetwork("GetNeutronNetwork.json",NETWORK_ID,HttpStatus.SC_OK);
+               mockOpenStackGetNeutronNetwork(wireMockServer, "GetNeutronNetwork.json",NETWORK_ID,HttpStatus.SC_OK);
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
        @Test
        public void queryNetworkNeutronModeException() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetNeutronNetwork(NETWORK_ID,HttpStatus.SC_INTERNAL_SERVER_ERROR);
+               mockOpenStackGetNeutronNetwork(wireMockServer, NETWORK_ID,HttpStatus.SC_INTERNAL_SERVER_ERROR);
 
                String uri =  "/services/NetworkAdapter";
                headers.set("X-ECOMP-RequestID", "123456789456127");
 
 
 package org.onap.so.adapters.network;
 
-import org.apache.http.HttpStatus;
-import org.junit.Test;
-import org.onap.so.adapters.vnf.BaseRestTestUtils;
-import org.onap.so.entity.MsoRequest;
-import org.onap.so.openstack.beans.NetworkRollback;
-import org.onap.so.openstack.beans.Subnet;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.containing;
 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 org.onap.so.bpmn.mock.StubOpenStack.getBodyFromFile;
 import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackGetStackCreatedVUSP_200;
 import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackPutPublicUrlStackByNameAndID_NETWORK2_200;
 import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackResponseAccessQueryNetwork;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.apache.http.HttpStatus;
+import org.junit.Test;
+import org.onap.so.adapters.vnf.BaseRestTestUtils;
+import org.onap.so.entity.MsoRequest;
+import org.onap.so.openstack.beans.NetworkRollback;
+import org.onap.so.openstack.beans.Subnet;
+import org.springframework.beans.factory.annotation.Autowired;
+
 public class MsoNetworkAdapterAsyncImplTest extends BaseRestTestUtils {
        @Autowired
        MsoNetworkAdapterAsyncImpl impl;
 
        @Test
        public void rollbackNetworkATest() throws IOException {
-               stubFor(post(urlPathEqualTo("/v2.0/tokens"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/v2.0/tokens"))
                                .withRequestBody(containing("tenantId"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(getBodyFromFile("OpenstackResponse_Access.json", wireMockPort, "/mockPublicUrl"))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(post(urlPathEqualTo("/notificationUrl"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/notificationUrl"))
                                .withRequestBody(containing("<completed>true</completed>"))
                                .willReturn(aResponse()
                                                .withBody("<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:net=\"http://org.onap.so/networkNotify\">\n" +
 
        @Test
        public void rollbackNetworkATest_NotifyException() throws IOException {
-               stubFor(post(urlPathEqualTo("/v2.0/tokens"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/v2.0/tokens"))
                                .withRequestBody(containing("tenantId"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(getBodyFromFile("OpenstackResponse_Access.json", wireMockPort, "/mockPublicUrl"))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(post(urlPathEqualTo("/notificationUrl"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/notificationUrl"))
                                .withRequestBody(containing("<completed>true</completed>"))
                                .willReturn(aResponse()
                                                .withStatus(HttpStatus.SC_NOT_FOUND)));
 
        @Test
        public void deleteNetworkATest() throws IOException {
-               stubFor(post(urlPathEqualTo("/v2.0/tokens"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/v2.0/tokens"))
                                .withRequestBody(containing("tenantId"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(getBodyFromFile("OpenstackResponse_Access.json", wireMockPort, "/mockPublicUrl"))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(post(urlPathEqualTo("/notificationUrl"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/notificationUrl"))
                                .withRequestBody(containing("<completed>true</completed>"))
                                .willReturn(aResponse()
                                                .withBody("<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:net=\"http://org.onap.so/networkNotify\">\n" +
 
        @Test
        public void deleteNetworkATest_NotifyException() throws IOException {
-               stubFor(post(urlPathEqualTo("/v2.0/tokens"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/v2.0/tokens"))
                                .withRequestBody(containing("tenantId"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(getBodyFromFile("OpenstackResponse_Access.json", wireMockPort, "/mockPublicUrl"))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(post(urlPathEqualTo("/notificationUrl"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/notificationUrl"))
                                .withRequestBody(containing("<completed>true</completed>"))
                                .willReturn(aResponse()
                                                .withStatus(HttpStatus.SC_NOT_FOUND)));
 
        @Test
        public void updateNetworkATest() throws IOException {
-               stubFor(post(urlPathEqualTo("/v2.0/tokens"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/v2.0/tokens"))
                                .withRequestBody(containing("tenantId"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(getBodyFromFile("OpenstackResponse_Access.json", wireMockPort, "/mockPublicUrl"))
                                                .withStatus(HttpStatus.SC_OK)));
-               mockOpenStackGetStackCreated_200("OpenstackResponse_Stack_Created.json", "dvspg-VCE_VPE-mtjnj40avbc");
-               mockOpenStackGetStackDeleteOrUpdateComplete_200("OpenstackResponse_Stack_UpdateComplete.json");
-               mockOpenStackPutPublicUrlStackByNameAndID_NETWORK2_200();
-               stubFor(post(urlPathEqualTo("/notificationUrl"))
+               mockOpenStackGetStackCreated_200(wireMockServer, "OpenstackResponse_Stack_Created.json", "dvspg-VCE_VPE-mtjnj40avbc");
+               mockOpenStackGetStackDeleteOrUpdateComplete_200(wireMockServer, "OpenstackResponse_Stack_UpdateComplete.json");
+               mockOpenStackPutPublicUrlStackByNameAndID_NETWORK2_200(wireMockServer);
+               wireMockServer.stubFor(post(urlPathEqualTo("/notificationUrl"))
                                .withRequestBody(containing("updateNetworkNotification"))
                                .willReturn(aResponse()
                                                .withBody("<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:net=\"http://org.onap.so/networkNotify\">\n" +
 
        @Test
        public void updateNetworkATest_NotifyExcpetion() throws IOException {
-               stubFor(post(urlPathEqualTo("/v2.0/tokens"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/v2.0/tokens"))
                                .withRequestBody(containing("tenantId"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(getBodyFromFile("OpenstackResponse_Access.json", wireMockPort, "/mockPublicUrl"))
                                                .withStatus(HttpStatus.SC_OK)));
-               mockOpenStackGetStackCreated_200("OpenstackResponse_Stack_Created.json", "dvspg-VCE_VPE-mtjnj40avbc");
-               mockOpenStackGetStackDeleteOrUpdateComplete_200("OpenstackResponse_Stack_UpdateComplete.json");
-               mockOpenStackPutPublicUrlStackByNameAndID_NETWORK2_200();
+               mockOpenStackGetStackCreated_200(wireMockServer, "OpenstackResponse_Stack_Created.json", "dvspg-VCE_VPE-mtjnj40avbc");
+               mockOpenStackGetStackDeleteOrUpdateComplete_200(wireMockServer, "OpenstackResponse_Stack_UpdateComplete.json");
+               mockOpenStackPutPublicUrlStackByNameAndID_NETWORK2_200(wireMockServer);
                HashMap<String,String> networkParams = new HashMap<String,String>();
                networkParams.put("shared", "true");
                networkParams.put("external", "false");
 
        @Test
        public void queryNetworkATest() throws IOException {
-               mockOpenStackResponseAccessQueryNetwork(wireMockPort);
+               mockOpenStackResponseAccessQueryNetwork(wireMockServer, wireMockPort);
                impl.queryNetworkA("mtn13", "tenantId", "networkId", "messageId", new MsoRequest(),
                                "http://localhost:"+wireMockPort+"/notificationUrl");
        }
 
        @Test
        public void createNetworkATest() throws IOException {
-               stubFor(post(urlPathEqualTo("/v2.0/tokens"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/v2.0/tokens"))
                                .withRequestBody(containing("tenantId"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(getBodyFromFile("OpenstackResponse_Access.json", wireMockPort, "/mockPublicUrl"))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(post(urlPathEqualTo("/notificationUrl"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/notificationUrl"))
                                .withRequestBody(containing("createNetworkNotification"))
                                .willReturn(aResponse()
                                                .withBody("<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:net=\"http://org.onap.so/networkNotify\">\n" +
                                                                "   </soapenv:Body>\n" +
                                                                "</soapenv:Envelope>")
                                                .withStatus(HttpStatus.SC_OK)));
-               mockOpenStackGetStackCreatedVUSP_200();
-               mockOpenStackPostStacks_200();
-               mockOpenStackPostStacks_200();
+               mockOpenStackGetStackCreatedVUSP_200(wireMockServer);
+               mockOpenStackPostStacks_200(wireMockServer);
+               mockOpenStackPostStacks_200(wireMockServer);
                HashMap<String,String> networkParams = new HashMap<String,String>();
                impl.createNetworkA("mtn13", "tenantId", "networkType", "3bdbb104-476c-483e-9f8b-c095b3d3068c", "vUSP-23804-T-01-dpa2b_EVUSP-CORE-VIF-TSIG0_net_0",
                                "physicalNetworkName", new ArrayList<>(), false, false, new ArrayList<>(), networkParams, "messageId",
 
        @Test
        public void createNetworkATest_NotifyException() throws IOException {
-               stubFor(post(urlPathEqualTo("/v2.0/tokens"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/v2.0/tokens"))
                                .withRequestBody(containing("tenantId"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(getBodyFromFile("OpenstackResponse_Access.json", wireMockPort, "/mockPublicUrl"))
                                                .withStatus(HttpStatus.SC_OK)));
-               mockOpenStackGetStackCreatedVUSP_200();
-               mockOpenStackPostStacks_200();
+               mockOpenStackGetStackCreatedVUSP_200(wireMockServer);
+               mockOpenStackPostStacks_200(wireMockServer);
                HashMap<String,String> networkParams = new HashMap<String,String>();
                networkParams.put("shared", "true");
                networkParams.put("external", "false");
 
                request.setModelCustomizationUuid(MODEL_CUSTOMIZATION_UUID);
                request.setNetworkTechnology(networkTechnology);
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackPostPublicUrlWithBodyFile_200();
+               mockOpenStackPostPublicUrlWithBodyFile_200(wireMockServer);
 
-               mockOpenStackGetStackCreatedVUSP_200();
+               mockOpenStackGetStackCreatedVUSP_200(wireMockServer);
 
-               mockOpenStackGetStackVUSP_404();
+               mockOpenStackGetStackVUSP_404(wireMockServer);
 
                headers.add("Accept", MediaType.APPLICATION_JSON);
                HttpEntity<CreateNetworkRequest> entity = new HttpEntity<CreateNetworkRequest>(request, headers);
                
 
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackPostPublicUrlWithBodyFile_200();
+               mockOpenStackPostPublicUrlWithBodyFile_200(wireMockServer);
 
-               mockOpenStackGetStackCreatedAppC_200();
+               mockOpenStackGetStackCreatedAppC_200(wireMockServer);
                
-               mockOpenStackGetStackAppC_404();
+               mockOpenStackGetStackAppC_404(wireMockServer);
                
                headers.add("Content-Type", MediaType.APPLICATION_JSON);
                headers.add("Accept", MediaType.APPLICATION_JSON);
                request.setModelCustomizationUuid(MODEL_CUSTOMIZATION_UUID);
                request.setNetworkStackId(NETWORK_ID);
                
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
                
-               mockOpenStackPublicUrlStackByID_200(wireMockPort);
+               mockOpenStackPublicUrlStackByID_200(wireMockServer, wireMockPort);
                
-               mockOpenStackGetPublicUrlStackByNameAndID_204(wireMockPort);
+               mockOpenStackGetPublicUrlStackByNameAndID_204(wireMockServer, wireMockPort);
                
-               mockOpenStackDeletePublicUrlStackByNameAndID_204();
+               mockOpenStackDeletePublicUrlStackByNameAndID_204(wireMockServer);
                
                headers.add("Accept", MediaType.APPLICATION_JSON);
                
                msoReq.setRequestId(MSO_REQUEST_ID);
                msoReq.setServiceInstanceId(MSO_SERVICE_INSTANCE_ID);
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackPublicUrlStackByID_200(wireMockPort);
+               mockOpenStackPublicUrlStackByID_200(wireMockServer, wireMockPort);
 
-               mockOpenStackGetPublicUrlStackByNameAndID_204(wireMockPort);
+               mockOpenStackGetPublicUrlStackByNameAndID_204(wireMockServer, wireMockPort);
 
-               mockOpenStackDeletePublicUrlStackByNameAndID_204();
+               mockOpenStackDeletePublicUrlStackByNameAndID_204(wireMockServer);
 
                headers.add("Accept", MediaType.APPLICATION_JSON);
 
        @Test
        public void testQueryNetwork() throws IOException{
 
-               mockOpenStackResponseAccess(wireMockPort);
-               mockOpenStackGetStackVfModule_200();
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+               mockOpenStackGetStackVfModule_200(wireMockServer);
 
                headers.add("Accept", MediaType.APPLICATION_JSON);
                HttpEntity<DeleteNetworkRequest> entity = new HttpEntity<DeleteNetworkRequest>(headers);
                request.setModelCustomizationUuid(MODEL_CUSTOMIZATION_UUID);
                request.setNetworkStackId(NETWORK_ID);
                
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackPublicUrlStackByName_200(wireMockPort);
+               mockOpenStackPublicUrlStackByName_200(wireMockServer, wireMockPort);
                
-               mockOpenStackPublicUrlStackByID_200(wireMockPort);
+               mockOpenStackPublicUrlStackByID_200(wireMockServer, wireMockPort);
                
-               mockOpenStackGetPublicUrlStackByNameAndID_200(wireMockPort);
+               mockOpenStackGetPublicUrlStackByNameAndID_200(wireMockServer, wireMockPort);
 
-               mockOpenStackPutPublicUrlStackByNameAndID_200();
+               mockOpenStackPutPublicUrlStackByNameAndID_200(wireMockServer);
 
                headers.add("Accept", MediaType.APPLICATION_JSON);
                
        @Test
        public void testCreateNetworkCNRC_JSON() throws JSONException, JsonParseException, JsonMappingException, IOException {
                
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackPostPublicUrlWithBodyFile_200();
+               mockOpenStackPostPublicUrlWithBodyFile_200(wireMockServer);
 
-               mockOpenStackGetStackCreatedAppC_200();
+               mockOpenStackGetStackCreatedAppC_200(wireMockServer);
                
-               mockOpenStackGetStackAppC_404();
+               mockOpenStackGetStackAppC_404(wireMockServer);
                
                headers.add("Content-Type", MediaType.APPLICATION_JSON);
                headers.add("Accept", MediaType.APPLICATION_JSON);
        @Test
        public void testCreateNetworkNC_Shared_JSON() throws JSONException, JsonParseException, JsonMappingException, IOException {
                
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackPostPublicUrlWithBodyFile_200();
+               mockOpenStackPostPublicUrlWithBodyFile_200(wireMockServer);
 
-               mockOpenStackGetStackCreatedAppC_200();
+               mockOpenStackGetStackCreatedAppC_200(wireMockServer);
                
-               mockOpenStackGetStackAppC_404();
+               mockOpenStackGetStackAppC_404(wireMockServer);
                
                headers.add("Content-Type", MediaType.APPLICATION_JSON);
                headers.add("Accept", MediaType.APPLICATION_JSON);
 
                request.setBackout(backout);
                request.setFailIfExists(failIfExists);
                
-               mockOpenStackResponseAccessAdmin(wireMockPort);
+               mockOpenStackResponseAccessAdmin(wireMockServer, wireMockPort);
                
-               mockOpenStackGetTenantByName_404(tenantName);
+               mockOpenStackGetTenantByName_404(wireMockServer, tenantName);
                
-               mockOpenStackPostTenantWithBodyFile_200();
+               mockOpenStackPostTenantWithBodyFile_200(wireMockServer);
                
-               mockOpenStackGetUser_200("m93945");
+               mockOpenStackGetUser_200(wireMockServer, "m93945");
                
-               mockOpenStackGetRoles_200("OS-KSADM");
+               mockOpenStackGetRoles_200(wireMockServer, "OS-KSADM");
                
-               mockOpenStackPutRolesAdmin_200("OS-KSADM");
+               mockOpenStackPutRolesAdmin_200(wireMockServer, "OS-KSADM");
                
-               mockOpenStackPostMetadata_200();
+               mockOpenStackPostMetadata_200(wireMockServer);
                
                headers.add("Accept", MediaType.APPLICATION_JSON);
                HttpEntity<CreateTenantRequest> entity = new HttpEntity<CreateTenantRequest>(request, headers);
                request.setBackout(backout);
                request.setFailIfExists(failIfExists);
 
-               mockOpenStackResponseAccessAdmin(wireMockPort);
+               mockOpenStackResponseAccessAdmin(wireMockServer, wireMockPort);
                
-               mockOpenStackGetTenantByName_200(tenantName);
+               mockOpenStackGetTenantByName_200(wireMockServer, tenantName);
                
-               mockOpenStackPostTenant_200();
+               mockOpenStackPostTenant_200(wireMockServer);
                
-               mockOpenStackGetMetadata_200();
+               mockOpenStackGetMetadata_200(wireMockServer);
                
                headers.add("Accept", MediaType.APPLICATION_JSON);
                HttpEntity<CreateTenantRequest> entity = new HttpEntity<CreateTenantRequest>(request, headers);
                request.setTenantId(tenantId);
                request.setMsoRequest(msoReq);
                
-               mockOpenStackResponseAccessAdmin(wireMockPort);
+               mockOpenStackResponseAccessAdmin(wireMockServer, wireMockPort);
                
-               mockOpenStackGetTenantById_200(tenantId);
+               mockOpenStackGetTenantById_200(wireMockServer, tenantId);
                
-               mockOpenStackDeleteTenantById_200(tenantId);
+               mockOpenStackDeleteTenantById_200(wireMockServer, tenantId);
                
                headers.add("Accept", MediaType.APPLICATION_JSON);
                HttpEntity<DeleteTenantRequest> entity = new HttpEntity<DeleteTenantRequest>(request, headers);
                request.setTenantId(tenantId);
                request.setMsoRequest(msoReq);
                
-               mockOpenStackResponseAccessAdmin(wireMockPort);
+               mockOpenStackResponseAccessAdmin(wireMockServer, wireMockPort);
 
-               mockOpenStackGetTenantById_404(tenantId);
+               mockOpenStackGetTenantById_404(wireMockServer, tenantId);
                
                headers.add("Accept", MediaType.APPLICATION_JSON);
                HttpEntity<DeleteTenantRequest> entity = new HttpEntity<DeleteTenantRequest>(request, headers);
 
                ValetCreateResponse vcr = mapper.readValue(new File("src/test/resources/__files/ValetCreateRequest.json"), ValetCreateResponse.class);
                GenericValetResponse<ValetCreateResponse> expected = new GenericValetResponse<ValetCreateResponse>(HttpStatus.SC_OK, ValetClient.NO_STATUS_RETURNED, vcr);
                
-               mockValetCreatePostResponse_200("requestId", mapper.writeValueAsString(vcr));
+               mockValetCreatePostResponse_200(wireMockServer, "requestId", mapper.writeValueAsString(vcr));
                
                GenericValetResponse<ValetCreateResponse> actual = client.callValetCreateRequest("requestId", "regionId", "ownerId", "tenantId", "serviceInstanceId", "vnfId", "vnfName", "vfModuleId", "vfModuleName", "keystoneUrl", null);
 
                ValetUpdateResponse vur = mapper.readValue(new File("src/test/resources/__files/ValetCreateRequest.json"), ValetUpdateResponse.class);
                GenericValetResponse<ValetUpdateResponse> expected = new GenericValetResponse<ValetUpdateResponse>(HttpStatus.SC_OK, ValetClient.NO_STATUS_RETURNED, vur);
                
-               mockValetCreatePutResponse_200("requestId", mapper.writeValueAsString(vur));
+               mockValetCreatePutResponse_200(wireMockServer, "requestId", mapper.writeValueAsString(vur));
                
                GenericValetResponse<ValetUpdateResponse> actual = client.callValetUpdateRequest("requestId", "regionId", "ownerId", "tenantId", "serviceInstanceId", "vnfId", "vnfName", "vfModuleId", "vfModuleName", "keystoneUrl", null);
 
                ValetDeleteResponse vdr = mapper.readValue(new File("src/test/resources/__files/ValetDeleteRequest.json"), ValetDeleteResponse.class);
                GenericValetResponse<ValetDeleteResponse> expected = new GenericValetResponse<ValetDeleteResponse>(HttpStatus.SC_OK, ValetClient.NO_STATUS_RETURNED, vdr);
                
-               mockValetDeleteDeleteResponse_200("requestId", mapper.writeValueAsString(vdr));
+               mockValetDeleteDeleteResponse_200(wireMockServer, "requestId", mapper.writeValueAsString(vdr));
                
                GenericValetResponse<ValetDeleteResponse> actual = client.callValetDeleteRequest("requestId", "regionId", "ownerId", "tenantId", "vfModuleId", "vfModuleName");
 
                ValetConfirmResponse vcr = new ValetConfirmResponse();
                GenericValetResponse<ValetConfirmResponse> expected = new GenericValetResponse<ValetConfirmResponse>(HttpStatus.SC_OK, ValetClient.NO_STATUS_RETURNED, vcr);
                
-               mockValetConfirmPutRequest_200("requestId", "{}");
+               mockValetConfirmPutRequest_200(wireMockServer, "requestId", "{}");
                
                GenericValetResponse<ValetConfirmResponse> actual = client.callValetConfirmRequest("requestId", "stackId");
 
                ValetRollbackResponse vrr = new ValetRollbackResponse();        
                GenericValetResponse<ValetRollbackResponse> expected = new GenericValetResponse<ValetRollbackResponse>(HttpStatus.SC_OK, ValetClient.NO_STATUS_RETURNED, vrr);
                
-               mockValetRollbackPutRequest_200("requestId", "{}");
+               mockValetRollbackPutRequest_200(wireMockServer, "requestId", "{}");
                
                GenericValetResponse<ValetRollbackResponse> actual = client.callValetRollbackRequest("requestId", "stackId", true, "error");
 
 
--- /dev/null
+/*-
+ * ============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.adapters.vnf;
+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
+}
 
 
 package org.onap.so.adapters.vnf;
 
-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 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.urlPathEqualTo;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+
+import javax.ws.rs.core.MediaType;
+
 import org.apache.http.HttpStatus;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import javax.ws.rs.core.MediaType;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-
-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.reset;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+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.WireMockServer;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = MsoOpenstackAdaptersApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public abstract class BaseRestTestUtils {
        @Value("${wiremock.server.port}")
     protected int wireMockPort;
+       
+       @Autowired
+       protected WireMockServer wireMockServer;
+       
        @Autowired
        CloudConfig cloudConfig;
 
         */
        @Before
        public void setUp() throws Exception {
-               reset();
+               wireMockServer.resetAll();
                mapper = new ObjectMapper();
                CloudIdentity identity = new CloudIdentity();
                identity.setId("MTN13");
                identity.setIdentityServerType(ServerType.KEYSTONE);
                cloudSite.setIdentityService(identity);
 
-               stubFor(get(urlPathEqualTo("/cloudSite/MTN13")).willReturn(aResponse()
+               wireMockServer.stubFor(get(urlPathEqualTo("/cloudSite/MTN13")).willReturn(aResponse()
                                .withBody(getBody(mapper.writeValueAsString(cloudSite),wireMockPort, ""))
                                .withHeader(org.apache.http.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(get(urlPathEqualTo("/cloudSite/DEFAULT")).willReturn(aResponse()
+               wireMockServer.stubFor(get(urlPathEqualTo("/cloudSite/DEFAULT")).willReturn(aResponse()
                                .withBody(getBody(mapper.writeValueAsString(cloudSite),wireMockPort, ""))
                                .withHeader(org.apache.http.HttpHeaders.CONTENT_TYPE,MediaType.APPLICATION_JSON)
                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(get(urlPathEqualTo("/cloudIdentity/MTN13")).willReturn(aResponse()
+               wireMockServer.stubFor(get(urlPathEqualTo("/cloudIdentity/MTN13")).willReturn(aResponse()
                                .withBody(getBody(mapper.writeValueAsString(identity),wireMockPort, ""))
                                .withHeader(org.apache.http.HttpHeaders.CONTENT_TYPE,MediaType.APPLICATION_JSON)
                                .withStatus(HttpStatus.SC_OK)));
 
 package org.onap.so.adapters.vnf;
 
 
-import org.apache.http.HttpStatus;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.onap.so.adapters.vnf.exceptions.VnfException;
-import org.onap.so.entity.MsoRequest;
-import org.onap.so.openstack.beans.VnfRollback;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
-
-import java.util.HashMap;
-import java.util.Map;
-
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.containing;
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.verify;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doThrow;
 import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackGetStackVfModule_200;
 import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackResponseAccess;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.http.HttpStatus;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.onap.so.entity.MsoRequest;
+import org.onap.so.openstack.beans.VnfRollback;
+import org.springframework.beans.factory.annotation.Autowired;
+
 public class MsoVnfAdapterAsyncImplTest extends BaseRestTestUtils {
 
        @Autowired
                msoRequest.setRequestId("12345");
                msoRequest.setServiceInstanceId("12345");
 
-               mockOpenStackResponseAccess(wireMockPort);
-               mockOpenStackGetStackVfModule_200();
-               stubFor(post(urlPathEqualTo("/notify/adapterNotify/updateVnfNotificationRequest")).withRequestBody
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+               mockOpenStackGetStackVfModule_200(wireMockServer);
+               wireMockServer.stubFor(post(urlPathEqualTo("/notify/adapterNotify/updateVnfNotificationRequest")).withRequestBody
                                (containing("messageId"))
                                .willReturn(aResponse().withStatus(HttpStatus.SC_OK)));
 
                                "volumeGroupHeatStackId|1", new HashMap<String, Object>(), Boolean.FALSE, Boolean.TRUE, Boolean.FALSE, "messageId",
                                msoRequest, notificationUrl);
 
-               verify(1,postRequestedFor(urlEqualTo("/notify/adapterNotify/updateVnfNotificationRequest")));
+       wireMockServer.verify(1,postRequestedFor(urlEqualTo("/notify/adapterNotify/updateVnfNotificationRequest")));
        }
 
        @Test
                                "volumeGroupHeatStackId|1", new HashMap<String, Object>(), Boolean.FALSE, Boolean.TRUE, Boolean.FALSE, "messageId",
                                null, notificationUrl);
 
-               verify(1,postRequestedFor(urlEqualTo("/notify/adapterNotify/updateVnfNotificationRequest")));
+       wireMockServer.verify(1,postRequestedFor(urlEqualTo("/notify/adapterNotify/updateVnfNotificationRequest")));
 
        }
 
 
                Map<String, Object> map = new HashMap<>();
                map.put("key1", "value1");
-               stubFor(post(urlPathEqualTo("/notify/adapterNotify/updateVnfNotificationRequest")).withRequestBody
+               wireMockServer.stubFor(post(urlPathEqualTo("/notify/adapterNotify/updateVnfNotificationRequest")).withRequestBody
                                (containing("messageId"))
                                .willReturn(aResponse().withStatus(HttpStatus.SC_OK)));
                String notificationUrl = "http://localhost:"+wireMockPort+"/notify/adapterNotify/updateVnfNotificationRequest";
 
                Map<String, Object> map = new HashMap<>();
                map.put("key1", "value1");
-               stubFor(post(urlPathEqualTo("/notify/adapterNotify/updateVnfNotificationRequest")).withRequestBody
+               wireMockServer.stubFor(post(urlPathEqualTo("/notify/adapterNotify/updateVnfNotificationRequest")).withRequestBody
                                (containing("messageId"))
                                .willReturn(aResponse().withStatus(HttpStatus.SC_OK)));
                String notificationUrl = "http://localhost:"+wireMockPort+"/notify/adapterNotify/updateVnfNotificationRequest";
                instance.updateVnfA("mdt1", "CloudOwner", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "vSAMP12", "VFMOD",
                                "volumeGroupHeatStackId|1", map, "messageId", msoRequest,
                                notificationUrl);
-               verify(1,postRequestedFor(urlEqualTo("/notify/adapterNotify/updateVnfNotificationRequest")));
+       wireMockServer.verify(1,postRequestedFor(urlEqualTo("/notify/adapterNotify/updateVnfNotificationRequest")));
        }
 
        @Test
 
 package org.onap.so.adapters.vnf;
 
 
-import com.github.tomakehurst.wiremock.client.WireMock;
+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.urlPathEqualTo;
+import static org.mockito.Mockito.when;
+import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackGetStackVfModule_200;
+import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackGetStackVfModule_404;
+import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackPutStack;
+import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackResponseAccess;
+import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenstackGetWithResponse;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.ws.Holder;
+
 import org.apache.http.HttpStatus;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.onap.so.db.catalog.beans.VfModule;
 import org.onap.so.db.catalog.beans.VfModuleCustomization;
 import org.onap.so.db.catalog.beans.VnfResource;
-import org.onap.so.db.catalog.data.repository.VFModuleCustomizationRepository;
-import org.onap.so.db.catalog.data.repository.VnfResourceRepository;
 import org.onap.so.entity.MsoRequest;
 import org.onap.so.openstack.beans.HeatStatus;
 import org.onap.so.openstack.beans.StackInfo;
 import org.onap.so.openstack.exceptions.MsoException;
 import org.onap.so.openstack.utils.MsoHeatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
 
-import javax.xml.ws.Holder;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-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.stubFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackGetStackVfModule_200;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackGetStackVfModule_404;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackPutStack;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackResponseAccess;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenstackGetWithResponse;
+import com.github.tomakehurst.wiremock.client.WireMock;
 
 
 public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 
        String vnfName = "DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001/stackId";
 
-       @Before
-       public void before() throws Exception {
-               MockitoAnnotations.initMocks(this);
-               WireMock.reset();
-               setUp();
-       }
-
        @Test
        @Ignore
        public void healthCheckVNFTest() {
                StackInfo info = new StackInfo();
                info.setStatus(HeatStatus.CREATED);
 
-               mockOpenStackResponseAccess(wireMockPort);
-               mockOpenStackGetStackVfModule_200();
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+               mockOpenStackGetStackVfModule_200(wireMockServer);
 
                MsoRequest msoRequest = getMsoRequest();
 
        @Test
        public void createVnfTest_HeatStatusUpdating() throws Exception {
                expectedException.expect(VnfAlreadyExists.class);
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001/stackId"))
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001/stackId"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBodyFile("OpenstackResponse_Stack_Updating_VfModule.json")
                                                .withStatus(HttpStatus.SC_OK)));
        @Test
        public void createVnfTest_HeatStatusUpdated() throws Exception {
                expectedException.expect(VnfAlreadyExists.class);
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001/stackId"))
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001/stackId"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBodyFile("OpenstackResponse_StackId.json")
                                                .withStatus(HttpStatus.SC_OK)));
        @Test
        public void createVnfTest_HeatStatusFailed() throws Exception {
                expectedException.expect(VnfAlreadyExists.class);
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001/stackId"))
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001/stackId"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBodyFile("OpenstackResponse_Stack_Failed_VfModule.json")
                                                .withStatus(HttpStatus.SC_OK)));
        @Test
        public void createVnfTest_HeatStatusCreated() throws Exception {
                expectedException.expect(VnfAlreadyExists.class);
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetStackVfModule_200();
+               mockOpenStackGetStackVfModule_200(wireMockServer);
 
                MsoRequest msoRequest = getMsoRequest();
 
        @Test
        public void createVnfTest_NestedHeatStatusNotFound() throws Exception {
                expectedException.expect(VnfException.class);
-               mockOpenStackResponseAccess(wireMockPort);
-               mockOpenStackGetStackVfModule_404();
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+               mockOpenStackGetStackVfModule_404(wireMockServer);
 
                MsoRequest msoRequest = getMsoRequest();
 
        @Test
        public void createVnfTest_ExceptionInGettingNestedHeat() throws Exception {
                expectedException.expect(VnfException.class);
-               mockOpenStackResponseAccess(wireMockPort);
-               mockOpenStackGetStackVfModule_404();
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/volumeGroupHeatStackId"))
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+               mockOpenStackGetStackVfModule_404(wireMockServer);
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/volumeGroupHeatStackId"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
 
        @Test
        public void createVnfTest_NestedBaseHeatStatus_NotFound() throws Exception {
                expectedException.expect(VnfException.class);
-               mockOpenStackResponseAccess(wireMockPort);
-               mockOpenStackGetStackVfModule_404();
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/volumeGroupHeatStackId"))
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+               mockOpenStackGetStackVfModule_404(wireMockServer);
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/volumeGroupHeatStackId"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBodyFile("OpenstackResponse_Stack_Created_VfModule.json")
                                                .withStatus(HttpStatus.SC_OK)));
        @Test
        public void createVnfTest_ExceptionInGettingBaseNestedHeat() throws Exception {
                expectedException.expect(VnfException.class);
-               mockOpenStackResponseAccess(wireMockPort);
-               mockOpenStackGetStackVfModule_404();
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/volumeGroupHeatStackId")).willReturn(aResponse().withBodyFile("OpenstackResponse_Stack_Created_VfModule.json").withStatus(HttpStatus.SC_OK)));
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/baseVfHeatStackId")).willReturn(aResponse().withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+               mockOpenStackGetStackVfModule_404(wireMockServer);
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/volumeGroupHeatStackId")).willReturn(aResponse().withBodyFile("OpenstackResponse_Stack_Created_VfModule.json").withStatus(HttpStatus.SC_OK)));
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/baseVfHeatStackId")).willReturn(aResponse().withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
 
                MsoRequest msoRequest = getMsoRequest();
 
        @Test
        public void createVnfTest_ExceptionInCreateStack() throws Exception {
                expectedException.expect(VnfException.class);
-               mockOpenStackResponseAccess(wireMockPort);
-               mockOpenStackGetStackVfModule_404();
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/volumeGroupHeatStackId")).willReturn(aResponse().withBodyFile("OpenstackResponse_Stack_Created_VfModule.json").withStatus(HttpStatus.SC_OK)));
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/baseVfHeatStackId")).willReturn(aResponse().withBodyFile("OpenstackResponse_Stack_Created_VfModule.json").withStatus(HttpStatus.SC_OK)));
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+               mockOpenStackGetStackVfModule_404(wireMockServer);
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/volumeGroupHeatStackId")).willReturn(aResponse().withBodyFile("OpenstackResponse_Stack_Created_VfModule.json").withStatus(HttpStatus.SC_OK)));
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/baseVfHeatStackId")).willReturn(aResponse().withBodyFile("OpenstackResponse_Stack_Created_VfModule.json").withStatus(HttpStatus.SC_OK)));
 
                VfModuleCustomization vfModuleCustomization = new VfModuleCustomization();
                VfModule vfModule = new VfModule();
        @Test
        public void createVnfTest_ModelCustUuidIsNull() throws Exception {
                expectedException.expect(VnfException.class);
-               mockOpenStackResponseAccess(wireMockPort);
-               mockOpenStackGetStackVfModule_404();
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/volumeGroupHeatStackId")).willReturn(aResponse().withBodyFile("OpenstackResponse_Stack_Created_VfModule.json").withStatus(HttpStatus.SC_OK)));
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/baseVfHeatStackId")).willReturn(aResponse().withBodyFile("OpenstackResponse_Stack_Created_VfModule.json").withStatus(HttpStatus.SC_OK)));
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+               mockOpenStackGetStackVfModule_404(wireMockServer);
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/volumeGroupHeatStackId")).willReturn(aResponse().withBodyFile("OpenstackResponse_Stack_Created_VfModule.json").withStatus(HttpStatus.SC_OK)));
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/baseVfHeatStackId")).willReturn(aResponse().withBodyFile("OpenstackResponse_Stack_Created_VfModule.json").withStatus(HttpStatus.SC_OK)));
 
                VfModuleCustomization vfModuleCustomization = new VfModuleCustomization();
                VfModule vfModule = new VfModule();
        @Test
        public void createVnfTest_HeatEnvironment_ContainsParameters() throws Exception {
                expectedException.expect(VnfException.class);
-               mockOpenStackResponseAccess(wireMockPort);
-               mockOpenStackGetStackVfModule_404();
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/volumeGroupHeatStackId")).willReturn(aResponse().withBodyFile("OpenstackResponse_Stack_Created_VfModule.json").withStatus(HttpStatus.SC_OK)));
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/baseVfHeatStackId")).willReturn(aResponse().withBodyFile("OpenstackResponse_Stack_Created_VfModule.json").withStatus(HttpStatus.SC_OK)));
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+               mockOpenStackGetStackVfModule_404(wireMockServer);
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/volumeGroupHeatStackId")).willReturn(aResponse().withBodyFile("OpenstackResponse_Stack_Created_VfModule.json").withStatus(HttpStatus.SC_OK)));
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/baseVfHeatStackId")).willReturn(aResponse().withBodyFile("OpenstackResponse_Stack_Created_VfModule.json").withStatus(HttpStatus.SC_OK)));
 
                MsoRequest msoRequest = getMsoRequest();
 
        public void updateVnfTest_HeatStackNotFound() throws Exception {
                expectedException.expect(VnfNotFound.class);
                MsoRequest msoRequest = getMsoRequest();
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
                Map<String, Object> map = new HashMap<>();
                map.put("key1", "value1");
                instance.updateVfModule("mtn13", "CloudOwner", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", vnfName, "VFMOD",
        public void updateVnfTest_ExceptionInGettingNestedHeatStack() throws Exception {
                expectedException.expect(VnfException.class);
                MsoRequest msoRequest = getMsoRequest();
-               mockOpenStackResponseAccess(wireMockPort);
-               mockOpenStackGetStackVfModule_200();
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/volumeGroupHeatStackId"))
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+               mockOpenStackGetStackVfModule_200(wireMockServer);
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/volumeGroupHeatStackId"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
                Map<String, Object> map = new HashMap<>();
        public void updateVnfTest_NestedHeatStackNotFound() throws Exception {
                expectedException.expect(VnfException.class);
                MsoRequest msoRequest = getMsoRequest();
-               mockOpenStackResponseAccess(wireMockPort);
-               mockOpenStackGetStackVfModule_200();
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/volumeGroupHeatStackId"))
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+               mockOpenStackGetStackVfModule_200(wireMockServer);
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/volumeGroupHeatStackId"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withStatus(HttpStatus.SC_NOT_FOUND)));
                Map<String, Object> map = new HashMap<>();
        public void updateVnfTest_ExceptionInGettingNestedBaseHeatStack() throws Exception {
                expectedException.expect(VnfException.class);
                MsoRequest msoRequest = getMsoRequest();
-               mockOpenStackResponseAccess(wireMockPort);
-               mockOpenStackGetStackVfModule_200();
-               mockOpenstackGetWithResponse("/mockPublicUrl/stacks/volumeGroupHeatStackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_Created_VfModule.json");
-               mockOpenstackGetWithResponse("/mockPublicUrl/stacks/baseVfHeatStackId",HttpStatus.SC_INTERNAL_SERVER_ERROR,"OpenstackResponse_Stack_Created_VfModule.json");
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+               mockOpenStackGetStackVfModule_200(wireMockServer);
+               mockOpenstackGetWithResponse(wireMockServer, "/mockPublicUrl/stacks/volumeGroupHeatStackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_Created_VfModule.json");
+               mockOpenstackGetWithResponse(wireMockServer, "/mockPublicUrl/stacks/baseVfHeatStackId",HttpStatus.SC_INTERNAL_SERVER_ERROR,"OpenstackResponse_Stack_Created_VfModule.json");
                Map<String, Object> map = new HashMap<>();
                map.put("key1", "value1");
                instance.updateVfModule("mtn13", "CloudOwner", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", vnfName, "VFMOD",
        public void updateVnfTest_NestedBaseHeatStackNotFound() throws Exception {
                expectedException.expect(VnfException.class);
                MsoRequest msoRequest = getMsoRequest();
-               mockOpenStackResponseAccess(wireMockPort);
-               mockOpenStackGetStackVfModule_200();
-               mockOpenstackGetWithResponse("/mockPublicUrl/stacks/volumeGroupHeatStackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_Created_VfModule.json");
-               mockOpenstackGetWithResponse("/mockPublicUrl/stacks/baseVfHeatStackId",HttpStatus.SC_NOT_FOUND,"OpenstackResponse_Stack_Created_VfModule.json");
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+               mockOpenStackGetStackVfModule_200(wireMockServer);
+               mockOpenstackGetWithResponse(wireMockServer, "/mockPublicUrl/stacks/volumeGroupHeatStackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_Created_VfModule.json");
+               mockOpenstackGetWithResponse(wireMockServer, "/mockPublicUrl/stacks/baseVfHeatStackId",HttpStatus.SC_NOT_FOUND,"OpenstackResponse_Stack_Created_VfModule.json");
                Map<String, Object> map = new HashMap<>();
                map.put("key1", "value1");
                instance.updateVfModule("mtn13", "CloudOwner", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", vnfName, "VFMOD",
        public void updateVnfTest_MissingParams() throws Exception {
                expectedException.expect(VnfException.class);
                MsoRequest msoRequest = getMsoRequest();
-               mockOpenStackResponseAccess(wireMockPort);
-               mockOpenStackGetStackVfModule_200();
-               mockOpenstackGetWithResponse("/mockPublicUrl/stacks/volumeGroupHeatStackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_Created_VfModule.json");
-               mockOpenstackGetWithResponse("/mockPublicUrl/stacks/baseVfHeatStackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_Created_VfModule.json");
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+               mockOpenStackGetStackVfModule_200(wireMockServer);
+               mockOpenstackGetWithResponse(wireMockServer, "/mockPublicUrl/stacks/volumeGroupHeatStackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_Created_VfModule.json");
+               mockOpenstackGetWithResponse(wireMockServer, "/mockPublicUrl/stacks/baseVfHeatStackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_Created_VfModule.json");
                Map<String, Object> map = new HashMap<>();
                map.put("key1", "value1");
                instance.updateVfModule("mtn13", "CloudOwner", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", vnfName, "VFMOD",
        public void updateVnfTest_UpdateStackException() throws Exception {
                expectedException.expect(VnfException.class);
                MsoRequest msoRequest = getMsoRequest();
-               mockOpenStackResponseAccess(wireMockPort);
-               mockOpenStackGetStackVfModule_200();
-               mockOpenstackGetWithResponse("/mockPublicUrl/stacks/volumeGroupHeatStackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_Created_VfModule.json");
-               mockOpenstackGetWithResponse("/mockPublicUrl/stacks/baseVfHeatStackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_Created_VfModule.json");
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+               mockOpenStackGetStackVfModule_200(wireMockServer);
+               mockOpenstackGetWithResponse(wireMockServer, "/mockPublicUrl/stacks/volumeGroupHeatStackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_Created_VfModule.json");
+               mockOpenstackGetWithResponse(wireMockServer, "/mockPublicUrl/stacks/baseVfHeatStackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_Created_VfModule.json");
 
                VfModuleCustomization vfModuleCustomization = getVfModuleCustomization();
                vfModuleCustomization.getVfModule().getModuleHeatTemplate().setParameters(new HashSet<>());
        @Test
        public void updateVnfTest() throws Exception {
                MsoRequest msoRequest = getMsoRequest();
-               mockOpenStackResponseAccess(wireMockPort);
-               mockOpenstackGetWithResponse("/mockPublicUrl/stacks/"+vnfName,HttpStatus.SC_OK,"OpenstackResponse_Stack_UpdateComplete.json");
-               mockOpenstackGetWithResponse("/mockPublicUrl/stacks/volumeGroupHeatStackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_Created_VfModule.json");
-               mockOpenstackGetWithResponse("/mockPublicUrl/stacks/baseVfHeatStackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_Created_VfModule.json");
-               mockOpenStackPutStack("null/stackId", HttpStatus.SC_OK);
-               mockOpenstackGetWithResponse("/mockPublicUrl/stacks/null/stackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_UpdateComplete.json");
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+               mockOpenstackGetWithResponse(wireMockServer, "/mockPublicUrl/stacks/"+vnfName,HttpStatus.SC_OK,"OpenstackResponse_Stack_UpdateComplete.json");
+               mockOpenstackGetWithResponse(wireMockServer, "/mockPublicUrl/stacks/volumeGroupHeatStackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_Created_VfModule.json");
+               mockOpenstackGetWithResponse(wireMockServer, "/mockPublicUrl/stacks/baseVfHeatStackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_Created_VfModule.json");
+               mockOpenStackPutStack(wireMockServer, "null/stackId", HttpStatus.SC_OK);
+               mockOpenstackGetWithResponse(wireMockServer, "/mockPublicUrl/stacks/null/stackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_UpdateComplete.json");
 
                VfModuleCustomization vfModuleCustomization = getVfModuleCustomization();
                vfModuleCustomization.getVfModule().getModuleHeatTemplate().setParameters(new HashSet<>());
 
 
 package org.onap.so.adapters.vnf;
 
+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.urlMatching;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static org.junit.Assert.assertTrue;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.ws.Holder;
+
 import org.apache.http.HttpStatus;
 import org.junit.Before;
 import org.junit.Rule;
 import org.onap.so.openstack.beans.VnfRollback;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.xml.ws.Holder;
-import java.util.HashMap;
-import java.util.Map;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
-
 public class MsoVnfCloudifyAdapterImplTest extends BaseRestTestUtils {
 
        @Rule
        
        @Test 
     public void queryVnfExceptionTest() throws Exception {
-               reset();
-               expectedException.expect(VnfException.class);
         MsoRequest msoRequest = new MsoRequest();
         msoRequest.setRequestId("12345");
         msoRequest.setServiceInstanceId("12345");
-
+        Holder <Map <String, String>> outputs = new Holder<>();
         instance.queryVnf("siteid", "CloudOwner", "1234", "vfname",
                 msoRequest, new Holder<>(), new Holder<>(), new Holder<>(),
-                new Holder<>());
+                outputs);
+        
+        assertTrue(outputs.value.isEmpty());
     }
 
        @Test
                MsoRequest msoRequest = new MsoRequest();
                msoRequest.setRequestId("12345");
                msoRequest.setServiceInstanceId("12345");
-               stubFor(get(urlPathEqualTo("/v2.0/api/v3/deployments/vfname")).willReturn(aResponse()
+               wireMockServer.stubFor(get(urlPathEqualTo("/v2.0/api/v3/deployments/vfname")).willReturn(aResponse()
                                .withBody("{ \"id\": \"123\" }")
                                .withStatus(HttpStatus.SC_OK)));
                
-               stubFor(get(urlPathEqualTo("/v2.0/api/v3/deployments/vfname/outputs")).willReturn(aResponse()
+               wireMockServer.stubFor(get(urlPathEqualTo("/v2.0/api/v3/deployments/vfname/outputs")).willReturn(aResponse()
                                .withBody("{ \"deployment_id\": \"123\",\"outputs\":{\"abc\":\"abc\"} }")
                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlMatching("/v2.0/api/v3/executions?.*")).willReturn(aResponse()
+               wireMockServer.stubFor(get(urlMatching("/v2.0/api/v3/executions?.*")).willReturn(aResponse()
                                .withBody("{ \"items\": {\"id\": \"123\",\"workflow_id\":\"install\",\"status\":\"terminated\" } } ")
                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlPathEqualTo("/v2.0/api/v3/tokens")).willReturn(aResponse()
+               wireMockServer.stubFor(get(urlPathEqualTo("/v2.0/api/v3/tokens")).willReturn(aResponse()
                                .withBodyFile("OpenstackResponse_Access.json")
                                .withStatus(HttpStatus.SC_OK)));
                
                MsoRequest msoRequest = new MsoRequest();
                msoRequest.setRequestId("12345");
                msoRequest.setServiceInstanceId("12345");
-               stubFor(get(urlPathEqualTo("/v2.0/api/v3/deployments/vfname")).willReturn(aResponse()
+               wireMockServer.stubFor(get(urlPathEqualTo("/v2.0/api/v3/deployments/vfname")).willReturn(aResponse()
                                .withBody("{ \"id\": \"123\" }")
                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlPathEqualTo("/v2.0/api/v3/deployments/vfname/outputs")).willReturn(aResponse()
+               wireMockServer.stubFor(get(urlPathEqualTo("/v2.0/api/v3/deployments/vfname/outputs")).willReturn(aResponse()
                                .withBody("{ \"deployment_id\": \"123\",\"outputs\":{\"abc\":\"abc\"} }")
                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlMatching("/v2.0/api/v3/executions?.*")).willReturn(aResponse()
+               wireMockServer.stubFor(get(urlMatching("/v2.0/api/v3/executions?.*")).willReturn(aResponse()
                                .withBody("{ \"items\": {\"id\": \"123\",\"workflow_id\":\"install\",\"status\":\"terminated\" } } ")
                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlPathEqualTo("/v2.0/api/v3/tokens")).willReturn(aResponse()
+               wireMockServer.stubFor(get(urlPathEqualTo("/v2.0/api/v3/tokens")).willReturn(aResponse()
                                .withBodyFile("OpenstackResponse_Access.json")
                                .withStatus(HttpStatus.SC_OK)));
 
                msoRequest.setRequestId("12345");
                msoRequest.setServiceInstanceId("12345");
 
-               stubFor(get(urlPathEqualTo("/v2.0/api/v3/deployments/vfname")).willReturn(aResponse()
+               wireMockServer.stubFor(get(urlPathEqualTo("/v2.0/api/v3/deployments/vfname")).willReturn(aResponse()
                                .withBody("{ \"id\": \"123\" }")
                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlPathEqualTo("/v2.0/api/v3/deployments/vfname/outputs")).willReturn(aResponse()
+               wireMockServer.stubFor(get(urlPathEqualTo("/v2.0/api/v3/deployments/vfname/outputs")).willReturn(aResponse()
                                .withBody("{ \"deployment_id\": \"123\",\"outputs\":{\"abc\":\"abc\"} }")
                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlMatching("/v2.0/api/v3/executions?.*")).willReturn(aResponse()
+               wireMockServer.stubFor(get(urlMatching("/v2.0/api/v3/executions?.*")).willReturn(aResponse()
                                .withBody("{ \"items\": {\"id\": \"123\",\"workflow_id\":\"install\",\"status\":\"terminated\" } } ")
                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlPathEqualTo("/v2.0/api/v3/tokens")).willReturn(aResponse()
+               wireMockServer.stubFor(get(urlPathEqualTo("/v2.0/api/v3/tokens")).willReturn(aResponse()
                                .withBodyFile("OpenstackResponse_Access.json")
                                .withStatus(HttpStatus.SC_OK)));
 
 
 
 package org.onap.so.adapters.vnf;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.delete;
+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.urlPathEqualTo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.ws.Holder;
+
 import org.apache.http.HttpStatus;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.onap.so.adapters.openstack.MsoOpenstackAdaptersApplication;
-import org.onap.so.adapters.vnf.exceptions.VnfException;
 import org.onap.so.cloud.CloudConfig;
-import org.onap.so.db.catalog.beans.CloudSite;
 import org.onap.so.entity.MsoRequest;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.web.server.LocalServerPort;
-
-import javax.xml.ws.Holder;
-import java.util.HashMap;
-import java.util.Map;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.delete;
-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.urlMatching;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 
 public class MsoVnfMulticloudAdapterImplTest extends BaseRestTestUtils{
     @Rule
         msoRequest.setRequestId("12345");
         msoRequest.setServiceInstanceId("12345");
 
-        stubFor(get(urlPathEqualTo("/api/multicloud/v1/cloud_owner/cloud_region_id/infra_workload/vfname")).willReturn(aResponse()
+        wireMockServer.stubFor(get(urlPathEqualTo("/api/multicloud/v1/cloud_owner/cloud_region_id/infra_workload/vfname")).willReturn(aResponse()
                 //.withHeader()
                 .withStatus(HttpStatus.SC_NOT_FOUND)));
 
-        stubFor(get(urlPathEqualTo("/api/multicloud/v1/cloud_owner/cloud_region_id/infra_workload/workload-id")).willReturn(aResponse()
+        wireMockServer.stubFor(get(urlPathEqualTo("/api/multicloud/v1/cloud_owner/cloud_region_id/infra_workload/workload-id")).willReturn(aResponse()
                 //.withHeader()
                 .withBodyFile("MulticloudResponse_Stack.json")
                 .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(get(urlPathEqualTo("/api/multicloud/v1/cloud_owner/cloud_region_id/infra_workload/vfname/outputs")).willReturn(aResponse()
+        wireMockServer.stubFor(get(urlPathEqualTo("/api/multicloud/v1/cloud_owner/cloud_region_id/infra_workload/vfname/outputs")).willReturn(aResponse()
                 .withStatus(HttpStatus.SC_NOT_FOUND)));
 
-        stubFor(post(urlPathEqualTo("/api/multicloud/v1/cloud_owner/cloud_region_id/infra_workload")).willReturn(aResponse()
+        wireMockServer.stubFor(post(urlPathEqualTo("/api/multicloud/v1/cloud_owner/cloud_region_id/infra_workload")).willReturn(aResponse()
                 .withBodyFile("MulticloudResponse_Stack_Create.json")
                 .withStatus(HttpStatus.SC_CREATED)));
 
         msoRequest.setRequestId("12345");
         msoRequest.setServiceInstanceId("12345");
 
-        stubFor(get(urlPathEqualTo("/api/multicloud/v1/cloud_owner/cloud_region_id/infra_workload/workload-id")).willReturn(aResponse()
+        wireMockServer.stubFor(get(urlPathEqualTo("/api/multicloud/v1/cloud_owner/cloud_region_id/infra_workload/workload-id")).willReturn(aResponse()
                 .withBodyFile("MulticloudResponse_Stack.json")
                 .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(delete(urlPathEqualTo("/api/multicloud/v1/cloud_owner/cloud_region_id/infra_workload/workload-id")).willReturn(aResponse()
+        wireMockServer.stubFor(delete(urlPathEqualTo("/api/multicloud/v1/cloud_owner/cloud_region_id/infra_workload/workload-id")).willReturn(aResponse()
                 .withStatus(HttpStatus.SC_NO_CONTENT)));
 
         instance.deleteVfModule("MTN13", "CloudOwner", "123", "workload-id", msoRequest, new Holder<>());
         msoRequest.setRequestId("12345");
         msoRequest.setServiceInstanceId("12345");
 
-        stubFor(get(urlPathEqualTo("/api/multicloud/v1/cloud_owner/cloud_region_id/infra_workload/workload-id")).willReturn(aResponse()
+        wireMockServer.stubFor(get(urlPathEqualTo("/api/multicloud/v1/cloud_owner/cloud_region_id/infra_workload/workload-id")).willReturn(aResponse()
                 .withBodyFile("MulticloudResponse_Stack.json")
                 .withStatus(HttpStatus.SC_OK)));
 
 
 
 package org.onap.so.adapters.vnf;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.delete;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackGetStackVfModule_200;
+import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackGetStackVfModule_404;
+import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackResponseAccess;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.ws.Holder;
+
 import org.apache.http.HttpStatus;
 import org.junit.Rule;
 import org.junit.Test;
 import org.onap.so.openstack.beans.VnfRollback;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.xml.ws.Holder;
-import java.util.HashMap;
-import java.util.Map;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.delete;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackGetStackVfModule_200;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackGetStackVfModule_404;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackResponseAccess;
-
 public class MsoVnfPluginAdapterImplTest extends BaseRestTestUtils {
 
     @Rule
 
     @Test
     public void createVfModule_INSTANTIATED() throws Exception {
-        mockOpenStackResponseAccess(wireMockPort);
-        mockOpenStackGetStackVfModule_200();
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+        mockOpenStackGetStackVfModule_200(wireMockServer);
 
         MsoRequest msoRequest = getMsoRequest();
         Map<String, Object> map = new HashMap<>();
     @Test
     public void createVfModule_queryVduNotFoundWithVolumeGroupId() throws Exception {
         expectedException.expect(VnfException.class);
-        mockOpenStackResponseAccess(wireMockPort);
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
         MsoRequest msoRequest = getMsoRequest();
         Map<String, Object> map = new HashMap<>();
         map.put("key1", "value1");
     @Test
     public void createVfModule_CreateVduException() throws Exception {
         expectedException.expect(VnfException.class);
-        mockOpenStackResponseAccess(wireMockPort);
-        mockOpenStackGetStackVfModule_404();
-        stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/volumeGroupHeatStackId"))
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+        mockOpenStackGetStackVfModule_404(wireMockServer);
+        wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/volumeGroupHeatStackId"))
                 .willReturn(aResponse().withHeader("Content-Type", "application/json")
                         .withBodyFile("OpenstackResponse_Stack_Created_VfModule.json")
                         .withStatus(HttpStatus.SC_OK)));
     @Test
     public void deleteVfModule_DeleteVduException() throws Exception {
         expectedException.expect(VnfException.class);
-        mockOpenStackResponseAccess(wireMockPort);
-        mockOpenStackGetStackVfModule_200();
-        stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/vSAMP12"))
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+        mockOpenStackGetStackVfModule_200(wireMockServer);
+        wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/vSAMP12"))
                 .willReturn(aResponse().withHeader("Content-Type", "application/json")
                         .withBodyFile("OpenstackResponse_Stack_Created_VfModule.json")
                         .withStatus(HttpStatus.SC_OK)));
-        stubFor(delete(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001/stackId"))
+        wireMockServer.stubFor(delete(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001/stackId"))
                 .willReturn(aResponse().withHeader("Content-Type", "application/json")
                         .withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
         MsoRequest msoRequest = getMsoRequest();
 
 
                CreateVfModuleRequest request = populateCreateVfModuleRequest();
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetStackVfModule_404();
+               mockOpenStackGetStackVfModule_404(wireMockServer);
 
-               mockOpenStackPostStacks_200();
+               mockOpenStackPostStacks_200(wireMockServer);
 
-               mockOpenStackGetStackVfModule_200();
+               mockOpenStackGetStackVfModule_200(wireMockServer);
 
                headers.add("Accept", MediaType.APPLICATION_JSON);
                HttpEntity<CreateVfModuleRequest> entity = new HttpEntity<CreateVfModuleRequest>(request, headers);
                CreateVfModuleRequest request = populateCreateVfModuleRequest();
                request.setNotificationUrl( createURLWithPort("/mso/WorkflowMesssage"));
                
-               mockOpenStackResponseAccess(wireMockPort);
-               mockOpenStackGetStackVfModule_404();
-               mockOpenStackPostStacks_200();
-               mockOpenStackGetStackVfModule_200();
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+               mockOpenStackGetStackVfModule_404(wireMockServer);
+               mockOpenStackPostStacks_200(wireMockServer);
+               mockOpenStackGetStackVfModule_200(wireMockServer);
                
                headers.add("Accept", MediaType.APPLICATION_JSON);
                HttpEntity<CreateVfModuleRequest> entity = new HttpEntity<CreateVfModuleRequest>(request, headers);
                request.setVfModuleParams(vfModuleParams);
                request.setMessageId(MESSAGE_ID);
 
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetStackVfModule_404();
+               mockOpenStackGetStackVfModule_404(wireMockServer);
 
-               mockOpenStackPostStacks_200();
+               mockOpenStackPostStacks_200(wireMockServer);
 
-               mockOpenStackGetStackVfModule_200();
+               mockOpenStackGetStackVfModule_200(wireMockServer);
 
 
                headers.add("Accept", MediaType.APPLICATION_JSON);
                request.setVfModuleParams(vfModuleParams);
                request.setMessageId(MESSAGE_ID);
                
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
 
-               mockOpenStackGetStackVfModule_404();
+               mockOpenStackGetStackVfModule_404(wireMockServer);
 
-               mockOpenStackGetStacks_404();
+               mockOpenStackGetStacks_404(wireMockServer);
                
-               mockOpenStackPostStacks_200();
+               mockOpenStackPostStacks_200(wireMockServer);
 
-               mockOpenStackGetStackVfModule_200();
+               mockOpenStackGetStackVfModule_200(wireMockServer);
 
                headers.add("Accept", MediaType.APPLICATION_JSON);
                HttpEntity<CreateVfModuleRequest> entity = new HttpEntity<CreateVfModuleRequest>(request, headers);
 
                assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value());
                
-               mockOpenStackGetStacksWithBody_200("DELETE_IN_PROGRESS");
+               mockOpenStackGetStacksWithBody_200(wireMockServer, "DELETE_IN_PROGRESS");
                
                response = restTemplate.exchange(
                                createURLWithPort("/services/rest/v1/vnfs/" + AAI_VNF_ID + "/vf-modules"), HttpMethod.POST,
                
                assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value());
                
-               mockOpenStackGetStacksWithBody_200("DELETE_FAILED");
+               mockOpenStackGetStacksWithBody_200(wireMockServer, "DELETE_FAILED");
                
                response = restTemplate.exchange(
                                createURLWithPort("/services/rest/v1/vnfs/" + AAI_VNF_ID + "/vf-modules"), HttpMethod.POST,
                
                assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value());
                
-               mockOpenStackGetStacksWithBody_200("UPDATE_COMPLETE");
+               mockOpenStackGetStacksWithBody_200(wireMockServer, "UPDATE_COMPLETE");
                
                response = restTemplate.exchange(
                                createURLWithPort("/services/rest/v1/vnfs/" + AAI_VNF_ID + "/vf-modules"), HttpMethod.POST,
                
                assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value());
                
-               mockOpenStackGetStacksWithBody_404();
+               mockOpenStackGetStacksWithBody_404(wireMockServer);
                
                response = restTemplate.exchange(
                                createURLWithPort("/services/rest/v1/vnfs/" + AAI_VNF_ID + "/vf-modules"), HttpMethod.POST,
                request.setVnfId(AAI_VNF_ID);
                request.setMsoRequest(msoRequest);
                
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
                
-               mockOpenStackPostStacks_200();
+               mockOpenStackPostStacks_200(wireMockServer);
                
-               mockOpenStackGetStacksStackId_404();
+               mockOpenStackGetStacksStackId_404(wireMockServer);
                
-               mockOpenStackGetPublicUrlStackByNameAndID_200(wireMockPort);
+               mockOpenStackGetPublicUrlStackByNameAndID_200(wireMockServer, wireMockPort);
                
-               mockOpenStackDeletePublicUrlStackByNameAndID_204();
+               mockOpenStackDeletePublicUrlStackByNameAndID_204(wireMockServer);
                
                
                headers.add("Accept", MediaType.APPLICATION_JSON);
                request.setBackout(backout);
                request.setVfModuleParams(vfModuleParams);
                
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
                
-               mockOpenStackGetStacksVfModuleWithLocationHeader_200(wireMockPort);
+               mockOpenStackGetStacksVfModuleWithLocationHeader_200(wireMockServer, wireMockPort);
                
-               mockOpenStackGetStacksVfModule_200(wireMockPort);
+               mockOpenStackGetStacksVfModule_200(wireMockServer, wireMockPort);
                
-               mockOpenStackGetStacksBaseStack_200(wireMockPort);
+               mockOpenStackGetStacksBaseStack_200(wireMockServer, wireMockPort);
                
-               mockOpenStackPutStacks_200();
+               mockOpenStackPutStacks_200(wireMockServer);
                
                UpdateVfModuleResponse expectedResponse = jettisonTypeObjectMapper.getMapper().readValue(
                                new File("src/test/resources/__files/UpdateVfModuleResponse.json"), UpdateVfModuleResponse.class);
                RollbackVfModuleRequest request = new RollbackVfModuleRequest();
                request.setVfModuleRollback(vfModuleRollback);
                
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
                
-               mockOpenStackGetStacksStackId_200(wireMockPort);
+               mockOpenStackGetStacksStackId_200(wireMockServer, wireMockPort);
                
-               mockOpenStackDeleteStacks();
+               mockOpenStackDeleteStacks(wireMockServer);
                
-               mockOpenStackGetStacksVUSP_404();
+               mockOpenStackGetStacksVUSP_404(wireMockServer);
                
                headers.add("Accept", MediaType.APPLICATION_JSON);
                HttpEntity<RollbackVfModuleRequest> entity = new HttpEntity<RollbackVfModuleRequest>(request, headers);
                                .build().toString();
                System.out.println(testUri);
                
-               mockOpenStackResponseAccess(wireMockPort);
+               mockOpenStackResponseAccess(wireMockServer, wireMockPort);
                
                
                headers.add("Accept", MediaType.APPLICATION_JSON);
 
     @Test
     public void testCreateVNFVolumes() throws IOException {
 
-        mockOpenStackResponseAccess(wireMockPort);
-        mockOpenStackPostStacks_200();
-        mockOpenStackGetStackVfModule_200();
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+        mockOpenStackPostStacks_200(wireMockServer);
+        mockOpenStackGetStackVfModule_200(wireMockServer);
         CreateVolumeGroupRequest request = buildCreateVfModuleRequest();
 
         HttpEntity<CreateVolumeGroupRequest> entity = new HttpEntity<>(request, headers);
     @Test
     public void testCreateVNFVolumesAsync() throws IOException {
 
-        mockOpenStackResponseAccess(wireMockPort);
-        mockOpenStackPostStacks_200();
-        mockOpenStackGetStackVfModule_200();
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+        mockOpenStackPostStacks_200(wireMockServer);
+        mockOpenStackGetStackVfModule_200(wireMockServer);
         CreateVolumeGroupRequest request = buildCreateVfModuleRequest();
         request.setNotificationUrl("http://localhost:8080");
 
 
     @Test
     public void testDeleteVNFVolumes() throws IOException  {
-        mockOpenStackResponseAccess(wireMockPort);
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
         DeleteVolumeGroupRequest request = buildDeleteVolumeGroupRequest();
         HttpEntity<DeleteVolumeGroupRequest> entity = new HttpEntity<>(request, headers);
         ResponseEntity<DeleteVolumeGroupResponse> response = restTemplate.exchange(
 
     @Test
     public void testDeleteVNFVolumesAsync() throws IOException  {
-        mockOpenStackResponseAccess(wireMockPort);
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
         DeleteVolumeGroupRequest request = buildDeleteVolumeGroupRequest();
         request.setNotificationUrl("http://localhost:8080");
         HttpEntity<DeleteVolumeGroupRequest> entity = new HttpEntity<>(request, headers);
 
     @Test
     public void testRollbackVNFVolumes()  throws IOException {
-        mockOpenStackResponseAccess(wireMockPort);
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
         RollbackVolumeGroupRequest request = buildRollbackVolumeGroupRequest();
         HttpEntity<RollbackVolumeGroupRequest> entity = new HttpEntity<>(request, headers);
         ResponseEntity<RollbackVolumeGroupResponse> response = restTemplate.exchange(
 
     @Test
     public void testRollbackVNFVolumesAsync() throws IOException {
-        mockOpenStackResponseAccess(wireMockPort);
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
         RollbackVolumeGroupRequest request = buildRollbackVolumeGroupRequest();
         request.setNotificationUrl("http://localhost:8080");
         HttpEntity<RollbackVolumeGroupRequest> entity = new HttpEntity<>(request, headers);
 
     @Test
     public void testQueryVNFVolumes() throws IOException{
-        mockOpenStackResponseAccess(wireMockPort);
-        mockOpenStackGetStacksWithBody_200("UPDATE_COMPLETE");
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+        mockOpenStackGetStacksWithBody_200(wireMockServer, "UPDATE_COMPLETE");
         javax.ws.rs.core.UriBuilder builder = UriBuilder.fromPath("/services/rest/v1/volume-groups/" + VOLUME_GROUP_ID);
         builder.queryParam("cloudSiteId", CLOUDSITE_ID).queryParam("tenantId", TENANT_ID)
                 .queryParam("volumeGroupStackId", VOUME_GROUP_NAME).queryParam("skipAAI", true)
 
     @Test
     public void testQueryVNFVolumesError() throws IOException{
-        mockOpenStackResponseAccess(wireMockPort);
-        mockOpenStackGetStacksWithBody_200("UPDATE_COMPLETE");
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+        mockOpenStackGetStacksWithBody_200(wireMockServer, "UPDATE_COMPLETE");
         javax.ws.rs.core.UriBuilder builder = UriBuilder.fromPath("/services/rest/v1/volume-groups/" + VOLUME_GROUP_ID);
         builder.queryParam("tenantId", TENANT_ID)
                 .queryParam("volumeGroupStackId", VOUME_GROUP_NAME).queryParam("skipAAI", true)
 
     @Test
     public void testUpdateVNFVolumes() throws IOException {
-        mockOpenStackResponseAccess(wireMockPort);
-        mockOpenStackGetStacksWithBody_200("CREATE_COMPLETE");
-        mockOpenStackPutStack(VOUME_GROUP_NAME+"/stackId",200);
-        mockOpenStackGetStackWithBody_200("UPDATE_COMPLETE");
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+        mockOpenStackGetStacksWithBody_200(wireMockServer, "CREATE_COMPLETE");
+        mockOpenStackPutStack(wireMockServer, VOUME_GROUP_NAME+"/stackId",200);
+        mockOpenStackGetStackWithBody_200(wireMockServer, "UPDATE_COMPLETE");
         UpdateVolumeGroupRequest request = buildUpdateVolumeGroupRequest();
         HttpEntity<UpdateVolumeGroupRequest> entity = new HttpEntity<>(request, headers);
         ResponseEntity<UpdateVolumeGroupResponse> response = restTemplate.exchange(
 
     @Test
     public void testUpdateVNFVolumesAsync() throws IOException {
-        mockOpenStackResponseAccess(wireMockPort);
-        mockOpenStackGetStacksWithBody_200("CREATE_COMPLETE");
-        mockOpenStackPutStack(VOUME_GROUP_NAME+"/stackId",200);
-        mockOpenStackGetStackWithBody_200("UPDATE_COMPLETE");
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+        mockOpenStackGetStacksWithBody_200(wireMockServer, "CREATE_COMPLETE");
+        mockOpenStackPutStack(wireMockServer, VOUME_GROUP_NAME+"/stackId",200);
+        mockOpenStackGetStackWithBody_200(wireMockServer, "UPDATE_COMPLETE");
         UpdateVolumeGroupRequest request = buildUpdateVolumeGroupRequest();
         request.setNotificationUrl("http://localhost:8080");
         HttpEntity<UpdateVolumeGroupRequest> entity = new HttpEntity<>(request, headers);
 
 
     @Test
     public void testCreateVNFVolumes() throws IOException {
-        mockOpenStackResponseAccess(wireMockPort);
-        mockOpenStackPostStacks_200();
-        mockOpenStackGetStackVfModule_200();
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+        mockOpenStackPostStacks_200(wireMockServer);
+        mockOpenStackGetStackVfModule_200(wireMockServer);
         CreateVolumeGroupRequest request = buildCreateVfModuleRequest();
 
         HttpEntity<CreateVolumeGroupRequest> entity = new HttpEntity<>(request, headers);
     @Test
     public void testCreateVNFVolumesAsync() throws IOException {
 
-        mockOpenStackResponseAccess(wireMockPort);
-        mockOpenStackPostStacks_200();
-        mockOpenStackGetStackVfModule_200();
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+        mockOpenStackPostStacks_200(wireMockServer);
+        mockOpenStackGetStackVfModule_200(wireMockServer);
         CreateVolumeGroupRequest request = buildCreateVfModuleRequest();
         request.setNotificationUrl("http://localhost:8080");
         HttpEntity<CreateVolumeGroupRequest> entity = new HttpEntity<>(request, headers);
 
     @Test
     public void testDeleteVNFVolumes() throws IOException  {
-        mockOpenStackResponseAccess(wireMockPort);
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
         DeleteVolumeGroupRequest request = buildDeleteVolumeGroupRequest();
         HttpEntity<DeleteVolumeGroupRequest> entity = new HttpEntity<>(request, headers);
         ResponseEntity<DeleteVolumeGroupResponse> response = restTemplate.exchange(
 
     @Test
     public void testDeleteVNFVolumesAsync() throws IOException  {
-        mockOpenStackResponseAccess(wireMockPort);
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
         DeleteVolumeGroupRequest request = buildDeleteVolumeGroupRequest();
         request.setNotificationUrl("http://localhost:8080");
         HttpEntity<DeleteVolumeGroupRequest> entity = new HttpEntity<>(request, headers);
 
     @Test
     public void testRollbackVNFVolumes()  throws IOException {
-        mockOpenStackResponseAccess(wireMockPort);
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
         RollbackVolumeGroupRequest request = buildRollbackVolumeGroupRequest();
         HttpEntity<RollbackVolumeGroupRequest> entity = new HttpEntity<>(request, headers);
         ResponseEntity<RollbackVolumeGroupResponse> response = restTemplate.exchange(
 
     @Test
     public void testRollbackVNFVolumesAsync()  throws IOException {
-        mockOpenStackResponseAccess(wireMockPort);
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
         RollbackVolumeGroupRequest request = buildRollbackVolumeGroupRequest();
         request.setNotificationUrl("http://localhost:8080");
         HttpEntity<RollbackVolumeGroupRequest> entity = new HttpEntity<>(request, headers);
 
     @Test
     public void testQueryVNFVolumes() throws IOException{
-        mockOpenStackResponseAccess(wireMockPort);
-        mockOpenStackGetStacksWithBody_200("UPDATE_COMPLETE");
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+        mockOpenStackGetStacksWithBody_200(wireMockServer, "UPDATE_COMPLETE");
         javax.ws.rs.core.UriBuilder builder = UriBuilder.fromPath("/services/rest/v2/volume-groups/" + VOLUME_GROUP_ID);
         builder.queryParam("cloudSiteId", CLOUDSITE_ID).queryParam("tenantId", TENANT_ID)
                 .queryParam("volumeGroupStackId", VOUME_GROUP_NAME).queryParam("skipAAI", true)
 
     @Test
     public void testQueryVNFVolumesError() throws IOException{
-        mockOpenStackResponseAccess(wireMockPort);
-        mockOpenStackGetStacksWithBody_200("UPDATE_COMPLETE");
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+        mockOpenStackGetStacksWithBody_200(wireMockServer, "UPDATE_COMPLETE");
         javax.ws.rs.core.UriBuilder builder = UriBuilder.fromPath("/services/rest/v2/volume-groups/" + VOLUME_GROUP_ID);
         builder.queryParam("tenantId", TENANT_ID)
                 .queryParam("volumeGroupStackId", VOUME_GROUP_NAME).queryParam("skipAAI", true)
     }
     @Test
     public void testUpdateVNFVolumes() throws IOException {
-        mockOpenStackResponseAccess(wireMockPort);
-        mockOpenStackGetStacksWithBody_200("CREATE_COMPLETE");
-        mockOpenStackPutStack(VOUME_GROUP_NAME+"/stackId",200);
-        mockOpenStackGetStackWithBody_200("UPDATE_COMPLETE");
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+        mockOpenStackGetStacksWithBody_200(wireMockServer, "CREATE_COMPLETE");
+        mockOpenStackPutStack(wireMockServer, VOUME_GROUP_NAME+"/stackId",200);
+        mockOpenStackGetStackWithBody_200(wireMockServer, "UPDATE_COMPLETE");
         UpdateVolumeGroupRequest request = buildUpdateVolumeGroupRequest();
         HttpEntity<UpdateVolumeGroupRequest> entity = new HttpEntity<>(request, headers);
         ResponseEntity<UpdateVolumeGroupResponse> response = restTemplate.exchange(
 
     @Test
     public void testUpdateVNFVolumesAsync() throws IOException {
-        mockOpenStackResponseAccess(wireMockPort);
-        mockOpenStackGetStacksWithBody_200("CREATE_COMPLETE");
-        mockOpenStackPutStack(VOUME_GROUP_NAME+"/stackId",200);
-        mockOpenStackGetStackWithBody_200("UPDATE_COMPLETE");
+        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
+        mockOpenStackGetStacksWithBody_200(wireMockServer, "CREATE_COMPLETE");
+        mockOpenStackPutStack(wireMockServer, VOUME_GROUP_NAME+"/stackId",200);
+        mockOpenStackGetStackWithBody_200(wireMockServer, "UPDATE_COMPLETE");
         UpdateVolumeGroupRequest request = buildUpdateVolumeGroupRequest();
         request.setNotificationUrl("http://localhost:8080");
         HttpEntity<UpdateVolumeGroupRequest> entity = new HttpEntity<>(request, headers);
 
 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.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 
 
 import org.apache.http.HttpStatus;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+
 public class StubOpenStack {
        private static final String NETWORK_NAME = "vUSP-23804-T-01-dpa2b_EVUSP-CORE-VIF-TSIG0_net_0";
        private static final String NETWORK_ID = "da886914-efb2-4917-b335-c8381528d90b";
        private static final String NETWORK_NAME_2 = "stackname";
        private static final String NETWORK_ID_2 = "stackId";
        
-       public static void mockOpenStackResponseAccess(int port) throws IOException {
-               stubFor(post(urlPathEqualTo("/v2.0/tokens")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+       public static void mockOpenStackResponseAccess(WireMockServer wireMockServer, int port) throws IOException {
+               wireMockServer.stubFor(post(urlPathEqualTo("/v2.0/tokens")).willReturn(aResponse().withHeader("Content-Type", "application/json")
                        .withBody(getBodyFromFile("OpenstackResponse_Access.json", port, "/mockPublicUrl"))
                                .withStatus(HttpStatus.SC_OK)));
        }
 
-       public static void mockOpenStackResponseAccessMulticloud(int port) throws IOException {
-               stubFor(post(urlPathEqualTo("/v2.0/tokens")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+       public static void mockOpenStackResponseAccessMulticloud(WireMockServer wireMockServer, int port) throws IOException {
+               wireMockServer.stubFor(post(urlPathEqualTo("/v2.0/tokens")).willReturn(aResponse().withHeader("Content-Type", "application/json")
                                .withBody(getBodyFromFile("OpenstackResponse_AccessMulticloud.json", port, "/mockPublicUrl"))
                                .withStatus(HttpStatus.SC_OK)));
        }
 
-       public static void mockOpenStackResponseAccessQueryNetwork(int port) throws IOException {
-               stubFor(post(urlPathEqualTo("/v2.0/tokens"))
+       public static void mockOpenStackResponseAccessQueryNetwork(WireMockServer wireMockServer, int port) throws IOException {
+               wireMockServer.stubFor(post(urlPathEqualTo("/v2.0/tokens"))
                                .withRequestBody(containing("tenantId"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                .withBody(getBodyFromFile("OpenstackResponse_Access_queryNetwork.json", port, "/mockPublicUrl"))
                                .withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackResponseAccessAdmin(int port) throws IOException {
-               stubFor(post(urlPathEqualTo("/v2.0/tokens")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+       public static void mockOpenStackResponseAccessAdmin(WireMockServer wireMockServer, int port) throws IOException {
+               wireMockServer.stubFor(post(urlPathEqualTo("/v2.0/tokens")).willReturn(aResponse().withHeader("Content-Type", "application/json")
                                .withBody(getBodyFromFile("OpenstackResponse_Access_Admin.json", port, "/mockPublicUrl"))
                                        .withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackPublicUrlStackByName_200(int port) throws IOException {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/"+NETWORK_NAME)).willReturn(aResponse()
+       public static void mockOpenStackPublicUrlStackByName_200(WireMockServer wireMockServer, int port) throws IOException {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/"+NETWORK_NAME)).willReturn(aResponse()
                        .withHeader("X-Openstack-Request-Id", "openstackRquest")
                                .withHeader("location", "http://localhost:" + port + "/mockPublicUrl/stacks/"+NETWORK_NAME)
                                        .withBody(getBodyFromFile("OpenstackResponse_StackId.json", port, "/mockPublicUrl/stacks/" + NETWORK_NAME))
                                                .withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackPublicUrlStackByID_200(int port) throws IOException {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/"+NETWORK_ID)).willReturn(aResponse()
+       public static void mockOpenStackPublicUrlStackByID_200(WireMockServer wireMockServer, int port) throws IOException {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/"+NETWORK_ID)).willReturn(aResponse()
                        .withHeader("X-Openstack-Request-Id", "openstackRquest")
                                .withHeader("location", "http://localhost:" + port + "/mockPublicUrl/stacks/"+NETWORK_NAME)
                                        .withBody(getBodyFromFile("OpenstackResponse_StackId.json", port, "/mockPublicUrl/stacks/" + NETWORK_NAME))
                                                .withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackGetPublicUrlStackByNameAndID_200(int port) throws IOException {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/"+NETWORK_NAME+"/"+NETWORK_ID)).willReturn(aResponse()
+       public static void mockOpenStackGetPublicUrlStackByNameAndID_200(WireMockServer wireMockServer, int port) throws IOException {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/"+NETWORK_NAME+"/"+NETWORK_ID)).willReturn(aResponse()
                        .withHeader("X-Openstack-Request-Id", "openstackRquest")
                                .withHeader("location", "http://localhost:" + port + "/mockPublicUrl/stacks/"+NETWORK_NAME)
                                        .withBody(getBodyFromFile("OpenstackResponse_StackId.json", port, "/mockPublicUrl/stacks/" + NETWORK_NAME))
                                                .withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackGetPublicUrlStackByNameAndID_204(int port) throws IOException {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/"+NETWORK_NAME+"/"+NETWORK_ID)).willReturn(aResponse()
+       public static void mockOpenStackGetPublicUrlStackByNameAndID_204(WireMockServer wireMockServer, int port) throws IOException {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/"+NETWORK_NAME+"/"+NETWORK_ID)).willReturn(aResponse()
                        .withHeader("X-Openstack-Request-Id", "openstackRquest")
                                .withHeader("location", "http://localhost:" + port + "/mockPublicUrl/stacks/"+NETWORK_NAME+"/"+NETWORK_ID)
                                        .withBody(getBodyFromFile("OpenstackResponse_StackId.json", port, "/mockPublicUrl/stacks/" + NETWORK_NAME))
                                                .withStatus(HttpStatus.SC_NOT_FOUND)));
        }
        
-       public static void mockOpenStackPutPublicUrlStackByNameAndID_200() {
-               stubFor(put(urlPathEqualTo("/mockPublicUrl/stacks/"+NETWORK_NAME+"/"+NETWORK_ID)).willReturn(aResponse()
+       public static void mockOpenStackPutPublicUrlStackByNameAndID_200(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(put(urlPathEqualTo("/mockPublicUrl/stacks/"+NETWORK_NAME+"/"+NETWORK_ID)).willReturn(aResponse()
                        .withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_OK)));
        }
 
-       public static void mockOpenStackPutPublicUrlStackByNameAndID_NETWORK2_200() {
-               stubFor(put(urlPathEqualTo("/mockPublicUrl/stacks/"+NETWORK_NAME_2+"/"+NETWORK_ID_2)).willReturn(aResponse()
+       public static void mockOpenStackPutPublicUrlStackByNameAndID_NETWORK2_200(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(put(urlPathEqualTo("/mockPublicUrl/stacks/"+NETWORK_NAME_2+"/"+NETWORK_ID_2)).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackDeletePublicUrlStackByNameAndID_204() {
-               stubFor(delete(urlPathEqualTo("/mockPublicUrl/stacks/"+NETWORK_NAME+"/"+NETWORK_ID)).willReturn(aResponse()
+       public static void mockOpenStackDeletePublicUrlStackByNameAndID_204(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(delete(urlPathEqualTo("/mockPublicUrl/stacks/"+NETWORK_NAME+"/"+NETWORK_ID)).willReturn(aResponse()
                        .withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_NO_CONTENT)));
        }
        
-       public static void mockOpenStackPostPublicUrlWithBodyFile_200() {
-               stubFor(post(urlPathEqualTo("/mockPublicUrl/stacks"))
+       public static void mockOpenStackPostPublicUrlWithBodyFile_200(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(post(urlPathEqualTo("/mockPublicUrl/stacks"))
                        .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                .withBodyFile("OpenstackResponse_Stack.json").withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackGetStackCreatedAppC_200() {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/APP-C-24595-T-IST-04AShared_untrusted_vDBE_net_3/stackId"))
+       public static void mockOpenStackGetStackCreatedAppC_200(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/APP-C-24595-T-IST-04AShared_untrusted_vDBE_net_3/stackId"))
                        .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                .withBodyFile("OpenstackResponse_Stack_Created.json").withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackGetStackAppC_404() {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/APP-C-24595-T-IST-04AShared_untrusted_vDBE_net_3"))
+       public static void mockOpenStackGetStackAppC_404(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/APP-C-24595-T-IST-04AShared_untrusted_vDBE_net_3"))
                        .willReturn(aResponse().withStatus(HttpStatus.SC_NOT_FOUND)));
        }
        
-       public static void mockOpenStackGetStackCreatedVUSP_200() {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/vUSP-23804-T-01-dpa2b_EVUSP-CORE-VIF-TSIG0_net_0/stackId"))
+       public static void mockOpenStackGetStackCreatedVUSP_200(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/vUSP-23804-T-01-dpa2b_EVUSP-CORE-VIF-TSIG0_net_0/stackId"))
                        .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                .withBodyFile("OpenstackResponse_Stack_Created.json").withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackGetStackVUSP_404() {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/vUSP-23804-T-01-dpa2b_EVUSP-CORE-VIF-TSIG0_net_0"))
+       public static void mockOpenStackGetStackVUSP_404(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/vUSP-23804-T-01-dpa2b_EVUSP-CORE-VIF-TSIG0_net_0"))
                        .willReturn(aResponse().withStatus(HttpStatus.SC_NOT_FOUND)));
        }
        
-       public static void mockOpenStackPostStack_200(String filename) {
-               stubFor(post(urlPathEqualTo("/mockPublicUrl/stacks")).willReturn(aResponse()
+       public static void mockOpenStackPostStack_200(WireMockServer wireMockServer, String filename) {
+               wireMockServer.stubFor(post(urlPathEqualTo("/mockPublicUrl/stacks")).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json")
                                .withBodyFile(filename).withStatus(HttpStatus.SC_OK)));
        }
 
-       public static void mockOpenStackPostNeutronNetwork_200(String filename) {
-               stubFor(post(urlPathEqualTo("/mockPublicUrl/v2.0/networks")).willReturn(aResponse()
+       public static void mockOpenStackPostNeutronNetwork_200(WireMockServer wireMockServer, String filename) {
+               wireMockServer.stubFor(post(urlPathEqualTo("/mockPublicUrl/v2.0/networks")).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json")
                                .withBodyFile(filename).withStatus(HttpStatus.SC_OK)));
        }
 
-       public static void mockOpenStackPutNeutronNetwork_200(String filename,String networkId) {
-               stubFor(put(urlPathEqualTo("/mockPublicUrl/v2.0/networks/"+networkId)).willReturn(aResponse()
+       public static void mockOpenStackPutNeutronNetwork_200(WireMockServer wireMockServer, String filename,String networkId) {
+               wireMockServer.stubFor(put(urlPathEqualTo("/mockPublicUrl/v2.0/networks/"+networkId)).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json")
                                .withBodyFile(filename).withStatus(HttpStatus.SC_OK)));
        }
 
-       public static void mockOpenStackPutNeutronNetwork(String networkId, int responseCode) {
-               stubFor(put(urlPathEqualTo("/mockPublicUrl/v2.0/networks/"+networkId)).willReturn(aResponse()
+       public static void mockOpenStackPutNeutronNetwork(WireMockServer wireMockServer, String networkId, int responseCode) {
+               wireMockServer.stubFor(put(urlPathEqualTo("/mockPublicUrl/v2.0/networks/"+networkId)).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json")
                                .withStatus(responseCode)));
        }
 
-       public static void mockOpenStackGetAllNeutronNetworks_200(String filename){
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/v2.0/networks")).willReturn(aResponse()
+       public static void mockOpenStackGetAllNeutronNetworks_200(WireMockServer wireMockServer, String filename){
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/v2.0/networks")).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json")
                                .withBodyFile(filename).withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackGetNeutronNetwork_404(String networkName) {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/v2.0/networks/"+networkName)).willReturn(aResponse()
+       public static void mockOpenStackGetNeutronNetwork_404(WireMockServer wireMockServer, String networkName) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/v2.0/networks/"+networkName)).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json")
                                .withStatus(HttpStatus.SC_NOT_FOUND)));
        }
 
-       public static void mockOpenStackGetAllNeutronNetworks_404() {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/v2.0/networks")).willReturn(aResponse()
+       public static void mockOpenStackGetAllNeutronNetworks_404(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/v2.0/networks")).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json")
                                .withStatus(HttpStatus.SC_NOT_FOUND)));
        }
 
-       public static void mockOpenstackGetWithResponse(String url,int responseCode, String responseFile) {
-               stubFor(get(urlPathEqualTo(url)).willReturn(aResponse()
+       public static void mockOpenstackGetWithResponse(WireMockServer wireMockServer, String url,int responseCode, String responseFile) {
+               wireMockServer.stubFor(get(urlPathEqualTo(url)).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json")
                                .withBodyFile(responseFile)
                                .withStatus(responseCode)));
        }
        
-       public static void mockOpenstackPostWithResponse(String url,int responseCode, String responseFile) {
-               stubFor(post(urlPathEqualTo(url)).willReturn(aResponse()
+       public static void mockOpenstackPostWithResponse(WireMockServer wireMockServer, String url,int responseCode, String responseFile) {
+               wireMockServer.stubFor(post(urlPathEqualTo(url)).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json")
                                .withBodyFile(responseFile)
                                .withStatus(responseCode)));
        }
 
-       public static void mockOpenstackGet(String url,int responseCode) {
-               stubFor(get(urlPathEqualTo(url)).willReturn(aResponse()
+       public static void mockOpenstackGet(WireMockServer wireMockServer, String url,int responseCode) {
+               wireMockServer.stubFor(get(urlPathEqualTo(url)).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json")
                                .withStatus(responseCode)));
        }
 
-       public static void mockOpenstackPost(String url,int responseCode) {
-               stubFor(post(urlPathEqualTo(url)).willReturn(aResponse()
+       public static void mockOpenstackPost(WireMockServer wireMockServer, String url,int responseCode) {
+               wireMockServer.stubFor(post(urlPathEqualTo(url)).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json")
                                .withStatus(responseCode)));
        }
 
-       public static void mockOpenStackGetStackVfModule_200() {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001/stackId"))
+       public static void mockOpenStackGetStackVfModule_200(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001/stackId"))
                        .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                .withBodyFile("OpenstackResponse_Stack_Created_VfModule.json")
                                        .withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackGetStackVfModule_404() {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001"))
+       public static void mockOpenStackGetStackVfModule_404(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001"))
                        .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                .withStatus(HttpStatus.SC_NOT_FOUND)));
        }
        
-       public static void mockOpenStackPostStacks_200() {
-               stubFor(post(urlPathEqualTo("/mockPublicUrl/stacks"))
+       public static void mockOpenStackPostStacks_200(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(post(urlPathEqualTo("/mockPublicUrl/stacks"))
                        .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                .withBodyFile("OpenstackResponse_Stack.json").withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackGetStacks_404() {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/3d7ff7b4-720b-4604-be0a-1974fc58ed96"))
+       public static void mockOpenStackGetStacks_404(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/3d7ff7b4-720b-4604-be0a-1974fc58ed96"))
                        .willReturn(aResponse().withStatus(HttpStatus.SC_NOT_FOUND)));
        }
        
-       public static void mockOpenStackGetStacksWithBody_200(String replaceWith) throws IOException {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001"))
+       public static void mockOpenStackGetStacksWithBody_200(WireMockServer wireMockServer, String replaceWith) throws IOException {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001"))
                        .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                .withBody(getBodyFromFileVnfAdapter(replaceWith))
                                        .withStatus(HttpStatus.SC_OK)));
        }
 
-       public static void mockOpenStackGetStackWithBody_200(String replaceWith) throws IOException {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001/stackId"))
+       public static void mockOpenStackGetStackWithBody_200(WireMockServer wireMockServer, String replaceWith) throws IOException {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001/stackId"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(getBodyFromFileVnfAdapter(replaceWith))
                                                .withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackGetStacksWithBody_404() throws IOException {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001"))
+       public static void mockOpenStackGetStacksWithBody_404(WireMockServer wireMockServer) throws IOException {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001"))
                        .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                .withBody(getBodyFromFileVnfAdapter(null))
                                        .withStatus(HttpStatus.SC_NOT_FOUND)));
        }
        
-       public static void mockOpenStackGetStacksStackId_404() {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/stackId"))
+       public static void mockOpenStackGetStacksStackId_404(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/stackId"))
                        .willReturn(aResponse().withStatus(HttpStatus.SC_NOT_FOUND)));
        }
        
-       public static void mockOpenStackGetStacksVfModule_200(int port) throws IOException {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001")).willReturn(aResponse()
+       public static void mockOpenStackGetStacksVfModule_200(WireMockServer wireMockServer, int port) throws IOException {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001")).willReturn(aResponse()
                        .withHeader("X-Openstack-Request-Id", "openstackRquest")
                                .withBody(getBodyFromFile("OpenstackResponse_VnfStackId.json", port, "/mockPublicUrl/stacks/stackId")).withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackGetStacksVfModuleWithLocationHeader_200(int port) throws IOException {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001")).willReturn(aResponse()
+       public static void mockOpenStackGetStacksVfModuleWithLocationHeader_200(WireMockServer wireMockServer, int port) throws IOException {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001")).willReturn(aResponse()
                        .withHeader("X-Openstack-Request-Id", "openstackRquest")
                                .withHeader("location", "http://localhost:" + port + "/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001")
                                        .withBody(getBodyFromFile("OpenstackResponse_VnfStackId.json", port, "/mockPublicUrl/stacks/stackId")).withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackGetStacksBaseStack_200(int port) throws IOException {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/baseVfModuleStackId")).willReturn(aResponse()
+       public static void mockOpenStackGetStacksBaseStack_200(WireMockServer wireMockServer, int port) throws IOException {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/baseVfModuleStackId")).willReturn(aResponse()
                        .withHeader("X-Openstack-Request-Id", "openstackRquest")
                                .withHeader("location", "http://localhost:" + port + "/mockPublicUrl/stacks/baseVfModuleStackId")
                                        .withBody(getBodyFromFile("OpenstackResponse_VnfBaseStackId.json", port, "/mockPublicUrl/stacks/stackId")).withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackPutStacks_200() {
-               stubFor(put(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001")).willReturn(aResponse()
+       public static void mockOpenStackPutStacks_200(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(put(urlPathEqualTo("/mockPublicUrl/stacks/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001/DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001")).willReturn(aResponse()
                        .withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_OK)));
        }
 
-       public static void mockOpenStackPutStack(String networkId,int responseCode) {
-               stubFor(put(urlPathEqualTo("/mockPublicUrl/stacks/"+networkId))
+       public static void mockOpenStackPutStack(WireMockServer wireMockServer, String networkId,int responseCode) {
+               wireMockServer.stubFor(put(urlPathEqualTo("/mockPublicUrl/stacks/"+networkId))
                                .willReturn(aResponse()
                                .withHeader("Content-Type", "application/json")
                                .withStatus(responseCode)));
        }
        
-       public static void mockOpenStackGetStacksStackId_200(int port) throws IOException {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/StackId")).willReturn(aResponse()
+       public static void mockOpenStackGetStacksStackId_200(WireMockServer wireMockServer, int port) throws IOException {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/StackId")).willReturn(aResponse()
                        .withHeader("X-Openstack-Request-Id", "openstackRquest")
                                .withHeader("location", "http://localhost:" + port + "/mockPublicUrl/stacks/stackId")
                                        .withBody(getBodyFromFile("OpenstackResponse_StackId.json", port, "/mockPublicUrl/stacks/stackId")).withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackDeleteStacks() {
-               stubFor(delete(urlPathEqualTo("/mockPublicUrl/stacks/vUSP-23804-T-01-dpa2b_EVUSP-CORE-VIF-TSIG0_net_0/da886914-efb2-4917-b335-c8381528d90b"))
+       public static void mockOpenStackDeleteStacks(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(delete(urlPathEqualTo("/mockPublicUrl/stacks/vUSP-23804-T-01-dpa2b_EVUSP-CORE-VIF-TSIG0_net_0/da886914-efb2-4917-b335-c8381528d90b"))
                        .willReturn(aResponse().withHeader("X-Openstack-Request-Id", "openstackRquest")));
        }
        
-       public static void mockOpenStackGetStacksVUSP_404() {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/vUSP-23804-T-01-dpa2b_EVUSP-CORE-VIF-TSIG0_net_0/da886914-efb2-4917-b335-c8381528d90b"))
+       public static void mockOpenStackGetStacksVUSP_404(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/vUSP-23804-T-01-dpa2b_EVUSP-CORE-VIF-TSIG0_net_0/da886914-efb2-4917-b335-c8381528d90b"))
                        .willReturn(aResponse()
                                .withHeader("X-Openstack-Request-Id", "openstackRquest")
                                        .withStatus(HttpStatus.SC_NOT_FOUND)));
        }
        
-       public static void mockOpenStackGetStackCreated_200(String filename, String networkName) {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/" + networkName))
+       public static void mockOpenStackGetStackCreated_200(WireMockServer wireMockServer, String filename, String networkName) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/" + networkName))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBodyFile(filename).withStatus(HttpStatus.SC_OK)));
        }
 
-       public static void mockOpenStackGetStack_404(String networkName) {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/" + networkName))
+       public static void mockOpenStackGetStack_404(WireMockServer wireMockServer, String networkName) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/" + networkName))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withStatus(HttpStatus.SC_NOT_FOUND)));
        }
 
-       public static void mockOpenStackGetStack_500(String networkName) {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/" + networkName))
+       public static void mockOpenStackGetStack_500(WireMockServer wireMockServer, String networkName) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/" + networkName))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
        }
 
-       public static void mockOpenStackGetStackDeleteOrUpdateComplete_200(String filename) {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/" + NETWORK_NAME_2 + "/" + NETWORK_ID_2))
+       public static void mockOpenStackGetStackDeleteOrUpdateComplete_200(WireMockServer wireMockServer, String filename) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/" + NETWORK_NAME_2 + "/" + NETWORK_ID_2))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBodyFile(filename).withStatus(HttpStatus.SC_OK)));
        }
 
-       public static void mockOpenStackGetNeutronNetwork(String filename,String networkId,int status) {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/v2.0/networks/"+ networkId))
+       public static void mockOpenStackGetNeutronNetwork(WireMockServer wireMockServer, String filename,String networkId,int status) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/v2.0/networks/"+ networkId))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBodyFile(filename).withStatus(status)));
        }
 
-       public static void mockOpenStackGetNeutronNetwork(String networkId,int status) {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/v2.0/networks/"+ networkId))
+       public static void mockOpenStackGetNeutronNetwork(WireMockServer wireMockServer, String networkId,int status) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/v2.0/networks/"+ networkId))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withStatus(status)));
        }
        
-       public static void mockOpenStackDeleteStack_200() {
-               stubFor(delete(urlPathEqualTo("/mockPublicUrl/stacks/" + NETWORK_NAME_2 + "/" + NETWORK_ID_2))
+       public static void mockOpenStackDeleteStack_200(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(delete(urlPathEqualTo("/mockPublicUrl/stacks/" + NETWORK_NAME_2 + "/" + NETWORK_ID_2))
                                .willReturn(aResponse().withStatus(HttpStatus.SC_OK)));
        }
 
-       public static void mockOpenStackDeleteStack_500() {
-               stubFor(delete(urlPathEqualTo("/mockPublicUrl/stacks/" + NETWORK_NAME_2 + "/" + NETWORK_ID_2))
+       public static void mockOpenStackDeleteStack_500(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(delete(urlPathEqualTo("/mockPublicUrl/stacks/" + NETWORK_NAME_2 + "/" + NETWORK_ID_2))
                                .willReturn(aResponse().withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
        }
 
-       public static void mockOpenStackDeleteNeutronNetwork(String networkId,int responseCode) {
-               stubFor(delete(urlPathEqualTo("/mockPublicUrl/v2.0/networks/" + networkId))
+       public static void mockOpenStackDeleteNeutronNetwork(WireMockServer wireMockServer, String networkId,int responseCode) {
+               wireMockServer.stubFor(delete(urlPathEqualTo("/mockPublicUrl/v2.0/networks/" + networkId))
                                .willReturn(aResponse().withStatus(responseCode)));
        }
        
-       public static void mockOpenStackPostMetadata_200() {
-               stubFor(post(urlPathEqualTo("/mockPublicUrl/tenants/tenantId/metadata")).willReturn(aResponse()
+       public static void mockOpenStackPostMetadata_200(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(post(urlPathEqualTo("/mockPublicUrl/tenants/tenantId/metadata")).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json")
                                                .withBodyFile("OpenstackResponse_Metadata.json").withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackGetMetadata_200() {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/tenants/tenantId/metadata")).willReturn(aResponse()
+       public static void mockOpenStackGetMetadata_200(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/tenants/tenantId/metadata")).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json")
                                                .withBodyFile("OpenstackResponse_Metadata.json").withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackPostTenantWithBodyFile_200() throws IOException {
-               stubFor(post(urlPathEqualTo("/mockPublicUrl/tenants"))
+       public static void mockOpenStackPostTenantWithBodyFile_200(WireMockServer wireMockServer) throws IOException {
+               wireMockServer.stubFor(post(urlPathEqualTo("/mockPublicUrl/tenants"))
                                .withRequestBody(equalToJson(readFile("src/test/resources/__files/OpenstackRequest_Tenant.json"))).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json")
                                                .withBodyFile("OpenstackResponse_Tenant.json").withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackPostTenant_200() throws IOException {
-               stubFor(post(urlPathEqualTo("/mockPublicUrl/tenants")).willReturn(aResponse()
+       public static void mockOpenStackPostTenant_200(WireMockServer wireMockServer) throws IOException {
+               wireMockServer.stubFor(post(urlPathEqualTo("/mockPublicUrl/tenants")).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackGetTenantByName_200(String tenantName) {
-               stubFor(get(urlEqualTo("/mockPublicUrl/tenants/?name=" + tenantName)).willReturn(aResponse()
+       public static void mockOpenStackGetTenantByName_200(WireMockServer wireMockServer, String tenantName) {
+               wireMockServer.stubFor(get(urlEqualTo("/mockPublicUrl/tenants/?name=" + tenantName)).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json")
                                                .withBodyFile("OpenstackResponse_Tenant.json").withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackGetTenantByName_404(String tenantName) {
-               stubFor(get(urlEqualTo("/mockPublicUrl/tenants/?name=" + tenantName)).willReturn(aResponse()
+       public static void mockOpenStackGetTenantByName_404(WireMockServer wireMockServer, String tenantName) {
+               wireMockServer.stubFor(get(urlEqualTo("/mockPublicUrl/tenants/?name=" + tenantName)).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_NOT_FOUND)));
        }
        
-       public static void mockOpenStackGetTenantById_200(String tenantId) {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/tenants/" + tenantId)).willReturn(aResponse()
+       public static void mockOpenStackGetTenantById_200(WireMockServer wireMockServer, String tenantId) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/tenants/" + tenantId)).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json")
                                                .withBodyFile("OpenstackResponse_Tenant.json").withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackGetTenantById_404(String tenantId) {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/tenants/" + tenantId)).willReturn(aResponse()
+       public static void mockOpenStackGetTenantById_404(WireMockServer wireMockServer, String tenantId) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/tenants/" + tenantId)).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_NOT_FOUND)));
        }
        
-       public static void mockOpenStackDeleteTenantById_200(String tenantId) {
-               stubFor(delete(urlPathEqualTo("/mockPublicUrl/tenants/" + tenantId)).willReturn(aResponse()
+       public static void mockOpenStackDeleteTenantById_200(WireMockServer wireMockServer, String tenantId) {
+               wireMockServer.stubFor(delete(urlPathEqualTo("/mockPublicUrl/tenants/" + tenantId)).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackGetUser_200(String user) {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/users/" + user)).willReturn(aResponse()
+       public static void mockOpenStackGetUser_200(WireMockServer wireMockServer, String user) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/users/" + user)).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json")
                                                .withBodyFile("OpenstackResponse_User.json").withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackGetRoles_200(String roleFor) {
-               stubFor(get(urlPathEqualTo("/mockPublicUrl/" + roleFor + "/roles")).willReturn(aResponse()
+       public static void mockOpenStackGetRoles_200(WireMockServer wireMockServer, String roleFor) {
+               wireMockServer.stubFor(get(urlPathEqualTo("/mockPublicUrl/" + roleFor + "/roles")).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json")
                                                .withBodyFile("OpenstackResponse_Roles.json").withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockOpenStackPutRolesAdmin_200(String roleFor) {
-               stubFor(put(urlPathEqualTo("/mockPublicUrl/tenants/tenantId/users/msoId/roles/" + roleFor + "/admin")).willReturn(aResponse()
+       public static void mockOpenStackPutRolesAdmin_200(WireMockServer wireMockServer, String roleFor) {
+               wireMockServer.stubFor(put(urlPathEqualTo("/mockPublicUrl/tenants/tenantId/users/msoId/roles/" + roleFor + "/admin")).willReturn(aResponse()
                                .withHeader("Content-Type", "application/json")
                                                .withBody("").withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockValetCreatePostResponse_200(String requestId, String body) {
-               stubFor(post(urlEqualTo("/api/valet/placement/v1/?requestId=" + requestId))
+       public static void mockValetCreatePostResponse_200(WireMockServer wireMockServer, String requestId, String body) {
+               wireMockServer.stubFor(post(urlEqualTo("/api/valet/placement/v1/?requestId=" + requestId))
                 .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                .withBody(body).withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockValetCreatePutResponse_200(String requestId, String body) {
-               stubFor(put(urlEqualTo("/api/valet/placement/v1/?requestId=" + requestId))
+       public static void mockValetCreatePutResponse_200(WireMockServer wireMockServer, String requestId, String body) {
+               wireMockServer.stubFor(put(urlEqualTo("/api/valet/placement/v1/?requestId=" + requestId))
               .willReturn(aResponse().withHeader("Content-Type", "application/json")
                          .withBody(body).withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockValetDeleteDeleteResponse_200(String requestId, String body) {
-               stubFor(delete(urlEqualTo("/api/valet/placement/v1/?requestId=" + requestId))
+       public static void mockValetDeleteDeleteResponse_200(WireMockServer wireMockServer, String requestId, String body) {
+               wireMockServer.stubFor(delete(urlEqualTo("/api/valet/placement/v1/?requestId=" + requestId))
                 .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                .withBody(body).withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockValetConfirmPutRequest_200(String requestId, String body) {
-               stubFor(put(urlPathEqualTo("/api/valet/placement/v1/" + requestId + "/confirm/"))
+       public static void mockValetConfirmPutRequest_200(WireMockServer wireMockServer, String requestId, String body) {
+               wireMockServer.stubFor(put(urlPathEqualTo("/api/valet/placement/v1/" + requestId + "/confirm/"))
                 .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                .withBody(body).withStatus(HttpStatus.SC_OK)));
        }
        
-       public static void mockValetRollbackPutRequest_200(String requestId, String body) {
-               stubFor(put(urlPathEqualTo("/api/valet/placement/v1/" + requestId + "/rollback/"))
+       public static void mockValetRollbackPutRequest_200(WireMockServer wireMockServer, String requestId, String body) {
+               wireMockServer.stubFor(put(urlPathEqualTo("/api/valet/placement/v1/" + requestId + "/rollback/"))
                 .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                .withBody(body).withStatus(HttpStatus.SC_OK)));
        }
 
                                        </execution>
                                </executions>
                        </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>default-test</id>
+                                               <goals>
+                                                       <goal>test</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <includes>
+                                                               <include>**/AllTestsTestSuite.java</include>
+                                                       </includes>
+                                                       <parallel>suites</parallel>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
                </plugins>
                <pluginManagement>
                        <plugins>
 
--- /dev/null
+/*-
+ * ============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.adapters.requestsdb;
+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
+}
 
 package org.onap.so.adapters.requestsdb;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
 import java.util.List;
 
-import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.so.adapters.requestsdb.application.MSORequestDBApplication;
 import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.db.request.data.repository.ArchivedInfraRequestsRepository;
 import org.onap.so.db.request.data.repository.InfraActiveRequestsRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = MSORequestDBApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-@Transactional
-public class ArchiveInfraRequestsSchedulerTest {
+public class ArchiveInfraRequestsSchedulerTest extends RequestsAdapterBase {
        
        @Autowired
        private ArchiveInfraRequestsScheduler scheduler;
 
 package org.onap.so.adapters.requestsdb;
 
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.ws.rs.core.MediaType;
+
 import org.junit.Before;
-import org.junit.After;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.so.adapters.requestsdb.application.MSORequestDBApplication;
 import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.db.request.data.controller.InstanceNameDuplicateCheckRequest;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.core.ParameterizedTypeReference;
 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.transaction.annotation.Transactional;
 import org.springframework.web.util.UriComponentsBuilder;
 
-import javax.ws.rs.core.MediaType;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.UUID;
-import java.util.ArrayList;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = MSORequestDBApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
 @Transactional
-public class InfraActiveRequestsRepositoryCustomControllerTest {
+public class InfraActiveRequestsRepositoryCustomControllerTest extends RequestsAdapterBase {
 
     @LocalServerPort
     private int port;
 
--- /dev/null
+package org.onap.so.adapters.requestsdb;
+
+import org.junit.runner.RunWith;
+import org.onap.so.adapters.requestsdb.application.MSORequestDBApplication;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = MSORequestDBApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@ActiveProfiles("test")
+public class RequestsAdapterBase {
+
+}
 
 
 package org.onap.so.adapters.requestsdb.adapters;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import java.util.Map;
+
 import javax.ws.rs.core.Response;
 
 import org.json.JSONException;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.onap.logging.ref.slf4j.ONAPLogConstants;
-import org.onap.so.adapters.requestsdb.application.MSORequestDBApplication;
+import org.onap.so.adapters.requestsdb.RequestsAdapterBase;
 import org.onap.so.adapters.requestsdb.application.TestAppender;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.web.server.LocalServerPort;
 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 ch.qos.logback.classic.spi.ILoggingEvent;
 
 
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = MSORequestDBApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-public class HealthCheckHandlerTest {
+public class HealthCheckHandlerTest extends RequestsAdapterBase {
        
        @LocalServerPort
        private int port;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-import org.onap.so.adapters.requestsdb.application.TestAppender;
 import org.onap.logging.ref.slf4j.ONAPLogConstants;
 import org.onap.so.adapters.requestsdb.MsoRequestsDbAdapter;
 import org.onap.so.adapters.requestsdb.RequestStatusType;
-import org.onap.so.adapters.requestsdb.application.MSORequestDBApplication;
+import org.onap.so.adapters.requestsdb.RequestsAdapterBase;
+import org.onap.so.adapters.requestsdb.application.TestAppender;
 import org.onap.so.adapters.requestsdb.exceptions.MsoRequestsDbException;
 import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.db.request.beans.OperationStatus;
 import org.onap.so.db.request.data.repository.ResourceOperationStatusRepository;
 import org.onap.so.requestsdb.RequestsDbConstant;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Bean;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+
 import ch.qos.logback.classic.spi.ILoggingEvent;
 
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = MSORequestDBApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-public class MSORequestDBImplTest {
+public class MSORequestDBImplTest extends RequestsAdapterBase {
 
        @LocalServerPort
        private int port;
        }       
        
        @Before
-       public void before(){
+       public void before() throws MsoRequestsDbException{
         JaxWsProxyFactoryBean jaxWsProxyFactory = new JaxWsProxyFactoryBean();
         jaxWsProxyFactory.setServiceClass(MsoRequestsDbAdapter.class);
         jaxWsProxyFactory.setAddress("http://localhost:" + port + "/services/RequestsDbAdapter");
         jaxWsProxyFactory.setUsername("bpel");
         jaxWsProxyFactory.setPassword("mso-db-1507!");
         dbAdapter = (MsoRequestsDbAdapter) jaxWsProxyFactory.create();
+        
+        InfraActiveRequests testRequest = this.buildTestRequest();
+
+        dbAdapter.updateInfraRequest ( testRequest.getRequestId(),
+                       testRequest.getLastModifiedBy(),
+                       testRequest.getStatusMessage(),
+                       testRequest.getResponseBody(),
+                       RequestStatusType.valueOf(testRequest.getRequestStatus()),
+                       testRequest.getProgress().toString(),
+                       testRequest.getVnfOutputs(),
+                       testRequest.getServiceInstanceId(),
+                       testRequest.getNetworkId(),
+                       testRequest.getVnfId(),
+                       testRequest.getVfModuleId(),
+                       testRequest.getVolumeGroupId(),
+                       testRequest.getServiceInstanceName(),
+                testRequest.getConfigurationId(),
+                testRequest.getConfigurationName(),
+                testRequest.getVfModuleName());
+        
+        
        }
 
        private InfraActiveRequests buildTestRequest() {        
                testRequest.setVfModuleId("c7d527b1-7a91-49fd-b97d-1c8c0f4a7992");
                testRequest.setVfModuleModelName("vSAMP10aDEV::base::module-0");
                testRequest.setVnfId("b92f60c8-8de3-46c1-8dc1-e4390ac2b005");
-               testRequest.setRequestUrl("http://localhost:8080/onap/so/infra/serviceInstantiation/v7/serviceInstances");
-               
+               testRequest.setRequestUrl("http://localhost:8080/onap/so/infra/serviceInstantiation/v7/serviceInstances");      
+               testRequest.setVolumeGroupId("volumeGroupId");
+               testRequest.setServiceInstanceName("serviceInstanceName");
+               testRequest.setConfigurationId("configurationId");
+               testRequest.setConfigurationName("configurationName");
+               testRequest.setNetworkId("networkId");
+               testRequest.setResponseBody("responseBody");
+               testRequest.setVfModuleName("vfModuleName");
+               testRequest.setVnfOutputs("vnfOutputs");
                return testRequest;
        }
 
                         fail("Null infraRequest");
                
                // Then
-               assertThat(infraRequest, sameBeanAs(testRequest).ignoring("requestBody").ignoring("endTime").ignoring("startTime").ignoring("modifyTime"));             
+               assertEquals(clientRequestId, infraRequest.getClientRequestId());
        }
        
        
                InfraActiveRequests infraRequest = dbAdapter.getInfraRequest(clientRequestId);
                // Then
                assertThat(infraRequest, sameBeanAs(testRequest).ignoring("requestBody").ignoring("endTime").ignoring("startTime").ignoring("modifyTime"));             
+       
+               
        }
        
        @Test
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.onap.so.adapters.requestsdb.RequestsAdapterBase;
 import org.onap.so.adapters.requestsdb.application.MSORequestDBApplication;
 import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.db.request.beans.OperationStatus;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertFalse;
 
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = MSORequestDBApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-public class RequestsDbClientTest {
+public class RequestsDbClientTest extends RequestsAdapterBase {
 
     @Autowired
     private RequestDbClientPortChanger requestsDbClient;
 
                                        </execution>
                                </executions>
                        </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>default-test</id>
+                                               <goals>
+                                                       <goal>test</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <includes>
+                                                               <include>**/AllTestsTestSuite.java</include>
+                                                       </includes>
+                                                       <parallel>suites</parallel>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
                </plugins>
        </build>
        <dependencyManagement>
 
--- /dev/null
+/*-
+ * ============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.adapters.sdnc;
+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
+}
 
 import org.junit.Rule;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SDNCAdapterApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles("test")
 public abstract class BaseTest {
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
-
+    
+    @Autowired
+    protected WireMockServer wireMockServer;
+    
     protected TestRestTemplate restTemplate = new TestRestTemplate("test", "test");
 
     @Value("${wiremock.server.port}")
 
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import org.apache.http.HttpStatus;
 import org.junit.Test;
 import org.onap.so.adapters.sdnc.BaseTest;
 import org.springframework.beans.factory.annotation.Autowired;
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
-import static org.junit.Assert.assertTrue;
 
 
 public class SDNCRestClientTest extends BaseTest {
         rt.setReqMethod("POST");
         rt.setSdncUrl("http://localhost:" + wireMockPort + "/sdnc");
 
-        stubFor(post(urlPathEqualTo("/sdnc"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/sdnc"))
                 .willReturn(aResponse().withHeader("Content-Type", "application/xml").withBody("").withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
 
         SDNCResponse response = sdncClient.getSdncResp("", rt);
 
 
 package org.onap.so.adapters.sdnc.sdncrest;
 
+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.urlPathEqualTo;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import org.apache.http.HttpStatus;
 import org.junit.Test;
 import org.onap.so.adapters.sdnc.BaseTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 public class BPRestCallbackTest extends BaseTest {
 
     @Autowired
                 "\t\t//   </error>\n" +
                 "\t\t// </errors>";
 
-        stubFor(post(urlPathEqualTo("/sdnc"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/sdnc"))
                 .willReturn(aResponse().withHeader("Content-Type", "application/xml").withBody(response).withStatus(HttpStatus.SC_MULTIPLE_CHOICES)));
 
         boolean responseCommon = bpRestCallback.send("http://localhost:" + wireMockPort + "/sdnc", "Test");
 
 
 package org.onap.so.adapters.sdnc.sdncrest;
 
+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.urlPathEqualTo;
+import static org.junit.Assert.assertNotNull;
+
 import org.apache.http.HttpStatus;
 import org.junit.Test;
 import org.onap.so.adapters.sdnc.BaseTest;
 import org.onap.so.adapters.sdncrest.SDNCResponseCommon;
 import org.springframework.beans.factory.annotation.Autowired;
 
-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.urlPathEqualTo;
-import static org.junit.Assert.assertNotNull;
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
-
 public class SDNCConnectorTest extends BaseTest {
 
     @Autowired
         rt.setReqMethod("POST");
         rt.setSdncUrl("http://localhost:" + wireMockPort + "/sdnc");
 
-        stubFor(post(urlPathEqualTo("/sdnc"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/sdnc"))
                 .willReturn(aResponse().withHeader("Content-Type", "application/xml").withBody(response).withStatus(HttpStatus.SC_MULTIPLE_CHOICES)));
 
         SDNCResponseCommon responseCommon = sdncConnector.send(content, rt);
 
         <version>0.7.7.201606060606</version>
         <configuration>
           <excludes>
-            +
             <exclude>**/resource-examples/**</exclude>
           </excludes>
         </configuration>
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-test</id>
+            <goals>
+              <goal>test</goal>
+            </goals>
+            <configuration>
+              <includes>
+                <include>**/AllTestsTestSuite.java</include>
+              </includes>
+              <parallel>suites</parallel>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
       <groupId>org.antlr</groupId>
       <artifactId>antlr4</artifactId>
       <version>${antlr.version}</version>
-
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
 
--- /dev/null
+/*-
+ * ============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.asdc;
+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
+}
 
 import org.onap.so.asdc.installer.heat.ToscaResourceInstaller;
 import org.onap.so.asdc.tenantIsolation.WatchdogDistribution;
 import org.onap.so.spring.SpringContextHelper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.ConfigFileApplicationContextInitializer;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = TestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles("test")
        protected WatchdogDistribution watchdogDistributionSpy;
        @SpyBean
        protected ToscaResourceInstaller toscaInstaller;
+       @Autowired
+       protected WireMockServer wireMockServer;
        
        @Value("${wiremock.server.port}")
     protected String wireMockPort;
 
 
 import static com.github.tomakehurst.wiremock.client.WireMock.ok;
 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.urlEqualTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
         String modelEndpoint = "/aai/v15/service-design-and-creation/models/model/" + serviceInvariantUuid
             + "/model-vers/model-ver/" + serviceUuid + "?depth=0";
 
-        stubFor(post(urlEqualTo(modelEndpoint)).willReturn(ok()));
+        wireMockServer.stubFor(post(urlEqualTo(modelEndpoint)).willReturn(ok()));
     }
 
     /**
 
 
 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 com.shazam.shazamcrest.MatcherAssert.assertThat;
 import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
        @Transactional
        public void testAllottedResourceService() throws Exception {
                
-               stubFor(post(urlPathMatching("/aai/.*"))
+               wireMockServer.stubFor(post(urlPathMatching("/aai/.*"))
                                  .willReturn(aResponse()
                                  .withStatus(200)
                                  .withHeader("Content-Type", "application/json")));
 
                                                </configuration>
                                        </execution>
                                </executions>
+                               <configuration>
+                                       <parallel>suites</parallel>
+                               </configuration>
                        </plugin>
                </plugins>
                <pluginManagement>
 
                                Response httpResponse = httpClient.post(oofRequest)
 
                                int responseCode = httpResponse.getStatus()
-                               logDebug("OOF sync response code is: " + responseCode)
+                               logger.debug("OOF sync response code is: " + responseCode)
 
 
                 logger.debug( "*** Completed Homing Call OOF ***")
 
         Response response = client.post(request.getBody().toString())
 
         int responseCode = response.getStatus()
-        logDebug("CatalogDB response code is: " + responseCode)
+        logger.debug("CatalogDB response code is: " + responseCode)
         String syncResponse = response.readEntity(String.class)
-        logDebug("CatalogDB response is: " + syncResponse)
+        logger.debug("CatalogDB response is: " + syncResponse)
 
         if(responseCode != 202){
             exceptionUtil.buildAndThrowWorkflowException(execution, responseCode, "Received a Bad Sync Response from CatalogDB.")
 
                        exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
                }
        }
+       
+       public Logger getLogger() {
+               return logger;
+       }
 }
 
                        exceptionUtil.buildWorkflowException(execution, 5300, msg)
                }
        }
+       
+       public Logger getLogger() {
+               return logger;
+       }
 }
 
                Node child = getChild(node, name)
                return child == null ? null : child.text()
        }
+       
+       public Logger getLogger() {
+               return logger;
+       }
 }
 
 String response = String.valueOf(execution.getVariable('SDNCREST_sdncAdapterResponse'))
 def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 def processKey = sdncAdapterRestV1.getProcessKey(execution)
-sdncAdapterRestV1.logDebug(processKey + " received response from SDNCAdapter: statusCode=" + statusCode +
-       " response=" + (response.isEmpty() ? "" : "\n") + response, isDebugLogEnabled)</bpmn2:script>
+sdncAdapterRestV1.getLogger().debug("{} received response from SDNCAdapter: statusCode= {} response={}", processKey, statusCode, (response.isEmpty() ? "" : "\n" + response))</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="ScriptTask_3" name="Workflow Exception (no connection)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_17</bpmn2:incoming>
 
 String response = String.valueOf(execution.getVariable('SDNCREST_sdncAdapterResponse'))
 def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 def processKey = sdncAdapterRestV2.getProcessKey(execution)
-sdncAdapterRestV2.logDebug(processKey + " received response from SDNCAdapter: statusCode=" + statusCode +
-       " response=" + (response.isEmpty() ? "" : "\n") + response, isDebugLogEnabled)</bpmn2:script>
+sdncAdapterRestV2.getLogger().debug("{} received response from SDNCAdapter: statusCode= {} response={}", processKey, statusCode, (response.isEmpty() ? "" : "\n" + response))</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="ScriptTask_3" name="Workflow Exception (no connection)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_17</bpmn2:incoming>
 
 String response = String.valueOf(execution.getVariable('VNFREST_vnfAdapterResponse'))
 def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 def processKey = vnfAdapterRestV1.getProcessKey(execution)
-vnfAdapterRestV1.logDebug(processKey + " received response from VnfAdapter: statusCode=" + statusCode +
-       " response=" + (response.isEmpty() ? "" : "\n") + response, isDebugLogEnabled)]]></bpmn2:script>
+vnfAdapterRestV1.getLogger().debug("{} received response from VnfAdapter: statusCode= {} response={}", processKey, statusCode, (response.isEmpty() ? "" : "\n" + response))]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="ScriptTask_3" name="Workflow Exception (no connection)">
       <bpmn2:incoming>SequenceFlow_17</bpmn2:incoming>
 
 @RunWith(MockitoJUnitRunner.class)
 @Ignore
 class PrepareUpdateAAIVfModuleTest {
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(28090)
 
     @Captor
     static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
 
         serviceDecomp.setVnfResources(vnfResourceList)
     }
 
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(28090)
-
     @Captor
     static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
 
 
 class UpdateAAIGenericVnfTest {
 
     String getVfModuleResponse = FileUtil.readResourceFile("__files/VfModularity/GenericVnf.xml")
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(28090)
 
     @Captor
     static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
 
     @Spy
     UpdateAAIVfModule updateAAIVfModule;
 
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(28090)
-
     @Captor
     static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
 
 
 import org.onap.so.test.categories.SpringAware;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.context.ActiveProfiles;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.tomakehurst.wiremock.client.WireMock;
+import com.github.tomakehurst.wiremock.WireMockServer;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = TestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 
        @Autowired
        private RepositoryService repositoryService;
+       
+       @Autowired
+       protected WireMockServer wireMockServer;
        /*
         * Mocked for injection via autowiring
         */
        
        @Before
        public void baseTestBefore() {
-               WireMock.reset();
+               wireMockServer.resetAll();
                variables.put("gBuildingBlockExecution", execution);
        }
 
 
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.delete;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+
 public class MockAAIDeleteGenericVnf {
-       public MockAAIDeleteGenericVnf(){
-               stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721/[?]resource-version=0000021"))
+       public MockAAIDeleteGenericVnf(WireMockServer wireMockServer){
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721/[?]resource-version=0000021"))
                                .willReturn(aResponse()
                                                .withStatus(200)));
-               stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c718/[?]resource-version=0000018"))
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c718/[?]resource-version=0000018"))
                                .willReturn(aResponse()
                                                .withStatus(500)
                                                .withHeader("Content-Type", "text/xml")
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.delete;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+
 public class MockAAIDeleteVfModule {
        
-       public MockAAIDeleteVfModule()
+       public MockAAIDeleteVfModule(WireMockServer wireMockServer)
        {
-               stubFor(delete(urlMatching(
+               wireMockServer.stubFor(delete(urlMatching(
                                "/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a73/[?]resource-version=0000073"))
                                                .willReturn(aResponse().withStatus(200)));
-               stubFor(delete(urlMatching(
+               wireMockServer.stubFor(delete(urlMatching(
                                "/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c720/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a75/[?]resource-version=0000075"))
                                                .willReturn(aResponse().withStatus(200)));
-               stubFor(delete(urlMatching(
+               wireMockServer.stubFor(delete(urlMatching(
                                "/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c718/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a78/[?]resource-version=0000078"))
                                                .willReturn(aResponse().withStatus(200)));
-               stubFor(delete(urlMatching(
+               wireMockServer.stubFor(delete(urlMatching(
                                "/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c719/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a77/[?]resource-version=0000077"))
                                                .willReturn(aResponse().withStatus(500).withHeader("Content-Type", "text/xml")
                                                                .withBodyFile("aaiFault.xml")));
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy\\?network-policy-fqdn=.*"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy\\?network-policy-fqdn=.*"))
                                .willReturn(aResponse().withStatus(200).withHeader("Content-Type", "text/xml")
                                                .withBodyFile("VfModularity/QueryNetworkPolicy_AAIResponse_Success.xml")));
 
-               stubFor(delete(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy/.*"))
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy/.*"))
                                .willReturn(aResponse().withStatus(200)));
        }
 }
 
 
 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.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+
 public class MockAAIGenericVnfSearch {
        
        private static final String EOL = "\n";
 
-       public MockAAIGenericVnfSearch(){
+       public MockAAIGenericVnfSearch(WireMockServer wireMockServer){
                String body;
                
                // The following stubs are for CreateAAIVfModule and UpdateAAIVfModule
        
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC23&depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC23&depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(500)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile("aaiFault.xml")));
        
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC22&depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC22&depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(404)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBody("Generic VNF Not Found")));
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/768073c7-f41f-4822-9323-b75962763d74[?]depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/768073c7-f41f-4822-9323-b75962763d74[?]depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(404)
                                                .withHeader("Content-Type", "text/xml")
                        "  <l-interfaces/>" + EOL +
                        "  <lag-interfaces/>" + EOL +
                        "</generic-vnf>" + EOL;
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC21&depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC21&depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBody(body)));
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721[?]depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721[?]depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                        "  <l-interfaces/>" + EOL +
                        "  <lag-interfaces/>" + EOL +
                        "</generic-vnf>" + EOL;
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC20&depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC20&depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBody(body)));
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/2f6aee38-1e2a-11e6-82d1-ffc7d9ee8aa4[?]depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/2f6aee38-1e2a-11e6-82d1-ffc7d9ee8aa4[?]depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
        
                // The following stubs are for DeleteAAIVfModule
        
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c723[?]depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c723[?]depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(500)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile("aaiFault.xml")));
        
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c722[?]depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c722[?]depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(404)
                                                .withHeader("Content-Type", "text/xml")
                                "  <l-interfaces/>" + EOL +
                                "  <lag-interfaces/>" + EOL +
                                "</generic-vnf>" + EOL;
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721[?]depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721[?]depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                        "  <l-interfaces/>" + EOL +
                        "  <lag-interfaces/>" + EOL +
                        "</generic-vnf>" + EOL;
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c720[?]depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c720[?]depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                        "  <l-interfaces/>" + EOL +
                        "  <lag-interfaces/>" + EOL +
                        "</generic-vnf>" + EOL;
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c719[?]depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c719[?]depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                        "  <l-interfaces/>" + EOL +
                        "  <lag-interfaces/>" + EOL +
                        "</generic-vnf>" + EOL;
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c718[?]depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c718[?]depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                        "  <l-interfaces/>" + EOL +
                        "  <lag-interfaces/>" + EOL +
                        "</generic-vnf>" + EOL;
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a73"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a73"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
 
 import org.onap.so.BaseTest;
 import org.springframework.core.ParameterizedTypeReference;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-
 import wiremock.org.apache.http.entity.ContentType;
 
 
                BaseClient<String, String> client = new BaseClient<>();
                String response = "{\"hello\" : \"world\"}";
                client.setTargetUrl(UriBuilder.fromUri("http://localhost/test").port(Integer.parseInt(wireMockPort)).build().toString());
-               stubFor(get(urlEqualTo("/test"))
+               wireMockServer.stubFor(get(urlEqualTo("/test"))
                 .willReturn(aResponse().withStatus(200).withBody(response).withHeader("Content-Type", ContentType.APPLICATION_JSON.toString())));
                
                String result = client.get("", new ParameterizedTypeReference<String>() {});
                BaseClient<String, Map<String, Object>> client = new BaseClient<>();
                String response = "{\"hello\" : \"world\"}";
                client.setTargetUrl(UriBuilder.fromUri("http://localhost/test").port(Integer.parseInt(wireMockPort)).build().toString());
-               stubFor(get(urlEqualTo("/test"))
+               wireMockServer.stubFor(get(urlEqualTo("/test"))
                 .willReturn(aResponse().withStatus(200).withBody(response).withHeader("Content-Type", ContentType.APPLICATION_JSON.toString())));
                
                Map<String, Object> result = client.get("", new ParameterizedTypeReference<Map<String, Object>>() {});
 
 
 package org.onap.so.bpmn.common.recipe;
 
+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.urlPathMatching;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.IOException;
+
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.junit.Test;
 import org.onap.so.BaseTest;
 import org.springframework.beans.factory.annotation.Autowired;
-import java.io.IOException;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 
 public class BpmnRestClientTest extends BaseTest{
 
 
     @Test
     public void postTest() throws IOException, Exception{
-        stubFor(post(urlPathMatching("/testRecipeUri"))
+        wireMockServer.stubFor(post(urlPathMatching("/testRecipeUri"))
                 .willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(org.springframework.http.HttpStatus.OK.value()).withBody("{}")));
 
         HttpResponse httpResponse = bpmnRestClient.post(
 
  */
 package org.onap.so.bpmn.common.resource;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.ok;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Rule;
 import org.junit.Test;
-import org.mockito.Mock;
 import org.onap.so.BaseTest;
-import org.onap.so.bpmn.core.UrnPropertiesReader;
-import org.springframework.core.env.Environment;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
 
 
 public class ResourceRequestBuilderTest extends BaseTest {
 
 
 
-        stubFor(get(urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelUuid=c3954379-4efe-431c-8258-f84905b158e5"))
+        wireMockServer.stubFor(get(urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelUuid=c3954379-4efe-431c-8258-f84905b158e5"))
                 .willReturn(ok("{ \"serviceResources\"    : {\n" +
                         "\t\"modelInfo\"       : {\n" +
                         "\t\t\"modelName\"          : \"demoVFWCL\",\n" +
     @Test
     public void getResourceInputDefaultValueTest() throws Exception {
 
-        stubFor(get(urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelUuid=c3954379-4efe-431c-8258-f84905b158e5"))
+        wireMockServer.stubFor(get(urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelUuid=c3954379-4efe-431c-8258-f84905b158e5"))
                 .willReturn(ok("{ \"serviceResources\"    : {\n" +
                         "\t\"modelInfo\"       : {\n" +
                         "\t\t\"modelName\"          : \"demoVFWCL\",\n" +
     @Test
     public void getResourceInputValueNoDefaultTest() throws Exception {
 
-        stubFor(get(urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelUuid=c3954379-4efe-431c-8258-f84905b158e5"))
+        wireMockServer.stubFor(get(urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelUuid=c3954379-4efe-431c-8258-f84905b158e5"))
                 .willReturn(ok("{ \"serviceResources\"    : {\n" +
                         "\t\"modelInfo\"       : {\n" +
                         "\t\t\"modelName\"          : \"demoVFWCL\",\n" +
     @Test
     public void getResourceSequenceTest() throws Exception {
 
-        stubFor(get(urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelUuid=c3954379-4efe-431c-8258-f84905b158e5"))
+        wireMockServer.stubFor(get(urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelUuid=c3954379-4efe-431c-8258-f84905b158e5"))
                 .willReturn(ok("{ \"serviceResources\"    : {\n" +
                         "\t\"modelInfo\"       : {\n" +
                         "\t\t\"modelName\"          : \"demoVFWCL\",\n" +
     @Test
     public void getResourceInputWithEmptyServiceResourcesTest() throws Exception {
 
-        stubFor(get(urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelUuid=c3954379-4efe-431c-8258-f84905b158e5"))
+        wireMockServer.stubFor(get(urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelUuid=c3954379-4efe-431c-8258-f84905b158e5"))
             .willReturn(ok("{ \"serviceResources\"    : {\n" +
                 "\t\"modelInfo\"       : {\n" +
                 "\t\t\"modelName\"          : \"demoVFWCL\",\n" +
 
 
 package org.onap.so.bpmn.mock;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.containing;
 import static com.github.tomakehurst.wiremock.client.WireMock.delete;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 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.patch;
+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.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+
 
 /**
  * Reusable Mock StubResponses for AAI Endpoints
        /**
         * Allotted Resource Mock StubResponses below
         */
-       public static void MockGetAllottedResource(String globalCustId, String subscriptionType, String serviceInstanceId, String allottedResourceId, String responseFile) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId + "/allotted-resources/allotted-resource/" + allottedResourceId))
+       public static void MockGetAllottedResource(WireMockServer wireMockServer, String globalCustId, String subscriptionType, String serviceInstanceId, String allottedResourceId, String responseFile) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId + "/allotted-resources/allotted-resource/" + allottedResourceId))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockPutAllottedResource(String globalCustId, String subscriptionType, String serviceInstanceId, String allottedResourceId) {
-               stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId + "/allotted-resources/allotted-resource/" + allottedResourceId))
+       public static void MockPutAllottedResource(WireMockServer wireMockServer, String globalCustId, String subscriptionType, String serviceInstanceId, String allottedResourceId) {
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId + "/allotted-resources/allotted-resource/" + allottedResourceId))
                                .willReturn(aResponse()
                                                .withStatus(200)));
        }
 
-       public static void MockPutAllottedResource_500(String globalCustId, String subscriptionType, String serviceInstanceId, String allottedResourceId) {
-               stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId + "/allotted-resources/allotted-resource/" + allottedResourceId))
+       public static void MockPutAllottedResource_500(WireMockServer wireMockServer, String globalCustId, String subscriptionType, String serviceInstanceId, String allottedResourceId) {
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId + "/allotted-resources/allotted-resource/" + allottedResourceId))
                                .willReturn(aResponse()
                                                .withStatus(500)));
        }
 
-       public static void MockDeleteAllottedResource(String globalCustId, String subscriptionType, String serviceInstanceId, String allottedResourceId, String resourceVersion) {
-               stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId + "/allotted-resources/allotted-resource/" + allottedResourceId + "[?]resource-version=" + resourceVersion))
+       public static void MockDeleteAllottedResource(WireMockServer wireMockServer, String globalCustId, String subscriptionType, String serviceInstanceId, String allottedResourceId, String resourceVersion) {
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId + "/allotted-resources/allotted-resource/" + allottedResourceId + "[?]resource-version=" + resourceVersion))
                                .willReturn(aResponse()
                                                .withStatus(204)));
        }
 
-       public static void MockPatchAllottedResource(String globalCustId, String subscriptionType, String serviceInstanceId, String allottedResourceId) {
-               stubFor(patch(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId + "/allotted-resources/allotted-resource/" + allottedResourceId))
+       public static void MockPatchAllottedResource(WireMockServer wireMockServer, String globalCustId, String subscriptionType, String serviceInstanceId, String allottedResourceId) {
+               wireMockServer.stubFor(patch(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId + "/allotted-resources/allotted-resource/" + allottedResourceId))
                                .willReturn(aResponse()
                                                .withStatus(200)));
        }
 
-       public static void MockQueryAllottedResourceById(String allottedResourceId, String responseFile){
-               stubFor(get(urlMatching("/aai/v[0-9]+/search/nodes-query[?]search-node-type=allotted-resource[&]filter=id:EQUALS:" + allottedResourceId))
+       public static void MockQueryAllottedResourceById(WireMockServer wireMockServer, String allottedResourceId, String responseFile){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/search/nodes-query[?]search-node-type=allotted-resource[&]filter=id:EQUALS:" + allottedResourceId))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
        /**
         * Service Instance Mock StubResponses below
         */
-       public static void MockGetServiceInstance(String globalCustId, String subscriptionType, String serviceInstanceId) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId))
+       public static void MockGetServiceInstance(WireMockServer wireMockServer, String globalCustId, String subscriptionType, String serviceInstanceId) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")));
        /**
         * Service Instance Mock StubResponses below
         */
-       public static void MockGetServiceInstance(String globalCustId, String subscriptionType, String serviceInstanceId, String responseFile) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId))
+       public static void MockGetServiceInstance(WireMockServer wireMockServer, String globalCustId, String subscriptionType, String serviceInstanceId, String responseFile) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetServiceInstance_404(String customer, String serviceSubscription, String serviceInstanceId){
-               stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId))
+       public static void MockGetServiceInstance_404(WireMockServer wireMockServer, String customer, String serviceSubscription, String serviceInstanceId){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId))
                                                .willReturn(aResponse()
                                                .withStatus(404)));
        }
 
-       public static void MockGetServiceInstance_500(String customer, String serviceSubscription, String serviceInstanceId){
-               stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId))
+       public static void MockGetServiceInstance_500(WireMockServer wireMockServer, String customer, String serviceSubscription, String serviceInstanceId){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId))
                                                .willReturn(aResponse()
                                                .withStatus(500)));
        }
 
-       public static void MockGetServiceInstance_500(String customer, String serviceSubscription, String serviceInstanceId, String responseFile){
-               stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId))
+       public static void MockGetServiceInstance_500(WireMockServer wireMockServer, String customer, String serviceSubscription, String serviceInstanceId, String responseFile){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId))
                                                .willReturn(aResponse()
                                                .withStatus(500)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockNodeQueryServiceInstanceByName(String serviceInstanceName, String responseFile){
-               stubFor(get(urlMatching("/aai/v[0-9]+/search/nodes-query[?]search-node-type=service-instance[&]filter=service-instance-name:EQUALS:" + serviceInstanceName))
+       public static void MockNodeQueryServiceInstanceByName(WireMockServer wireMockServer, String serviceInstanceName, String responseFile){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/search/nodes-query[?]search-node-type=service-instance[&]filter=service-instance-name:EQUALS:" + serviceInstanceName))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockNodeQueryServiceInstanceByName_404(String serviceInstanceName){
-               stubFor(get(urlMatching("/aai/v[0-9]+/search/nodes-query[?]search-node-type=service-instance&filter=service-instance-name:EQUALS:" + serviceInstanceName))
+       public static void MockNodeQueryServiceInstanceByName_404(WireMockServer wireMockServer, String serviceInstanceName){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/search/nodes-query[?]search-node-type=service-instance&filter=service-instance-name:EQUALS:" + serviceInstanceName))
                                .willReturn(aResponse()
                                                .withStatus(404)));
        }
 
-       public static void MockNodeQueryServiceInstanceByName_500(String serviceInstanceName){
-               stubFor(get(urlMatching("/aai/v[0-9]+/search/nodes-query[?]search-node-type=service-instance&filter=service-instance-name:EQUALS:" + serviceInstanceName))
+       public static void MockNodeQueryServiceInstanceByName_500(WireMockServer wireMockServer, String serviceInstanceName){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/search/nodes-query[?]search-node-type=service-instance&filter=service-instance-name:EQUALS:" + serviceInstanceName))
                                .willReturn(aResponse()
                                                .withStatus(500)));
        }
 
-       public static void MockNodeQueryServiceInstanceById(String serviceInstanceId, String responseFile){
-               stubFor(get(urlMatching("/aai/v[0-9]+/search/nodes-query[?]search-node-type=service-instance[&]filter=service-instance-id:EQUALS:" + serviceInstanceId))
+       public static void MockNodeQueryServiceInstanceById(WireMockServer wireMockServer, String serviceInstanceId, String responseFile){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/search/nodes-query[?]search-node-type=service-instance[&]filter=service-instance-id:EQUALS:" + serviceInstanceId))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockNodeQueryServiceInstanceById_404(String serviceInstanceId){
-               stubFor(get(urlMatching("/aai/v[0-9]+/search/nodes-query[?]search-node-type=service-instance&filter=service-instance-id:EQUALS:" + serviceInstanceId))
+       public static void MockNodeQueryServiceInstanceById_404(WireMockServer wireMockServer, String serviceInstanceId){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/search/nodes-query[?]search-node-type=service-instance&filter=service-instance-id:EQUALS:" + serviceInstanceId))
                                .willReturn(aResponse()
                                                .withStatus(404)));
        }
 
-       public static void MockNodeQueryServiceInstanceById_500(String serviceInstanceId){
-               stubFor(get(urlMatching("/aai/v[0-9]+/search/nodes-query[?]search-node-type=service-instance&filter=service-instance-id:EQUALS:" + serviceInstanceId))
+       public static void MockNodeQueryServiceInstanceById_500(WireMockServer wireMockServer, String serviceInstanceId){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/search/nodes-query[?]search-node-type=service-instance&filter=service-instance-id:EQUALS:" + serviceInstanceId))
                                .willReturn(aResponse()
                                                .withStatus(500)));
        }
 
-       public static void MockDeleteServiceInstance(String customer, String serviceSubscription, String serviceInstanceId, String resourceVersion){
-               stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId + "[?]resource-version=" + resourceVersion))
+       public static void MockDeleteServiceInstance(WireMockServer wireMockServer, String customer, String serviceSubscription, String serviceInstanceId, String resourceVersion){
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId + "[?]resource-version=" + resourceVersion))
                                  .willReturn(aResponse()
                                  .withStatus(204)));
        }
 
-       public static void MockGetServiceInstance(String customer, String serviceSubscription, String serviceInstanceId, String resourceVersion, int statusCode){
-               stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId + "[?]resource-version=" + resourceVersion))
+       public static void MockGetServiceInstance(WireMockServer wireMockServer, String customer, String serviceSubscription, String serviceInstanceId, String resourceVersion, int statusCode){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId + "[?]resource-version=" + resourceVersion))
                                  .willReturn(aResponse()
                                  .withStatus(statusCode)));
        }
 
-       public static void MockGetServiceInstance(String customer, String serviceSubscription, int statusCode){
-               stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription))
+       public static void MockGetServiceInstance(WireMockServer wireMockServer, String customer, String serviceSubscription, int statusCode){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription))
                                  .willReturn(aResponse()
                                  .withStatus(200)
                                  .withHeader("Content-Type", "text/xml")));
        }
 
-       public static void MockDeleteServiceInstance(String customer, String serviceSubscription, String serviceInstanceId, String resourceVersion, int statusCode){
-               stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId + "[?]resource-version=" + resourceVersion))
+       public static void MockDeleteServiceInstance(WireMockServer wireMockServer, String customer, String serviceSubscription, String serviceInstanceId, String resourceVersion, int statusCode){
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId + "[?]resource-version=" + resourceVersion))
                                .willReturn(aResponse()
                                                .withStatus(statusCode)));
        }
 
-       public static void MockDeleteServiceInstance(String customer, String serviceSubscription, String resourceVersion, int statusCode){
-               stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "[?]resource-version=" +1234))
+       public static void MockDeleteServiceInstance(WireMockServer wireMockServer, String customer, String serviceSubscription, String resourceVersion, int statusCode){
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "[?]resource-version=" +1234))
                                  .willReturn(aResponse()
                                  .withStatus(statusCode)));
        }
 
-       public static void MockDeleteServiceInstance_404(String customer, String serviceSubscription, String serviceInstanceId, String resourceVersion){
-               stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId + "[?]resource-version=" + resourceVersion))
+       public static void MockDeleteServiceInstance_404(WireMockServer wireMockServer, String customer, String serviceSubscription, String serviceInstanceId, String resourceVersion){
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId + "[?]resource-version=" + resourceVersion))
                                 .willReturn(aResponse()
                                  .withStatus(404)));
        }
 
-       public static void MockDeleteServiceInstance_500(String customer, String serviceSubscription, String serviceInstanceId, String resourceVersion){
-               stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId + "[?]resource-version=" + resourceVersion))
+       public static void MockDeleteServiceInstance_500(WireMockServer wireMockServer, String customer, String serviceSubscription, String serviceInstanceId, String resourceVersion){
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId + "[?]resource-version=" + resourceVersion))
                                 .willReturn(aResponse()
                                  .withStatus(500)));
        }
 
-       public static void MockPutServiceInstance(String globalCustId, String subscriptionType, String serviceInstanceId, String responseFile) {
-               stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId))
+       public static void MockPutServiceInstance(WireMockServer wireMockServer, String globalCustId, String subscriptionType, String serviceInstanceId, String responseFile) {
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockPutServiceInstance_500(String globalCustId, String subscriptionType, String serviceInstanceId) {
-               stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId))
+       public static void MockPutServiceInstance_500(WireMockServer wireMockServer, String globalCustId, String subscriptionType, String serviceInstanceId) {
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId))
                                .willReturn(aResponse()
                                                .withStatus(500)));
        }
        /**
         * Service-Subscription Mock StubResponses below
         */
-       public static void MockGetServiceSubscription(String globalCustId, String subscriptionType, String responseFile) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType))
+       public static void MockGetServiceSubscription(WireMockServer wireMockServer, String globalCustId, String subscriptionType, String responseFile) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockDeleteServiceSubscription(String globalCustId, String subscriptionType, int statusCode) {
-               stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType))
+       public static void MockDeleteServiceSubscription(WireMockServer wireMockServer, String globalCustId, String subscriptionType, int statusCode) {
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType))
                                .willReturn(aResponse()
                                                .withStatus(statusCode)));
        }
 
-       public static void MockDeleteServiceInstanceId(String globalCustId, String subscriptionType, String serviceInstanceId) {
-               stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId))
+       public static void MockDeleteServiceInstanceId(WireMockServer wireMockServer, String globalCustId, String subscriptionType, String serviceInstanceId) {
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId))
                                .willReturn(aResponse()
                                                .withStatus(200)));
        }
 
-       public static void MockPutServiceSubscription(String globalCustId, String subscriptionType) {
-               stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType))
+       public static void MockPutServiceSubscription(WireMockServer wireMockServer, String globalCustId, String subscriptionType) {
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType))
                                .willReturn(aResponse()
                                                .withStatus(200)));
        }
 
-       public static void MockGetServiceSubscription(String globalCustId, String subscriptionType, int statusCode) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType))
+       public static void MockGetServiceSubscription(WireMockServer wireMockServer, String globalCustId, String subscriptionType, int statusCode) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType))
                                .willReturn(aResponse()
                                .withStatus(statusCode)));
        }
        /**
         * Customer Mock StubResponses below
         */
-       public static void MockGetCustomer(String globalCustId, String responseFile) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId))
+       public static void MockGetCustomer(WireMockServer wireMockServer, String globalCustId, String responseFile) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockDeleteCustomer(String globalCustId) {
-               stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId))
+       public static void MockDeleteCustomer(WireMockServer wireMockServer, String globalCustId) {
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId))
                                .willReturn(aResponse()
                                                .withStatus(200)));
        }
 
-       public static void MockPutCustomer(String globalCustId) {
-               stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId))
+       public static void MockPutCustomer(WireMockServer wireMockServer, String globalCustId) {
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId))
                                .willReturn(aResponse()
                                                .withStatus(200)));
        }
 
-       public static void MockPutCustomer_500(String globalCustId) {
-               stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId))
+       public static void MockPutCustomer_500(WireMockServer wireMockServer, String globalCustId) {
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId))
                                .willReturn(aResponse()
                                                .withStatus(500)));
        }
         * Generic-Vnf Mock StubResponses below
         */
 
-       public static void MockGetGenericVnfById(String vnfId, String responseFile){
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "[?]depth=1"))
+       public static void MockGetGenericVnfById(WireMockServer wireMockServer, String vnfId, String responseFile){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "[?]depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetGenericVnfById(String vnfId, String responseFile, int statusCode){
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf" + vnfId))
+       public static void MockGetGenericVnfById(WireMockServer wireMockServer, String vnfId, String responseFile, int statusCode){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf" + vnfId))
                                .willReturn(aResponse()
                                                .withStatus(statusCode)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetGenericVnfByIdWithPriority(String vnfId, int statusCode, String responseFile) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf" + vnfId))
+       public static void MockGetGenericVnfByIdWithPriority(WireMockServer wireMockServer, String vnfId, int statusCode, String responseFile) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf" + vnfId))
                                .atPriority(1)
                                .willReturn(aResponse()
                                        .withStatus(statusCode)
                                        .withBodyFile(responseFile)));
        }
 
-       public static void MockGetGenericVnfByIdWithPriority(String vnfId, String vfModuleId, int statusCode, String responseFile, int priority) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module/" + vfModuleId))
+       public static void MockGetGenericVnfByIdWithPriority(WireMockServer wireMockServer, String vnfId, String vfModuleId, int statusCode, String responseFile, int priority) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module/" + vfModuleId))
                                .atPriority(priority)
                                .willReturn(aResponse()
                                        .withStatus(statusCode)
                                        .withBodyFile(responseFile)));
        }
 
-       public static void MockGetGenericVnfByIdWithDepth(String vnfId, int depth, String responseFile){
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "[?]depth=" + depth))
+       public static void MockGetGenericVnfByIdWithDepth(WireMockServer wireMockServer, String vnfId, int depth, String responseFile){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "[?]depth=" + depth))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetGenericVnfById_404(String vnfId){
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId))
+       public static void MockGetGenericVnfById_404(WireMockServer wireMockServer, String vnfId){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId))
                                .willReturn(aResponse()
                                                .withStatus(404)));
        }
 
-       public static void MockGetGenericVnfById_500(String vnfId){
-               stubFor(get(urlMatching("/aai/v9/network/generic-vnfs/generic-vnf/" + vnfId + "[?]depth=1"))
+       public static void MockGetGenericVnfById_500(WireMockServer wireMockServer, String vnfId){
+               wireMockServer.stubFor(get(urlMatching("/aai/v9/network/generic-vnfs/generic-vnf/" + vnfId + "[?]depth=1"))
                                .withQueryParam("depth", equalTo("1"))
                                .willReturn(aResponse()
                                                .withStatus(500)));
        }
 
-       public static void MockGetGenericVnfByName(String vnfName, String responseFile){
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf[?]vnf-name=" + vnfName))
+       public static void MockGetGenericVnfByName(WireMockServer wireMockServer, String vnfName, String responseFile){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf[?]vnf-name=" + vnfName))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetGenericVnfByNameWithDepth(String vnfName, int depth, String responseFile){
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf[?]vnf-name=" + vnfName + "[&]depth=" + depth))
+       public static void MockGetGenericVnfByNameWithDepth(WireMockServer wireMockServer, String vnfName, int depth, String responseFile){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf[?]vnf-name=" + vnfName + "[&]depth=" + depth))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetGenericVnfByName_404(String vnfName){
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf[?]vnf-name=" + vnfName))
+       public static void MockGetGenericVnfByName_404(WireMockServer wireMockServer, String vnfName){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf[?]vnf-name=" + vnfName))
                                .willReturn(aResponse()
                                                .withStatus(404)));
        }
 
-       public static void MockDeleteGenericVnf(String vnfId, String resourceVersion){
-               stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "[?]resource-version=" + resourceVersion))
+       public static void MockDeleteGenericVnf(WireMockServer wireMockServer, String vnfId, String resourceVersion){
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "[?]resource-version=" + resourceVersion))
                                .willReturn(aResponse()
                                                .withStatus(204)));
        }
 
-       public static void MockDeleteGenericVnf(String vnfId, String resourceVersion, int statusCode){
-               stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "[?]resource-version=" + resourceVersion))
+       public static void MockDeleteGenericVnf(WireMockServer wireMockServer, String vnfId, String resourceVersion, int statusCode){
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "[?]resource-version=" + resourceVersion))
                                .willReturn(aResponse()
                                                .withStatus(statusCode)));
        }
 
-       public static void MockDeleteGenericVnf_500(String vnfId, String resourceVersion){
-               stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "[?]resource-version=" + resourceVersion))
+       public static void MockDeleteGenericVnf_500(WireMockServer wireMockServer, String vnfId, String resourceVersion){
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "[?]resource-version=" + resourceVersion))
                                .willReturn(aResponse()
                                                .withStatus(500)));
        }
 
-       public static void MockPutGenericVnf(String vnfId){
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId))
+       public static void MockPutGenericVnf(WireMockServer wireMockServer, String vnfId){
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId))
                                .willReturn(aResponse()
                                                .withStatus(200)));
        }
 
-       public static void MockPutGenericVnf(String vnfId, String requestBodyContaining, int statusCode) {
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf" + vnfId))
+       public static void MockPutGenericVnf(WireMockServer wireMockServer, String vnfId, String requestBodyContaining, int statusCode) {
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf" + vnfId))
                                .withRequestBody(containing(requestBodyContaining))
                                .willReturn(aResponse()
                                        .withStatus(statusCode)));
        }
 
-       public static void MockPutGenericVnf(String vnfId, int statusCode) {
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf" + vnfId))
+       public static void MockPutGenericVnf(WireMockServer wireMockServer, String vnfId, int statusCode) {
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf" + vnfId))
                                .willReturn(aResponse()
                                        .withStatus(statusCode)));
        }
 
-       public static void MockPutGenericVnf_Bad(String vnfId, int statusCode){
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId))
+       public static void MockPutGenericVnf_Bad(WireMockServer wireMockServer, String vnfId, int statusCode){
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId))
                                .willReturn(aResponse()
                                                .withStatus(statusCode)));
        }
 
-       public static void MockPatchGenericVnf(String vnfId){
-               stubFor(patch(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId))
+       public static void MockPatchGenericVnf(WireMockServer wireMockServer, String vnfId){
+               wireMockServer.stubFor(patch(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId))
                                .willReturn(aResponse()
                                                .withStatus(200)));
        }
        /**
         * Vce Mock StubResponses below
         */
-       public static void MockGetVceById(String vnfId, String responseFile){
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/vces/vce/" + vnfId))
+       public static void MockGetVceById(WireMockServer wireMockServer, String vnfId, String responseFile){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/vces/vce/" + vnfId))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetVceByName(String vnfName, String responseFile){
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/vces/vce[?]vnf-name=" + vnfName))
+       public static void MockGetVceByName(WireMockServer wireMockServer, String vnfName, String responseFile){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/vces/vce[?]vnf-name=" + vnfName))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockDeleteVce(String vnfId, String resourceVersion, int statusCode){
-               stubFor(delete(urlMatching("/aai/v[0-9]+/network/vces/vce/" + vnfId + "[?]resource-version=" + resourceVersion))
+       public static void MockDeleteVce(WireMockServer wireMockServer, String vnfId, String resourceVersion, int statusCode){
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/network/vces/vce/" + vnfId + "[?]resource-version=" + resourceVersion))
                                .willReturn(aResponse()
                                                .withStatus(statusCode)));
        }
 
-       public static void MockPutVce(String vnfId){
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/vces/vce/" + vnfId))
+       public static void MockPutVce(WireMockServer wireMockServer, String vnfId){
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/vces/vce/" + vnfId))
                                .willReturn(aResponse()
                                                .withStatus(200)));
        }
 
-       public static void MockGetGenericVceByNameWithDepth(String vnfName, int depth, String responseFile){
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/vces/vce[?]vnf-name=" + vnfName + "[&]depth=" + depth))
+       public static void MockGetGenericVceByNameWithDepth(WireMockServer wireMockServer, String vnfName, int depth, String responseFile){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/vces/vce[?]vnf-name=" + vnfName + "[&]depth=" + depth))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetVceGenericQuery(String serviceInstanceName, int depth, int statusCode, String responseFile){
-               stubFor(get(urlMatching("/aai/v[0-9]+/search/generic-query[?]key=service-instance.service-instance-name:" + serviceInstanceName + "[&]start-node-type=service-instance[&]include=vce[&]depth=" + depth))
+       public static void MockGetVceGenericQuery(WireMockServer wireMockServer, String serviceInstanceName, int depth, int statusCode, String responseFile){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/search/generic-query[?]key=service-instance.service-instance-name:" + serviceInstanceName + "[&]start-node-type=service-instance[&]include=vce[&]depth=" + depth))
                                .willReturn(aResponse()
                                                .withStatus(statusCode)
                                                .withHeader("Content-Type", "text/xml")
        /**
         * Tenant Mock StubResponses below
         */
-       public static void MockGetTenantGenericQuery(String customer, String serviceType, String responseFile) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/search/generic-query[?]key=customer.global-customer-id:" + customer + "&key=service-subscription.service-type:" + serviceType + "&start-node-type=service-subscription&include=tenant&include=service-subscription&depth=1"))
+       public static void MockGetTenantGenericQuery(WireMockServer wireMockServer, String customer, String serviceType, String responseFile) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/search/generic-query[?]key=customer.global-customer-id:" + customer + "&key=service-subscription.service-type:" + serviceType + "&start-node-type=service-subscription&include=tenant&include=service-subscription&depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetTenant(String tenantId, String responseFile) {
-               stubFor(get(urlEqualTo("/aai/v2/cloud-infrastructure/tenants/tenant/" + tenantId))
+       public static void MockGetTenant(WireMockServer wireMockServer, String tenantId, String responseFile) {
+               wireMockServer.stubFor(get(urlEqualTo("/aai/v2/cloud-infrastructure/tenants/tenant/" + tenantId))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
        /**
         * Network Mock StubResponses below
         */
-       public static void MockGetNetwork(String networkId, String responseFile, int statusCode) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/l3-networks/l3-network/" + networkId))
+       public static void MockGetNetwork(WireMockServer wireMockServer, String networkId, String responseFile, int statusCode) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/l3-networks/l3-network/" + networkId))
                                .willReturn(aResponse()
                                                .withStatus(statusCode)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetNetworkByIdWithDepth(String networkId, String responseFile, String depth) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/l3-networks/l3-network/" + networkId + "[?]depth=" + depth))
+       public static void MockGetNetworkByIdWithDepth(WireMockServer wireMockServer, String networkId, String responseFile, String depth) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/l3-networks/l3-network/" + networkId + "[?]depth=" + depth))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetNetworkCloudRegion(String responseFile, String cloudRegion) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/"+cloudRegion))
+       public static void MockGetNetworkCloudRegion(WireMockServer wireMockServer, String responseFile, String cloudRegion) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/"+cloudRegion))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetNetworkByName(String networkName, String responseFile) {
-                  stubFor(get(urlMatching("/aai/v[0-9]+/network/l3-networks/l3-network[?]network-name="+networkName))
+       public static void MockGetNetworkByName(WireMockServer wireMockServer, String networkName, String responseFile) {
+                  wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/l3-networks/l3-network[?]network-name="+networkName))
                                        .willReturn(aResponse()
                                                        .withStatus(200)
                                                        .withHeader("Content-Type", "text/xml")
                                                        .withBodyFile(responseFile)));
        }
 
-       public static void MockGetNetworkByName_404(String responseFile, String networkName) {
-       stubFor(get(urlMatching("/aai/v[0-9]+/network/l3-networks/l3-network[?]network-name="+networkName))
+       public static void MockGetNetworkByName_404(WireMockServer wireMockServer, String responseFile, String networkName) {
+       wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/l3-networks/l3-network[?]network-name="+networkName))
                                .willReturn(aResponse()
                                                .withStatus(404)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetNetworkCloudRegion_404(String cloudRegion) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/"+cloudRegion))
+       public static void MockGetNetworkCloudRegion_404(WireMockServer wireMockServer, String cloudRegion) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/"+cloudRegion))
                                .willReturn(aResponse()
                                                .withStatus(404)));
        }
 
-       public static void MockPutNetwork(String networkId, int statusCode, String responseFile) {
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/l3-networks/l3-network/" + networkId))
+       public static void MockPutNetwork(WireMockServer wireMockServer, String networkId, int statusCode, String responseFile) {
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/l3-networks/l3-network/" + networkId))
                                .willReturn(aResponse()
                                                .withStatus(statusCode)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockPutNetwork(String networkPolicyId, String responseFile, int statusCode) {
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy/" + networkPolicyId))
+       public static void MockPutNetwork(WireMockServer wireMockServer, String networkPolicyId, String responseFile, int statusCode) {
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy/" + networkPolicyId))
                                  .willReturn(aResponse()
                                  .withStatus(statusCode)
                                  .withHeader("Content-Type", "text/xml")
                                  .withBodyFile(responseFile)));
        }
 
-       public static void MockGetNetworkName(String networkPolicyName, String responseFile, int statusCode) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/l3-networks/l3-network[?]network-name=" + networkPolicyName))
+       public static void MockGetNetworkName(WireMockServer wireMockServer, String networkPolicyName, String responseFile, int statusCode) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/l3-networks/l3-network[?]network-name=" + networkPolicyName))
                                  .willReturn(aResponse()
                                  .withStatus(statusCode)
                                  .withHeader("Content-Type", "text/xml")
                                  .withBodyFile(responseFile)));
        }
 
-       public static void MockGetNetworkVpnBinding(String responseFile, String vpnBinding) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/vpn-bindings/vpn-binding/"+vpnBinding + "[?]depth=all"))
+       public static void MockGetNetworkVpnBinding(WireMockServer wireMockServer, String responseFile, String vpnBinding) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/vpn-bindings/vpn-binding/"+vpnBinding + "[?]depth=all"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetNetworkPolicy(String responseFile, String policy) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy/"+policy + "[?]depth=all"))
+       public static void MockGetNetworkPolicy(WireMockServer wireMockServer, String responseFile, String policy) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy/"+policy + "[?]depth=all"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetNetworkVpnBinding(String networkBindingId, String responseFile, int statusCode) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/vpn-bindings/vpn-binding/" + networkBindingId))
+       public static void MockGetNetworkVpnBinding(WireMockServer wireMockServer, String networkBindingId, String responseFile, int statusCode) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/vpn-bindings/vpn-binding/" + networkBindingId))
                                  .willReturn(aResponse()
                                  .withStatus(statusCode)
                                  .withHeader("Content-Type", "text/xml")
                                  .withBodyFile(responseFile)));
        }
 
-       public static void MockGetNetworkPolicy(String networkPolicy, String responseFile, int statusCode) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy/" + networkPolicy))
+       public static void MockGetNetworkPolicy(WireMockServer wireMockServer, String networkPolicy, String responseFile, int statusCode) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy/" + networkPolicy))
                                  .willReturn(aResponse()
                                  .withStatus(statusCode)
                                  .withHeader("Content-Type", "text/xml")
                                  .withBodyFile(responseFile)));
        }
 
-       public static void MockGetNetworkTableReference(String responseFile, String tableReference) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/route-table-references/route-table-reference/"+tableReference + "[?]depth=all"))
+       public static void MockGetNetworkTableReference(WireMockServer wireMockServer, String responseFile, String tableReference) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/route-table-references/route-table-reference/"+tableReference + "[?]depth=all"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockPutNetworkIdWithDepth(String responseFile, String networkId, String depth) {
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/l3-networks/l3-network/"+networkId+"[?]depth="+depth ))
+       public static void MockPutNetworkIdWithDepth(WireMockServer wireMockServer, String responseFile, String networkId, String depth) {
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/l3-networks/l3-network/"+networkId+"[?]depth="+depth ))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetNetworkPolicyfqdn(String networkPolicy, String responseFile, int statusCode) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy[?]network-policy-fqdn=" + networkPolicy))
+       public static void MockGetNetworkPolicyfqdn(WireMockServer wireMockServer, String networkPolicy, String responseFile, int statusCode) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy[?]network-policy-fqdn=" + networkPolicy))
                                  .willReturn(aResponse()
                                  .withStatus(statusCode)
                                  .withHeader("Content-Type", "text/xml")
                                  .withBodyFile(responseFile)));
        }
 
-       public static void MockGetNetworkRouteTable(String networkRouteId, String responseFile, int statusCode) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/route-table-references/route-table-reference/" + networkRouteId))
+       public static void MockGetNetworkRouteTable(WireMockServer wireMockServer, String networkRouteId, String responseFile, int statusCode) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/route-table-references/route-table-reference/" + networkRouteId))
                                  .willReturn(aResponse()
                                  .withStatus(statusCode)
                                  .withHeader("Content-Type", "text/xml")
                                  .withBodyFile(responseFile)));
        }
 
-       public static void MockPatchVfModuleId(String vnfId, String vfModuleId) {
-               stubFor(patch(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module/" + vfModuleId))
+       public static void MockPatchVfModuleId(WireMockServer wireMockServer, String vnfId, String vfModuleId) {
+               wireMockServer.stubFor(patch(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module/" + vfModuleId))
                                .willReturn(aResponse()
                                                .withStatus(200)));
        }
 
        /////////////
 
-       public static void MockVNFAdapterRestVfModule() {
-               stubFor(put(urlEqualTo("/vnfs/v1/vnfs/skask/vf-modules/supercool"))
+       public static void MockVNFAdapterRestVfModule(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(put(urlEqualTo("/vnfs/v1/vnfs/skask/vf-modules/supercool"))
                        .willReturn(aResponse()
                                .withStatus(202)
                                .withHeader("Content-Type", "application/xml")));
-               stubFor(post(urlMatching("/vnfs/v1/vnfs/.*/vf-modules"))
+               wireMockServer.stubFor(post(urlMatching("/vnfs/v1/vnfs/.*/vf-modules"))
                                .willReturn(aResponse()
                                        .withStatus(202)
                                        .withHeader("Content-Type", "application/xml")));
-               stubFor(post(urlEqualTo("/vnfs/v1/vnfs/skask/vf-modules"))
+               wireMockServer.stubFor(post(urlEqualTo("/vnfs/v1/vnfs/skask/vf-modules"))
                        .willReturn(aResponse()
                                .withStatus(202)
                                .withHeader("Content-Type", "application/xml")));
-               stubFor(put(urlEqualTo("/vnfs/v1/volume-groups/78987"))
+               wireMockServer.stubFor(put(urlEqualTo("/vnfs/v1/volume-groups/78987"))
                        .willReturn(aResponse()
                                .withStatus(202)
                                .withHeader("Content-Type", "application/xml")));
        }
 
-       public static void MockDBUpdateVfModule(){
-               stubFor(post(urlEqualTo("/dbadapters/RequestsDbAdapter"))
+       public static void MockDBUpdateVfModule(WireMockServer wireMockServer){
+               wireMockServer.stubFor(post(urlEqualTo("/dbadapters/RequestsDbAdapter"))
                        .willReturn(aResponse()
                                .withStatus(200)
                            .withHeader("Content-Type", "text/xml")
        }
 
        // start of mocks used locally and by other VF Module unit tests
-       public static void MockSDNCAdapterVfModule() {
+       public static void MockSDNCAdapterVfModule(WireMockServer wireMockServer) {
                // simplified the implementation to return "success" for all requests
-               stubFor(post(urlEqualTo("/SDNCAdapter"))
+               wireMockServer.stubFor(post(urlEqualTo("/SDNCAdapter"))
 //                     .withRequestBody(containing("SvcInstanceId><"))
                        .willReturn(aResponse()
                                .withStatus(200)
        }
 
        // start of mocks used locally and by other VF Module unit tests
-       public static void MockAAIVfModule() {
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/supercool"))
+       public static void MockAAIVfModule(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/supercool"))
                        .atPriority(1)
                        .willReturn(aResponse()
                                .withStatus(200)
                                .withHeader("Content-Type", "text/xml")
                                .withBodyFile("VfModularity/VfModule-supercool.xml")));
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/lukewarm"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/lukewarm"))
                        .atPriority(2)
                        .willReturn(aResponse()
                                .withStatus(200)
                                .withHeader("Content-Type", "text/xml")
                                .withBodyFile("VfModularity/VfModule-lukewarm.xml")));
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/.*"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/.*"))
                        .atPriority(5)
                        .willReturn(aResponse()
                                .withStatus(200)
                                .withHeader("Content-Type", "text/xml")
                                .withBodyFile("VfModularity/VfModule-new.xml")));
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask[?]depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask[?]depth=1"))
                        .willReturn(aResponse()
                                .withStatus(200)
                                .withHeader("Content-Type", "text/xml")
                                .withBodyFile("VfModularity/GenericVnf.xml")));
-               stubFor(patch(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/supercool"))
+               wireMockServer.stubFor(patch(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/supercool"))
 //                     .withRequestBody(containing("PCRF"))
                        .willReturn(aResponse()
                                .withStatus(200)));
-               stubFor(patch(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/.*"))
+               wireMockServer.stubFor(patch(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/.*"))
 //                             .withRequestBody(containing("PCRF"))
                                .willReturn(aResponse()
                                        .withStatus(200)));
                // HTTP PUT stub still used by CreateAAIvfModuleVolumeGroup
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/.*"))
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/.*"))
                                .withRequestBody(containing("PCRF"))
                                .willReturn(aResponse()
                                        .withStatus(200)));
                // HTTP PUT stub still used by DoCreateVfModuleTest
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/.*"))
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/.*"))
                                .withRequestBody(containing("MODULELABEL"))
                                .willReturn(aResponse()
                                        .withStatus(200)));
-               stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/volume-groups/volume-group[?]volume-group-id=78987"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/volume-groups/volume-group[?]volume-group-id=78987"))
                        .willReturn(aResponse()
                                .withStatus(200)
                                .withHeader("Content-Type", "text/xml")
                                .withBodyFile("VfModularity/ConfirmVolumeGroupTenantResponse.xml")));
-               stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/volume-groups/volume-group[?]volume-group-id=78987"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/volume-groups/volume-group[?]volume-group-id=78987"))
                                .willReturn(aResponse()
                                .withStatus(200)
                                .withHeader("Content-Type", "text/xml")
                                .withBodyFile("VfModularity/ConfirmVolumeGroupTenantResponse.xml")));
-               stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/MDTWNJ21/volume-groups/volume-group/78987"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/MDTWNJ21/volume-groups/volume-group/78987"))
                        .willReturn(aResponse()
                                .withStatus(200)
                                .withHeader("Content-Type", "text/xml")
                                .withBodyFile("VfModularity/VolumeGroup.xml")));
-               stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/AAIAIC25/volume-groups/volume-group/78987"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/AAIAIC25/volume-groups/volume-group/78987"))
                                .willReturn(aResponse()
                                        .withStatus(200)
                                        .withHeader("Content-Type", "text/xml")
                                        .withBodyFile("VfModularity/VolumeGroup.xml")));
-               stubFor(delete(urlMatching("/aai/v[0-9]+/cloud-infrastructure/volume-groups/volume-group/78987[?]resource-version=0000020"))
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/cloud-infrastructure/volume-groups/volume-group/78987[?]resource-version=0000020"))
                             .willReturn(aResponse()
                             .withStatus(200)
                             .withHeader("Content-Type", "text/xml")
                             .withBodyFile("DeleteCinderVolumeV1/DeleteVolumeId_AAIResponse_Success.xml")));
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy/.*"))
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy/.*"))
                                  .willReturn(aResponse()
                                  .withStatus(200)
                                  .withHeader("Content-Type", "text/xml")
                                  .withBodyFile("VfModularity/AddNetworkPolicy_AAIResponse_Success.xml")));
-               stubFor(patch(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/NEWvBNGModuleId"))
+               wireMockServer.stubFor(patch(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/NEWvBNGModuleId"))
                                .withRequestBody(containing("NEWvBNGModuleId"))
                                .willReturn(aResponse()
                                        .withStatus(200)));
         * Cloud infrastructure below
         */
 
-       public static void MockGetCloudRegion(String cloudRegionId, int statusCode, String responseFile) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/" + cloudRegionId))
+       public static void MockGetCloudRegion(WireMockServer wireMockServer, String cloudRegionId, int statusCode, String responseFile) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/" + cloudRegionId))
                                .willReturn(aResponse()
                                                .withStatus(statusCode)
                                                .withHeader("Content-Type", "text/xml")
        /**
         * Volume Group StubResponse below
         */
-       public static void MockGetVolumeGroupById(String cloudRegionId, String volumeGroupId, String responseFile) {
-               MockGetVolumeGroupById(cloudRegionId, volumeGroupId, responseFile, 200);
+       public static void MockGetVolumeGroupById(WireMockServer wireMockServer, String cloudRegionId, String volumeGroupId, String responseFile) {
+               MockGetVolumeGroupById(wireMockServer, cloudRegionId, volumeGroupId, responseFile, 200);
        }
 
-       public static void MockGetVolumeGroupById(String cloudRegionId, String volumeGroupId, String responseFile, int responseCode) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/" + cloudRegionId + "/volume-groups/volume-group/" + volumeGroupId))
+       public static void MockGetVolumeGroupById(WireMockServer wireMockServer, String cloudRegionId, String volumeGroupId, String responseFile, int responseCode) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/" + cloudRegionId + "/volume-groups/volume-group/" + volumeGroupId))
                                .willReturn(aResponse()
                                                .withStatus(responseCode)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockPutVolumeGroupById(String cloudRegionId, String volumeGroupId, String responseFile, int statusCode) {
-               stubFor(put(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/" + cloudRegionId + "/volume-groups/volume-group/" + volumeGroupId))
+       public static void MockPutVolumeGroupById(WireMockServer wireMockServer, String cloudRegionId, String volumeGroupId, String responseFile, int statusCode) {
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/" + cloudRegionId + "/volume-groups/volume-group/" + volumeGroupId))
                                .willReturn(aResponse()
                                                .withStatus(statusCode)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetVolumeGroupByName(String cloudRegionId, String volumeGroupName, String responseFile, int statusCode) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/" + cloudRegionId + "/volume-groups[?]volume-group-name=" + volumeGroupName))
+       public static void MockGetVolumeGroupByName(WireMockServer wireMockServer, String cloudRegionId, String volumeGroupName, String responseFile, int statusCode) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/" + cloudRegionId + "/volume-groups[?]volume-group-name=" + volumeGroupName))
                                .willReturn(aResponse()
                                                .withStatus(statusCode)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockDeleteVolumeGroupById(String cloudRegionId, String volumeGroupId, String resourceVersion, int statusCode) {
-               stubFor(delete(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/" + cloudRegionId + "/volume-groups/volume-group/" + volumeGroupId + "[?]resource-version=" + resourceVersion))
+       public static void MockDeleteVolumeGroupById(WireMockServer wireMockServer, String cloudRegionId, String volumeGroupId, String resourceVersion, int statusCode) {
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/" + cloudRegionId + "/volume-groups/volume-group/" + volumeGroupId + "[?]resource-version=" + resourceVersion))
                                  .willReturn(aResponse()
                                  .withStatus(statusCode)));
        }
 
-       public static void MockGetVolumeGroupByName_404(String cloudRegionId, String volumeGroupName) {
-               stubFor(get(urlMatching("/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/" + cloudRegionId + "/volume-groups[?]volume-group-name=" + volumeGroupName))
+       public static void MockGetVolumeGroupByName_404(WireMockServer wireMockServer, String cloudRegionId, String volumeGroupName) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/" + cloudRegionId + "/volume-groups[?]volume-group-name=" + volumeGroupName))
                                .willReturn(aResponse()
                                .withStatus(404)));
        }
 
-       public static void MockDeleteVolumeGroup(String cloudRegionId, String volumeGroupId, String resourceVersion) {
-               stubFor(delete(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/" + cloudRegionId + "/volume-groups/volume-group/" + volumeGroupId + "[?]resource-version=" + resourceVersion))
+       public static void MockDeleteVolumeGroup(WireMockServer wireMockServer, String cloudRegionId, String volumeGroupId, String resourceVersion) {
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/" + cloudRegionId + "/volume-groups/volume-group/" + volumeGroupId + "[?]resource-version=" + resourceVersion))
                                .willReturn(aResponse()
                                .withStatus(200)));
        }
         * VF-Module StubResponse below
         * @param statusCode TODO
         */
-       public static void MockGetVfModuleId(String vnfId, String vfModuleId, String responseFile, int statusCode) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module/" + vfModuleId))
+       public static void MockGetVfModuleId(WireMockServer wireMockServer, String vnfId, String vfModuleId, String responseFile, int statusCode) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module/" + vfModuleId))
                                .willReturn(aResponse()
                                                .withStatus(statusCode)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetVfModuleByNameWithDepth(String vnfId, String vfModuleName, int depth, String responseFile, int statusCode) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module[?]vf-module-name=" + vfModuleName + "[?]depth=" + depth))
+       public static void MockGetVfModuleByNameWithDepth(WireMockServer wireMockServer, String vnfId, String vfModuleName, int depth, String responseFile, int statusCode) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module[?]vf-module-name=" + vfModuleName + "[?]depth=" + depth))
                                .willReturn(aResponse()
                                                .withStatus(statusCode)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetVfModuleByName(String vnfId, String vfModuleName, String responseFile, int statusCode) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module[?]vf-module-name=" + vfModuleName))
+       public static void MockGetVfModuleByName(WireMockServer wireMockServer, String vnfId, String vfModuleName, String responseFile, int statusCode) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module[?]vf-module-name=" + vfModuleName))
                                .willReturn(aResponse()
                                                .withStatus(statusCode)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetVfModuleIdNoResponse(String vnfId, String requestContaining, String vfModuleId) {
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module/" + vfModuleId))
+       public static void MockGetVfModuleIdNoResponse(WireMockServer wireMockServer, String vnfId, String requestContaining, String vfModuleId) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module/" + vfModuleId))
                                .withRequestBody(containing(requestContaining))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")));
        }
 
-       public static void MockPutVfModuleIdNoResponse(String vnfId, String requestContaining, String vfModuleId) {
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId +"/vf-modules/vf-module/" +vfModuleId))
+       public static void MockPutVfModuleIdNoResponse(WireMockServer wireMockServer, String vnfId, String requestContaining, String vfModuleId) {
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId +"/vf-modules/vf-module/" +vfModuleId))
                                .withRequestBody(containing(requestContaining))
                                .willReturn(aResponse()
                                        .withStatus(200)));
        }
 
-       public static void MockPutVfModuleId(String vnfId, String vfModuleId) {
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module/" + vfModuleId))
+       public static void MockPutVfModuleId(WireMockServer wireMockServer, String vnfId, String vfModuleId) {
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module/" + vfModuleId))
                                .willReturn(aResponse()
                                                .withStatus(200)));
        }
 
-       public static void MockPutVfModuleId(String vnfId, String vfModuleId, int returnCode) {
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module/" + vfModuleId))
+       public static void MockPutVfModuleId(WireMockServer wireMockServer, String vnfId, String vfModuleId, int returnCode) {
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module/" + vfModuleId))
                                .willReturn(aResponse()
                                                .withStatus(returnCode)));
        }
 
-       public static void MockDeleteVfModuleId(String vnfId, String vfModuleId, String resourceVersion, int returnCode) {
-               stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module/" + vfModuleId + "/[?]resource-version=" + resourceVersion))
+       public static void MockDeleteVfModuleId(WireMockServer wireMockServer, String vnfId, String vfModuleId, String resourceVersion, int returnCode) {
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module/" + vfModuleId + "/[?]resource-version=" + resourceVersion))
                                .willReturn(aResponse()
                                                .withStatus(returnCode)));
        }
 
-       public static void MockAAIVfModuleBadPatch(String endpoint, int statusCode) {
-               stubFor(patch(urlMatching(endpoint))
+       public static void MockAAIVfModuleBadPatch(WireMockServer wireMockServer, String endpoint, int statusCode) {
+               wireMockServer.stubFor(patch(urlMatching(endpoint))
                        .willReturn(aResponse()
                                .withStatus(statusCode)));
        }
 
        /* AAI Pserver Queries */
-       public static void MockGetPserverByVnfId(String vnfId, String responseFile, int statusCode) {
-               stubFor(put(urlMatching("/aai/v1[0-9]/query.*"))
+       public static void MockGetPserverByVnfId(WireMockServer wireMockServer, String vnfId, String responseFile, int statusCode) {
+               wireMockServer.stubFor(put(urlMatching("/aai/v1[0-9]/query.*"))
                                .willReturn(aResponse()
                                                .withStatus(statusCode)
                                                .withHeader("Content-Type", "application/json")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetGenericVnfsByVnfId(String vnfId, String responseFile, int statusCode) {
-               stubFor(get(urlMatching("/aai/v1[0-9]/network/generic-vnfs/.*"))
+       public static void MockGetGenericVnfsByVnfId(WireMockServer wireMockServer, String vnfId, String responseFile, int statusCode) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v1[0-9]/network/generic-vnfs/.*"))
                                .willReturn(aResponse()
                                                .withStatus(statusCode)
                                                .withHeader("Content-Type", "application/json; charset=utf-8")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void MockSetInMaintFlagByVnfId(String vnfId, int statusCode) {
-               stubFor(patch(urlMatching("/aai/v1[0-9]/network/generic-vnfs/.*"))
+       public static void MockSetInMaintFlagByVnfId(WireMockServer wireMockServer, String vnfId, int statusCode) {
+               wireMockServer.stubFor(patch(urlMatching("/aai/v1[0-9]/network/generic-vnfs/.*"))
                                .willReturn(aResponse()
                                                .withStatus(statusCode)
                                                ));
        }
 
-       public static void MockSetInMaintFlagByVnfId(String vnfId, String responseFile, int statusCode) {
-               stubFor(post(urlMatching("/aai/v1[0-9]/network/generic-vnfs/.*"))
+       public static void MockSetInMaintFlagByVnfId(WireMockServer wireMockServer, String vnfId, String responseFile, int statusCode) {
+               wireMockServer.stubFor(post(urlMatching("/aai/v1[0-9]/network/generic-vnfs/.*"))
                                .willReturn(aResponse()
                                                .withStatus(statusCode)
                                                .withBodyFile(responseFile)
                                                ));
        }
 
-       public static void MockGetDefaultCloudRegionByCloudRegionId(String cloudRegionId, String responseFile, int statusCode) {
-               stubFor(get(urlMatching("/aai/v1[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/"+cloudRegionId + ".*"))
+       public static void MockGetDefaultCloudRegionByCloudRegionId(WireMockServer wireMockServer, String cloudRegionId, String responseFile, int statusCode) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v1[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/"+cloudRegionId + ".*"))
                                .willReturn(aResponse()
                                                .withStatus(statusCode)
                                                .withHeader("Content-Type", "application/json; charset=utf-8")
 
        //// Deprecated Stubs below - to be deleted once unit test that reference them are refactored to use common ones above ////
        @Deprecated
-       public static void MockGetVceById(){
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/vces/vce/testVnfId123?depth=1"))
+       public static void MockGetVceById(WireMockServer wireMockServer){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/vces/vce/testVnfId123?depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile("GenericFlows/getVceResponse.xml")));
        }
        @Deprecated
-       public static void MockGetVceByName(){
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/vces/vce[?]vnf-name=testVnfName123"))
+       public static void MockGetVceByName(WireMockServer wireMockServer){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/vces/vce[?]vnf-name=testVnfName123"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile("GenericFlows/getVceByNameResponse.xml")));
        }
        @Deprecated
-       public static void MockPutVce(){
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/vces/vce/testVnfId123"))
+       public static void MockPutVce(WireMockServer wireMockServer){
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/vces/vce/testVnfId123"))
                                .willReturn(aResponse()
                                                .withStatus(200)));
        }
        @Deprecated
-       public static void MockDeleteVce(){
-               stubFor(delete(urlMatching("/aai/v[0-9]+/network/vces/vce/testVnfId123[?]resource-version=testReVer123"))
+       public static void MockDeleteVce(WireMockServer wireMockServer){
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/network/vces/vce/testVnfId123[?]resource-version=testReVer123"))
                                .willReturn(aResponse()
                                                .withStatus(204)));
        }
        @Deprecated
-       public static void MockDeleteVce_404(){
-               stubFor(delete(urlMatching("/aai/v[0-9]+/network/vces/vce/testVnfId123[?]resource-version=testReVer123"))
+       public static void MockDeleteVce_404(WireMockServer wireMockServer){
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/network/vces/vce/testVnfId123[?]resource-version=testReVer123"))
                                .willReturn(aResponse()
                                                .withStatus(404)));
        }
 
        @Deprecated
-       public static void MockDeleteServiceSubscription(){
-               stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/1604-MVM-26/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET[?]resource-version=1234"))
+       public static void MockDeleteServiceSubscription(WireMockServer wireMockServer){
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/1604-MVM-26/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET[?]resource-version=1234"))
                                  .willReturn(aResponse()
                                  .withStatus(204)));
        }
        @Deprecated
-       public static void MockGetServiceSubscription(){
-               stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/1604-MVM-26/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET"))
+       public static void MockGetServiceSubscription(WireMockServer wireMockServer){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/1604-MVM-26/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET"))
                                  .willReturn(aResponse()
                                  .withStatus(200)
                                  .withHeader("Content-Type", "text/xml")
                                  .withBodyFile("GenericFlows/getServiceSubscription.xml")));
        }
        @Deprecated
-       public static void MockGetServiceSubscription_200Empty(){
-               stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/1604-MVM-26/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET[?]resource-version=1234"))
+       public static void MockGetServiceSubscription_200Empty(WireMockServer wireMockServer){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/1604-MVM-26/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET[?]resource-version=1234"))
                                  .willReturn(aResponse()
                                  .withStatus(200)
                                  .withHeader("Content-Type", "text/xml")
                                  .withBody(" ")));
        }
        @Deprecated
-       public static void MockGetServiceSubscription_404() {
-               stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/1604-MVM-26/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET"))
+       public static void MockGetServiceSubscription_404(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/1604-MVM-26/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET"))
                                .willReturn(aResponse()
                                                .withStatus(404)));
        }
 
        @Deprecated
-       public static void MockGetGenericVnfById(){
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123"))
+       public static void MockGetGenericVnfById(WireMockServer wireMockServer){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile("GenericFlows/getGenericVnfByNameResponse.xml")));
        }
        @Deprecated
-       public static void MockGetGenericVnfById_404(){
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123"))
+       public static void MockGetGenericVnfById_404(WireMockServer wireMockServer){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123"))
                                .willReturn(aResponse()
                                                .withStatus(404)));
        }
        @Deprecated
-       public static void MockGetGenericVnfByName(){
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf[?]vnf-name=testVnfName123"))
+       public static void MockGetGenericVnfByName(WireMockServer wireMockServer){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf[?]vnf-name=testVnfName123"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile("GenericFlows/getGenericVnfResponse.xml")));
        }
        @Deprecated
-       public static void MockGetGenericVnfByName_hasRelationships(){
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf[?]vnf-name=testVnfName123"))
+       public static void MockGetGenericVnfByName_hasRelationships(WireMockServer wireMockServer){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf[?]vnf-name=testVnfName123"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile("GenericFlows/getGenericVnfResponse_hasRelationships.xml")));
        }
        @Deprecated
-       public static void MockGetGenericVnfById_hasRelationships(){
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123"))
+       public static void MockGetGenericVnfById_hasRelationships(WireMockServer wireMockServer){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile("GenericFlows/getGenericVnfResponse_hasRelationships.xml")));
        }
        @Deprecated
-       public static void MockGetGenericVnfById_500(){
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123"))
+       public static void MockGetGenericVnfById_500(WireMockServer wireMockServer){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123"))
                                .willReturn(aResponse()
                                                .withStatus(500)));
        }
        @Deprecated
-       public static void MockGetGenericVnfByName_404(){
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf[?]vnf-name=testVnfName123"))
+       public static void MockGetGenericVnfByName_404(WireMockServer wireMockServer){
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf[?]vnf-name=testVnfName123"))
                                .willReturn(aResponse()
                                                .withStatus(404)));
        }
        @Deprecated
-       public static void MockPutGenericVnf(){
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123"))
+       public static void MockPutGenericVnf(WireMockServer wireMockServer){
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123"))
                                .willReturn(aResponse()
                                                .withStatus(200)));
        }
        @Deprecated
-       public static void MockPutGenericVnf_400(){
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123"))
+       public static void MockPutGenericVnf_400(WireMockServer wireMockServer){
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123"))
                                .willReturn(aResponse()
                                                .withStatus(400)));
        }
        @Deprecated
-       public static void MockDeleteGenericVnf(){
-               stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123[?]resource-version=testReVer123"))
+       public static void MockDeleteGenericVnf(WireMockServer wireMockServer){
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123[?]resource-version=testReVer123"))
                                .willReturn(aResponse()
                                                .withStatus(204)));
        }
        @Deprecated
-       public static void MockDeleteGenericVnf_404(){
-               stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123[?]resource-version=testReVer123"))
+       public static void MockDeleteGenericVnf_404(WireMockServer wireMockServer){
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123[?]resource-version=testReVer123"))
                                .willReturn(aResponse()
                                                .withStatus(404)));
        }
        @Deprecated
-       public static void MockDeleteGenericVnf_500(){
-               stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123[?]resource-version=testReVer123"))
+       public static void MockDeleteGenericVnf_500(WireMockServer wireMockServer){
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123[?]resource-version=testReVer123"))
                                .willReturn(aResponse()
                                                .withStatus(500)));
        }
        @Deprecated
-       public static void MockDeleteGenericVnf_412(){
-               stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123[[?]]resource-version=testReVer123"))
+       public static void MockDeleteGenericVnf_412(WireMockServer wireMockServer){
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123[[?]]resource-version=testReVer123"))
                                .willReturn(aResponse()
                                                .withStatus(412)));
        }
 
 package org.onap.so.bpmn.mock;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.containing;
-import static com.github.tomakehurst.wiremock.client.WireMock.delete;
 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.patch;
 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.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+
 /**
  * Reusable Mock StubResponses for Policy
  *
        }
 
        // start of Policy mocks
-       public static void MockAppcError() {            
-               stubFor(get(urlMatching("/events/.*"))
+       public static void MockAppcError(WireMockServer wireMockServer) {               
+               wireMockServer.stubFor(get(urlMatching("/events/.*"))
                //      .withRequestBody(containing("APPC"))
                        .willReturn(aResponse()
                                .withStatus(200)
                                .withHeader("Content-Type", "application/json")
                                .withBodyFile("APPC/appc_error.json")));
-               stubFor(put(urlMatching("/events/.*"))
+               wireMockServer.stubFor(put(urlMatching("/events/.*"))
                                //      .withRequestBody(containing("APPC"))
                                        .willReturn(aResponse()
                                                .withStatus(200)
 
 package org.onap.so.bpmn.mock;
 
 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.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+
 /**
  * Stub response class for Database stubs
  * including database adapter, catalog db,
 
        }
 
-       public static void MockUpdateRequestDB(String fileName){
-               stubFor(post(urlEqualTo("/services/RequestsDbAdapter"))
+       public static void MockUpdateRequestDB(WireMockServer wireMockServer, String fileName){
+               wireMockServer.stubFor(post(urlEqualTo("/services/RequestsDbAdapter"))
                                .willReturn(aResponse()
                                .withStatus(200)
                            .withHeader("Content-Type", "text/xml")
                                .withBodyFile(fileName)));
        }       
        
-       public static void mockUpdateRequestDB(int statusCode, String reponseFile) {
-               stubFor(post(urlEqualTo("/services/RequestsDbAdapter"))
+       public static void mockUpdateRequestDB(WireMockServer wireMockServer, int statusCode, String reponseFile) {
+               wireMockServer.stubFor(post(urlEqualTo("/services/RequestsDbAdapter"))
                                .willReturn(aResponse()
                                .withStatus(statusCode)
                            .withHeader("Content-Type", "text/xml")
                                .withBodyFile(reponseFile)));
        }
 
-       public static void MockGetAllottedResourcesByModelInvariantId(String modelInvariantId, String responseFile){
-               stubFor(get(urlEqualTo("/v1/serviceAllottedResources?serviceModelInvariantUuid=" + modelInvariantId))
+       public static void MockGetAllottedResourcesByModelInvariantId(WireMockServer wireMockServer, String modelInvariantId, String responseFile){
+               wireMockServer.stubFor(get(urlEqualTo("/v1/serviceAllottedResources?serviceModelInvariantUuid=" + modelInvariantId))
                                .willReturn(aResponse()
                                .withStatus(200)
                            .withHeader("Content-Type", "application/json")
                                .withBodyFile(responseFile)));
        }
 
-       public static void MockGetAllottedResourcesByModelInvariantId_500(String modelInvariantId, String responseFile){
-               stubFor(get(urlEqualTo("/v1/serviceAllottedResources?serviceModelInvariantUuid=" + modelInvariantId))
+       public static void MockGetAllottedResourcesByModelInvariantId_500(WireMockServer wireMockServer, String modelInvariantId, String responseFile){
+               wireMockServer.stubFor(get(urlEqualTo("/v1/serviceAllottedResources?serviceModelInvariantUuid=" + modelInvariantId))
                                .willReturn(aResponse()
                                .withStatus(500)));
        }
        
-       public static void MockGetVnfCatalogDataCustomizationUuid(String vnfModelCustomizationUuid,  String responseFile){
-               stubFor(get(urlEqualTo("/v2/serviceVnfs?vnfModelCustomizationUuid=" + vnfModelCustomizationUuid))
+       public static void MockGetVnfCatalogDataCustomizationUuid(WireMockServer wireMockServer, String vnfModelCustomizationUuid,  String responseFile){
+               wireMockServer.stubFor(get(urlEqualTo("/v2/serviceVnfs?vnfModelCustomizationUuid=" + vnfModelCustomizationUuid))
                                  .willReturn(aResponse()
                                  .withStatus(200)
                                  .withHeader("Content-Type", "application/json")
                                  .withBodyFile(responseFile)));
        }
 
-       public static void MockGetVfModuleByModelNameCatalogData(String vfModuleModelName, String responseFile){
-               stubFor(get(urlEqualTo("/v2/vfModules?vfModuleModelName=" + vfModuleModelName))
+       public static void MockGetVfModuleByModelNameCatalogData(WireMockServer wireMockServer, String vfModuleModelName, String responseFile){
+               wireMockServer.stubFor(get(urlEqualTo("/v2/vfModules?vfModuleModelName=" + vfModuleModelName))
                                  .willReturn(aResponse()
                                  .withStatus(200)
                                  .withHeader("Content-Type", "application/json")
                                  .withBodyFile(responseFile)));
        }
        
-       public static void MockGetServiceResourcesCatalogData(String serviceModelInvariantUuid, String serviceModelVersion, String responseFile){
-               stubFor(get(urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelInvariantUuid=" +
+       public static void MockGetServiceResourcesCatalogData(WireMockServer wireMockServer, String serviceModelInvariantUuid, String serviceModelVersion, String responseFile){
+               wireMockServer.stubFor(get(urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelInvariantUuid=" +
                                serviceModelInvariantUuid + 
                                "&serviceModelVersion=" + serviceModelVersion))
                                  .willReturn(aResponse()
                                  .withBodyFile(responseFile)));
        }
        
-       public static void MockGetServiceResourcesCatalogData(String serviceModelInvariantUuid, String responseFile){
-               stubFor(get(urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelInvariantUuid=" + serviceModelInvariantUuid))
+       public static void MockGetServiceResourcesCatalogData(WireMockServer wireMockServer, String serviceModelInvariantUuid, String responseFile){
+               wireMockServer.stubFor(get(urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelInvariantUuid=" + serviceModelInvariantUuid))
                                  .willReturn(aResponse()
                                  .withStatus(200)
                                  .withHeader("Content-Type", "application/json")
                                  .withBodyFile(responseFile)));
        }       
        
-    public static void MockGetServiceResourcesCatalogDataByModelUuid(String serviceModelUuid, String responseFile){
-        stubFor(get(urlEqualTo("/v2/serviceResources?serviceModelUuid=" + serviceModelUuid))
+    public static void MockGetServiceResourcesCatalogDataByModelUuid(WireMockServer wireMockServer, String serviceModelUuid, String responseFile){
+        wireMockServer.stubFor(get(urlEqualTo("/v2/serviceResources?serviceModelUuid=" + serviceModelUuid))
                   .willReturn(aResponse()
                   .withStatus(200)
                   .withHeader("Content-Type", "application/json")
                   .withBodyFile(responseFile)));
     }  
        
-       public static void MockPostRequestDB(){
-               stubFor(post(urlEqualTo("/dbadapters/RequestsDbAdapter"))
+       public static void MockPostRequestDB(WireMockServer wireMockServer){
+               wireMockServer.stubFor(post(urlEqualTo("/dbadapters/RequestsDbAdapter"))
                                .willReturn(aResponse()
                                .withStatus(200)
                            .withHeader("Content-Type", "text/xml")));
 
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.containing;
+import static com.github.tomakehurst.wiremock.client.WireMock.delete;
 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.delete;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+
 /**
  * Please describe the StubResponseNetwork.java class
  *
        }
 
 
-       public static void MockNetworkAdapter() {
-               stubFor(post(urlEqualTo("/networks/NetworkAdapter"))
+       public static void MockNetworkAdapter(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(post(urlEqualTo("/networks/NetworkAdapter"))
                        .willReturn(aResponse()
                        .withStatus(200)));
        }
 
-       public static void MockNetworkAdapter(String response) {
-               stubFor(post(urlEqualTo("/networks/NetworkAdapter"))
+       public static void MockNetworkAdapter(WireMockServer wireMockServer, String response) {
+               wireMockServer.stubFor(post(urlEqualTo("/networks/NetworkAdapter"))
                        .willReturn(aResponse()
                        .withStatus(200)
                        .withHeader("Content-Type", "text/xml")
                        .withBodyFile(response)));
        }
 
-       public static void MockNetworkAdapter_500() {
-               stubFor(post(urlEqualTo("/networks/NetworkAdapter"))
+       public static void MockNetworkAdapter_500(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(post(urlEqualTo("/networks/NetworkAdapter"))
                        .willReturn(aResponse()
                        .withStatus(500)));
        }
 
-       public static void MockNetworkAdapterPost(String responseFile, String requestContaining) {
-               stubFor(post(urlEqualTo("/networks/NetworkAdapter"))
+       public static void MockNetworkAdapterPost(WireMockServer wireMockServer, String responseFile, String requestContaining) {
+               wireMockServer.stubFor(post(urlEqualTo("/networks/NetworkAdapter"))
                        .withRequestBody(containing(requestContaining))                         
                        .willReturn(aResponse()
                        .withStatus(200)
                        .withBodyFile(responseFile)));
        }       
        
-       public static void MockNetworkAdapter(String networkId, int statusCode, String responseFile) {
-               stubFor(delete(urlEqualTo("/networks/NetworkAdapter/" + networkId))
+       public static void MockNetworkAdapter(WireMockServer wireMockServer, String networkId, int statusCode, String responseFile) {
+               wireMockServer.stubFor(delete(urlEqualTo("/networks/NetworkAdapter/" + networkId))
                                  .willReturn(aResponse()
                                  .withStatus(statusCode)
                                  .withHeader("Content-Type", "application/xml")
                                  .withBodyFile(responseFile)));
        }
        
-       public static void MockNetworkAdapterContainingRequest(String requestContaining, int statusCode, String responseFile) {
-               stubFor(post(urlEqualTo("/networks/NetworkAdapter"))
+       public static void MockNetworkAdapterContainingRequest(WireMockServer wireMockServer, String requestContaining, int statusCode, String responseFile) {
+               wireMockServer.stubFor(post(urlEqualTo("/networks/NetworkAdapter"))
                                  .withRequestBody(containing(requestContaining))
                                  .willReturn(aResponse()
                                  .withStatus(statusCode)
                                  .withBodyFile(responseFile)));
        }
        
-       public static void MockPutNetworkAdapter(String networkId, String requestContaining, int statusCode, String responseFile) {
-               stubFor(put(urlEqualTo("/networks/NetworkAdapter/" + networkId))
+       public static void MockPutNetworkAdapter(WireMockServer wireMockServer, String networkId, String requestContaining, int statusCode, String responseFile) {
+               wireMockServer.stubFor(put(urlEqualTo("/networks/NetworkAdapter/" + networkId))
                                  .withRequestBody(containing(requestContaining))
                                  .willReturn(aResponse()
                                  .withStatus(statusCode)
                                  .withBodyFile(responseFile)));
        }
        
-       public static void MockNetworkAdapterRestRollbackDelete(String responseFile, String networkId) {
-               stubFor(delete(urlEqualTo("/networks/NetworkAdapter/"+networkId+"/rollback"))
+       public static void MockNetworkAdapterRestRollbackDelete(WireMockServer wireMockServer, String responseFile, String networkId) {
+               wireMockServer.stubFor(delete(urlEqualTo("/networks/NetworkAdapter/"+networkId+"/rollback"))
                        .willReturn(aResponse()
                        .withStatus(200)
                        .withHeader("Content-Type", "text/xml")
                        .withBodyFile(responseFile)));
        }       
 
-       public static void MockNetworkAdapterRestPut(String responseFile, String networkId) {
-               stubFor(put(urlEqualTo("/networks/NetworkAdapter/"+networkId))
+       public static void MockNetworkAdapterRestPut(WireMockServer wireMockServer, String responseFile, String networkId) {
+               wireMockServer.stubFor(put(urlEqualTo("/networks/NetworkAdapter/"+networkId))
                        .willReturn(aResponse()
                        .withStatus(200)
                        .withHeader("Content-Type", "text/xml")
 
 
 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.urlEqualTo;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+
 /**
  * StubResponseOof.java class
  */
 
     }
 
-    public static void mockOof() {
-        stubFor(post(urlEqualTo("/api/oof/v1/placement"))
+    public static void mockOof(WireMockServer wireMockServer) {
+        wireMockServer.stubFor(post(urlEqualTo("/api/oof/v1/placement"))
                 .willReturn(aResponse()
                         .withStatus(202)
                         .withHeader("Content-Type", "application/json")));
     }
 
-    public static void mockOof(String responseFile) {
-        stubFor(post(urlEqualTo("/api/oof/v1/placement"))
+    public static void mockOof(WireMockServer wireMockServer, String responseFile) {
+        wireMockServer.stubFor(post(urlEqualTo("/api/oof/v1/placement"))
                 .willReturn(aResponse()
                         .withStatus(202)
                         .withHeader("Content-Type", "application/json")
                         .withBodyFile(responseFile)));
     }
 
-    public static void mockOof_400() {
-        stubFor(post(urlEqualTo("/api/oof/v1/placement"))
+    public static void mockOof_400(WireMockServer wireMockServer) {
+        wireMockServer.stubFor(post(urlEqualTo("/api/oof/v1/placement"))
                 .willReturn(aResponse()
                         .withStatus(400)
                         .withHeader("Content-Type", "application/json")));
     }
 
-    public static void mockOof_500() {
-        stubFor(post(urlEqualTo("/api/oof/v1/placement"))
+    public static void mockOof_500(WireMockServer wireMockServer) {
+        wireMockServer.stubFor(post(urlEqualTo("/api/oof/v1/placement"))
                 .willReturn(aResponse()
                         .withStatus(500)
                         .withHeader("Content-Type", "application/json")));
 
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.containing;
-import static com.github.tomakehurst.wiremock.client.WireMock.delete;
-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.patch;
-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.urlEqualTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
 
 /**
  * Reusable Mock StubResponses for Policy
        }
 
        // start of Policy mocks
-       public static void MockPolicyAbort() {          
-               stubFor(post(urlEqualTo("/pdp/api/getDecision"))
+       public static void MockPolicyAbort(WireMockServer wireMockServer) {             
+               wireMockServer.stubFor(post(urlEqualTo("/pdp/api/getDecision"))
                        .withRequestBody(containing("BB1"))
                        .willReturn(aResponse()
                                .withStatus(200)
                                .withHeader("Content-Type", "application/json")
                                .withBodyFile("policyAbortResponse.json")));
                
-               stubFor(post(urlEqualTo("/pdp/api/getDecision"))
+               wireMockServer.stubFor(post(urlEqualTo("/pdp/api/getDecision"))
                                .withRequestBody(containing("UPDVnfI"))
                                .willReturn(aResponse()
                                        .withStatus(200)
                                        .withHeader("Content-Type", "application/json")
                                        .withBodyFile("policyAbortResponse.json")));
                
-               stubFor(post(urlEqualTo("/pdp/api/getDecision"))
+               wireMockServer.stubFor(post(urlEqualTo("/pdp/api/getDecision"))
                                .withRequestBody(containing("RPLVnfI"))
                                .willReturn(aResponse()
                                        .withStatus(200)
                                        .withHeader("Content-Type", "application/json")
                                        .withBodyFile("policyAbortResponse.json")));
                
-               stubFor(post(urlEqualTo("/pdp/api/getDecision"))
+               wireMockServer.stubFor(post(urlEqualTo("/pdp/api/getDecision"))
                                .withRequestBody(containing("VnfIPU"))
                                .willReturn(aResponse()
                                        .withStatus(200)
                                        .withHeader("Content-Type", "application/json")
                                        .withBodyFile("policyAbortResponse.json")));
                
-               stubFor(post(urlEqualTo("/pdp/api/getDecision"))
+               wireMockServer.stubFor(post(urlEqualTo("/pdp/api/getDecision"))
                                .withRequestBody(containing("VnfCU"))
                                .willReturn(aResponse()
                                        .withStatus(200)
 
        }
        
-       public static void MockPolicySkip() {           
-               stubFor(post(urlEqualTo("/pdp/api/getDecision"))
+       public static void MockPolicySkip(WireMockServer wireMockServer) {              
+               wireMockServer.stubFor(post(urlEqualTo("/pdp/api/getDecision"))
                        .withRequestBody(containing("BB1"))
                        .willReturn(aResponse()
                                .withStatus(200)
                                .withHeader("Content-Type", "application/json")
                                .withBodyFile("Policy/policySkipResponse.json")));
                
-               stubFor(post(urlEqualTo("/pdp/api/getDecision"))
+               wireMockServer.stubFor(post(urlEqualTo("/pdp/api/getDecision"))
                                .withRequestBody(containing("UPDVnfI"))
                                .willReturn(aResponse()
                                        .withStatus(200)
                                        .withHeader("Content-Type", "application/json")
                                        .withBodyFile("Policy/policySkipResponse.json")));
                
-               stubFor(post(urlEqualTo("/pdp/api/getDecision"))
+               wireMockServer.stubFor(post(urlEqualTo("/pdp/api/getDecision"))
                                .withRequestBody(containing("RPLVnfI"))
                                .willReturn(aResponse()
                                        .withStatus(200)
                                        .withHeader("Content-Type", "application/json")
                                        .withBodyFile("Policy/policySkipResponse.json")));
                
-               stubFor(post(urlEqualTo("/pdp/api/getDecision"))
+               wireMockServer.stubFor(post(urlEqualTo("/pdp/api/getDecision"))
                                .withRequestBody(containing("VnfIPU"))
                                .willReturn(aResponse()
                                        .withStatus(200)
                                        .withHeader("Content-Type", "application/json")
                                        .withBodyFile("Policy/policySkipResponse.json")));
                
-               stubFor(post(urlEqualTo("/pdp/api/getDecision"))
+               wireMockServer.stubFor(post(urlEqualTo("/pdp/api/getDecision"))
                                .withRequestBody(containing("VnfCU"))
                                .willReturn(aResponse()
                                        .withStatus(200)
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.containing;
 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.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+
 /**
  * Please describe the StubResponseSDNC.java class
  */
 
        }
 
-       public static void mockSDNCAdapter_500() {
-               stubFor(post(urlEqualTo("/SDNCAdapter"))
+       public static void mockSDNCAdapter_500(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(post(urlEqualTo("/SDNCAdapter"))
                                .willReturn(aResponse()
                                                .withStatus(500)));
        }               
        
-       public static void mockSDNCAdapter_500(String requestContaining) {
-               stubFor(post(urlEqualTo("/SDNCAdapter"))
+       public static void mockSDNCAdapter_500(WireMockServer wireMockServer, String requestContaining) {
+               wireMockServer.stubFor(post(urlEqualTo("/SDNCAdapter"))
                  .withRequestBody(containing(requestContaining))
                  .willReturn(aResponse()
                  .withStatus(500)));
        }               
        
-       public static void mockSDNCAdapter(int statusCode) {
-               stubFor(post(urlMatching(".*/SDNCAdapter"))
+       public static void mockSDNCAdapter(WireMockServer wireMockServer, int statusCode) {
+               wireMockServer.stubFor(post(urlMatching(".*/SDNCAdapter"))
                                .willReturn(aResponse()
                                                .withStatus(statusCode)));
        }
        
-       public static void mockSDNCAdapter(String endpoint, int statusCode, String responseFile) {
-               stubFor(post(urlEqualTo(endpoint))      
+       public static void mockSDNCAdapter(WireMockServer wireMockServer, String endpoint, int statusCode, String responseFile) {
+               wireMockServer.stubFor(post(urlEqualTo(endpoint))       
                                  .willReturn(aResponse()
                                  .withStatus(statusCode)
                                  .withHeader("Content-Type", "text/xml")
                                  .withBodyFile(responseFile)));
        }
 
-       public static void mockSDNCAdapter(String responseFile) {
-               stubFor(post(urlEqualTo("/SDNCAdapter"))
+       public static void mockSDNCAdapter(WireMockServer wireMockServer, String responseFile) {
+               wireMockServer.stubFor(post(urlEqualTo("/SDNCAdapter"))
                                  .willReturn(aResponse()
                                  .withStatus(200)
                                  .withHeader("Content-Type", "text/xml")
                                  .withBodyFile(responseFile)));
        }
        
-       public static void mockSDNCAdapter(String endpoint, String requestContaining, int statusCode, String responseFile) {
-               stubFor(post(urlEqualTo(endpoint))
+       public static void mockSDNCAdapter(WireMockServer wireMockServer, String endpoint, String requestContaining, int statusCode, String responseFile) {
+               wireMockServer.stubFor(post(urlEqualTo(endpoint))
                                .withRequestBody(containing(requestContaining))
                                .willReturn(aResponse()
                                        .withStatus(statusCode)
                                        .withBodyFile(responseFile)));
        }
 
-       public static void mockSDNCAdapterRest() {
-               stubFor(post(urlEqualTo("/SDNCAdapter/v1/sdnc/services"))
+       public static void mockSDNCAdapterRest(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(post(urlEqualTo("/SDNCAdapter/v1/sdnc/services"))
                                .willReturn(aResponse()
                                                .withStatus(202)
                                                .withHeader("Content-Type", "application/json")));
        }
 
-       public static void mockSDNCAdapterRest_500() {
-               stubFor(post(urlEqualTo("/SDNCAdapter/v1/sdnc/services"))
+       public static void mockSDNCAdapterRest_500(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(post(urlEqualTo("/SDNCAdapter/v1/sdnc/services"))
                                .willReturn(aResponse()
                                                .withStatus(500)
                                                .withHeader("Content-Type", "application/json")));
        }
 
-       public static void mockSDNCAdapterRest(String requestContaining) {
-               stubFor(post(urlEqualTo("/SDNCAdapter/v1/sdnc/services"))
+       public static void mockSDNCAdapterRest(WireMockServer wireMockServer, String requestContaining) {
+               wireMockServer.stubFor(post(urlEqualTo("/SDNCAdapter/v1/sdnc/services"))
                                .withRequestBody(containing(requestContaining))
                                .willReturn(aResponse()
                                                .withStatus(202)
                                                .withHeader("Content-Type", "application/json")));
        }
 
-       public static void mockSDNCAdapterRest_500(String requestContaining) {
-               stubFor(post(urlEqualTo("/SDNCAdapter/v1/sdnc/services"))
+       public static void mockSDNCAdapterRest_500(WireMockServer wireMockServer, String requestContaining) {
+               wireMockServer.stubFor(post(urlEqualTo("/SDNCAdapter/v1/sdnc/services"))
                                .withRequestBody(containing(requestContaining))
                                .willReturn(aResponse()
                                                .withStatus(500)
 
 
 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.urlEqualTo;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+
 /**
  * Please describe the StubResponseSNIRO.java class
  *
 
        }
 
-       public static void mockSNIRO() {
-               stubFor(post(urlEqualTo("/sniro/api/v2/placement"))
+       public static void mockSNIRO(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(post(urlEqualTo("/sniro/api/v2/placement"))
                                .willReturn(aResponse()
                                                .withStatus(202)
                                                .withHeader("Content-Type", "application/json")));
        }
 
-       public static void mockSNIRO(String responseFile) {
-               stubFor(post(urlEqualTo("/sniro/api/v2/placement"))
+       public static void mockSNIRO(WireMockServer wireMockServer, String responseFile) {
+               wireMockServer.stubFor(post(urlEqualTo("/sniro/api/v2/placement"))
                                .willReturn(aResponse()
                                                .withStatus(202)
                                                .withHeader("Content-Type", "application/json")
                                                .withBodyFile(responseFile)));
        }
 
-       public static void mockSNIRO_400() {
-               stubFor(post(urlEqualTo("/sniro/api/v2/placement"))
+       public static void mockSNIRO_400(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(post(urlEqualTo("/sniro/api/v2/placement"))
                                .willReturn(aResponse()
                                                .withStatus(400)
                                                .withHeader("Content-Type", "application/json")));
        }
 
-       public static void mockSNIRO_500() {
-               stubFor(post(urlEqualTo("/sniro/api/v2/placement"))
+       public static void mockSNIRO_500(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(post(urlEqualTo("/sniro/api/v2/placement"))
                                .willReturn(aResponse()
                                                .withStatus(500)
                                                .withHeader("Content-Type", "application/json")));
 
 package org.onap.so.bpmn.mock;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.containing;
 import static com.github.tomakehurst.wiremock.client.WireMock.delete;
 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.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+
 /**
  * Please describe the StubResponseVNF.java class
  */
 public class StubResponseVNFAdapter {
 
-       public static void mockVNFAdapter() {
-               stubFor(post(urlEqualTo("/vnfs/VnfAdapterAsync"))
+       public static void mockVNFAdapter(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(post(urlEqualTo("/vnfs/VnfAdapterAsync"))
                                .willReturn(aResponse()
                                                .withStatus(200)));
        }
 
-       public static void mockVNFAdapter(String responseFile) {
-               stubFor(post(urlEqualTo("/vnfs/VnfAdapterAsync"))
+       public static void mockVNFAdapter(WireMockServer wireMockServer, String responseFile) {
+               wireMockServer.stubFor(post(urlEqualTo("/vnfs/VnfAdapterAsync"))
                                  .willReturn(aResponse()
                                  .withStatus(200)
                                  .withHeader("Content-Type", "text/xml")
                                  .withBodyFile(responseFile)));
        }
 
-       public static void mockVNFAdapter_500() {
-               stubFor(post(urlEqualTo("/vnfs/VnfAdapterAsync"))
+       public static void mockVNFAdapter_500(WireMockServer wireMockServer) {
+               wireMockServer.stubFor(post(urlEqualTo("/vnfs/VnfAdapterAsync"))
                                .willReturn(aResponse()
                                                .withStatus(500)));
        }
        
-       public static void mockVNFPost(String vfModuleId, int statusCode, String vnfId) {
-               stubFor(post(urlEqualTo("/services/rest/v1/vnfs" + vnfId + "/vf-modules" + vfModuleId))
+       public static void mockVNFPost(WireMockServer wireMockServer, String vfModuleId, int statusCode, String vnfId) {
+               wireMockServer.stubFor(post(urlEqualTo("/services/rest/v1/vnfs" + vnfId + "/vf-modules" + vfModuleId))
                                .willReturn(aResponse()
                                .withStatus(statusCode)
                                .withHeader("Content-Type", "application/xml")));
-               stubFor(post(urlEqualTo("/services/rest/v1/vnfs/" + vnfId + "/vf-modules" + vfModuleId))
+               wireMockServer.stubFor(post(urlEqualTo("/services/rest/v1/vnfs/" + vnfId + "/vf-modules" + vfModuleId))
                                .willReturn(aResponse()
                                .withStatus(statusCode)
                                .withHeader("Content-Type", "application/xml")));
        }
        
-       public static void mockVNFPut(String vfModuleId, int statusCode) {
-               stubFor(put(urlEqualTo("/services/rest/v1/vnfsvnfId/vf-modules" + vfModuleId))
+       public static void mockVNFPut(WireMockServer wireMockServer, String vfModuleId, int statusCode) {
+               wireMockServer.stubFor(put(urlEqualTo("/services/rest/v1/vnfsvnfId/vf-modules" + vfModuleId))
                                .willReturn(aResponse()
                                .withStatus(statusCode)
                                .withHeader("Content-Type", "application/xml")));
-               stubFor(put(urlEqualTo("/services/rest/v1/vnfs/vnfId/vf-modules" + vfModuleId))
+               wireMockServer.stubFor(put(urlEqualTo("/services/rest/v1/vnfs/vnfId/vf-modules" + vfModuleId))
                                .willReturn(aResponse()
                                .withStatus(statusCode)
                                .withHeader("Content-Type", "application/xml")));
        }
        
-       public static void mockVNFPut(String vnfId, String vfModuleId, int statusCode) {
-               stubFor(put(urlEqualTo("/services/rest/v1/vnfs" + vnfId + "/vf-modules" + vfModuleId))
+       public static void mockVNFPut(WireMockServer wireMockServer, String vnfId, String vfModuleId, int statusCode) {
+               wireMockServer.stubFor(put(urlEqualTo("/services/rest/v1/vnfs" + vnfId + "/vf-modules" + vfModuleId))
                                .willReturn(aResponse()
                                .withStatus(statusCode)
                                .withHeader("Content-Type", "application/xml")));
-               stubFor(put(urlEqualTo("/services/rest/v1/vnfs/" + vnfId + "/vf-modules" + vfModuleId))
+               wireMockServer.stubFor(put(urlEqualTo("/services/rest/v1/vnfs/" + vnfId + "/vf-modules" + vfModuleId))
                                .willReturn(aResponse()
                                .withStatus(statusCode)
                                .withHeader("Content-Type", "application/xml")));
        }
        
-       public static void mockVNFDelete(String vnfId, String vfModuleId, int statusCode) {
-               stubFor(delete(urlEqualTo("/services/rest/v1/vnfs" + vnfId + "/vf-modules" + vfModuleId))
+       public static void mockVNFDelete(WireMockServer wireMockServer, String vnfId, String vfModuleId, int statusCode) {
+               wireMockServer.stubFor(delete(urlEqualTo("/services/rest/v1/vnfs" + vnfId + "/vf-modules" + vfModuleId))
                                .willReturn(aResponse()
                                .withStatus(statusCode)
                                .withHeader("Content-Type", "application/xml")));
-               stubFor(delete(urlEqualTo("/services/rest/v1/vnfs/" + vnfId + "/vf-modules" + vfModuleId))
+               wireMockServer.stubFor(delete(urlEqualTo("/services/rest/v1/vnfs/" + vnfId + "/vf-modules" + vfModuleId))
                                .willReturn(aResponse()
                                .withStatus(statusCode)
                                .withHeader("Content-Type", "application/xml")));
        }
        
-       public static void mockVNFRollbackDelete(String vfModuleId, int statusCode) {
-               stubFor(delete(urlEqualTo("/services/rest/v1/vnfsvnfId/vf-modules" + vfModuleId + "/rollback"))
+       public static void mockVNFRollbackDelete(WireMockServer wireMockServer, String vfModuleId, int statusCode) {
+               wireMockServer.stubFor(delete(urlEqualTo("/services/rest/v1/vnfsvnfId/vf-modules" + vfModuleId + "/rollback"))
                                .willReturn(aResponse()
                                .withStatus(statusCode)
                                .withHeader("Content-Type", "application/xml")));
-               stubFor(delete(urlEqualTo("/services/rest/v1/vnfs/vnfId/vf-modules" + vfModuleId + "/rollback"))
+               wireMockServer.stubFor(delete(urlEqualTo("/services/rest/v1/vnfs/vnfId/vf-modules" + vfModuleId + "/rollback"))
                                .willReturn(aResponse()
                                .withStatus(statusCode)
                                .withHeader("Content-Type", "application/xml")));
        }
        
-       public static void mockPutVNFVolumeGroup(String volumeGroupId, int statusCode) {
-               stubFor(put(urlEqualTo("/vnfs/v1/volume-groups/" + volumeGroupId))
+       public static void mockPutVNFVolumeGroup(WireMockServer wireMockServer, String volumeGroupId, int statusCode) {
+               wireMockServer.stubFor(put(urlEqualTo("/vnfs/v1/volume-groups/" + volumeGroupId))
                                .willReturn(aResponse()
                                        .withStatus(statusCode)
                                        .withHeader("Content-Type", "application/xml")));
-               stubFor(put(urlEqualTo("/vnfs/rest/v1/volume-groups/" + volumeGroupId))
+               wireMockServer.stubFor(put(urlEqualTo("/vnfs/rest/v1/volume-groups/" + volumeGroupId))
                                .willReturn(aResponse()
                                        .withStatus(statusCode)
                                        .withHeader("Content-Type", "application/xml")));
        }
        
-       public static void mockPutVNFVolumeGroupRollback(String volumeGroupId, int statusCode) {
-               stubFor(delete(urlMatching("/vnfs/v1/volume-groups/" + volumeGroupId + "/rollback"))
+       public static void mockPutVNFVolumeGroupRollback(WireMockServer wireMockServer, String volumeGroupId, int statusCode) {
+               wireMockServer.stubFor(delete(urlMatching("/vnfs/v1/volume-groups/" + volumeGroupId + "/rollback"))
                                .willReturn(aResponse()
                                .withStatus(statusCode)
                                .withHeader("Content-Type", "application/xml")));
-               stubFor(delete(urlMatching("/vnfs/rest/v1/volume-groups/" + volumeGroupId + "/rollback"))
+               wireMockServer.stubFor(delete(urlMatching("/vnfs/rest/v1/volume-groups/" + volumeGroupId + "/rollback"))
                                .willReturn(aResponse()
                                .withStatus(statusCode)
                                .withHeader("Content-Type", "application/xml")));
        }
-       public static void mockPostVNFVolumeGroup(int statusCode) {
-               stubFor(post(urlEqualTo("/vnfs/v1/volume-groups"))
+       public static void mockPostVNFVolumeGroup(WireMockServer wireMockServer, int statusCode) {
+               wireMockServer.stubFor(post(urlEqualTo("/vnfs/v1/volume-groups"))
                                .willReturn(aResponse()
                                        .withStatus(statusCode)
                                        .withHeader("Content-Type", "application/xml")));
-               stubFor(post(urlEqualTo("/vnfs/rest/v1/volume-groups"))
+               wireMockServer.stubFor(post(urlEqualTo("/vnfs/rest/v1/volume-groups"))
                                .willReturn(aResponse()
                                        .withStatus(statusCode)
                                        .withHeader("Content-Type", "application/xml")));
        }
        
-       public static void mockVNFAdapterRest(String vnfId) {
-               stubFor(post(urlEqualTo("/services/rest/v1/vnfs" + vnfId + "/vf-modules"))
+       public static void mockVNFAdapterRest(WireMockServer wireMockServer, String vnfId) {
+               wireMockServer.stubFor(post(urlEqualTo("/services/rest/v1/vnfs" + vnfId + "/vf-modules"))
                                .willReturn(aResponse()
                                                .withStatus(200)));
-               stubFor(post(urlEqualTo("/services/rest/v1/vnfs/" + vnfId + "/vf-modules"))
+               wireMockServer.stubFor(post(urlEqualTo("/services/rest/v1/vnfs/" + vnfId + "/vf-modules"))
                                .willReturn(aResponse()
                                                .withStatus(200)));
        }
 
-       public static void mockVNFAdapterRest_500(String vnfId) {
-               stubFor(post(urlEqualTo("/services/rest/v1/vnfs" + vnfId + "/vf-modules"))
+       public static void mockVNFAdapterRest_500(WireMockServer wireMockServer, String vnfId) {
+               wireMockServer.stubFor(post(urlEqualTo("/services/rest/v1/vnfs" + vnfId + "/vf-modules"))
                                .willReturn(aResponse()
                                                .withStatus(500)));
-               stubFor(post(urlEqualTo("/services/rest/v1/vnfs/" + vnfId + "/vf-modules"))
+               wireMockServer.stubFor(post(urlEqualTo("/services/rest/v1/vnfs/" + vnfId + "/vf-modules"))
                                .willReturn(aResponse()
                                                .withStatus(500)));
        }
        
-       public static void mockVfModuleDelete(String volumeGroupId) {
-               stubFor(delete(urlMatching("/vnfs/v1/volume-groups/"+ volumeGroupId))
+       public static void mockVfModuleDelete(WireMockServer wireMockServer, String volumeGroupId) {
+               wireMockServer.stubFor(delete(urlMatching("/vnfs/v1/volume-groups/"+ volumeGroupId))
                                .willReturn(aResponse()
                                .withStatus(202)
                                .withHeader("Content-Type", "application/xml")));
-               stubFor(delete(urlMatching("/vnfs/rest/v1/volume-groups/"+ volumeGroupId))
+               wireMockServer.stubFor(delete(urlMatching("/vnfs/rest/v1/volume-groups/"+ volumeGroupId))
                                .willReturn(aResponse()
                                .withStatus(202)
                                .withHeader("Content-Type", "application/xml")));
        }
        
-       public static void mockVfModuleDelete(String volumeGroupId, int statusCode) {
-               stubFor(delete(urlMatching("/vnfs/v1/volume-groups/78987"))
+       public static void mockVfModuleDelete(WireMockServer wireMockServer, String volumeGroupId, int statusCode) {
+               wireMockServer.stubFor(delete(urlMatching("/vnfs/v1/volume-groups/78987"))
                                .willReturn(aResponse()
                                .withStatus(statusCode)
                                .withHeader("Content-Type", "application/xml")));
-               stubFor(delete(urlMatching("/vnfs/rest/v1/volume-groups/78987"))
+               wireMockServer.stubFor(delete(urlMatching("/vnfs/rest/v1/volume-groups/78987"))
                                .willReturn(aResponse()
                                .withStatus(statusCode)
                                .withHeader("Content-Type", "application/xml")));
 
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.client.WireMock;
 
 @RunWith(SpringRunner.class)
        @Value("${wiremock.server.port}")
        protected String wiremockPort;
        
+       @Autowired
+       protected WireMockServer wireMockServer;
+       
        @After
        public void baseAfterTest() {
-               WireMock.reset();
+               wireMockServer.resetAll();
        }
 }
 
 
 public class CompleteMsoProcessIT extends BaseIntegrationTest {
        
        private void executeFlow(String inputRequestFile) throws InterruptedException {
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
                Map<String, Object> variables = new HashMap<>();
                variables.put("CompleteMsoProcessRequest",inputRequestFile);
                variables.put("mso-request-id", UUID.randomUUID().toString());
 
        @Test   
        public void sunnyDay() throws Exception {
                logStart();
-               MockGetVolumeGroupById("MDTWNJ21", "VOLUME_GROUP_ID_1", "aai-volume-group-id-info.xml");                
+               MockGetVolumeGroupById(wireMockServer, "MDTWNJ21", "VOLUME_GROUP_ID_1", "aai-volume-group-id-info.xml");                
                
                Map<String, Object> variables = new HashMap<>();
                variables.put("isDebugLogEnabled","true");
                logStart();
                
                // does not exist would return a 404 from AAI
-               MockGetVolumeGroupById("MDTWNJ21", "VOLUME_GROUP_ID_THAT_DOES_NOT_EXIST", "aai-volume-group-id-info.xml", 404);
+               MockGetVolumeGroupById(wireMockServer, "MDTWNJ21", "VOLUME_GROUP_ID_THAT_DOES_NOT_EXIST", "aai-volume-group-id-info.xml", 404);
                                        
                Map<String, Object> variables = new HashMap<>();
                variables.put("isDebugLogEnabled","true");
        public void rainyDayNameDoesNotMatch() throws Exception {
                logStart();
                
-               MockGetVolumeGroupById("MDTWNJ21", "VOLUME_GROUP_ID_1", "aai-volume-group-id-info.xml", 200);
+               MockGetVolumeGroupById(wireMockServer, "MDTWNJ21", "VOLUME_GROUP_ID_1", "aai-volume-group-id-info.xml", 200);
                                
                Map<String, Object> variables = new HashMap<>();
                variables.put("isDebugLogEnabled","true");
 
 
        @Test   
        public void testRemoveLayer3Service_success() throws Exception{
-               MockGetVolumeGroupById("MDTWNJ21", "a8399879-31b3-4973-be26-0a0cbe776b58", "CRTGVNF_queryAAIResponseVolume.xml");
+               MockGetVolumeGroupById(wireMockServer, "MDTWNJ21", "a8399879-31b3-4973-be26-0a0cbe776b58", "CRTGVNF_queryAAIResponseVolume.xml");
 
                Map<String, Object> variables = new HashMap<>();
                setVariables(variables);
 
        @Test   
        public void testRemoveLayer3Service_idsNotMatch() throws Exception{
-               MockGetVolumeGroupById("MDTWNJ21", "a8399879-31b3-4973-be26-0a0cbe776b58", "CRTGVNF_queryAAIResponseVolume_idsNotMatch.xml");
+               MockGetVolumeGroupById(wireMockServer, "MDTWNJ21", "a8399879-31b3-4973-be26-0a0cbe776b58", "CRTGVNF_queryAAIResponseVolume_idsNotMatch.xml");
 
                Map<String, Object> variables = new HashMap<>();
                setVariables(variables);
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.containing;
 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.urlMatching;
 
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+
 /**
  * Unit test for CreateAAIVfModule.bpmn.
  */
        @Test   
        public void  TestCreateGenericVnfSuccess_200() {
 
-               new MockAAIGenericVnfSearch();
-               MockAAICreateGenericVnf();
-               MockAAIVfModulePUT(true);
+               new MockAAIGenericVnfSearch(wireMockServer);
+               MockAAICreateGenericVnf(wireMockServer);
+               MockAAIVfModulePUT(wireMockServer, true);
                                        
                Map<String, Object> variables = new HashMap<>();
                variables.put("mso-request-id", UUID.randomUUID().toString());
        @Test   
        public void  TestCreateVfModuleSuccess_200() {
                // create Add-on VF Module for existing Generic VNF
-               new MockAAIGenericVnfSearch();
-               MockAAICreateGenericVnf();
-               MockAAIVfModulePUT(true);                                       
+               new MockAAIGenericVnfSearch(wireMockServer);
+               MockAAICreateGenericVnf(wireMockServer);
+               MockAAIVfModulePUT(wireMockServer, true);                                       
                Map<String, Object> variables = new HashMap<>();
                variables.put("mso-request-id", UUID.randomUUID().toString());
                variables.put("isDebugLogEnabled","true");
 
        @Test           
        public void  TestQueryGenericVnfFailure_5000() {
-               new MockAAIGenericVnfSearch();
-               MockAAICreateGenericVnf();
-               MockAAIVfModulePUT(true);
+               new MockAAIGenericVnfSearch(wireMockServer);
+               MockAAICreateGenericVnf(wireMockServer);
+               MockAAIVfModulePUT(wireMockServer, true);
                                        
                Map<String, Object> variables = new HashMap<>();
                variables.put("mso-request-id", UUID.randomUUID().toString());
 
        @Test   
        public void  TestCreateDupGenericVnfFailure_1002() {
-               new MockAAIGenericVnfSearch();
-               MockAAICreateGenericVnf();
-               MockAAIVfModulePUT(true);
+               new MockAAIGenericVnfSearch(wireMockServer);
+               MockAAICreateGenericVnf(wireMockServer);
+               MockAAIVfModulePUT(wireMockServer, true);
                        
                Map<String, Object> variables = new HashMap<>();
                variables.put("mso-request-id", UUID.randomUUID().toString());
 
        @Test           
        public void  TestCreateDupVfModuleFailure_1002() {
-               new MockAAIGenericVnfSearch();
-               MockAAICreateGenericVnf();
-               MockAAIVfModulePUT(true);
+               new MockAAIGenericVnfSearch(wireMockServer);
+               MockAAICreateGenericVnf(wireMockServer);
+               MockAAIVfModulePUT(wireMockServer, true);
                        
                Map<String, Object> variables = new HashMap<>(); 
                variables.put("mso-request-id", UUID.randomUUID().toString());
        
        @Test           
        public void  TestCreateGenericVnfFailure_5000() {
-               new MockAAIGenericVnfSearch();
-               MockAAICreateGenericVnf();
-               MockAAIVfModulePUT(true);
+               new MockAAIGenericVnfSearch(wireMockServer);
+               MockAAICreateGenericVnf(wireMockServer);
+               MockAAIVfModulePUT(wireMockServer, true);
                        
                Map<String, Object> variables = new HashMap<>();
                variables.put("mso-request-id", UUID.randomUUID().toString());
 
        @Test   
        public void  TestCreateGenericVnfFailure_1002() {
-               new MockAAIGenericVnfSearch();
-               MockAAICreateGenericVnf();
-               MockAAIVfModulePUT(true);
+               new MockAAIGenericVnfSearch(wireMockServer);
+               MockAAICreateGenericVnf(wireMockServer);
+               MockAAIVfModulePUT(wireMockServer, true);
                        
                Map<String, Object> variables = new HashMap<>();
                variables.put("mso-request-id", UUID.randomUUID().toString());
 
        @Test   
        public void  TestCreateVfModuleFailure_5000() {
-               new MockAAIGenericVnfSearch();
-               MockAAICreateGenericVnf();
-               MockAAIVfModulePUT(true);
+               new MockAAIGenericVnfSearch(wireMockServer);
+               MockAAICreateGenericVnf(wireMockServer);
+               MockAAIVfModulePUT(wireMockServer, true);
                        
                Map<String, Object> variables = new HashMap<>();
                variables.put("isDebugLogEnabled","true");              
                logger.debug(exception.getErrorMessage());
        }
 
-       public static void MockAAICreateGenericVnf(){
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/.*"))
+       public static void MockAAICreateGenericVnf(WireMockServer wireMockServer){
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/.*"))
                                .withRequestBody(containing("<service-id>00000000-0000-0000-0000-000000000000</service-id>"))
                                .willReturn(aResponse()
                                                .withStatus(201)));
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/.*"))
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/.*"))
                                .withRequestBody(containing("<service-id>99999999-9999-9999-9999-999999999999</service-id>"))
                                .willReturn(aResponse()
                                                .withStatus(500)
        }
        
        // start of mocks used locally and by other VF Module unit tests
-       public static void MockAAIVfModulePUT(boolean isCreate){
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/.*/vf-modules/vf-module/.*"))
+       public static void MockAAIVfModulePUT(WireMockServer wireMockServer, boolean isCreate){
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/.*/vf-modules/vf-module/.*"))
                                .withRequestBody(containing("MMSC"))
                                .willReturn(aResponse()
                                                .withStatus(isCreate ? 201 : 200)));
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/.*/vf-modules/vf-module/.*"))
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/.*/vf-modules/vf-module/.*"))
                                .withRequestBody(containing("PCRF"))
                                .willReturn(aResponse()
                                                .withStatus(500)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile("aaiFault.xml")));
-               stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721"))                          
+               wireMockServer.stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721"))                           
                                .willReturn(aResponse()
                                        .withStatus(200)));
        }
 
                logStart();
 
                String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/CreateAAIVfModuleVolumeGroupRequest.xml");
-               MockGetGenericVnfByIdWithPriority("skask", "lukewarm", 200, "VfModularity/VfModule-lukewarm.xml", 2);
-               MockPutVfModuleIdNoResponse("skask", "PCRF", "lukewarm");
+               MockGetGenericVnfByIdWithPriority(wireMockServer, "skask", "lukewarm", 200, "VfModularity/VfModule-lukewarm.xml", 2);
+               MockPutVfModuleIdNoResponse(wireMockServer, "skask", "PCRF", "lukewarm");
 
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
                logStart();
 
                String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/CreateAAIVfModuleVolumeGroupRequest.xml");
-               MockGetVfModuleId("skask", ".*", "VfModularity/VfModule-supercool.xml", 404);
+               MockGetVfModuleId(wireMockServer, "skask", ".*", "VfModularity/VfModule-supercool.xml", 404);
 
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
                logStart();
 
                String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/CreateAAIVfModuleVolumeGroupRequest.xml");
-               MockGetVfModuleId("skask", "lukewarm", "VfModularity/VfModule-lukewarm.xml", 200);
-               MockPutVfModuleId("skask", "lukewarm", 404);
+               MockGetVfModuleId(wireMockServer, "skask", "lukewarm", "VfModularity/VfModule-lukewarm.xml", 200);
+               MockPutVfModuleId(wireMockServer, "skask", "lukewarm", 404);
 
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
 
 
        @Test   
        public void testDecomposeService_success() throws Exception{
-               MockGetServiceResourcesCatalogData("cmw-123-456-789", "1.0", "/getCatalogServiceResourcesDataWithConfig.json");
+               MockGetServiceResourcesCatalogData(wireMockServer, "cmw-123-456-789", "1.0", "/getCatalogServiceResourcesDataWithConfig.json");
 
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        //@Test
        @Test
        public void testDecomposeService_success_partial() throws Exception{
-               MockGetServiceResourcesCatalogData("cmw-123-456-789", "1.0", "/getCatalogServiceResourcesDataNoNetwork.json");
+               MockGetServiceResourcesCatalogData(wireMockServer, "cmw-123-456-789", "1.0", "/getCatalogServiceResourcesDataNoNetwork.json");
 
 
                String businessKey = UUID.randomUUID().toString();
 
 
 package org.onap.so.bpmn.common;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.delete;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import org.camunda.bpm.engine.RuntimeService;
-import org.camunda.bpm.engine.test.Deployment;
 import org.junit.Assert;
 import org.junit.Test;
 import org.onap.so.BaseIntegrationTest;
        public void  TestDeleteGenericVnfSuccess_200() {
                // delete the Base Module and Generic Vnf
                // vnf-id=a27ce5a9-29c4-4c22-a017-6615ac73c721, vf-module-id=973ed047-d251-4fb9-bf1a-65b8949e0a73
-               new MockAAIGenericVnfSearch();
-               new MockAAIDeleteGenericVnf();
-               new MockAAIDeleteVfModule();
+               new MockAAIGenericVnfSearch(wireMockServer);
+               new MockAAIDeleteGenericVnf(wireMockServer);
+               new MockAAIDeleteVfModule(wireMockServer);
                
                Map<String, Object> variables = new HashMap<>();
                variables.put("isDebugLogEnabled","true");
                        "  <vnf-params xmlns:tns=\"http://openecomp.org/mso/infra/vnf-request/v1\"/>" + EOL +
                        "</vnf-request>" + EOL;
 
-               new MockAAIGenericVnfSearch();
-               new MockAAIDeleteGenericVnf();
-               new MockAAIDeleteVfModule();
+               new MockAAIGenericVnfSearch(wireMockServer);
+               new MockAAIDeleteGenericVnf(wireMockServer);
+               new MockAAIDeleteVfModule(wireMockServer);
                
                Map<String, Object> variables = new HashMap<>();
                variables.put("isDebugLogEnabled","true");
                        "  </vnf-inputs>" + EOL +
                        "  <vnf-params xmlns:tns=\"http://openecomp.org/mso/infra/vnf-request/v1\"/>" + EOL +
                        "</vnf-request>" + EOL;
-               new MockAAIGenericVnfSearch();
-               new MockAAIDeleteGenericVnf();
-               new MockAAIDeleteVfModule();
+               new MockAAIGenericVnfSearch(wireMockServer);
+               new MockAAIDeleteGenericVnf(wireMockServer);
+               new MockAAIDeleteVfModule(wireMockServer);
                
                Map<String, Object> variables = new HashMap<>();
                variables.put("isDebugLogEnabled","true");
                        "  </vnf-inputs>" + EOL +
                        "  <vnf-params xmlns:tns=\"http://openecomp.org/mso/infra/vnf-request/v1\"/>" + EOL +
                        "</vnf-request>" + EOL;
-               new MockAAIGenericVnfSearch();
-               new MockAAIDeleteGenericVnf();
-               new MockAAIDeleteVfModule();
+               new MockAAIGenericVnfSearch(wireMockServer);
+               new MockAAIDeleteGenericVnf(wireMockServer);
+               new MockAAIDeleteVfModule(wireMockServer);
                
                Map<String, Object> variables = new HashMap<>();
                variables.put("isDebugLogEnabled","true");
                        "  </vnf-inputs>" + EOL +
                        "  <vnf-params xmlns:tns=\"http://openecomp.org/mso/infra/vnf-request/v1\"/>" + EOL +
                        "</vnf-request>" + EOL;
-               new MockAAIGenericVnfSearch();
-               new MockAAIDeleteGenericVnf();
-               new MockAAIDeleteVfModule();
+               new MockAAIGenericVnfSearch(wireMockServer);
+               new MockAAIDeleteGenericVnf(wireMockServer);
+               new MockAAIDeleteVfModule(wireMockServer);
                
                Map<String, Object> variables = new HashMap<>();
                variables.put("isDebugLogEnabled","true");
                        "  </vnf-inputs>" + EOL +
                        "  <vnf-params xmlns:tns=\"http://openecomp.org/mso/infra/vnf-request/v1\"/>" + EOL +
                        "</vnf-request>" + EOL;
-               new MockAAIGenericVnfSearch();
-               new MockAAIDeleteGenericVnf();
-               new MockAAIDeleteVfModule();
+               new MockAAIGenericVnfSearch(wireMockServer);
+               new MockAAIDeleteGenericVnf(wireMockServer);
+               new MockAAIDeleteVfModule(wireMockServer);
                
                Map<String, Object> variables = new HashMap<>();
                variables.put("isDebugLogEnabled","true");
                        "  </vnf-inputs>" + EOL +
                        "  <vnf-params xmlns:tns=\"http://openecomp.org/mso/infra/vnf-request/v1\"/>" + EOL +
                        "</vnf-request>" + EOL;
-               new MockAAIGenericVnfSearch();
-               new MockAAIDeleteGenericVnf();
-               new MockAAIDeleteVfModule();
+               new MockAAIGenericVnfSearch(wireMockServer);
+               new MockAAIDeleteGenericVnf(wireMockServer);
+               new MockAAIDeleteVfModule(wireMockServer);
                
                Map<String, Object> variables = new HashMap<>();
                variables.put("isDebugLogEnabled","true");
        public void  TestDeleteVfModuleFailure_1002_2() {
                // failure attempting to delete a Vf Module that does not exist (A&AI returns 404)
                // vnf-id=a27ce5a9-29c4-4c22-a017-6615ac73c720, vf-module-id=973ed047-d251-4fb9-bf1a-65b8949e0a76
-               new MockAAIGenericVnfSearch();
-               new MockAAIDeleteGenericVnf();
-               new MockAAIDeleteVfModule();
+               new MockAAIGenericVnfSearch(wireMockServer);
+               new MockAAIDeleteGenericVnf(wireMockServer);
+               new MockAAIDeleteVfModule(wireMockServer);
                
                Map<String, Object> variables = new HashMap<>();
                variables.put("isDebugLogEnabled","true");
 
 
 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.urlEqualTo;
 import static org.onap.so.bpmn.common.BPMNUtil.waitForWorkflowToFinish;
 
        
        
        private void setupMocks() {
-               stubFor(post(urlEqualTo("/dbadapters/AttRequestsDbAdapter"))
+               wireMockServer.stubFor(post(urlEqualTo("/dbadapters/AttRequestsDbAdapter"))
                                .willReturn(aResponse()
                                .withStatus(200)
                                .withHeader("Content-Type", "text/xml")
                                .withBody("<DbTag>Notified</DbTag>")));
-               stubFor(post(urlEqualTo("/dbadapters/RequestsDbAdapter"))
+               wireMockServer.stubFor(post(urlEqualTo("/dbadapters/RequestsDbAdapter"))
                                .willReturn(aResponse()
                                .withStatus(200)
                                .withHeader("Content-Type", "text/xml")
 
                        "  <vnf-params xmlns:tns=\"http://ecomp.att.com/mso/infra/vnf-request/v1\"/>" + EOL +
                        "</vnf-request>" + EOL;
 
-               MockGetGenericVnfById(".*", "GenericFlows/getGenericVnfByNameResponse.xml");
+               MockGetGenericVnfById(wireMockServer, ".*", "GenericFlows/getGenericVnfByNameResponse.xml");
                RuntimeService runtimeService = processEngine.getRuntimeService();                              
                Map<String, Object> variables = new HashMap<String, Object>();          
                variables.put("isDebugLogEnabled","true");              
 
        
        @Test
        public void  TestManualHandlingSuccess() {
-               MockPostRequestDB();
+               MockPostRequestDB(wireMockServer);
                
                Map<String, Object> variables = new HashMap<>();
                variables.put("isDebugLogEnabled","true");
 
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.delete;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+
 public class MockAAIDeleteGenericVnf {
-       public MockAAIDeleteGenericVnf(){
-               stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721/[?]resource-version=0000021"))
+       public MockAAIDeleteGenericVnf(WireMockServer wireMockServer){
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721/[?]resource-version=0000021"))
                                .willReturn(aResponse()
                                                .withStatus(200)));
-               stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c718/[?]resource-version=0000018"))
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c718/[?]resource-version=0000018"))
                                .willReturn(aResponse()
                                                .withStatus(500)
                                                .withHeader("Content-Type", "text/xml")
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.delete;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+
 public class MockAAIDeleteVfModule {
        
-       public MockAAIDeleteVfModule()
+       public MockAAIDeleteVfModule(WireMockServer wireMockServer)
        {
-               stubFor(delete(urlMatching(
+               wireMockServer.stubFor(delete(urlMatching(
                                "/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a73/[?]resource-version=0000073"))
                                                .willReturn(aResponse().withStatus(200)));
-               stubFor(delete(urlMatching(
+               wireMockServer.stubFor(delete(urlMatching(
                                "/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c720/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a75/[?]resource-version=0000075"))
                                                .willReturn(aResponse().withStatus(200)));
-               stubFor(delete(urlMatching(
+               wireMockServer.stubFor(delete(urlMatching(
                                "/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c718/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a78/[?]resource-version=0000078"))
                                                .willReturn(aResponse().withStatus(200)));
-               stubFor(delete(urlMatching(
+               wireMockServer.stubFor(delete(urlMatching(
                                "/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c719/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a77/[?]resource-version=0000077"))
                                                .willReturn(aResponse().withStatus(500).withHeader("Content-Type", "text/xml")
                                                                .withBodyFile("aaiFault.xml")));
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy\\?network-policy-fqdn=.*"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy\\?network-policy-fqdn=.*"))
                                .willReturn(aResponse().withStatus(200).withHeader("Content-Type", "text/xml")
                                                .withBodyFile("VfModularity/QueryNetworkPolicy_AAIResponse_Success.xml")));
 
-               stubFor(delete(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy/.*"))
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy/.*"))
                                .willReturn(aResponse().withStatus(200)));
        }
 }
 
 
 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.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+
 public class MockAAIGenericVnfSearch {
        
        private static final String EOL = "\n";
 
-       public MockAAIGenericVnfSearch(){
+       public MockAAIGenericVnfSearch(WireMockServer wireMockServer){
                String body;
                
                // The following stubs are for CreateAAIVfModule and UpdateAAIVfModule
        
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC23&depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC23&depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(500)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile("aaiFault.xml")));
        
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC22&depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC22&depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(404)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBody("Generic VNF Not Found")));
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/768073c7-f41f-4822-9323-b75962763d74[?]depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/768073c7-f41f-4822-9323-b75962763d74[?]depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(404)
                                                .withHeader("Content-Type", "text/xml")
                        "  <l-interfaces/>" + EOL +
                        "  <lag-interfaces/>" + EOL +
                        "</generic-vnf>" + EOL;
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC21&depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC21&depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBody(body)));
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721[?]depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721[?]depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                        "  <l-interfaces/>" + EOL +
                        "  <lag-interfaces/>" + EOL +
                        "</generic-vnf>" + EOL;
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC20&depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC20&depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBody(body)));
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/2f6aee38-1e2a-11e6-82d1-ffc7d9ee8aa4[?]depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/2f6aee38-1e2a-11e6-82d1-ffc7d9ee8aa4[?]depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
        
                // The following stubs are for DeleteAAIVfModule
        
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c723[?]depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c723[?]depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(500)
                                                .withHeader("Content-Type", "text/xml")
                                                .withBodyFile("aaiFault.xml")));
        
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c722[?]depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c722[?]depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(404)
                                                .withHeader("Content-Type", "text/xml")
                                "  <l-interfaces/>" + EOL +
                                "  <lag-interfaces/>" + EOL +
                                "</generic-vnf>" + EOL;
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721[?]depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721[?]depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                        "  <l-interfaces/>" + EOL +
                        "  <lag-interfaces/>" + EOL +
                        "</generic-vnf>" + EOL;
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c720[?]depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c720[?]depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                        "  <l-interfaces/>" + EOL +
                        "  <lag-interfaces/>" + EOL +
                        "</generic-vnf>" + EOL;
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c719[?]depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c719[?]depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                        "  <l-interfaces/>" + EOL +
                        "  <lag-interfaces/>" + EOL +
                        "</generic-vnf>" + EOL;
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c718[?]depth=1"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c718[?]depth=1"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
                        "  <l-interfaces/>" + EOL +
                        "  <lag-interfaces/>" + EOL +
                        "</generic-vnf>" + EOL;
-               stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a73"))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a73"))
                                .willReturn(aResponse()
                                                .withStatus(200)
                                                .withHeader("Content-Type", "text/xml")
 
     @Test    
     public void testHoming_success_2AR1Vnf() throws Exception {
 
-        mockOof();
+        mockOof(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<>();
     @Test  
     public void testHoming_success_2AR1Vnf2Net() throws Exception {
 
-        mockOof();
+        mockOof(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<>();
     public void testHoming_success_vnfResourceList() throws Exception {
 
         // Create a Service Decomposition
-        MockGetServiceResourcesCatalogDataByModelUuid("2f7f309d-c842-4644-a2e4-34167be5eeb4",
+        MockGetServiceResourcesCatalogDataByModelUuid(wireMockServer, "2f7f309d-c842-4644-a2e4-34167be5eeb4",
                 "/BuildingBlocks/oofCatalogResp.json");
         String busKey = UUID.randomUUID().toString();
         Map<String, Object> vars = new HashMap<>();
 
         // Invoke Homing
 
-        mockOof();
+        mockOof(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<>();
     @Test   
     public void testHoming_success_existingLicense() throws Exception {
 
-        mockOof();
+        mockOof(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<String, Object>();
 
     @Test  
     public void testHoming_error_badResponse() throws Exception {
-        mockOof_500();
+        mockOof_500(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<>();
 
     @Test   
     public void testHoming_error_oofNoSolution() throws Exception {
-        mockOof();
+        mockOof(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<>();
 
     @Test  
     public void testHoming_error_oofPolicyException() throws Exception {
-        mockOof();
+        mockOof(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<>();
 
     @Test   
     public void testHoming_error_oofServiceException() throws Exception {
-        mockOof();
+        mockOof(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<>();
 
 
     public void testHoming_success_2AR1Vnf() throws Exception {
 
-        mockOof();
+        mockOof(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<>();
 
     public void testHoming_success_2AR1Vnf2Net() throws Exception {
 
-        mockOof();
+        mockOof(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<>();
     public void testHoming_success_vnfResourceList() throws Exception {
 
         // Create a Service Decomposition
-        MockGetServiceResourcesCatalogDataByModelUuid("2f7f309d-c842-4644-a2e4-34167be5eeb4",
+        MockGetServiceResourcesCatalogDataByModelUuid(wireMockServer, "2f7f309d-c842-4644-a2e4-34167be5eeb4",
                 "/BuildingBlocks/oofCatalogResp.json");
         String busKey = UUID.randomUUID().toString();
         Map<String, Object> vars = new HashMap<>();
 
         // Invoke Homing
 
-        mockOof();
+        mockOof(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<>();
     @Test
     public void testHoming_success_existingLicense() throws Exception {
 
-        mockOof();
+        mockOof(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<String, Object>();
     @Test
 
     public void testHoming_error_badResponse() throws Exception {
-        mockOof_500();
+        mockOof_500(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<>();
     @Test
 
     public void testHoming_error_oofNoSolution() throws Exception {
-        mockOof();
+        mockOof(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<>();
     @Test
 
     public void testHoming_error_oofPolicyException() throws Exception {
-        mockOof();
+        mockOof(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<>();
     @Test
 
     public void testHoming_error_oofServiceException() throws Exception {
-        mockOof();
+        mockOof(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<>();
 
                
                String prepareUpdateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/PrepareUpdateAAIVfModuleRequest.xml"); 
                
-               MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");
-               MockPutGenericVnf("/skask/vf-modules/vf-module/supercool", "PCRF", 200);
-               MockPatchVfModuleId("skask", "supercool");
+               MockGetGenericVnfByIdWithDepth(wireMockServer, "skask", 1, "VfModularity/GenericVnf.xml");
+               MockPutGenericVnf(wireMockServer, "/skask/vf-modules/vf-module/supercool", "PCRF", 200);
+               MockPatchVfModuleId(wireMockServer, "skask", "supercool");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
                logStart();
                
                String prepareUpdateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/PrepareUpdateAAIVfModuleRequest.xml"); 
-               MockGetGenericVnfById_404("skask[?]depth=1");
+               MockGetGenericVnfById_404(wireMockServer, "skask[?]depth=1");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
                
                String prepareUpdateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/PrepareUpdateAAIVfModuleRequest.xml").replaceFirst("supercool", "lukewarm");
                
-               MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");
+               MockGetGenericVnfByIdWithDepth(wireMockServer, "skask", 1, "VfModularity/GenericVnf.xml");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
                
                String prepareUpdateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/PrepareUpdateAAIVfModuleRequest.xml").replaceFirst("supercool", "notsocool");
                
-               MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");              
+               MockGetGenericVnfByIdWithDepth(wireMockServer, "skask", 1, "VfModularity/GenericVnf.xml");              
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
                
                String prepareUpdateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/PrepareUpdateAAIVfModuleRequest.xml"); 
                
-               MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");
-               MockAAIVfModuleBadPatch("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/supercool", 404);
+               MockGetGenericVnfByIdWithDepth(wireMockServer, "skask", 1, "VfModularity/GenericVnf.xml");
+               MockAAIVfModuleBadPatch(wireMockServer, "/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/supercool", 404);
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
 
                variables.put("errorText", "update failed");
                variables.put("vnfName", "vSAMP1");
                
-               MockPolicyAbort();
+               MockPolicyAbort(wireMockServer);
                
                
                String businessKey = UUID.randomUUID().toString();
 
 
 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.urlEqualTo;
 
 import java.io.IOException;
         * Defines WireMock stubs needed by these tests.
         */
        private void mocks() {
-               stubFor(post(urlEqualTo("/SDNCAdapter/v1/sdnc"))
+               wireMockServer.stubFor(post(urlEqualTo("/SDNCAdapter/v1/sdnc"))
                        .willReturn(aResponse()
                                .withStatus(202)
                                .withHeader("Content-Type", "application/json")));
 
        
        public void testHoming_success_2AR1Vnf() throws Exception {
 
-               mockSNIRO();
+               mockSNIRO(wireMockServer);
 
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        
        public void testHoming_success_2AR1Vnf2Net() throws Exception {
 
-               mockSNIRO();
+               mockSNIRO(wireMockServer);
 
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        public void testHoming_success_vnfResourceList() throws Exception {
 
                // Create a Service Decomposition 
-               MockGetServiceResourcesCatalogDataByModelUuid("2f7f309d-c842-4644-a2e4-34167be5eeb4", "/BuildingBlocks/catalogResp.json");
+               MockGetServiceResourcesCatalogDataByModelUuid(wireMockServer, "2f7f309d-c842-4644-a2e4-34167be5eeb4", "/BuildingBlocks/catalogResp.json");
                String busKey = UUID.randomUUID().toString();
                Map<String, Object> vars = new HashMap<>();
                setVariablesForServiceDecomposition(vars, "testRequestId123", "ff5256d2-5a33-55df-13ab-12abad84e7ff");
 
                // Invoke Homing
 
-               mockSNIRO();
+               mockSNIRO(wireMockServer);
 
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        
        public void testHoming_success_existingLicense() throws Exception {
 
-               mockSNIRO();
+               mockSNIRO(wireMockServer);
 
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<String, Object>();
        @Test
        
        public void testHoming_error_badResponse() throws Exception {
-               mockSNIRO_500();
+               mockSNIRO_500(wireMockServer);
 
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
         // 1802 merge
        
        public void testHoming_error_sniroNoSolution() throws Exception {
-               mockSNIRO();
+               mockSNIRO(wireMockServer);
 
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        @Test
        
        public void testHoming_error_sniroPolicyException() throws Exception {
-               mockSNIRO();
+               mockSNIRO(wireMockServer);
 
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        @Test
        
        public void testHoming_error_sniroServiceException() throws Exception {
-               mockSNIRO();
+               mockSNIRO(wireMockServer);
 
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
 
                logStart();
                
                String updateAAIGenericVnfRequest =     FileUtil.readResourceFile("__files/VfModularity/UpdateAAIGenericVnfRequest.xml"); 
-               MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");
-               MockPutGenericVnf("/skask", 200);
-               MockPatchGenericVnf("skask");
+               MockGetGenericVnfByIdWithDepth(wireMockServer, "skask", 1, "VfModularity/GenericVnf.xml");
+               MockPutGenericVnf(wireMockServer, "/skask", 200);
+               MockPatchGenericVnf(wireMockServer, "skask");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
                String updateAAIGenericVnfRequest =     FileUtil.readResourceFile("__files/VfModularity/UpdateAAIGenericVnfRequest.xml"); 
                updateAAIGenericVnfRequest = updateAAIGenericVnfRequest.replaceFirst("introvert", "extrovert");
                
-               MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");
+               MockGetGenericVnfByIdWithDepth(wireMockServer, "skask", 1, "VfModularity/GenericVnf.xml");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
                
                String updateAAIGenericVnfRequest = FileUtil.readResourceFile("__files/VfModularity/UpdateAAIGenericVnfRequest.xml"); 
                
-               MockGetGenericVnfById_404("skask[?]depth=1");
+               MockGetGenericVnfById_404(wireMockServer, "skask[?]depth=1");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
                
                String updateAAIGenericVnfRequest = FileUtil.readResourceFile("__files/VfModularity/UpdateAAIGenericVnfRequest.xml"); 
                
-               MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");
-               MockPutGenericVnf_Bad("skask", 404);
-               MockAAIVfModuleBadPatch("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask", 404);
+               MockGetGenericVnfByIdWithDepth(wireMockServer, "skask", 1, "VfModularity/GenericVnf.xml");
+               MockPutGenericVnf_Bad(wireMockServer, "skask", 404);
+               MockAAIVfModuleBadPatch(wireMockServer, "/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask", 404);
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
 
                logStart();
                
                String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/UpdateAAIVfModuleRequest.xml"); 
-               MockGetGenericVnfByIdWithPriority("/skask/vf-modules/vf-module/supercool", 200, "VfModularity/VfModule-supercool.xml");
-               MockPutGenericVnf("/skask/vf-modules/vf-module/supercool", "PCRF", 200);
-               MockPatchVfModuleId("skask", "supercool");
+               MockGetGenericVnfByIdWithPriority(wireMockServer, "/skask/vf-modules/vf-module/supercool", 200, "VfModularity/VfModule-supercool.xml");
+               MockPutGenericVnf(wireMockServer, "/skask/vf-modules/vf-module/supercool", "PCRF", 200);
+               MockPatchVfModuleId(wireMockServer, "skask", "supercool");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
                logStart();
                
                String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/UpdateAAIVfModuleRequest.xml"); 
-               MockGetGenericVnfById("/skask/vf-modules/vf-module/.*", "VfModularity/VfModule-supercool.xml", 404);
+               MockGetGenericVnfById(wireMockServer, "/skask/vf-modules/vf-module/.*", "VfModularity/VfModule-supercool.xml", 404);
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
                logStart();
                
                String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/UpdateAAIVfModuleRequest.xml"); 
-               MockGetGenericVnfById_404("/skask/vf-modules/vf-module/supercool");
-               MockGetGenericVnfById("/skask/vf-modules/vf-module/supercool", "VfModularity/VfModule-supercool.xml", 200);
-               MockAAIVfModuleBadPatch("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/supercool", 404);
+               MockGetGenericVnfById_404(wireMockServer, "/skask/vf-modules/vf-module/supercool");
+               MockGetGenericVnfById(wireMockServer, "/skask/vf-modules/vf-module/supercool", "VfModularity/VfModule-supercool.xml", 200);
+               MockAAIVfModuleBadPatch(wireMockServer, "/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/supercool", 404);
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
 
        public void testCreateVfModuleSuccess() throws Exception {
                logStart();
 
-               mockVNFPost("", 202, "vnfId");
+               mockVNFPost(wireMockServer, "", 202, "vnfId");
 
                String requestId = "dffbae0e-5588-4bd6-9749-b0f0adb52312";
                String messageId = requestId + "-" + System.currentTimeMillis();
        public void testUpdateVfModuleSuccess() throws Exception {
                logStart();
 
-               mockVNFPut("/vfModuleId", 202);
+               mockVNFPut(wireMockServer, "/vfModuleId", 202);
 
                String requestId = "dffbae0e-5588-4bd6-9749-b0f0adb52312";
                String messageId = requestId + "-" + System.currentTimeMillis();
        public void testDeleteVfModuleSuccess() throws Exception {
                logStart();
 
-               mockVNFDelete("vnfId", "/vfModuleId", 202);
+               mockVNFDelete(wireMockServer, "vnfId", "/vfModuleId", 202);
 
                String requestId = "dffbae0e-5588-4bd6-9749-b0f0adb52312";
                String messageId = requestId + "-" + System.currentTimeMillis();
        public void testRollbackVfModuleSuccess() throws Exception {
                logStart();
 
-               mockVNFRollbackDelete("/vfModuleId", 202);
+               mockVNFRollbackDelete(wireMockServer, "/vfModuleId", 202);
 
                String requestId = "dffbae0e-5588-4bd6-9749-b0f0adb52312";
                String messageId = requestId + "-" + System.currentTimeMillis();
        public void testCreateVfModuleException() throws Exception {
                logStart();
 
-               mockVNFPost("", 202, "vnfId");
+               mockVNFPost(wireMockServer, "", 202, "vnfId");
 
                String requestId = "dffbae0e-5588-4bd6-9749-b0f0adb52312";
                String messageId = requestId + "-" + System.currentTimeMillis();
 
 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.urlMatching;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
        @Test
        public void testCreateVcpeResCustService_Success() throws Exception {
                System.out.println("starting:  testCreateVcpeResCustService_Success\n");
-               MockGetServiceResourcesCatalogData("uuid-miu-svc-011-abcdef", "2","VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json");
-               MockGetServiceResourcesCatalogData("uuid-miu-svc-011-abcdef", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json");
-               MockGetCustomer(CUST, "VCPE/CreateVcpeResCustService/getCustomer.xml");
-               StubResponseOof.mockOof();
+               MockGetServiceResourcesCatalogData(wireMockServer, "uuid-miu-svc-011-abcdef", "2","VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json");
+               MockGetServiceResourcesCatalogData(wireMockServer, "uuid-miu-svc-011-abcdef", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json");
+               MockGetCustomer(wireMockServer, CUST, "VCPE/CreateVcpeResCustService/getCustomer.xml");
+               StubResponseOof.mockOof(wireMockServer);
                // TODO: the SI should NOT have to be URL-encoded yet again!
-               MockPutServiceInstance(CUST, SVC, INST.replace("%", "%25"), "GenericFlows/getServiceInstance.xml");
-               MockGetServiceInstance(CUST, SVC, INST.replace("%", "%25"), "GenericFlows/getServiceInstance.xml");
+               MockPutServiceInstance(wireMockServer, CUST, SVC, INST.replace("%", "%25"), "GenericFlows/getServiceInstance.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, INST.replace("%", "%25"), "GenericFlows/getServiceInstance.xml");
                
-               MockNodeQueryServiceInstanceById(INST, "GenericFlows/getSIUrlById.xml");
-               MockNodeQueryServiceInstanceById(PARENT_INST, "GenericFlows/getParentSIUrlById.xml");           
-               MockGetServiceInstance(CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
-               MockGetServiceInstance(CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
-               MockPutAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               MockPatchAllottedResource(CUST, SVC, PARENT_INST, ARID);
-        MockGetGenericVnfByIdWithDepth(".*", 1, "VCPE/CreateVcpeResCustService/GenericVnf.xml");
-
-               MockPutGenericVnf(".*");
-        MockPatchGenericVnf(".*");
-
-        MockGetGenericVnfByIdWithPriority(".*", ".*", 200, "VfModularity/VfModule-new.xml", 5);
-        // MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");
-        MockPutVfModuleIdNoResponse(".*", "PCRF", ".*");
-        MockPutNetwork(".*", "VfModularity/AddNetworkPolicy_AAIResponse_Success.xml", 200);
-
-               MockGetNetworkPolicyfqdn(".*","CreateNetworkV2/createNetwork_queryNetworkPolicy_AAIResponse_Success.xml",200);
-               MockNodeQueryServiceInstanceByName_404(".*");
-
-               mockVNFPost("", 202, ".*");
-
-        stubFor(post(urlMatching("/services/rest/v1/vnfs" + ".*" + "/vf-modules" )).willReturn(aResponse().withStatus(202)));
-               stubFor(get(urlMatching(".*/business/owning-entities?.*")).willReturn(aResponse().withStatus(404)));
-               stubFor(put(urlMatching(".*/business/owning-entities/owning-entity/.*")).willReturn(aResponse().withStatus(200)));
-               stubFor(put(urlMatching(".*/business/owning-entities/owning-entity/038d99af-0427-42c2-9d15-971b99b9b489/relationship-list/relationship")).willReturn(aResponse().withStatus(200)));
-               stubFor(put(urlMatching(".*/query?.*")).willReturn(aResponse().withStatus(200)));
-               MockPostRequestDB();    
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
-               mockSDNCAdapter(200);
+               MockNodeQueryServiceInstanceById(wireMockServer, INST, "GenericFlows/getSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, PARENT_INST, "GenericFlows/getParentSIUrlById.xml");           
+               MockGetServiceInstance(wireMockServer, CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
+               MockPutAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+        MockGetGenericVnfByIdWithDepth(wireMockServer, ".*", 1, "VCPE/CreateVcpeResCustService/GenericVnf.xml");
+
+               MockPutGenericVnf(wireMockServer, ".*");
+        MockPatchGenericVnf(wireMockServer, ".*");
+
+        MockGetGenericVnfByIdWithPriority(wireMockServer, ".*", ".*", 200, "VfModularity/VfModule-new.xml", 5);
+        // MockGetGenericVnfByIdWithDepth(wireMockServer, "skask", 1, "VfModularity/GenericVnf.xml");
+        MockPutVfModuleIdNoResponse(wireMockServer, ".*", "PCRF", ".*");
+        MockPutNetwork(wireMockServer, ".*", "VfModularity/AddNetworkPolicy_AAIResponse_Success.xml", 200);
+
+               MockGetNetworkPolicyfqdn(wireMockServer, ".*","CreateNetworkV2/createNetwork_queryNetworkPolicy_AAIResponse_Success.xml",200);
+               MockNodeQueryServiceInstanceByName_404(wireMockServer, ".*");
+
+               mockVNFPost(wireMockServer, "", 202, ".*");
+
+        wireMockServer.stubFor(post(urlMatching("/services/rest/v1/vnfs" + ".*" + "/vf-modules" )).willReturn(aResponse().withStatus(202)));
+               wireMockServer.stubFor(get(urlMatching(".*/business/owning-entities?.*")).willReturn(aResponse().withStatus(404)));
+               wireMockServer.stubFor(put(urlMatching(".*/business/owning-entities/owning-entity/.*")).willReturn(aResponse().withStatus(200)));
+               wireMockServer.stubFor(put(urlMatching(".*/business/owning-entities/owning-entity/038d99af-0427-42c2-9d15-971b99b9b489/relationship-list/relationship")).willReturn(aResponse().withStatus(200)));
+               wireMockServer.stubFor(put(urlMatching(".*/query?.*")).willReturn(aResponse().withStatus(200)));
+               MockPostRequestDB(wireMockServer);      
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
+               mockSDNCAdapter(wireMockServer, 200);
                
                Map<String, Object> variables = setupVariables();
 
        @Test
        public void testCreateVcpeResCustService_NoParts() throws Exception {
                System.out.println("starting: testCreateVcpeResCustService_NoParts\n"  );
-               MockGetServiceResourcesCatalogData("uuid-miu-svc-011-abcdef", "2", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesNoData.json");
-               MockGetServiceResourcesCatalogData("uuid-miu-svc-011-abcdef", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesNoData.json");
-               MockGetCustomer(CUST, "VCPE/CreateVcpeResCustService/getCustomer.xml");
+               MockGetServiceResourcesCatalogData(wireMockServer, "uuid-miu-svc-011-abcdef", "2", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesNoData.json");
+               MockGetServiceResourcesCatalogData(wireMockServer, "uuid-miu-svc-011-abcdef", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesNoData.json");
+               MockGetCustomer(wireMockServer, CUST, "VCPE/CreateVcpeResCustService/getCustomer.xml");
                
                // TODO: the SI should NOT have to be URL-encoded yet again!
-               MockPutServiceInstance(CUST, SVC, INST.replace("%", "%25"), "GenericFlows/getServiceInstance.xml");
-               MockGetServiceInstance(CUST, SVC, INST.replace("%", "%25"), "GenericFlows/getServiceInstance.xml");
+               MockPutServiceInstance(wireMockServer, CUST, SVC, INST.replace("%", "%25"), "GenericFlows/getServiceInstance.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, INST.replace("%", "%25"), "GenericFlows/getServiceInstance.xml");
                
-               MockNodeQueryServiceInstanceById(INST, "GenericFlows/getSIUrlById.xml");                
-               MockGetServiceInstance(CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
-               MockNodeQueryServiceInstanceById(PARENT_INST, "GenericFlows/getParentSIUrlById.xml");
-               MockGetServiceInstance(CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, INST, "GenericFlows/getSIUrlById.xml");                
+               MockGetServiceInstance(wireMockServer, CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, PARENT_INST, "GenericFlows/getParentSIUrlById.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
                
                // TODO: should these really be PARENT_INST, or should they be INST?
-               MockPutAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               MockPatchAllottedResource(CUST, SVC, PARENT_INST, ARID);
-
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
-
-        StubResponseOof.mockOof();
-        stubFor(get(urlMatching(".*/business/owning-entities?.*")).willReturn(aResponse().withStatus(404)));
-        stubFor(put(urlMatching(".*/business/owning-entities/owning-entity/.*")).willReturn(aResponse().withStatus(200)));
-        stubFor(put(urlMatching(".*/business/owning-entities/owning-entity/038d99af-0427-42c2-9d15-971b99b9b489/relationship-list/relationship")).willReturn(aResponse().withStatus(200)));
-        stubFor(put(urlMatching(".*/query?.*")).willReturn(aResponse().withStatus(200)));
-        MockPostRequestDB();
-        mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockPutAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
+
+        StubResponseOof.mockOof(wireMockServer);
+        wireMockServer.stubFor(get(urlMatching(".*/business/owning-entities?.*")).willReturn(aResponse().withStatus(404)));
+        wireMockServer.stubFor(put(urlMatching(".*/business/owning-entities/owning-entity/.*")).willReturn(aResponse().withStatus(200)));
+        wireMockServer.stubFor(put(urlMatching(".*/business/owning-entities/owning-entity/038d99af-0427-42c2-9d15-971b99b9b489/relationship-list/relationship")).willReturn(aResponse().withStatus(200)));
+        wireMockServer.stubFor(put(urlMatching(".*/query?.*")).willReturn(aResponse().withStatus(200)));
+        MockPostRequestDB(wireMockServer);
+        mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
                
                Map<String, Object> variables = setupVariables();
 
        @Test
        public void testCreateVcpeResCustService_Fault_NoRollback() throws Exception {
                System.out.println("starting:  testCreateVcpeResCustService_Fault_NoRollback\n");
-               MockGetServiceResourcesCatalogData("uuid-miu-svc-011-abcdef", "2", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json");
-               MockGetServiceResourcesCatalogData("uuid-miu-svc-011-abcdef", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json");
-               MockGetCustomer(CUST, "VCPE/CreateVcpeResCustService/getCustomer.xml");
+               MockGetServiceResourcesCatalogData(wireMockServer, "uuid-miu-svc-011-abcdef", "2", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json");
+               MockGetServiceResourcesCatalogData(wireMockServer, "uuid-miu-svc-011-abcdef", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json");
+               MockGetCustomer(wireMockServer, CUST, "VCPE/CreateVcpeResCustService/getCustomer.xml");
                
                // TODO: the SI should NOT have to be URL-encoded yet again!
-               MockPutServiceInstance(CUST, SVC, INST.replace("%", "%25"), "GenericFlows/getServiceInstance.xml");
-               MockGetServiceInstance(CUST, SVC, INST.replace("%", "%25"), "GenericFlows/getServiceInstance.xml");
+               MockPutServiceInstance(wireMockServer, CUST, SVC, INST.replace("%", "%25"), "GenericFlows/getServiceInstance.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, INST.replace("%", "%25"), "GenericFlows/getServiceInstance.xml");
                
-               MockNodeQueryServiceInstanceById(INST, "GenericFlows/getSIUrlById.xml");
-               MockNodeQueryServiceInstanceById(PARENT_INST, "GenericFlows/getParentSIUrlById.xml");           
-               MockGetServiceInstance(CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
-               MockGetServiceInstance_500(CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
-               MockPutAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               MockPatchAllottedResource(CUST, SVC, PARENT_INST, ARID);
-
-               mockSDNCAdapter(404);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
-
-        StubResponseOof.mockOof();
-        stubFor(get(urlMatching(".*/business/owning-entities?.*")).willReturn(aResponse().withStatus(404)));
-        stubFor(put(urlMatching(".*/business/owning-entities/owning-entity/.*")).willReturn(aResponse().withStatus(200)));
-        stubFor(put(urlMatching(".*/business/owning-entities/owning-entity/038d99af-0427-42c2-9d15-971b99b9b489/relationship-list/relationship")).willReturn(aResponse().withStatus(200)));
-        stubFor(put(urlMatching(".*/query?.*")).willReturn(aResponse().withStatus(200)));
-        MockPostRequestDB();
+               MockNodeQueryServiceInstanceById(wireMockServer, INST, "GenericFlows/getSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, PARENT_INST, "GenericFlows/getParentSIUrlById.xml");           
+               MockGetServiceInstance(wireMockServer, CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
+               MockGetServiceInstance_500(wireMockServer, CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
+               MockPutAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+
+               mockSDNCAdapter(wireMockServer, 404);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
+
+        StubResponseOof.mockOof(wireMockServer);
+        wireMockServer.stubFor(get(urlMatching(".*/business/owning-entities?.*")).willReturn(aResponse().withStatus(404)));
+        wireMockServer.stubFor(put(urlMatching(".*/business/owning-entities/owning-entity/.*")).willReturn(aResponse().withStatus(200)));
+        wireMockServer.stubFor(put(urlMatching(".*/business/owning-entities/owning-entity/038d99af-0427-42c2-9d15-971b99b9b489/relationship-list/relationship")).willReturn(aResponse().withStatus(200)));
+        wireMockServer.stubFor(put(urlMatching(".*/query?.*")).willReturn(aResponse().withStatus(200)));
+        MockPostRequestDB(wireMockServer);
                
                Map<String, Object> variables = setupVariables();
 
        @Test
        public void testCreateVcpeResCustService_Fault_Rollback() throws Exception {
                System.out.println("starting:  testCreateVcpeResCustService_Fault_Rollback\n");
-               MockGetServiceResourcesCatalogData("uuid-miu-svc-011-abcdef", "2", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json");
-               MockGetServiceResourcesCatalogData("uuid-miu-svc-011-abcdef", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json");
-               MockGetCustomer(CUST, "VCPE/CreateVcpeResCustService/getCustomer.xml");
+               MockGetServiceResourcesCatalogData(wireMockServer, "uuid-miu-svc-011-abcdef", "2", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json");
+               MockGetServiceResourcesCatalogData(wireMockServer, "uuid-miu-svc-011-abcdef", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json");
+               MockGetCustomer(wireMockServer, CUST, "VCPE/CreateVcpeResCustService/getCustomer.xml");
                
                // TODO: the SI should NOT have to be URL-encoded yet again!
-               MockPutServiceInstance(CUST, SVC, INST.replace("%", "%25"), "GenericFlows/getServiceInstance.xml");
-               MockGetServiceInstance(CUST, SVC, INST.replace("%", "%25"), "GenericFlows/getServiceInstance.xml");
+               MockPutServiceInstance(wireMockServer, CUST, SVC, INST.replace("%", "%25"), "GenericFlows/getServiceInstance.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, INST.replace("%", "%25"), "GenericFlows/getServiceInstance.xml");
                
-               MockNodeQueryServiceInstanceById(INST, "GenericFlows/getSIUrlById.xml");
-               MockNodeQueryServiceInstanceById(PARENT_INST, "GenericFlows/getParentSIUrlById.xml");           
-               MockGetServiceInstance(CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
-               MockGetServiceInstance(CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/CreateVcpeResCustService/arGetById.xml");
-               MockGetAllottedResource(CUST, SVC, PARENT_INST, ARID, "VCPE/CreateVcpeResCustService/arGetById.xml");
-               MockPutAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               MockPatchAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               MockDeleteAllottedResource(CUST, SVC, PARENT_INST, ARID, ARVERS);
-
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
-
-               StubResponseOof.mockOof();
-               stubFor(get(urlMatching(".*/business/owning-entities?.*")).willReturn(aResponse().withStatus(404)));
-               stubFor(put(urlMatching(".*/business/owning-entities/owning-entity/.*")).willReturn(aResponse().withStatus(200)));
-               stubFor(put(urlMatching(".*/business/owning-entities/owning-entity/038d99af-0427-42c2-9d15-971b99b9b489/relationship-list/relationship")).willReturn(aResponse().withStatus(200)));
-               stubFor(put(urlMatching(".*/query?.*")).willReturn(aResponse().withStatus(200)));
-               MockPostRequestDB();
+               MockNodeQueryServiceInstanceById(wireMockServer, INST, "GenericFlows/getSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, PARENT_INST, "GenericFlows/getParentSIUrlById.xml");           
+               MockGetServiceInstance(wireMockServer, CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/CreateVcpeResCustService/arGetById.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID, "VCPE/CreateVcpeResCustService/arGetById.xml");
+               MockPutAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID, ARVERS);
+
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
+
+               StubResponseOof.mockOof(wireMockServer);
+               wireMockServer.stubFor(get(urlMatching(".*/business/owning-entities?.*")).willReturn(aResponse().withStatus(404)));
+               wireMockServer.stubFor(put(urlMatching(".*/business/owning-entities/owning-entity/.*")).willReturn(aResponse().withStatus(200)));
+               wireMockServer.stubFor(put(urlMatching(".*/business/owning-entities/owning-entity/038d99af-0427-42c2-9d15-971b99b9b489/relationship-list/relationship")).willReturn(aResponse().withStatus(200)));
+               wireMockServer.stubFor(put(urlMatching(".*/query?.*")).willReturn(aResponse().withStatus(200)));
+               MockPostRequestDB(wireMockServer);
                String req = FileUtil.readResourceFile("__files/VCPE/CreateVcpeResCustService/requestRollback.json");
 
                Map<String, Object> variables = setupVariables();
 
 
 package org.onap.so.bpmn.vcpe;
 
-import com.github.tomakehurst.wiremock.stubbing.Scenario;
-import org.junit.Before;
-import org.junit.Test;
-import org.onap.so.bpmn.common.BPMNUtil;
-import org.onap.so.bpmn.mock.FileUtil;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.delete;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.onap.so.bpmn.mock.StubResponseDatabase.mockUpdateRequestDB;
 import static org.onap.so.bpmn.mock.StubResponseSDNCAdapter.mockSDNCAdapter;
 
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.so.bpmn.common.BPMNUtil;
+import org.onap.so.bpmn.mock.FileUtil;
+
+import com.github.tomakehurst.wiremock.stubbing.Scenario;
+
 public class DeleteVcpeResCustServiceIT extends AbstractTestBase {
 
        private static final String PROCNAME = "DeleteVcpeResCustService";
        @Test
        public void testDeleteVcpeResCustService_Success() throws Exception {
                logStart();
-               MockNodeQueryServiceInstanceById(INST, "GenericFlows/getSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, INST, "GenericFlows/getSIUrlById.xml");
 
                // TODO: use INST instead of DEC_INST
                /*
                 * fail to URL-encode the SI id before performing the query so we'll
                 * add a stub for that case, too.
                 */
-               MockNodeQueryServiceInstanceById(DEC_INST, "GenericFlows/getSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_INST, "GenericFlows/getSIUrlById.xml");
 
                /*
-                * cannot use MockGetServiceInstance(), because we need to return
+                * cannot use MockGetServiceInstance(wireMockServer, ), because we need to return
                 * different responses as we traverse through the flow
                 */
 
                // initially, the SI includes the ARs
-               stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + CUST + "/service-subscriptions/service-subscription/" + SVC + "/service-instances/service-instance/" + INST))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + CUST + "/service-subscriptions/service-subscription/" + SVC + "/service-instances/service-instance/" + INST))
                                .inScenario("SI retrieval")
                                .whenScenarioStateIs(Scenario.STARTED)
                                .willReturn(aResponse()
                                .willSetStateTo("ARs Deleted"));
 
                // once the ARs have been deleted, the SI should be empty
-               stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + CUST + "/service-subscriptions/service-subscription/" + SVC + "/service-instances/service-instance/" + INST))
+               wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + CUST + "/service-subscriptions/service-subscription/" + SVC + "/service-instances/service-instance/" + INST))
                                .inScenario("SI retrieval")
                                .whenScenarioStateIs("ARs Deleted")
                                .willReturn(aResponse()
                                                .withBodyFile("VCPE/DeleteVcpeResCustService/getSIAfterDelArs.xml")));
 
                // for BRG
-               MockQueryAllottedResourceById(AR_BRG_ID, "VCPE/DeleteVcpeResCustService/getBRGArUrlById.xml");
-               MockGetAllottedResource(CUST, SVC, INST, AR_BRG_ID, "VCPE/DeleteVcpeResCustService/arGetBRGById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, AR_BRG_ID);
-               MockDeleteAllottedResource(CUST, SVC, INST, AR_BRG_ID, ARVERS);
+               MockQueryAllottedResourceById(wireMockServer, AR_BRG_ID, "VCPE/DeleteVcpeResCustService/getBRGArUrlById.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, AR_BRG_ID, "VCPE/DeleteVcpeResCustService/arGetBRGById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, AR_BRG_ID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, AR_BRG_ID, ARVERS);
 
                // for TXC
-               MockQueryAllottedResourceById(AR_TXC_ID, "VCPE/DeleteVcpeResCustService/getTXCArUrlById.xml");
-               MockGetAllottedResource(CUST, SVC, INST, AR_TXC_ID, "VCPE/DeleteVcpeResCustService/arGetTXCById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, AR_TXC_ID);
-               MockDeleteAllottedResource(CUST, SVC, INST, AR_TXC_ID, ARVERS);
+               MockQueryAllottedResourceById(wireMockServer, AR_TXC_ID, "VCPE/DeleteVcpeResCustService/getTXCArUrlById.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, AR_TXC_ID, "VCPE/DeleteVcpeResCustService/arGetTXCById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, AR_TXC_ID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, AR_TXC_ID, ARVERS);
 
         //MockGetGenericVnfById("vnfX.*", "GenericFlows/getGenericVnfByNameResponse.xml");
-        stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/.*"))
+        wireMockServer.stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/.*"))
                 .willReturn(aResponse()
                         .withStatus(200)
                         .withHeader("Content-Type", "text/xml")
                         .withBodyFile("GenericFlows/getGenericVnfByNameResponse.xml")));
 
 
-               stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/.*"))
+               wireMockServer.stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/.*"))
                                .willReturn(aResponse()
                                                .withStatus(204)
                                                .withHeader("Content-Type", "text/xml")));
 
-        MockDeleteServiceInstance(CUST,SVC,INST,SVC);
+        MockDeleteServiceInstance(wireMockServer, CUST,SVC,INST,SVC);
 
-        mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+        mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
 
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = setupVariables(businessKey);
        @Test
        public void testDeleteVcpeResCustService_NoBRG_NoTXC_NoVNF() throws Exception {
                logStart();
-               MockNodeQueryServiceInstanceById(INST, "GenericFlows/getSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, INST, "GenericFlows/getSIUrlById.xml");
 
                // TODO: use INST instead of DEC_INST
                /*
                 * fail to URL-encode the SI id before performing the query so we'll
                 * add a stub for that case, too.
                 */
-               MockNodeQueryServiceInstanceById(DEC_INST, "GenericFlows/getSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_INST, "GenericFlows/getSIUrlById.xml");
 
-               MockGetServiceInstance(CUST, SVC, INST, "VCPE/DeleteVcpeResCustService/getSIAfterDelArs.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, INST, "VCPE/DeleteVcpeResCustService/getSIAfterDelArs.xml");
 
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
 
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = setupVariables(businessKey);
        @Test
        public void testDeleteVcpeResCustService_Fault() throws Exception {
                logStart();
-               MockNodeQueryServiceInstanceById(INST, "GenericFlows/getSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, INST, "GenericFlows/getSIUrlById.xml");
 
                // TODO: use INST instead of DEC_INST
                /*
                 * fail to URL-encode the SI id before performing the query so we'll
                 * add a stub for that case, too.
                 */
-               MockNodeQueryServiceInstanceById(DEC_INST, "GenericFlows/getSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_INST, "GenericFlows/getSIUrlById.xml");
 
-               MockGetServiceInstance(CUST, SVC, INST, "VCPE/DeleteVcpeResCustService/getSIAfterDelArs.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, INST, "VCPE/DeleteVcpeResCustService/getSIAfterDelArs.xml");
 
                // generate failure
-               mockSDNCAdapter(404);
+               mockSDNCAdapter(wireMockServer, 404);
 
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
 
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = setupVariables(businessKey);
 
                 * have a bug in that they don't URL-encode the SI id before using
                 * it in the query
                 */
-               MockNodeQueryServiceInstanceById(DEC_INST, "GenericFlows/getSIUrlById.xml");
-               MockNodeQueryServiceInstanceById(DEC_PARENT_INST, "GenericFlows/getParentSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_INST, "GenericFlows/getSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_PARENT_INST, "GenericFlows/getParentSIUrlById.xml");
 
-               MockGetServiceInstance(CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
-               MockGetServiceInstance(CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
-               MockPutAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               MockPatchAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
+               MockPutAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
 
                Map<String, Object> variables = new HashMap<>();
                setVariablesSuccess(variables,"testRequestId123");
                 * have a bug in that they don't URL-encode the SI id before using
                 * it in the query
                 */
-               MockNodeQueryServiceInstanceById(DEC_INST, "GenericFlows/getNotFound.xml");
-               MockNodeQueryServiceInstanceById(DEC_PARENT_INST, "GenericFlows/getParentSIUrlById.xml");
-
-               MockGetServiceInstance(CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
-               MockGetServiceInstance(CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
-               MockPutAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               MockPatchAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_INST, "GenericFlows/getNotFound.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_PARENT_INST, "GenericFlows/getParentSIUrlById.xml");
+
+               MockGetServiceInstance(wireMockServer, CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
+               MockPutAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
                
                Map<String, Object> variables = new HashMap<>();
                setVariablesSuccess(variables,"testRequestId124");
                 * have a bug in that they don't URL-encode the SI id before using
                 * it in the query
                 */
-               MockNodeQueryServiceInstanceById(DEC_INST, "GenericFlows/getSIUrlById.xml");
-               MockNodeQueryServiceInstanceById(DEC_PARENT_INST, "GenericFlows/getParentSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_INST, "GenericFlows/getSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_PARENT_INST, "GenericFlows/getParentSIUrlById.xml");
                
-               MockGetServiceInstance(CUST, SVC, INST, "VCPE/DoCreateAllottedResourceBRG/getSIandAR.xml");
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRG/getArBrg2.xml");
-               MockGetServiceInstance(CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
-               MockPutAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               MockPatchAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, INST, "VCPE/DoCreateAllottedResourceBRG/getSIandAR.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRG/getArBrg2.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
+               MockPutAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
 
                Map<String, Object> variables = new HashMap<>();
                setVariablesSuccess(variables,"testRequestId125");
                 * have a bug in that they don't URL-encode the SI id before using
                 * it in the query
                 */
-               MockNodeQueryServiceInstanceById(DEC_INST, "GenericFlows/getSIUrlById.xml");
-               MockNodeQueryServiceInstanceById(DEC_PARENT_INST, "GenericFlows/getNotFound.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_INST, "GenericFlows/getSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_PARENT_INST, "GenericFlows/getNotFound.xml");
 
-               MockGetServiceInstance(CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
-               MockGetServiceInstance(CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
-               MockPutAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               MockPatchAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
+               MockPutAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
 
                Map<String, Object> variables = new HashMap<>();
                setVariablesSuccess(variables,"testRequestId126");
                 * have a bug in that they don't URL-encode the SI id before using
                 * it in the query
                 */
-               MockNodeQueryServiceInstanceById(DEC_INST, "GenericFlows/getSIUrlById.xml");
-               MockNodeQueryServiceInstanceById(DEC_PARENT_INST, "GenericFlows/getParentSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_INST, "GenericFlows/getSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_PARENT_INST, "GenericFlows/getParentSIUrlById.xml");
                
-               MockGetServiceInstance(CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
-               MockGetServiceInstance(CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
-               MockPutAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               MockPatchAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               mockSDNCAdapter(404);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
+               MockPutAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               mockSDNCAdapter(wireMockServer, 404);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
 
                Map<String, Object> variables = new HashMap<>();
                setVariablesSuccess(variables,"testRequestId127");
 
        @Test
        public void testDoCreateAllottedResourceBRGRollback_Success() throws Exception {
         logStart();
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, ARID);
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, ARID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        @Test
        public void testDoCreateAllottedResourceBRGRollback_skipRollback() throws Exception {
                logStart();
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, ARID);
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, ARID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        @Test
        public void testDoCreateAllottedResourceBRGRollback_DoNotRollBack() throws Exception {
                logStart();
-           MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml");
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+           MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml");
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        @Test
        public void testDoCreateAllottedResourceBRGRollback_NoDeactivate() throws Exception {
                logStart();
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, ARID);
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, ARID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        @Test
        public void testDoCreateAllottedResourceBRGRollback_NoDelete() throws Exception {
                logStart();
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, ARID);
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, ARID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        @Test
        public void testDoCreateAllottedResourceBRGRollback_NoUnassign() throws Exception {
                logStart();
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, ARID);
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, ARID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        @Test
        public void testDoCreateAllottedResourceBRGRollback_SubProcessError() throws Exception {
                logStart();
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, ARID);
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, ARID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
 
-               mockSDNCAdapter(404);
+               mockSDNCAdapter(wireMockServer, 404);
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        @Test
        public void testDoCreateAllottedResourceBRGRollback_JavaException() throws Exception {
                logStart();
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, ARID);
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, ARID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
 
                 * have a bug in that they don't URL-encode the SI id before using
                 * it in the query
                 */
-               MockNodeQueryServiceInstanceById(DEC_INST, "GenericFlows/getSIUrlById.xml");
-               MockNodeQueryServiceInstanceById(DEC_PARENT_INST, "GenericFlows/getParentSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_INST, "GenericFlows/getSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_PARENT_INST, "GenericFlows/getParentSIUrlById.xml");
                
-               MockGetServiceInstance(CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
-               MockGetServiceInstance(CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
-               MockPutAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               MockPatchAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
+               MockPutAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
 
                Map<String, Object> variables = new HashMap<>();
                setVariablesSuccess(variables, "testRequestId123");
                 * have a bug in that they don't URL-encode the SI id before using
                 * it in the query
                 */
-               MockNodeQueryServiceInstanceById(DEC_INST, "GenericFlows/getNotFound.xml");
-               MockNodeQueryServiceInstanceById(DEC_PARENT_INST, "GenericFlows/getParentSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_INST, "GenericFlows/getNotFound.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_PARENT_INST, "GenericFlows/getParentSIUrlById.xml");
                
-               MockGetServiceInstance(CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
-               MockGetServiceInstance(CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
-               MockPutAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               MockPatchAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
+               MockPutAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
 
                Map<String, Object> variables = new HashMap<>();
                setVariablesSuccess(variables, "testRequestId123");
                 * have a bug in that they don't URL-encode the SI id before using
                 * it in the query
                 */
-               MockNodeQueryServiceInstanceById(DEC_INST, "GenericFlows/getSIUrlById.xml");
-               MockNodeQueryServiceInstanceById(DEC_PARENT_INST, "GenericFlows/getParentSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_INST, "GenericFlows/getSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_PARENT_INST, "GenericFlows/getParentSIUrlById.xml");
                
-               MockGetServiceInstance(CUST, SVC, INST, "VCPE/DoCreateAllottedResourceTXC/getSIandAR.xml");
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc2.xml");
-               MockGetServiceInstance(CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
-               MockPutAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               MockPatchAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, INST, "VCPE/DoCreateAllottedResourceTXC/getSIandAR.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc2.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
+               MockPutAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
 
                Map<String, Object> variables = new HashMap<>();
                setVariablesSuccess(variables, "testRequestId123");
                 * have a bug in that they don't URL-encode the SI id before using
                 * it in the query
                 */
-               MockNodeQueryServiceInstanceById(DEC_INST, "GenericFlows/getSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_INST, "GenericFlows/getSIUrlById.xml");
                
-               MockNodeQueryServiceInstanceById(DEC_PARENT_INST, "GenericFlows/getNotFound.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_PARENT_INST, "GenericFlows/getNotFound.xml");
                
-               MockGetServiceInstance(CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
-               MockGetServiceInstance(CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
-               MockPutAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               MockPatchAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
+               MockPutAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
 
                Map<String, Object> variables = new HashMap<>();
                setVariablesSuccess(variables, "testRequestId123");
                 * have a bug in that they don't URL-encode the SI id before using
                 * it in the query
                 */
-               MockNodeQueryServiceInstanceById(DEC_INST, "GenericFlows/getSIUrlById.xml");
-               MockNodeQueryServiceInstanceById(DEC_PARENT_INST, "GenericFlows/getParentSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_INST, "GenericFlows/getSIUrlById.xml");
+               MockNodeQueryServiceInstanceById(wireMockServer, DEC_PARENT_INST, "GenericFlows/getParentSIUrlById.xml");
                
-               MockGetServiceInstance(CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
-               MockGetServiceInstance(CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
-               MockPutAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               MockPatchAllottedResource(CUST, SVC, PARENT_INST, ARID);
-               mockSDNCAdapter(404);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, INST, "GenericFlows/getServiceInstance.xml");
+               MockGetServiceInstance(wireMockServer, CUST, SVC, PARENT_INST, "GenericFlows/getParentServiceInstance.xml");
+               MockPutAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, PARENT_INST, ARID);
+               mockSDNCAdapter(wireMockServer, 404);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
 
                Map<String, Object> variables = new HashMap<>();
                setVariablesSuccess(variables, "testRequestId123");
 
        @Test
        public void testDoCreateAllottedResourceTXCRollback_Success() throws Exception {
                logStart();
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, ARID);
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, ARID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        @Test
        public void testDoCreateAllottedResourceTXCRollback_skipRollback() throws Exception {
                logStart();
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, ARID);
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, ARID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        @Test
        public void testDoCreateAllottedResourceTXCRollback_DoNotRollBack() throws Exception {
                logStart();
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml");
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml");
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        @Test
        public void testDoCreateAllottedResourceTXCRollback_NoDeactivate() throws Exception {
                logStart();
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, ARID);
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, ARID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        @Test
        public void testDoCreateAllottedResourceTXCRollback_NoDelete() throws Exception {
                logStart();
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, ARID);
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, ARID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        @Test
        public void testDoCreateAllottedResourceTXCRollback_NoUnassign() throws Exception {
                logStart();
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, ARID);
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, ARID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        @Test
        public void testDoCreateAllottedResourceTXCRollback_SubProcessError() throws Exception {
                logStart();
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, ARID);
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, ARID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
 
-               mockSDNCAdapter(404);
+               mockSDNCAdapter(wireMockServer, 404);
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        @Test
        public void testDoCreateAllottedResourceTXCRollback_JavaException() throws Exception {
                logStart();
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, ARID);
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, ARID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
 
        @Test
        public void testDoDeleteAllottedResourceBRG_Success() {
                logStart();
-               MockQueryAllottedResourceById(ARID, "GenericFlows/getARUrlById.xml");
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceBRG/arGetById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, ARID);
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockQueryAllottedResourceById(wireMockServer, ARID, "GenericFlows/getARUrlById.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceBRG/arGetById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, ARID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        @Test
        public void testDoDeleteAllottedResourceBRG_ARNotInSDNC() {
                logStart();
-               MockQueryAllottedResourceById(ARID, "GenericFlows/getARUrlById.xml");
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceBRG/arGetById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, ARID);
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockQueryAllottedResourceById(wireMockServer, ARID, "GenericFlows/getARUrlById.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceBRG/arGetById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, ARID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
                
                String businessKey = UUID.randomUUID().toString();
                Map<String, Object> variables = new HashMap<>();
        @Test
        public void testDoDeleteAllottedResourceBRG_SubProcessError() throws Exception {
                logStart();
-               MockQueryAllottedResourceById(ARID, "GenericFlows/getARUrlById.xml");
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceBRG/arGetById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, ARID);
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockQueryAllottedResourceById(wireMockServer, ARID, "GenericFlows/getARUrlById.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceBRG/arGetById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, ARID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
 
-               mockSDNCAdapter(500);
+               mockSDNCAdapter(wireMockServer, 500);
                
                Map<String, Object> variables = new HashMap<>();
                setVariablesSuccess(variables);
 
        @Test
        public void testDoDeleteAllottedResourceTXC_Success() throws Exception {
                logStart();
-               MockQueryAllottedResourceById(ARID, "GenericFlows/getARUrlById.xml");
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceTXC/arGetById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, ARID);
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockQueryAllottedResourceById(wireMockServer, ARID, "GenericFlows/getARUrlById.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceTXC/arGetById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, ARID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
                
                Map<String, Object> variables = new HashMap<>();
                setVariablesSuccess(variables);
        @Test
        public void testDoDeleteAllottedResourceTXC_ARNotInSDNC() throws Exception {
                logStart();
-               MockQueryAllottedResourceById(ARID, "GenericFlows/getARUrlById.xml");
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceTXC/arGetById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, ARID);
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockSDNCAdapter(200);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockQueryAllottedResourceById(wireMockServer, ARID, "GenericFlows/getARUrlById.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceTXC/arGetById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, ARID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockSDNCAdapter(wireMockServer, 200);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
                
                Map<String, Object> variables = new HashMap<>();
                setVariablesSuccess(variables);
        @Test
        public void testDoDeleteAllottedResourceTXC_SubProcessError() throws Exception {
                logStart();
-               MockQueryAllottedResourceById(ARID, "GenericFlows/getARUrlById.xml");
-               MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceTXC/arGetById.xml");
-               MockPatchAllottedResource(CUST, SVC, INST, ARID);
-               MockDeleteAllottedResource(CUST, SVC, INST, ARID, ARVERS);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+               MockQueryAllottedResourceById(wireMockServer, ARID, "GenericFlows/getARUrlById.xml");
+               MockGetAllottedResource(wireMockServer, CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceTXC/arGetById.xml");
+               MockPatchAllottedResource(wireMockServer, CUST, SVC, INST, ARID);
+               MockDeleteAllottedResource(wireMockServer, CUST, SVC, INST, ARID, ARVERS);
+               mockUpdateRequestDB(wireMockServer, 200, "Database/DBUpdateResponse.xml");
 
-               mockSDNCAdapter(500);
+               mockSDNCAdapter(wireMockServer, 500);
                
                Map<String, Object> variables = new HashMap<>();
                setVariablesSuccess(variables);
 
                                                </configuration>
                                        </execution>
                                </executions>
+                               <configuration>
+                                       <parallel>suites</parallel>
+                               </configuration>
                        </plugin>
                </plugins>
 
 
                                                        </configuration>
                                                </execution>
                                        </executions>
+                                       <configuration>
+                                               <parallel>suites</parallel>
+                                       </configuration>
                                </plugin>
                        </plugins>
                </pluginManagement>
 
 @RunWith(MockitoJUnitRunner.class)
 class CreateCustomE2EServiceInstanceTest {
 
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(28090);
-
     @Before
     public void init() throws IOException {
         MockitoAnnotations.initMocks(this);
 
     def prefix = "CVFMI_"
     def requestInfo = "<requestInfo><request-id>12345</request-id></requestInfo>"
 
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(28090)
-
     @Captor
     static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
 
 
 @RunWith(MockitoJUnitRunner.class)
 class DoCreateNetworkInstanceRollbackTest  {
        
-       @Rule
-       public WireMockRule wireMockRule = new WireMockRule(28090);
-       
-               def utils = new MsoUtils()
+       def utils = new MsoUtils()
                String Prefix="CRENWKIR_"
 
 
 
 class DoCreateServiceInstanceTest extends MsoGroovyTest{
     def prefix = "DCRESI_"
 
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(28090)
-
     @Rule
     public ExpectedException thrown = ExpectedException.none()
 
 
     @Spy
     DoCreateVfModuleRollback doCreateVfModuleRollback
 
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(28090)
-
     @Captor
     static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
 
 
 class DoCreateVfModuleTest {
     def prefix = "DCVFM_"
 
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(28090)
-
     @Captor
     static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
 
 
 @RunWith(MockitoJUnitRunner.class)
 class DoCreateVnfAndModulesTest {
 
-       @Rule
-       public WireMockRule wireMockRule = new WireMockRule(28090)
-
        @Captor
        static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
 
 
 class DoCreateVnfTest {
     def prefix = "DoCVNF_"
 
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(28090)
-
     @Captor
     static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
 
 
 @RunWith(MockitoJUnitRunner.class)
 class DoDeleteServiceInstanceTest {
 
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(28090)
-
     @Captor
     static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
 
 
 @RunWith(MockitoJUnitRunner.class)
 class DoDeleteVfModuleFromVnfTest extends MsoGroovyTest {
 
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(28090);
-
     @Captor
     static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
 
 
     @Spy
     DoDeleteVfModule doDeleteVfModule
 
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(28090);
-
     @Captor
     static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
 
 
 
 @RunWith(MockitoJUnitRunner.class)
 class DoDeleteVfModuleVolumeV2Test extends MsoGroovyTest{
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(28090);
 
     @Captor
     static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
 
 @RunWith(MockitoJUnitRunner.class)
 public class DoDeleteVnfAndModulesTest extends MsoGroovyTest{
 
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(28090);
-
     @Captor
     static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
 
 
 @RunWith(MockitoJUnitRunner.class)
 class DoUpdateNetworkInstanceRollbackTest  {
 
-       @Rule
-       public WireMockRule wireMockRule = new WireMockRule(28090);
-
                def utils = new MsoUtils()
                String Prefix="UPDNETIR_"
 
 
     @Captor
     static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
 
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(28090)
-
     @Spy
     DoUpdateVfModule doUpdateVfModule
 
 
     @Captor
     static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
 
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(28090);
-
     @Before
     public void init() {
         MockitoAnnotations.initMocks(this)
 
         ExecutionEntity mex = setupMock()
         initUpdateAaiAROrchStatus(mex)
 
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml")
-        MockPatchAllottedResource(CUST, SVC, INST, ARID)
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml")
+        MockPatchAllottedResource(wireMockRule, CUST, SVC, INST, ARID)
 
         DoCreateAllottedResourceBRGRollback DoCreateAllottedResourceBRGRollback = new DoCreateAllottedResourceBRGRollback()
         DoCreateAllottedResourceBRGRollback.updateAaiAROrchStatus(mex, "success")
         ExecutionEntity mex = setupMock()
         initUpdateAaiAROrchStatus(mex)
 
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml")
-        MockPatchAllottedResource(CUST, SVC, INST, ARID)
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml")
+        MockPatchAllottedResource(wireMockRule, CUST, SVC, INST, ARID)
 
         when(mex.getVariable("aaiARPath")).thenReturn(null)
 
         ExecutionEntity mex = setupMock()
         initDeleteAaiAR(mex)
 
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml")
-        MockDeleteAllottedResource(CUST, SVC, INST, ARID, VERS)
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml")
+        MockDeleteAllottedResource(wireMockRule, CUST, SVC, INST, ARID, VERS)
 
         DoCreateAllottedResourceBRGRollback DoCreateAllottedResourceBRGRollback = new DoCreateAllottedResourceBRGRollback()
         DoCreateAllottedResourceBRGRollback.deleteAaiAR(mex)
         ExecutionEntity mex = setupMock()
         initDeleteAaiAR(mex)
 
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml")
-        MockDeleteAllottedResource(CUST, SVC, INST, ARID, VERS)
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml")
+        MockDeleteAllottedResource(wireMockRule, CUST, SVC, INST, ARID, VERS)
 
         when(mex.getVariable("aaiARPath")).thenReturn("")
 
         ExecutionEntity mex = setupMock()
         initDeleteAaiAR(mex)
 
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml")
-        MockDeleteAllottedResource(CUST, SVC, INST, ARID, VERS)
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml")
+        MockDeleteAllottedResource(wireMockRule, CUST, SVC, INST, ARID, VERS)
 
         when(mex.getVariable("aaiARPath")).thenThrow(new BpmnError("expected exception"))
 
         ExecutionEntity mex = setupMock()
         initDeleteAaiAR(mex)
 
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml")
-        MockDeleteAllottedResource(CUST, SVC, INST, ARID, VERS)
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml")
+        MockDeleteAllottedResource(wireMockRule, CUST, SVC, INST, ARID, VERS)
 
         when(mex.getVariable("aaiARPath")).thenThrow(new RuntimeException("expected exception"))
 
 
     @Test
     @Ignore
     public void getAaiAR() {
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRG/getArBrg.xml")
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRG/getArBrg.xml")
 
         ExecutionEntity mex = setupMock()
         initGetAaiAR(mex)
 
     @Test
     public void getAaiAR_Duplicate() {
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRG/getArBrg.xml")
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRG/getArBrg.xml")
 
         ExecutionEntity mex = setupMock()
         initGetAaiAR(mex)
 
     @Test
     public void getAaiAR_NotActive() {
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRG/getArBrg.xml")
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRG/getArBrg.xml")
 
         ExecutionEntity mex = setupMock()
         initGetAaiAR(mex)
     @Test
     @Ignore
     public void getAaiAR_NoStatus() {
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRG/getArBrg.xml")
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceBRG/getArBrg.xml")
 
         ExecutionEntity mex = setupMock()
         initGetAaiAR(mex)
 
         when(mex.getVariable("PSI_resourceLink")).thenReturn(null)
 
-        MockPutAllottedResource(CUST, SVC, INST, ARID)
+        MockPutAllottedResource(wireMockRule, CUST, SVC, INST, ARID)
 
         DoCreateAllottedResourceBRG DoCreateAllottedResourceBRG = new DoCreateAllottedResourceBRG()
 
         ExecutionEntity mex = setupMock()
         initCreateAaiAr(mex)
 
-        MockPutAllottedResource_500(CUST, SVC, INST, ARID)
+        MockPutAllottedResource_500(wireMockRule, CUST, SVC, INST, ARID)
 
         DoCreateAllottedResourceBRG DoCreateAllottedResourceBRG = new DoCreateAllottedResourceBRG()
 
 
         when(mex.getVariable("aai.endpoint")).thenThrow(new BpmnError("expected exception"))
 
-        MockPutAllottedResource(CUST, SVC, INST, ARID)
+        MockPutAllottedResource(wireMockRule, CUST, SVC, INST, ARID)
 
         DoCreateAllottedResourceBRG DoCreateAllottedResourceBRG = new DoCreateAllottedResourceBRG()
 
 
         when(mex.getVariable("aai.endpoint")).thenThrow(new RuntimeException("expected exception"))
 
-        MockPutAllottedResource(CUST, SVC, INST, ARID)
+        MockPutAllottedResource(wireMockRule, CUST, SVC, INST, ARID)
 
         DoCreateAllottedResourceBRG DoCreateAllottedResourceBRG = new DoCreateAllottedResourceBRG()
 
     @Test
     @Ignore
     public void updateAaiAROrchStatus() {
-        MockPatchAllottedResource(CUST, SVC, INST, ARID)
+        MockPatchAllottedResource(wireMockRule, CUST, SVC, INST, ARID)
 
         ExecutionEntity mex = setupMock()
         initUpdateAaiAROrchStatus(mex)
 
         ExecutionEntity mex = setupMock()
         initUpdateAaiAROrchStatus(mex)
 
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml")
-        MockPatchAllottedResource(CUST, SVC, INST, ARID)
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml")
+        MockPatchAllottedResource(wireMockRule, CUST, SVC, INST, ARID)
 
         DoCreateAllottedResourceTXCRollback DoCreateAllottedResourceTXCRollback = new DoCreateAllottedResourceTXCRollback()
         DoCreateAllottedResourceTXCRollback.updateAaiAROrchStatus(mex, "success")
         ExecutionEntity mex = setupMock()
         initUpdateAaiAROrchStatus(mex)
 
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml")
-        MockPatchAllottedResource(CUST, SVC, INST, ARID)
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml")
+        MockPatchAllottedResource(wireMockRule, CUST, SVC, INST, ARID)
 
         when(mex.getVariable("aaiARPath")).thenReturn(null)
 
         ExecutionEntity mex = setupMock()
         initDeleteAaiAR(mex)
 
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml")
-        MockDeleteAllottedResource(CUST, SVC, INST, ARID, VERS)
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml")
+        MockDeleteAllottedResource(wireMockRule, CUST, SVC, INST, ARID, VERS)
 
         DoCreateAllottedResourceTXCRollback DoCreateAllottedResourceTXCRollback = new DoCreateAllottedResourceTXCRollback()
         DoCreateAllottedResourceTXCRollback.deleteAaiAR(mex)
         ExecutionEntity mex = setupMock()
         initDeleteAaiAR(mex)
 
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml")
-        MockDeleteAllottedResource(CUST, SVC, INST, ARID, VERS)
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml")
+        MockDeleteAllottedResource(wireMockRule, CUST, SVC, INST, ARID, VERS)
 
         when(mex.getVariable("aaiARPath")).thenReturn("")
 
         ExecutionEntity mex = setupMock()
         initDeleteAaiAR(mex)
 
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml")
-        MockDeleteAllottedResource(CUST, SVC, INST, ARID, VERS)
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml")
+        MockDeleteAllottedResource(wireMockRule, CUST, SVC, INST, ARID, VERS)
 
         when(mex.getVariable("aaiARPath")).thenThrow(new BpmnError("expected exception"))
 
         ExecutionEntity mex = setupMock()
         initDeleteAaiAR(mex)
 
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml")
-        MockDeleteAllottedResource(CUST, SVC, INST, ARID, VERS)
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml")
+        MockDeleteAllottedResource(wireMockRule, CUST, SVC, INST, ARID, VERS)
 
         when(mex.getVariable("aaiARPath")).thenThrow(new RuntimeException("expected exception"))
 
 
     @Test
     @Ignore
     public void getAaiAR() {
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml")
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml")
 
         ExecutionEntity mex = setupMock()
         initGetAaiAR(mex)
     @Test
 
     public void getAaiAR_Duplicate() {
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml")
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml")
 
         ExecutionEntity mex = setupMock()
         initGetAaiAR(mex)
 
     @Test
     public void getAaiAR_NotActive() {
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml")
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml")
 
         ExecutionEntity mex = setupMock()
         initGetAaiAR(mex)
     @Test
     @Ignore
     public void getAaiAR_NoStatus() {
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml")
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml")
 
         ExecutionEntity mex = setupMock()
         initGetAaiAR(mex)
 
         when(mex.getVariable("PSI_resourceLink")).thenReturn(null)
 
-        MockPutAllottedResource(CUST, SVC, INST, ARID)
+        MockPutAllottedResource(wireMockRule, CUST, SVC, INST, ARID)
 
         DoCreateAllottedResourceTXC DoCreateAllottedResourceTXC = new DoCreateAllottedResourceTXC()
 
         ExecutionEntity mex = setupMock()
         initCreateAaiAr(mex)
 
-        MockPutAllottedResource_500(CUST, SVC, INST, ARID)
+        MockPutAllottedResource_500(wireMockRule, CUST, SVC, INST, ARID)
 
         DoCreateAllottedResourceTXC DoCreateAllottedResourceTXC = new DoCreateAllottedResourceTXC()
 
 
         when(mex.getVariable("aai.endpoint")).thenThrow(new BpmnError("expected exception"))
 
-        MockPutAllottedResource(CUST, SVC, INST, ARID)
+        MockPutAllottedResource(wireMockRule, CUST, SVC, INST, ARID)
 
         DoCreateAllottedResourceTXC DoCreateAllottedResourceTXC = new DoCreateAllottedResourceTXC()
 
 
         when(mex.getVariable("aai.endpoint")).thenThrow(new RuntimeException("expected exception"))
 
-        MockPutAllottedResource(CUST, SVC, INST, ARID)
+        MockPutAllottedResource(wireMockRule, CUST, SVC, INST, ARID)
 
         DoCreateAllottedResourceTXC DoCreateAllottedResourceTXC = new DoCreateAllottedResourceTXC()
 
     @Test
     @Ignore
     public void updateAaiAROrchStatus() {
-        MockPatchAllottedResource(CUST, SVC, INST, ARID)
+        MockPatchAllottedResource(wireMockRule, CUST, SVC, INST, ARID)
 
         ExecutionEntity mex = setupMock()
         initUpdateAaiAROrchStatus(mex)
 
         ExecutionEntity mex = setupMock()
         initUpdateAaiAROrchStatus(mex)
 
-        MockPatchAllottedResource(CUST, SVC, INST, ARID)
+        MockPatchAllottedResource(wireMockRule, CUST, SVC, INST, ARID)
 
         DoDeleteAllottedResourceBRG DoDeleteAllottedResourceBRG = new DoDeleteAllottedResourceBRG()
         DoDeleteAllottedResourceBRG.updateAaiAROrchStatus(mex, "success")
         ExecutionEntity mex = setupMock()
         initDeleteAaiAR(mex)
 
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceBRG/arGetById.xml")
-        MockDeleteAllottedResource(CUST, SVC, INST, ARID, VERS)
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceBRG/arGetById.xml")
+        MockDeleteAllottedResource(wireMockRule, CUST, SVC, INST, ARID, VERS)
 
         DoDeleteAllottedResourceBRG DoDeleteAllottedResourceBRG = new DoDeleteAllottedResourceBRG()
         DoDeleteAllottedResourceBRG.deleteAaiAR(mex)
         ExecutionEntity mex = setupMock()
         initDeleteAaiAR(mex)
 
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceBRG/arGetById.xml")
-        MockDeleteAllottedResource(CUST, SVC, INST, ARID, VERS)
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceBRG/arGetById.xml")
+        MockDeleteAllottedResource(wireMockRule, CUST, SVC, INST, ARID, VERS)
 
         when(mex.getVariable("aaiARPath")).thenReturn("")
 
         ExecutionEntity mex = setupMock()
         initDeleteAaiAR(mex)
 
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceBRG/arGetById.xml")
-        MockDeleteAllottedResource(CUST, SVC, INST, ARID, VERS)
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceBRG/arGetById.xml")
+        MockDeleteAllottedResource(wireMockRule, CUST, SVC, INST, ARID, VERS)
 
         when(mex.getVariable("aaiARPath")).thenThrow(new BpmnError("expected exception"))
 
         ExecutionEntity mex = setupMock()
         initDeleteAaiAR(mex)
 
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceBRG/arGetById.xml")
-        MockDeleteAllottedResource(CUST, SVC, INST, ARID, VERS)
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceBRG/arGetById.xml")
+        MockDeleteAllottedResource(wireMockRule, CUST, SVC, INST, ARID, VERS)
 
         when(mex.getVariable("aaiARPath")).thenThrow(new RuntimeException("expected exception"))
 
 
         ExecutionEntity mex = setupMock()
         initUpdateAaiAROrchStatus(mex)
 
-        MockPatchAllottedResource(CUST, SVC, INST, ARID)
+        MockPatchAllottedResource(wireMockRule, CUST, SVC, INST, ARID)
 
         DoDeleteAllottedResourceTXC DoDeleteAllottedResourceTXC = new DoDeleteAllottedResourceTXC()
         DoDeleteAllottedResourceTXC.updateAaiAROrchStatus(mex, "success")
         ExecutionEntity mex = setupMock()
         initDeleteAaiAR(mex)
 
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceTXC/arGetById.xml")
-        MockDeleteAllottedResource(CUST, SVC, INST, ARID, VERS)
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceTXC/arGetById.xml")
+        MockDeleteAllottedResource(wireMockRule, CUST, SVC, INST, ARID, VERS)
 
         DoDeleteAllottedResourceTXC DoDeleteAllottedResourceTXC = new DoDeleteAllottedResourceTXC()
         DoDeleteAllottedResourceTXC.deleteAaiAR(mex)
         ExecutionEntity mex = setupMock()
         initDeleteAaiAR(mex)
 
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceTXC/arGetById.xml")
-        MockDeleteAllottedResource(CUST, SVC, INST, ARID, VERS)
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceTXC/arGetById.xml")
+        MockDeleteAllottedResource(wireMockRule, CUST, SVC, INST, ARID, VERS)
 
         when(mex.getVariable("aaiARPath")).thenReturn("")
 
         ExecutionEntity mex = setupMock()
         initDeleteAaiAR(mex)
 
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceTXC/arGetById.xml")
-        MockDeleteAllottedResource(CUST, SVC, INST, ARID, VERS)
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceTXC/arGetById.xml")
+        MockDeleteAllottedResource(wireMockRule, CUST, SVC, INST, ARID, VERS)
 
         when(mex.getVariable("aaiARPath")).thenThrow(new BpmnError("expected exception"))
 
         ExecutionEntity mex = setupMock()
         initDeleteAaiAR(mex)
 
-        MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceTXC/arGetById.xml")
-        MockDeleteAllottedResource(CUST, SVC, INST, ARID, VERS)
+        MockGetAllottedResource(wireMockRule, CUST, SVC, INST, ARID, "VCPE/DoDeleteAllottedResourceTXC/arGetById.xml")
+        MockDeleteAllottedResource(wireMockRule, CUST, SVC, INST, ARID, VERS)
 
         when(mex.getVariable("aaiARPath")).thenThrow(new RuntimeException("expected exception"))
 
 
                                                        </configuration>
                                                </execution>
                                        </executions>
+                                       <configuration>
+                                               <parallel>suites</parallel>
+                                       </configuration>
                                </plugin>
                        </plugins>
                </pluginManagement>
 
                         </configuration>
                     </execution>
                 </executions>
+                <configuration>
+                    <parallel>suites</parallel>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>io.swagger</groupId>
 
 import org.onap.so.client.sdnc.SDNCClient;
 import org.onap.so.client.sniro.SniroClient;
 import org.onap.so.db.catalog.client.CatalogDbClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.github.tomakehurst.wiremock.client.WireMock;
+import com.github.tomakehurst.wiremock.WireMockServer;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = TestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 
        @MockBean
        protected CatalogDbClient catalogDbClient;
+       
+       @Autowired
+       protected WireMockServer wireMockServer;
 
        @Before
        public void baseTestBefore() {
-               WireMock.reset();
+               wireMockServer.resetAll();
        }
        public String readResourceFile(String fileName) {
                InputStream stream;
 
 
 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.urlEqualTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
+import org.onap.so.BaseIntegrationTest;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.AllottedResource;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
 import org.onap.so.bpmn.servicedecomposition.homingobjects.CandidateType;
 import org.onap.so.client.exception.BadResponseException;
 import org.onap.so.client.sniro.beans.SniroManagerRequest;
-import org.onap.so.BaseIntegrationTest;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
        public void testCallSniro_success_1VpnLink() throws BadResponseException, IOException{
        beforeVpnBondingLink("1");
 
-        stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
+        wireMockServer.stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
                        .willReturn(aResponse().withStatus(200)
                 .withHeader("Content-Type", "application/json")
                 .withBody(mockResponse)));
        beforeVpnBondingLink("2");
        beforeVpnBondingLink("3");
 
-        stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
+        wireMockServer.stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
                        .willReturn(aResponse().withStatus(200)
                 .withHeader("Content-Type", "application/json")
                 .withBody(mockResponse)));
        public void testCallSniro_success_3Allotteds() throws BadResponseException, JsonProcessingException{
                beforeAllottedResource();
 
-        stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
+        wireMockServer.stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
                        .willReturn(aResponse().withStatus(200)
                 .withHeader("Content-Type", "application/json")
                 .withBody(mockResponse)));
        public void testCallSniro_success_1Vnf() throws JsonProcessingException, BadResponseException{
                beforeVnf();
 
-        stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
+        wireMockServer.stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
                        .willReturn(aResponse().withStatus(200)
                 .withHeader("Content-Type", "application/json")
                 .withBody(mockResponse)));
                beforeAllottedResource();
                beforeVnf();
 
-        stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
+        wireMockServer.stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
                        .willReturn(aResponse().withStatus(200)
                 .withHeader("Content-Type", "application/json")
                 .withBody(mockResponse)));
                beforeAllottedResource();
 
                mockResponse = "{\"transactionId\": \"123456789\", \"requestId\": \"1234\", \"statusMessage\": \"\", \"requestStatus\": \"failed\"}";
-               stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
+               wireMockServer.stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
                                .willReturn(aResponse().withStatus(200)
                                                .withHeader("Content-Type", "application/json")
                                                .withBody(mockResponse)));
 
 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.urlPathEqualTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+
 import javax.ws.rs.core.Response;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.so.BaseIntegrationTest;
 
                CreateNetworkResponse mockResponse = new CreateNetworkResponse();
                mockResponse.setNetworkCreated(true);
-               stubFor(post(urlPathEqualTo(REST_ENDPOINT))
+               wireMockServer.stubFor(post(urlPathEqualTo(REST_ENDPOINT))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(200)));
 
 
                CreateNetworkError mockResponse = new CreateNetworkError();
                mockResponse.setMessage("Error in create network");
-               stubFor(post(urlPathEqualTo(REST_ENDPOINT))
+               wireMockServer.stubFor(post(urlPathEqualTo(REST_ENDPOINT))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(500)));
 
                DeleteNetworkResponse mockResponse = new DeleteNetworkResponse();
                mockResponse.setNetworkDeleted(true);
 
-               stubFor(delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
+               wireMockServer.stubFor(delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(200)));
 
 
                DeleteNetworkError mockResponse = new DeleteNetworkError();
                mockResponse.setMessage("Error in delete network");
-               stubFor(delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
+               wireMockServer.stubFor(delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(500)));
 
                RollbackNetworkResponse mockResponse = new RollbackNetworkResponse();
                mockResponse.setNetworkRolledBack(true);
 
-               stubFor(delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
+               wireMockServer.stubFor(delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(200)));
 
                RollbackNetworkError mockResponse = new RollbackNetworkError();
                mockResponse.setMessage("Error in rollback network");
 
-               stubFor(delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
+               wireMockServer.stubFor(delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(500)));
 
                QueryNetworkResponse mockResponse = new QueryNetworkResponse();
                mockResponse.setNetworkExists(true);
 
-               stubFor(get(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID)).withQueryParam("cloudSiteId", equalTo(TESTING_ID))
+               wireMockServer.stubFor(get(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID)).withQueryParam("cloudSiteId", equalTo(TESTING_ID))
                                .withQueryParam("tenantId", equalTo(TESTING_ID))
                                .withQueryParam("networkStackId", equalTo("networkStackId")).withQueryParam("skipAAI", equalTo("true"))
                                .withQueryParam("msoRequest.requestId", equalTo("testRequestId"))
                QueryNetworkError mockResponse = new QueryNetworkError();
                mockResponse.setMessage("Error in query network");
 
-               stubFor(get(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID)).withQueryParam("cloudSiteId", equalTo(TESTING_ID))
+               wireMockServer.stubFor(get(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID)).withQueryParam("cloudSiteId", equalTo(TESTING_ID))
                                .withQueryParam("tenantId", equalTo(TESTING_ID))
                                .withQueryParam("networkStackId", equalTo("networkStackId")).withQueryParam("skipAAI", equalTo("true"))
                                .withQueryParam("msoRequest.requestId", equalTo("testRequestId"))
 
                UpdateNetworkResponse mockResponse = new UpdateNetworkResponse();
                mockResponse.setNetworkId("test1");
-               stubFor(put(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
+               wireMockServer.stubFor(put(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(200)));
 
 
                UpdateNetworkResponse mockResponse = new UpdateNetworkResponse();
                mockResponse.setNetworkId("test1");
-               stubFor(put(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
+               wireMockServer.stubFor(put(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(200)));
 
 
                UpdateNetworkError mockResponse = new UpdateNetworkError();
                mockResponse.setMessage("Error in update network");
-               stubFor(put(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
+               wireMockServer.stubFor(put(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(500)));
 
 
 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.urlPathEqualTo;
 import static org.junit.Assert.assertEquals;
 
 
                CreateVfModuleResponse mockResponse = new CreateVfModuleResponse();
                mockResponse.setVfModuleCreated(true);
-               stubFor(post(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules"))
+               wireMockServer.stubFor(post(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(200)));
 
 
                VfModuleExceptionResponse mockResponse = new VfModuleExceptionResponse();
                mockResponse.setMessage("Error in create Vf module");
-               stubFor(post(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules"))
+               wireMockServer.stubFor(post(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(500)));
 
 
                RollbackVfModuleResponse mockResponse = new RollbackVfModuleResponse();
                mockResponse.setVfModuleRolledback(true);
-               stubFor(
-                               delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID + "/rollback"))
+               wireMockServer.stubFor(
+                       delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID + "/rollback"))
                                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(200)));
 
 
                VfModuleExceptionResponse mockResponse = new VfModuleExceptionResponse();
                mockResponse.setMessage("Error in rollback Vf module");
-               stubFor(
-                               delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID + "/rollback"))
+               wireMockServer.stubFor(
+                       delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID + "/rollback"))
                                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(500)));
 
 
                DeleteVfModuleResponse mockResponse = new DeleteVfModuleResponse();
                mockResponse.setVfModuleDeleted(true);
-               stubFor(delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID))
+               wireMockServer.stubFor(delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(200)));
 
 
                VfModuleExceptionResponse mockResponse = new VfModuleExceptionResponse();
                mockResponse.setMessage("Error in delete Vf module");
-               stubFor(delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID))
+               wireMockServer.stubFor(delete(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(500)));
 
 
                UpdateVfModuleResponse mockResponse = new UpdateVfModuleResponse();
                mockResponse.setVfModuleId("test1");
-               stubFor(put(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID))
+               wireMockServer.stubFor(put(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(200)));
 
 
                VfModuleExceptionResponse mockResponse = new VfModuleExceptionResponse();
                mockResponse.setMessage("Error in update Vf module");
-               stubFor(put(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID))
+               wireMockServer.stubFor(put(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody(mapper.writeValueAsString(mockResponse)).withStatus(500)));
 
                QueryVfModuleResponse mockResponse = new QueryVfModuleResponse();
                mockResponse.setVnfId(AAI_VNF_ID);
                mockResponse.setVfModuleId(AAI_VF_MODULE_ID);
-               stubFor(get(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID))
+               wireMockServer.stubFor(get(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID))
                                .withQueryParam("cloudSiteId", equalTo(TESTING_ID))
                                .withQueryParam("tenantId", equalTo(TESTING_ID))
                                .withQueryParam("vfModuleName", equalTo("someName"))
        public void queryVfModuleTestThrowException() throws JsonProcessingException, VnfAdapterClientException {
                VfModuleExceptionResponse mockResponse = new VfModuleExceptionResponse();
                mockResponse.setMessage("Error in update Vf module");
-               stubFor(get(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID))
+               wireMockServer.stubFor(get(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID))
                                .withQueryParam("cloudSiteId", equalTo(TESTING_ID))
                                .withQueryParam("tenantId", equalTo(TESTING_ID))
                                .withQueryParam("vfModuleName", equalTo("someName"))
 
 import org.onap.so.client.adapter.rest.AdapterRestClient;
 import org.onap.so.BaseIntegrationTest;
 
-
-@RunWith(MockitoJUnitRunner.Silent.class)
 public class VnfVolumeAdapterClientIT extends BaseIntegrationTest{
 
        private static final String TESTING_ID = "___TESTING___";
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.delete;
 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 org.junit.Assert.assertTrue;
 
        
        @Test
        public void assignNameGenRequest() throws BadResponseException, IOException{
-               stubFor(post(urlPathEqualTo("/web/service/v1/genNetworkElementName"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/web/service/v1/genNetworkElementName"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                .withBodyFile("NamingClient/AssignResponse.json")
                                .withStatus(HttpStatus.SC_ACCEPTED)));
        }
        @Test
        public void assignNameGenRequestError() throws BadResponseException, IOException{
-               stubFor(post(urlPathEqualTo("/web/service/v1/genNetworkElementName"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/web/service/v1/genNetworkElementName"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                .withBodyFile("NamingClient/ErrorResponse.json")
                                .withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
        }
        @Test
        public void unassignNameGenRequest() throws BadResponseException, IOException{
-               stubFor(delete(urlPathEqualTo("/web/service/v1/genNetworkElementName"))
+               wireMockServer.stubFor(delete(urlPathEqualTo("/web/service/v1/genNetworkElementName"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                .withBodyFile("NamingClient/UnassignResponse.json")
                                .withStatus(HttpStatus.SC_ACCEPTED)));
        }
        @Test
        public void unassignNameGenRequestError() throws BadResponseException, IOException{
-               stubFor(delete(urlPathEqualTo("/web/service/v1/genNetworkElementName"))
+               wireMockServer.stubFor(delete(urlPathEqualTo("/web/service/v1/genNetworkElementName"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                .withBodyFile("NamingClient/ErrorResponse.json")
                                .withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
 
 
 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.urlEqualTo;
 
 import org.junit.Test;
     public void testPostDemands_success() throws BadResponseException, JsonProcessingException {
         String mockResponse = "{\"transactionId\": \"123456789\", \"requestId\": \"1234\", \"statusMessage\": \"status\", \"requestStatus\": \"accepted\"}";
 
-        stubFor(post(urlEqualTo("/api/oof/v1/placement"))
+        wireMockServer.stubFor(post(urlEqualTo("/api/oof/v1/placement"))
                 .willReturn(aResponse().withStatus(200)
                         .withHeader("Content-Type", "application/json")
                         .withBody(mockResponse)));
     public void testAsyncResponse_success() throws BadResponseException, JsonProcessingException {
         String mockResponse = "{\"transactionId\": \"123456789\", \"requestId\": \"1234\", \"statusMessage\": \"status\", \"requestStatus\": \"accepted\"}";
 
-        stubFor(post(urlEqualTo("/api/oof/v1/placement"))
+        wireMockServer.stubFor(post(urlEqualTo("/api/oof/v1/placement"))
                 .willReturn(aResponse().withStatus(200)
                         .withHeader("Content-Type", "application/json")
                         .withBody(mockResponse)));
     public void testPostDemands_error_failed() throws JsonProcessingException, BadResponseException {
         String mockResponse = "{\"transactionId\": \"123456789\", \"requestId\": \"1234\", \"statusMessage\": \"missing data\", \"requestStatus\": \"failed\"}";
 
-        stubFor(post(urlEqualTo("/api/oof/v1/placement"))
+        wireMockServer.stubFor(post(urlEqualTo("/api/oof/v1/placement"))
                 .willReturn(aResponse().withStatus(200)
                         .withHeader("Content-Type", "application/json")
                         .withBody(mockResponse)));
     public void testPostDemands_error_noMessage() throws JsonProcessingException, BadResponseException {
         String mockResponse = "{\"transactionId\": \"123456789\", \"requestId\": \"1234\", \"statusMessage\": \"\", \"requestStatus\": \"failed\"}";
 
-        stubFor(post(urlEqualTo("/api/oof/v1/placement"))
+        wireMockServer.stubFor(post(urlEqualTo("/api/oof/v1/placement"))
                 .willReturn(aResponse().withStatus(200)
                         .withHeader("Content-Type", "application/json")
                         .withBody(mockResponse)));
     public void testPostDemands_error_noStatus() throws JsonProcessingException, BadResponseException {
         String mockResponse = "{\"transactionId\": \"123456789\", \"requestId\": \"1234\", \"statusMessage\": \"missing data\", \"requestStatus\": null}";
 
-        stubFor(post(urlEqualTo("/api/oof/v1/placement"))
+        wireMockServer.stubFor(post(urlEqualTo("/api/oof/v1/placement"))
                 .willReturn(aResponse().withStatus(200)
                         .withHeader("Content-Type", "application/json")
                         .withBody(mockResponse)));
     public void testPostDemands_error_empty() throws JsonProcessingException, BadResponseException {
         String mockResponse = "{ }";
 
-        stubFor(post(urlEqualTo("/api/oof/v1/placement"))
+        wireMockServer.stubFor(post(urlEqualTo("/api/oof/v1/placement"))
                 .willReturn(aResponse().withStatus(200)
                         .withHeader("Content-Type", "application/json")
                         .withBody(mockResponse)));
 
 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.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 
        String responseJson =  new String(Files.readAllBytes(Paths.get(JSON_FILE_LOCATION + "SDNCClientGetResponse.json")));
        String queryLink = "/topologyQuery";            
                                     
-       stubFor(get(urlEqualTo(queryLink))
+       wireMockServer.stubFor(get(urlEqualTo(queryLink))
                 .willReturn(aResponse().withStatus(200)
                         .withHeader("Content-Type", "application/json").withBody(responseJson)));
         String response = SPY_sdncClient.get(queryLink);
         
        String queryLink = "/restconf/operations/GENERIC-RESOURCE-API:network-topology-operation/";
                        
-       stubFor(post(urlMatching(queryLink))
+       wireMockServer.stubFor(post(urlMatching(queryLink))
                 .willReturn(aResponse().withStatus(200)
                         .withHeader("Content-Type", "application/json").withBody(responseJson)));
        
         
        String queryLink = "/restconf/operations/GENERIC-RESOURCE-API:network-topology-operation/";
                        
-       stubFor(post(urlMatching(queryLink))
+       wireMockServer.stubFor(post(urlMatching(queryLink))
                 .willReturn(aResponse().withStatus(200)
                         .withHeader("Content-Type", "application/json").withBody(responseJson)));
        
 
 
 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.urlEqualTo;
 
 import org.junit.Test;
     public void testPostDemands_success() throws BadResponseException, JsonProcessingException {
         String mockResponse = "{\"transactionId\": \"123456789\", \"requestId\": \"1234\", \"statusMessage\": \"corys cool\", \"requestStatus\": \"accepted\"}";
 
-        stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
+        wireMockServer.stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
                                .willReturn(aResponse().withStatus(200)
                     .withHeader("Content-Type", "application/json")
                     .withBody(mockResponse)));
     public void testPostDemands_error_failed() throws JsonProcessingException, BadResponseException {
        String mockResponse = "{\"transactionId\": \"123456789\", \"requestId\": \"1234\", \"statusMessage\": \"missing data\", \"requestStatus\": \"failed\"}";
 
-       stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
+       wireMockServer.stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
                        .willReturn(aResponse().withStatus(200)
                                        .withHeader("Content-Type", "application/json")
                                        .withBody(mockResponse)));
     public void testPostDemands_error_noMessage() throws JsonProcessingException, BadResponseException {
        String mockResponse = "{\"transactionId\": \"123456789\", \"requestId\": \"1234\", \"statusMessage\": \"\", \"requestStatus\": \"failed\"}";
 
-       stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
+       wireMockServer.stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
                        .willReturn(aResponse().withStatus(200)
                                        .withHeader("Content-Type", "application/json")
                                        .withBody(mockResponse)));
     public void testPostDemands_error_noStatus() throws JsonProcessingException, BadResponseException {
        String mockResponse = "{\"transactionId\": \"123456789\", \"requestId\": \"1234\", \"statusMessage\": \"missing data\", \"requestStatus\": null}";
 
-       stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
+       wireMockServer.stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
                        .willReturn(aResponse().withStatus(200)
                                        .withHeader("Content-Type", "application/json")
                                        .withBody(mockResponse)));
     public void testPostDemands_error_empty() throws JsonProcessingException, BadResponseException {
        String mockResponse = "{ }";
 
-       stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
+       wireMockServer.stubFor(post(urlEqualTo("/sniro/api/placement/v2"))
                        .willReturn(aResponse().withStatus(200)
                                        .withHeader("Content-Type", "application/json")
                                        .withBody(mockResponse)));
     public void testPostRelease_success() throws BadResponseException, JsonProcessingException {
         String mockResponse = "{\"status\": \"success\", \"message\": \"corys cool\"}";
 
-        stubFor(post(urlEqualTo("/v1/release-orders"))
+        wireMockServer.stubFor(post(urlEqualTo("/v1/release-orders"))
                                .willReturn(aResponse().withStatus(200)
                     .withHeader("Content-Type", "application/json")
                     .withBody(mockResponse)));
     public void testPostRelease_error_failed() throws BadResponseException, JsonProcessingException {
         String mockResponse = "{\"status\": \"failure\", \"message\": \"corys cool\"}";
 
-        stubFor(post(urlEqualTo("/v1/release-orders"))
+        wireMockServer.stubFor(post(urlEqualTo("/v1/release-orders"))
                                .willReturn(aResponse().withStatus(200)
                     .withHeader("Content-Type", "application/json")
                     .withBody(mockResponse)));
     public void testPostRelease_error_noStatus() throws BadResponseException, JsonProcessingException {
         String mockResponse = "{\"status\": \"\", \"message\": \"corys cool\"}";
 
-        stubFor(post(urlEqualTo("/v1/release-orders"))
+        wireMockServer.stubFor(post(urlEqualTo("/v1/release-orders"))
                                .willReturn(aResponse().withStatus(200)
                     .withHeader("Content-Type", "application/json")
                     .withBody(mockResponse)));
     public void testPostRelease_error_noMessage() throws BadResponseException, JsonProcessingException {
         String mockResponse = "{\"status\": \"failure\", \"message\": null}";
 
-        stubFor(post(urlEqualTo("/v1/release-orders"))
+        wireMockServer.stubFor(post(urlEqualTo("/v1/release-orders"))
                                .willReturn(aResponse().withStatus(200)
                     .withHeader("Content-Type", "application/json")
                     .withBody(mockResponse)));
     public void testPostRelease_error_empty() throws BadResponseException, JsonProcessingException {
         String mockResponse = "{ }";
 
-        stubFor(post(urlEqualTo("/v1/release-orders"))
+        wireMockServer.stubFor(post(urlEqualTo("/v1/release-orders"))
                                .willReturn(aResponse().withStatus(200)
                     .withHeader("Content-Type", "application/json")
                     .withBody(mockResponse)));
 
 import static com.github.tomakehurst.wiremock.client.WireMock.exactly;
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.verify;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import java.net.MalformedURLException;
 import java.net.URL;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.onap.so.utils.TargetEntity;
 
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
 public class HttpClientTest{
 
 
        @Test
        public void testPost_success() throws MalformedURLException{
 
-        stubFor(post(urlEqualTo("/services/sdnc/post"))
+               wireMockRule.stubFor(post(urlEqualTo("/services/sdnc/post"))
                        .willReturn(aResponse().withStatus(200)
                 .withHeader("Content-Type", "application/json")
                 .withBody("")));
     @Test
        public void testPost_nullHeader() throws MalformedURLException{
 
-        stubFor(post(urlEqualTo("/services/sdnc/post"))
+       wireMockRule.stubFor(post(urlEqualTo("/services/sdnc/post"))
                        .willReturn(aResponse().withStatus(200)
                 .withHeader("Content-Type", "application/json")
                 .withBody("")));
     @Test
        public void testPost_nullBasicAuth() throws MalformedURLException{
 
-        stubFor(post(urlEqualTo("/services/sdnc/post"))
+       wireMockRule.stubFor(post(urlEqualTo("/services/sdnc/post"))
                        .willReturn(aResponse().withStatus(200)
                 .withHeader("Content-Type", "application/json")
                 .withBody("")));
 
 
 package org.onap.so.client.aai;
 
-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.urlMatching;
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.doNothing;
 import java.util.Optional;
 import java.util.UUID;
 
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.so.client.aai.entities.Configuration;
 import org.onap.so.client.aai.entities.uri.AAIResourceUri;
-import org.onap.so.client.aai.entities.uri.AAIUri;
 import org.onap.so.client.aai.entities.uri.AAIUriFactory;
 import org.onap.so.serviceinstancebeans.ModelInfo;
 import org.onap.so.serviceinstancebeans.RequestDetails;
-
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
 @RunWith(MockitoJUnitRunner.class) 
 public class AAIConfigurationClientTest {
 
-       @Rule
-       public WireMockRule wireMockRule = new WireMockRule(wireMockConfig().port(8443));
-       
        @Mock
        AAIResourcesClient aaiClient;
        
                AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.CONFIGURATION, uuid);
                assertEquals(uri, aaiConfigurationClient.getConfigurationURI(uuid));
        }
-       
-       @Test
-       public void verifyNotExists() {
-               AAIUri path = AAIUriFactory.createResourceUri(AAIObjectType.CONFIGURATION, "test2");
-               wireMockRule.stubFor(get(
-                               urlMatching("/aai/v[0-9]+" + path.build() + ".*"))
-                               .willReturn(
-                                       aResponse()
-                                       .withHeader("Content-Type", "text/plain")
-                                       .withBody("hello")
-                                       .withStatus(404)));
-               boolean result = aaiConfigurationClient.configurationExists("test2");
-               assertEquals("path not found", false, result);
-       }
 }
 
 public class AAIResourcesClientWithServiceInstanceUriTest {
 
        @Rule
-       public WireMockRule wireMockRule = new WireMockRule(wireMockConfig().port(8443));
+       public WireMockRule wireMockRule = new WireMockRule(wireMockConfig().dynamicPort());
        
        @Rule
        public ExpectedException thrown = ExpectedException.none();
        private ServiceInstanceUri uri;
        @Before
        public void setUp() {
-               
-               doReturn(new DefaultAAIPropertiesImpl()).when(client).getRestProperties();
+               doReturn(new DefaultAAIPropertiesImpl(wireMockRule.port())).when(client).getRestProperties();
                wireMockRule.stubFor(get(urlMatching("/aai/v[0-9]+/nodes.*")) 
                                .willReturn(aResponse() 
                                        .withStatus(404) 
 
 
 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.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 import static org.hamcrest.MatcherAssert.assertThat;
                ServiceInstanceUri spy = spy(instance);
                AAIResourcesClient client = aaiClient;
                doReturn(client).when(spy).getResourcesClient();
-               stubFor(get(urlPathMatching("/aai/v[0-9]+/nodes/service-instances/service-instance/key3")) 
+               wireMockRule.stubFor(get(urlPathMatching("/aai/v[0-9]+/nodes/service-instances/service-instance/key3")) 
                                .willReturn(aResponse() 
                                        .withStatus(404) 
                                        .withHeader("Content-Type", "application/json") 
 
                                                        <includes>
                                                                <include>**/AllTestsTestSuite.java</include>
                                                        </includes>
+                                                       <parallel>suites</parallel>
                                                </configuration>
                                        </execution>
                                </executions>
 
 
 package org.onap.so.apihandlerinfra;
 
-import com.github.tomakehurst.wiremock.client.WireMock;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import javax.transaction.Transactional;
+
 import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import javax.transaction.Transactional;
-
-import java.nio.file.Files;
-import java.nio.file.Paths;
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = ApiHandlerApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
        @LocalServerPort
        private int port;
        
+       @Autowired
+       protected WireMockServer wireMockServer;
+       
        protected String createURLWithPort(String uri) {
                return "http://localhost:" + port + uri;
        }
        
        @After
        public void tearDown(){
-               WireMock.reset();
+               wireMockServer.resetAll();
        }
 
        public static String getResponseTemplate;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson;
 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;
        
        @Before
        public void init() throws JsonProcessingException {
-               stubFor(post(urlPathEqualTo("/testOrchestrationUri"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/testOrchestrationUri"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(post(urlPathEqualTo("/infraActiveRequests/")).withRequestBody(equalToJson("{\"clientRequestId\":null,\"action\":null,\"requestStatus\":\"FAILED\",\"statusMessage\":\"Error parsing request: No valid requestorId is specified\",\"progress\":100,\"startTime\":1533541051247,\"endTime\":1533541051247,\"source\":null,\"vnfId\":null,\"vnfName\":null,\"vnfType\":null,\"serviceType\":null,\"aicNodeClli\":null,\"tenantId\":null,\"provStatus\":null,\"vnfParams\":null,\"vnfOutputs\":null,\"requestBody\":\"{\\r\\n   \\\"service\\\":{\\r\\n      \\\"name\\\":\\\"so_test4\\\",\\r\\n      \\\"description\\\":\\\"so_test2\\\",\\r\\n      \\\"serviceInvariantUuid\\\":\\\"60c3e96e-0970-4871-b6e0-3b6de7561519\\\",\\r\\n      \\\"serviceUuid\\\":\\\"592f9437-a9c0-4303-b9f6-c445bb7e9814\\\",\\r\\n      \\\"globalSubscriberId\\\":\\\"123457\\\",\\r\\n      \\\"serviceType\\\":\\\"voLTE\\\",\\r\\n      \\\"parameters\\\":{\\r\\n         \\\"resources\\\":[\\r\\n            {\\r\\n               \\\"resourceName\\\":\\\"vIMS\\\",\\r\\n               \\\"resourceInvariantUuid\\\":\\\"60c3e96e-0970-4871-b6e0-3b6de7561516\\\",\\r\\n               \\\"resourceUuid\\\":\\\"60c3e96e-0970-4871-b6e0-3b6de7561512\\\",\\r\\n               \\\"parameters\\\":{\\r\\n                  \\\"locationConstraints\\\":[\\r\\n                     {\\r\\n                        \\\"vnfProfileId\\\":\\\"zte-vBAS-1.0\\\",\\r\\n                        \\\"locationConstraints\\\":{\\r\\n                           \\\"vimId\\\":\\\"4050083f-465f-4838-af1e-47a545222ad0\\\"\\r\\n                        }\\r\\n                     },\\r\\n                     {\\r\\n                        \\\"vnfProfileId\\\":\\\"zte-vMME-1.0\\\",\\r\\n                        \\\"locationConstraints\\\":{\\r\\n                           \\\"vimId\\\":\\\"4050083f-465f-4838-af1e-47a545222ad0\\\"\\r\\n                        }\\r\\n                     }\\r\\n                  ]\\r\\n               }\\r\\n            },\\r\\n            {\\r\\n               \\\"resourceName\\\":\\\"vEPC\\\",\\r\\n               \\\"resourceInvariantUuid\\\":\\\"61c3e96e-0970-4871-b6e0-3b6de7561516\\\",\\r\\n               \\\"resourceUuid\\\":\\\"62c3e96e-0970-4871-b6e0-3b6de7561512\\\",\\r\\n               \\\"parameters\\\":{\\r\\n                  \\\"locationConstraints\\\":[\\r\\n                     {\\r\\n                        \\\"vnfProfileId\\\":\\\"zte-CSCF-1.0\\\",\\r\\n                        \\\"locationConstraints\\\":{\\r\\n                           \\\"vimId\\\":\\\"4050083f-465f-4838-af1e-47a545222ad1\\\"\\r\\n                        }\\r\\n                     }\\r\\n                  ]\\r\\n               }\\r\\n            },\\r\\n            {\\r\\n               \\\"resourceName\\\":\\\"underlayvpn\\\",\\r\\n               \\\"resourceInvariantUuid\\\":\\\"60c3e96e-0970-4871-b6e0-3b6de7561513\\\",\\r\\n               \\\"resourceUuid\\\":\\\"60c3e96e-0970-4871-b6e0-3b6de7561514\\\",\\r\\n               \\\"parameters\\\":{\\r\\n                  \\\"locationConstraints\\\":[\\r\\n\\r\\n                  ]\\r\\n               }\\r\\n            },\\r\\n            {\\r\\n               \\\"resourceName\\\":\\\"overlayvpn\\\",\\r\\n               \\\"resourceInvariantUuid\\\":\\\"60c3e96e-0970-4871-b6e0-3b6de7561517\\\",\\r\\n               \\\"resourceUuid\\\":\\\"60c3e96e-0970-4871-b6e0-3b6de7561518\\\",\\r\\n               \\\"parameters\\\":{\\r\\n                  \\\"locationConstraints\\\":[\\r\\n\\r\\n                  ]\\r\\n               }\\r\\n            }\\r\\n         ],\\r\\n         \\\"requestInputs\\\":{\\r\\n            \\\"externalDataNetworkName\\\":\\\"Flow_out_net\\\",\\r\\n            \\\"m6000_mng_ip\\\":\\\"181.18.20.2\\\",\\r\\n            \\\"externalCompanyFtpDataNetworkName\\\":\\\"Flow_out_net\\\",\\r\\n            \\\"externalPluginManageNetworkName\\\":\\\"plugin_net_2014\\\",\\r\\n            \\\"externalManageNetworkName\\\":\\\"mng_net_2017\\\",\\r\\n            \\\"sfc_data_network\\\":\\\"sfc_data_net_2016\\\",\\r\\n            \\\"NatIpRange\\\":\\\"210.1.1.10-210.1.1.20\\\",\\r\\n            \\\"location\\\":\\\"4050083f-465f-4838-af1e-47a545222ad0\\\",\\r\\n            \\\"sdncontroller\\\":\\\"9b9f02c0-298b-458a-bc9c-be3692e4f35e\\\"\\r\\n         }\\r\\n      }\\r\\n\\r\\n   }\\r\\n\\r\\n}\",\"responseBody\":null,\"lastModifiedBy\":\"APIH\",\"modifyTime\":null,\"requestType\":null,\"volumeGroupId\":null,\"volumeGroupName\":null,\"vfModuleId\":null,\"vfModuleName\":null,\"vfModuleModelName\":null,\"aaiServiceId\":null,\"aicCloudRegion\":null,\"callBackUrl\":null,\"correlator\":null,\"serviceInstanceId\":null,\"serviceInstanceName\":null,\"requestScope\":\"service\",\"requestAction\":\"createInstance\",\"networkId\":null,\"networkName\":null,\"networkType\":null,\"requestorId\":null,\"configurationId\":null,\"configurationName\":null,\"operationalEnvId\":null,\"operationalEnvName\":null,\"requestURI\":\"d167c9d0-1785-4e93-b319-996ebbcc3272\"}")).willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+               wireMockServer.stubFor(post(urlPathEqualTo("/infraActiveRequests/")).withRequestBody(equalToJson("{\"clientRequestId\":null,\"action\":null,\"requestStatus\":\"FAILED\",\"statusMessage\":\"Error parsing request: No valid requestorId is specified\",\"progress\":100,\"startTime\":1533541051247,\"endTime\":1533541051247,\"source\":null,\"vnfId\":null,\"vnfName\":null,\"vnfType\":null,\"serviceType\":null,\"aicNodeClli\":null,\"tenantId\":null,\"provStatus\":null,\"vnfParams\":null,\"vnfOutputs\":null,\"requestBody\":\"{\\r\\n   \\\"service\\\":{\\r\\n      \\\"name\\\":\\\"so_test4\\\",\\r\\n      \\\"description\\\":\\\"so_test2\\\",\\r\\n      \\\"serviceInvariantUuid\\\":\\\"60c3e96e-0970-4871-b6e0-3b6de7561519\\\",\\r\\n      \\\"serviceUuid\\\":\\\"592f9437-a9c0-4303-b9f6-c445bb7e9814\\\",\\r\\n      \\\"globalSubscriberId\\\":\\\"123457\\\",\\r\\n      \\\"serviceType\\\":\\\"voLTE\\\",\\r\\n      \\\"parameters\\\":{\\r\\n         \\\"resources\\\":[\\r\\n            {\\r\\n               \\\"resourceName\\\":\\\"vIMS\\\",\\r\\n               \\\"resourceInvariantUuid\\\":\\\"60c3e96e-0970-4871-b6e0-3b6de7561516\\\",\\r\\n               \\\"resourceUuid\\\":\\\"60c3e96e-0970-4871-b6e0-3b6de7561512\\\",\\r\\n               \\\"parameters\\\":{\\r\\n                  \\\"locationConstraints\\\":[\\r\\n                     {\\r\\n                        \\\"vnfProfileId\\\":\\\"zte-vBAS-1.0\\\",\\r\\n                        \\\"locationConstraints\\\":{\\r\\n                           \\\"vimId\\\":\\\"4050083f-465f-4838-af1e-47a545222ad0\\\"\\r\\n                        }\\r\\n                     },\\r\\n                     {\\r\\n                        \\\"vnfProfileId\\\":\\\"zte-vMME-1.0\\\",\\r\\n                        \\\"locationConstraints\\\":{\\r\\n                           \\\"vimId\\\":\\\"4050083f-465f-4838-af1e-47a545222ad0\\\"\\r\\n                        }\\r\\n                     }\\r\\n                  ]\\r\\n               }\\r\\n            },\\r\\n            {\\r\\n               \\\"resourceName\\\":\\\"vEPC\\\",\\r\\n               \\\"resourceInvariantUuid\\\":\\\"61c3e96e-0970-4871-b6e0-3b6de7561516\\\",\\r\\n               \\\"resourceUuid\\\":\\\"62c3e96e-0970-4871-b6e0-3b6de7561512\\\",\\r\\n               \\\"parameters\\\":{\\r\\n                  \\\"locationConstraints\\\":[\\r\\n                     {\\r\\n                        \\\"vnfProfileId\\\":\\\"zte-CSCF-1.0\\\",\\r\\n                        \\\"locationConstraints\\\":{\\r\\n                           \\\"vimId\\\":\\\"4050083f-465f-4838-af1e-47a545222ad1\\\"\\r\\n                        }\\r\\n                     }\\r\\n                  ]\\r\\n               }\\r\\n            },\\r\\n            {\\r\\n               \\\"resourceName\\\":\\\"underlayvpn\\\",\\r\\n               \\\"resourceInvariantUuid\\\":\\\"60c3e96e-0970-4871-b6e0-3b6de7561513\\\",\\r\\n               \\\"resourceUuid\\\":\\\"60c3e96e-0970-4871-b6e0-3b6de7561514\\\",\\r\\n               \\\"parameters\\\":{\\r\\n                  \\\"locationConstraints\\\":[\\r\\n\\r\\n                  ]\\r\\n               }\\r\\n            },\\r\\n            {\\r\\n               \\\"resourceName\\\":\\\"overlayvpn\\\",\\r\\n               \\\"resourceInvariantUuid\\\":\\\"60c3e96e-0970-4871-b6e0-3b6de7561517\\\",\\r\\n               \\\"resourceUuid\\\":\\\"60c3e96e-0970-4871-b6e0-3b6de7561518\\\",\\r\\n               \\\"parameters\\\":{\\r\\n                  \\\"locationConstraints\\\":[\\r\\n\\r\\n                  ]\\r\\n               }\\r\\n            }\\r\\n         ],\\r\\n         \\\"requestInputs\\\":{\\r\\n            \\\"externalDataNetworkName\\\":\\\"Flow_out_net\\\",\\r\\n            \\\"m6000_mng_ip\\\":\\\"181.18.20.2\\\",\\r\\n            \\\"externalCompanyFtpDataNetworkName\\\":\\\"Flow_out_net\\\",\\r\\n            \\\"externalPluginManageNetworkName\\\":\\\"plugin_net_2014\\\",\\r\\n            \\\"externalManageNetworkName\\\":\\\"mng_net_2017\\\",\\r\\n            \\\"sfc_data_network\\\":\\\"sfc_data_net_2016\\\",\\r\\n            \\\"NatIpRange\\\":\\\"210.1.1.10-210.1.1.20\\\",\\r\\n            \\\"location\\\":\\\"4050083f-465f-4838-af1e-47a545222ad0\\\",\\r\\n            \\\"sdncontroller\\\":\\\"9b9f02c0-298b-458a-bc9c-be3692e4f35e\\\"\\r\\n         }\\r\\n      }\\r\\n\\r\\n   }\\r\\n\\r\\n}\",\"responseBody\":null,\"lastModifiedBy\":\"APIH\",\"modifyTime\":null,\"requestType\":null,\"volumeGroupId\":null,\"volumeGroupName\":null,\"vfModuleId\":null,\"vfModuleName\":null,\"vfModuleModelName\":null,\"aaiServiceId\":null,\"aicCloudRegion\":null,\"callBackUrl\":null,\"correlator\":null,\"serviceInstanceId\":null,\"serviceInstanceName\":null,\"requestScope\":\"service\",\"requestAction\":\"createInstance\",\"networkId\":null,\"networkName\":null,\"networkType\":null,\"requestorId\":null,\"configurationId\":null,\"configurationName\":null,\"operationalEnvId\":null,\"operationalEnvName\":null,\"requestURI\":\"d167c9d0-1785-4e93-b319-996ebbcc3272\"}")).willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                .withStatus(HttpStatus.SC_OK)));
                Service defaultService = new Service();
                defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a");
                serviceRecipe.setRecipeTimeout(180);
                serviceRecipe.setOrchestrationUri("/testOrchestrationUri");
 
-               stubFor(get(urlPathEqualTo("/service/search/findFirstByModelNameOrderByModelVersionDesc"))
+               wireMockServer.stubFor(get(urlPathEqualTo("/service/search/findFirstByModelNameOrderByModelVersionDesc"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(defaultService))
                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlPathEqualTo("/serviceRecipe/search/findFirstByServiceModelUUIDAndAction"))
+               wireMockServer.stubFor(get(urlPathEqualTo("/serviceRecipe/search/findFirstByServiceModelUUIDAndAction"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(serviceRecipe))
                                                .withStatus(HttpStatus.SC_OK)));
        @Test
        public void getE2EServiceInstanceNullOperationalStatus() throws IOException{
                String uri = e2eServInstancesUri + "v5/9b9f02c0-298b-458a-bc9c-be3692e4f35e/operations/9b9f02c0-298b-458a-bc9c-be3692e4f35e";
-               stubFor(get(urlPathEqualTo("/operationStatus/search/findOneByServiceIdAndOperationId"))
+               wireMockServer.stubFor(get(urlPathEqualTo("/operationStatus/search/findOneByServiceIdAndOperationId"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
                ResponseEntity<String> response = sendRequest(inputStream("/Request.json"), uri, HttpMethod.GET);
                OperationStatus status = new OperationStatus();
                status.setOperationId("operationId");
                status.setServiceId("9b9f02c0-298b-458a-bc9c-be3692e4f35e");
-               stubFor(get(urlPathEqualTo("/operationStatus/search/findOneByServiceIdAndOperationId"))
+               wireMockServer.stubFor(get(urlPathEqualTo("/operationStatus/search/findOneByServiceIdAndOperationId"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(status))
                                                .withStatus(HttpStatus.SC_OK)));
        }
        @Test
        public void compareModelWithTargetVersion() throws IOException{
-               stubFor(post(urlPathEqualTo("/mso/async/services/CompareModelofE2EServiceInstance"))
+               wireMockServer.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)));
                
        }
        @Test
        public void compareModelWithTargetVersionEmptyResponse() throws IOException{
-               stubFor(post(urlPathEqualTo("/mso/async/services/CompareModelofE2EServiceInstance"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/CompareModelofE2EServiceInstance"))
                                .willReturn(aResponse().withFault(Fault.EMPTY_RESPONSE)));
                
                RequestError expectedResponse = new RequestError();
        }
        @Test
        public void compareModelWithTargetVersionBadBpelResponse() throws IOException{
-               stubFor(post(urlPathEqualTo("/mso/async/services/CompareModelofE2EServiceInstance"))
+               wireMockServer.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)));
                
        }
        @Test
        public void compareModelWithTargetVersionNoBPELResponse() throws IOException{
-               stubFor(post(urlPathEqualTo("/mso/async/services/CompareModelofE2EServiceInstance"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/CompareModelofE2EServiceInstance"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json")
                                                .withBody("{}").withStatus(org.apache.http.HttpStatus.SC_BAD_GATEWAY)));
 
 
 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.urlMatching;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
                } catch (MalformedURLException e) {
                        e.printStackTrace();
                } 
-               stubFor(post(urlMatching(".*/infraActiveRequests.*"))
+               wireMockServer.stubFor(post(urlMatching(".*/infraActiveRequests.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
        }
 
     @Test
     public void executeCustomWorkflow() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/VnfInPlaceUpdate"))
+       wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/VnfInPlaceUpdate"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
         
-        stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction[?]" +
+       wireMockServer.stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction[?]" +
                 "nfRole=GR-API-DEFAULT&action=inPlaceSoftwareUpdate"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfRecipeInPlaceUpdate_Response.json"))
 
 
 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.MatcherAssert.assertThat;
 import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
     @Test
     public void testCreateOpEnvObjectMapperError() throws IOException {
         TestAppender.events.clear();
-        stubFor(post(urlPathEqualTo("/sobpmnengine/task/55/complete"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/sobpmnengine/task/55/complete"))
                 .willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_OK)));
 
         String taskId = "55";
     }
     @Test
     public void completeTaskBpelResponseError() throws IOException {
-        stubFor(post(urlPathEqualTo("/sobpmnengine/task/55/complete"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/sobpmnengine/task/55/complete"))
                 .willReturn(aResponse().withHeader("Content-Type", "application/json").withFault(Fault.EMPTY_RESPONSE)));
 
         String taskId = "55";
 
 import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson;
 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.MatcherAssert.assertThat;
 import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
 
     public void setupTestGetOrchestrationRequest() throws Exception{
         //For testGetOrchestrationRequest
-        stubFor(any(urlPathEqualTo("/infraActiveRequests/00032ab7-na18-42e5-965d-8ea592502018")).willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+        wireMockServer.stubFor(any(urlPathEqualTo("/infraActiveRequests/00032ab7-na18-42e5-965d-8ea592502018")).willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                 .withBody(new String(Files.readAllBytes(Paths.get("src/test/resources/OrchestrationRequest/getOrchestrationRequest.json"))))
                 .withStatus(HttpStatus.SC_OK)));
-        stubFor(get(urlPathEqualTo("/requestProcessingData/search/findBySoRequestIdOrderByGroupingIdDesc/"))
+        wireMockServer.stubFor(get(urlPathEqualTo("/requestProcessingData/search/findBySoRequestIdOrderByGroupingIdDesc/"))
                        .withQueryParam("SO_REQUEST_ID", equalTo("00032ab7-na18-42e5-965d-8ea592502018"))
                        .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                 .withBody(new String(Files.readAllBytes(Paths.get("src/test/resources/OrchestrationRequest/getRequestProcessingData.json"))))
     }
     public void setupTestGetOrchestrationRequestInstanceGroup() throws Exception{
         //For testGetOrchestrationRequest
-        stubFor(any(urlPathEqualTo("/infraActiveRequests/00032ab7-na18-42e5-965d-8ea592502018")).willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+        wireMockServer.stubFor(any(urlPathEqualTo("/infraActiveRequests/00032ab7-na18-42e5-965d-8ea592502018")).willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                 .withBody(new String(Files.readAllBytes(Paths.get("src/test/resources/OrchestrationRequest/getOrchestrationRequestInstanceGroup.json"))))
                 .withStatus(HttpStatus.SC_OK)));
-        stubFor(get(urlPathEqualTo("/requestProcessingData/search/findBySoRequestIdOrderByGroupingIdDesc/"))
+        wireMockServer.stubFor(get(urlPathEqualTo("/requestProcessingData/search/findBySoRequestIdOrderByGroupingIdDesc/"))
                        .withQueryParam("SO_REQUEST_ID", equalTo("00032ab7-na18-42e5-965d-8ea592502018"))
                        .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                 .withBody(new String(Files.readAllBytes(Paths.get("src/test/resources/OrchestrationRequest/getRequestProcessingData.json"))))
     }
 
     private void setupTestGetOrchestrationRequestRequestDetails(String requestId, String status) throws Exception{
-        stubFor(get(urlPathEqualTo(getTestUrl(requestId))).willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+        wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl(requestId))).willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                 .withBody(new String(Files.readAllBytes(Paths.get("src/test/resources/OrchestrationRequest/getOrchestrationRequestDetails.json"))))
                 .withStatus(HttpStatus.SC_OK)));
     }
 
     private void setupTestUnlockOrchestrationRequest(String requestId, String status) {
-        stubFor(get(urlPathEqualTo(getTestUrl(requestId))).willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+        wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl(requestId))).willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                 .withBody(String.format(getResponseTemplate, requestId, status))
                 .withStatus(HttpStatus.SC_OK)));
 
 
 
     private void setupTestUnlockOrchestrationRequest_invalid_Json() {
-        stubFor(get(urlPathEqualTo(getTestUrl(INVALID_REQUEST_ID))).willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+        wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl(INVALID_REQUEST_ID))).willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                 .withStatus(HttpStatus.SC_NOT_FOUND)));
 
     }
 
     private void setupTestUnlockOrchestrationRequest_Valid_Status(String requestID, String status) {
-        stubFor(get(urlPathEqualTo(getTestUrl(requestID))).willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+        wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl(requestID))).willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                 .withBody(String.format(getResponseTemplate, requestID, status))
                 .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(post(urlPathEqualTo(getTestUrl(""))).willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+        wireMockServer.stubFor(post(urlPathEqualTo(getTestUrl(""))).willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                 .withBody(String.format(infraActivePost, requestID))
                 .withStatus(HttpStatus.SC_OK)));
     }
 
     private void setupTestGetOrchestrationRequestFilter() throws Exception{
         //for testGetOrchestrationRequestFilter();
-        stubFor(any(urlPathEqualTo("/infraActiveRequests/getOrchestrationFiltersFromInfraActive/")).withRequestBody(equalToJson("{\"modelType\":[\"EQUALS\",\"vfModule\"]}")).willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+        wireMockServer.stubFor(any(urlPathEqualTo("/infraActiveRequests/getOrchestrationFiltersFromInfraActive/")).withRequestBody(equalToJson("{\"modelType\":[\"EQUALS\",\"vfModule\"]}")).willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                 .withBody(new String(Files.readAllBytes(Paths.get("src/test/resources/OrchestrationRequest/getRequestDetailsFilter.json"))))
                 .withStatus(HttpStatus.SC_OK)));
     }
 
 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.urlMatching;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
                } catch (MalformedURLException e) {
                        e.printStackTrace();
                } 
-               stubFor(post(urlMatching(".*/infraActiveRequests.*"))
+               wireMockServer.stubFor(post(urlMatching(".*/infraActiveRequests.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
        }
                Service defaultService = new Service();
                defaultService.setServiceType("testServiceTypeALaCarte");
        
-       stubFor(get(urlMatching(".*/service/search/.*"))
+               wireMockServer.stubFor(get(urlMatching(".*/service/search/.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(defaultService))
                         .withStatus(HttpStatus.SC_OK)));
                Service defaultService = new Service();
                defaultService.setServiceType("testServiceType");
        
-       stubFor(get(urlMatching(".*/service/0dd91181-49da-446b-b839-cd959a96f04a"))
+               wireMockServer.stubFor(get(urlMatching(".*/service/0dd91181-49da-446b-b839-cd959a96f04a"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(defaultService))
                         .withStatus(HttpStatus.SC_OK)));
                Service defaultService = new Service();
                defaultService.setServiceType("testServiceType");
        
-       stubFor(get(urlMatching(".*/service/0dd91181-49da-446b-b839-cd959a96f04a"))
+               wireMockServer.stubFor(get(urlMatching(".*/service/0dd91181-49da-446b-b839-cd959a96f04a"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withStatus(HttpStatus.SC_NOT_FOUND)));
-       stubFor(get(urlMatching(".*/service/search/.*"))
+               wireMockServer.stubFor(get(urlMatching(".*/service/search/.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(defaultService))
                         .withStatus(HttpStatus.SC_OK)));
     }
     @Test
     public void camundaHistoryCheckTest() throws ContactCamundaException, RequestDbFailureException{
-       stubFor(get(("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
+       wireMockServer.stubFor(get(("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/HistoryCheckResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
        
     }
     @Test
     public void camundaHistoryCheckNoneFoundTest() throws ContactCamundaException, RequestDbFailureException{
-       stubFor(get(("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
+       wireMockServer.stubFor(get(("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody("[]").withStatus(org.apache.http.HttpStatus.SC_OK)));
        
     }
     @Test
     public void camundaHistoryCheckNotInProgressTest()throws ContactCamundaException, RequestDbFailureException{
-       stubFor(get(("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
+       wireMockServer.stubFor(get(("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/HistoryCheckResponseCompleted.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
        
 
 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.urlMatching;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
 import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Paths;
                } catch (MalformedURLException e) {
                        e.printStackTrace();
                } 
-               stubFor(post(urlMatching(".*/infraActiveRequests.*"))
+               wireMockServer.stubFor(post(urlMatching(".*/infraActiveRequests.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
        }
         defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a");
         
         
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/service/search/.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/service/search/.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(defaultService))
                         .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(serviceRecipe))
                         .withStatus(HttpStatus.SC_OK)));
         Service defaultService = new Service();
         defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a");
            
-        stubFor(post(urlPathEqualTo("/mso/async/services/CreateGenericALaCarteServiceInstance"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/CreateGenericALaCarteServiceInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
         
 
-        stubFor(get(urlMatching(".*/service/search/.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/service/search/.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(defaultService))
                         .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(serviceRecipe))
                         .withStatus(HttpStatus.SC_OK)));
         defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a");
 
 
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_BAD_GATEWAY)));
         
 
-        stubFor(get(urlMatching(".*/service/search/.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/service/search/.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(defaultService))
                         .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(serviceRecipe))
                         .withStatus(HttpStatus.SC_OK)));
                Service defaultService = new Service();
                defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a");
                
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withStatus(org.apache.http.HttpStatus.SC_BAD_GATEWAY).withBody("{}")));
         
-               stubFor(get(urlMatching(".*/service/search/.*"))
+               wireMockServer.stubFor(get(urlMatching(".*/service/search/.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(defaultService))
                                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
+               wireMockServer.stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(serviceRecipe))
                                                .withStatus(HttpStatus.SC_OK)));
                Service defaultService = new Service();
                defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a");
                
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withFault(Fault.EMPTY_RESPONSE)));
         
-               stubFor(get(urlMatching(".*/service/search/.*"))
+               wireMockServer.stubFor(get(urlMatching(".*/service/search/.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(defaultService))
                                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
+               wireMockServer.stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(serviceRecipe))
                                                .withStatus(HttpStatus.SC_OK)));
         Service defaultService = new Service();
         defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a");
         
-        stubFor(get(urlMatching(".*/service/search/.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/service/search/.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(defaultService))
                         .withStatus(HttpStatus.SC_OK)));
 
         
-        stubFor(get(urlMatching(".*/serviceRecipe/search/findFirstByServiceModelUUIDAndAction?serviceModelUUID=d88da85c-d9e8-4f73-b837-3a72a431622a&action=activateInstance"))
+        wireMockServer.stubFor(get(urlMatching(".*/serviceRecipe/search/findFirstByServiceModelUUIDAndAction?serviceModelUUID=d88da85c-d9e8-4f73-b837-3a72a431622a&action=activateInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withStatus(HttpStatus.SC_NOT_FOUND)));
 
         uri = servInstanceuri + "v5" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/activate";
         Service defaultService = new Service();
         defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a");
-        stubFor(get(urlMatching(".*/service/search/.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/service/search/.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(defaultService))
                         .withStatus(HttpStatus.SC_OK)));
         
-        stubFor(get(urlMatching(".*/serviceRecipe/search/.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/serviceRecipe/search/.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_NOT_FOUND)));
 
                Service defaultService = new Service();
                defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a");
                
-               stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-               stubFor(get(urlMatching(".*/service/search/.*"))
+               wireMockServer.stubFor(get(urlMatching(".*/service/search/.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(defaultService))
                                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
+               wireMockServer.stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(serviceRecipe))
                                                .withStatus(HttpStatus.SC_OK)));
                Service defaultService = new Service();
                defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a");
 
-               stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-               stubFor(get(urlMatching(".*/service/.*"))
+               wireMockServer.stubFor(get(urlMatching(".*/service/.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(defaultService))
                                                .withStatus(HttpStatus.SC_OK)));
                
-               stubFor(get(urlMatching(".*/service/search/.*"))
+               wireMockServer.stubFor(get(urlMatching(".*/service/search/.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(defaultService))
                                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
+               wireMockServer.stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(serviceRecipe))
                                                .withStatus(HttpStatus.SC_OK)));
                Service defaultService = new Service();
                defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a");
 
-               stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-               stubFor(get(urlMatching(".*/service/.*"))
+               wireMockServer.stubFor(get(urlMatching(".*/service/.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(defaultService))
                                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlMatching(".*/service/search/.*"))
+               wireMockServer.stubFor(get(urlMatching(".*/service/search/.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(defaultService))
                                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
+               wireMockServer.stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(serviceRecipe))
                                                .withStatus(HttpStatus.SC_OK)));
                Service defaultService = new Service();
                defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a");
 
-               stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-               stubFor(get(urlMatching(".*/service/.*"))
+               wireMockServer.stubFor(get(urlMatching(".*/service/.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(defaultService))
                                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlMatching(".*/service/search/.*"))
+               wireMockServer.stubFor(get(urlMatching(".*/service/search/.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(defaultService))
                                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
+               wireMockServer.stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(serviceRecipe))
                                                .withStatus(HttpStatus.SC_OK)));
                Service defaultService = new Service();
                defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a");
 
-               stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-               stubFor(get(urlMatching(".*/service/.*"))
+               wireMockServer.stubFor(get(urlMatching(".*/service/.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(defaultService))
                                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlMatching(".*/service/search/.*"))
+               wireMockServer.stubFor(get(urlMatching(".*/service/search/.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(defaultService))
                                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
+               wireMockServer.stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(serviceRecipe))
                                                .withStatus(HttpStatus.SC_OK)));
     }
     @Test
     public void createPortConfiguration() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
         //expected response
     }
     @Test
     public void deletePortConfiguration() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
     }
     @Test
     public void enablePort() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
         //expected response
     }
     @Test
     public void disablePort() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
         //expected response
     }
     @Test
     public void activatePort() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
         //expected response
     }
     @Test
     public void deactivatePort() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
         //expected response
     }
     @Test
     public void addRelationships() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
         //expected response
     }
     @Test
     public void removeRelationships() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
         //expected response
     }
     @Test
     public void createVnfInstanceNoALaCarte() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
 
-        stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002671"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002671"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfResourceCustomization_ReplaceVnf_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002671/vnfResources"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002671/vnfResources"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfResources_ReplaceVnf_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction[?]nfRole=GR-API-DEFAULT&action=createInstance"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction[?]nfRole=GR-API-DEFAULT&action=createInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfRecipeReplaceInstance_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
     }
     @Test
     public void createVnfInstance() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/service/5df8b6de-2083-11e7-93ae-92361f002672"))
+        wireMockServer.stubFor(get(urlMatching(".*/service/5df8b6de-2083-11e7-93ae-92361f002672"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("serviceVnf_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
-        stubFor(get(urlMatching(".*/service/5df8b6de-2083-11e7-93ae-92361f002672/vnfCustomizations"))
+        wireMockServer.stubFor(get(urlMatching(".*/service/5df8b6de-2083-11e7-93ae-92361f002672/vnfCustomizations"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfResourceCustomizationsList_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
         
         
-        stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002672/vnfResources"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002672/vnfResources"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfResourcesCreateVnf_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction[?]nfRole=GR-API-DEFAULT&action=createInstance"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction[?]nfRole=GR-API-DEFAULT&action=createInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfRecipeCreateInstance_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
     }
     @Test
     public void replaceVnfInstance() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002671"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002671"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfResourceCustomization_ReplaceVnf_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002671/vnfResources"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002671/vnfResources"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfResources_ReplaceVnf_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction[?]nfRole=GR-API-DEFAULT&action=replaceInstance"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction[?]nfRole=GR-API-DEFAULT&action=replaceInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfRecipeReplaceInstance_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
     }
     @Test
     public void replaceVnfRecreateInstance() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/RecreateInfraVce"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/RecreateInfraVce"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002674"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002674"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfResourceCustomization_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002674/vnfResources"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002674/vnfResources"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfResources_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
                
-        stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction[?]nfRole=TEST&action=replaceInstance"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction[?]nfRole=TEST&action=replaceInstance"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(getWiremockResponseForCatalogdb("vnfRecipe_Response.json"))
                                                .withStatus(org.apache.http.HttpStatus.SC_OK)));
     }
     @Test
     public void recreateVnfInstance() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002674"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002674"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfResourceCustomization_Response"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002674/vnfResources"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002674/vnfResources"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfResources_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
                
-        stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction[?]nfRole=GR-API-DEFAULT&action=recreateInstance"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction[?]nfRole=GR-API-DEFAULT&action=recreateInstance"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(getWiremockResponseForCatalogdb("vnfRecipe_ResponseWorkflowAction.json"))
                                                .withStatus(org.apache.http.HttpStatus.SC_OK)));
     }
     @Test
     public void updateVnfInstance() throws IOException {       
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002674"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002674"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfResourceCustomization_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002674/vnfResources"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002674/vnfResources"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfResources_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
         
-        stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction" +
+        wireMockServer.stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction" +
                 "[?]nfRole=GR-API-DEFAULT&action=updateInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("UpdateVnfRecipe_Response.json"))
     }
     @Test
     public void applyUpdatedConfig() throws IOException {                      
-        stubFor(post(urlPathEqualTo("/mso/async/services/VnfConfigUpdate"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/VnfConfigUpdate"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
 
-        stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction" +
+        wireMockServer.stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction" +
                 "[?]nfRole=GR-API-DEFAULT&action=applyUpdatedConfig"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfRecipeApplyUpdatedConfig_Response.json"))
     }
     @Test
     public void deleteVnfInstanceV5() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction" +
+        wireMockServer.stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction" +
                 "[?]nfRole=GR-API-DEFAULT&action=deleteInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfRecipeDelete_Response.json"))
     }
     @Test
     public void createVfModuleInstance() throws IOException {
-        stubFor(get(urlMatching(".*/vfModuleCustomization/cb82ffd8-252a-11e7-93ae-92361f002671"))
+        wireMockServer.stubFor(get(urlMatching(".*/vfModuleCustomization/cb82ffd8-252a-11e7-93ae-92361f002671"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModuleCustomization_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModuleCustomization/cb82ffd8-252a-11e7-93ae-92361f002671/vfModule"))
+        wireMockServer.stubFor(get(urlMatching(".*/vfModuleCustomization/cb82ffd8-252a-11e7-93ae-92361f002671/vfModule"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModule_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModule/20c4431c-246d-11e7-93ae-92361f002671"))
+        wireMockServer.stubFor(get(urlMatching(".*/vfModule/20c4431c-246d-11e7-93ae-92361f002671"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModule_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
            
-           stubFor(post(urlPathEqualTo("/mso/async/services/CreateVfModuleInfra"))
+           wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/CreateVfModuleInfra"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
+        wireMockServer.stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
                 "[?]vfModuleModelUUID=20c4431c-246d-11e7-93ae-92361f002671&vnfComponentType=vfModule&action=createInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfComponentRecipe_Response.json"))
     }
     @Test
     public void createVfModuleInstanceNoModelCustomization() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/CreateVfModuleInfra"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/CreateVfModuleInfra"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfResource/fe6478e4-ea33-3346-ac12-ab121484a3fe"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResource/fe6478e4-ea33-3346-ac12-ab121484a3fe"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfResourceForVfModule_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfResourceCustomization/search/findByModelInstanceNameAndVnfResources" +
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResourceCustomization/search/findByModelInstanceNameAndVnfResources" +
                 "[?]modelInstanceName=test&vnfResourceModelUUID=fe6478e4-ea33-3346-ac12-ab121484a3fe"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfResourceCustomizationForVfModule_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002673/vfModuleCustomizations"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002673/vfModuleCustomizations"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModuleCustomizationsPCM_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModuleCustomization/search/findByModelCustomizationUUIDAndVfModuleModelUUID[?]" +
+        wireMockServer.stubFor(get(urlMatching(".*/vfModuleCustomization/search/findByModelCustomizationUUIDAndVfModuleModelUUID[?]" +
                 "modelCustomizationUUID=b4ea86b4-253f-11e7-93ae-92361f002672&vfModuleModelUUID=066de97e-253e-11e7-93ae-92361f002672"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModuleCustomizationPCM_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002672/vfModule"))
+        wireMockServer.stubFor(get(urlMatching(".*/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002672/vfModule"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModulePCM_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModule/066de97e-253e-11e7-93ae-92361f002672"))
+        wireMockServer.stubFor(get(urlMatching(".*/vfModule/066de97e-253e-11e7-93ae-92361f002672"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModulePCM_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
 
-        stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVnfComponentTypeAndAction" +
+        wireMockServer.stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVnfComponentTypeAndAction" +
                 "[?]vnfComponentType=vfModule&action=createInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfComponentRecipeVNF_API_Response.json"))
     }
     @Test
     public void deleteVfModuleInstanceNoMatchingModelUUD() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfResource/.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResource/.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfResourceForVfModule_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfResourceCustomization/search/findByModelInstanceNameAndVnfResources.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResourceCustomization/search/findByModelInstanceNameAndVnfResources.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfResourceCustomizationForVfModule_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002673/vfModuleCustomizations"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002673/vfModuleCustomizations"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModuleCustomizationsPCM_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002672"))
+        wireMockServer.stubFor(get(urlMatching(".*/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002672"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModuleCustomizationPCM_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002672/vfModule"))
+        wireMockServer.stubFor(get(urlMatching(".*/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002672/vfModule"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModulePCM_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModule/066de97e-253e-11e7-93ae-92361f002672"))
+        wireMockServer.stubFor(get(urlMatching(".*/vfModule/066de97e-253e-11e7-93ae-92361f002672"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModulePCM_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
+        wireMockServer.stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
                 "[?]vfModuleModelUUID=GR-API-DEFAULT&vnfComponentType=vfModule&action=deleteInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfComponentRecipeDeleteVfModule_Response.json"))
     @Test
     public void createVfModuleInstanceNoRecipe() throws IOException {
 
-        stubFor(get(urlMatching(".*/vnfResource/fe6478e4-ea33-3346-ac12-ab121484a3fe"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResource/fe6478e4-ea33-3346-ac12-ab121484a3fe"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfResourceForVfModule_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfResourceCustomization/search/findByModelInstanceNameAndVnfResources" +
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResourceCustomization/search/findByModelInstanceNameAndVnfResources" +
                 "[?]modelInstanceName=test&vnfResourceModelUUID=fe6478e4-ea33-3346-ac12-ab121484a3fe"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfResourceCustomizationForVfModule_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002673/vfModuleCustomizations"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002673/vfModuleCustomizations"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModuleCustomizationsPCM_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModuleCustomization/search/findByModelCustomizationUUIDAndVfModuleModelUUID[?]" +
+        wireMockServer.stubFor(get(urlMatching(".*/vfModuleCustomization/search/findByModelCustomizationUUIDAndVfModuleModelUUID[?]" +
                 "modelCustomizationUUID=b4ea86b4-253f-11e7-93ae-92361f002672&vfModuleModelUUID=066de97e-253e-11e7-93ae-92361f002672"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModuleCustomizationPCM_Response.json"))
     }
     @Test
     public void replaceVfModuleInstance() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
         
-        stubFor(get(urlMatching(".*/vfModule/search/findFirstVfModuleByModelInvariantUUIDAndModelVersion[?]" +
+        wireMockServer.stubFor(get(urlMatching(".*/vfModule/search/findFirstVfModuleByModelInvariantUUIDAndModelVersion[?]" +
                 "modelInvariantUUID=78ca26d0-246d-11e7-93ae-92361f002671&modelVersion=2"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModule_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
+        wireMockServer.stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
                 "[?]vfModuleModelUUID=GR-API-DEFAULT&vnfComponentType=vfModule&action=replaceInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfComponentRecipeDeleteVfModule_Response.json"))
     }
     @Test
     public void updateVfModuleInstance() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModuleCustomization/cb82ffd8-252a-11e7-93ae-92361f002671"))
+        wireMockServer.stubFor(get(urlMatching(".*/vfModuleCustomization/cb82ffd8-252a-11e7-93ae-92361f002671"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModuleCustomization_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModuleCustomization/cb82ffd8-252a-11e7-93ae-92361f002671/vfModule"))
+        wireMockServer.stubFor(get(urlMatching(".*/vfModuleCustomization/cb82ffd8-252a-11e7-93ae-92361f002671/vfModule"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModule_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModule/20c4431c-246d-11e7-93ae-92361f002671"))
+        wireMockServer.stubFor(get(urlMatching(".*/vfModule/20c4431c-246d-11e7-93ae-92361f002671"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModule_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
+        wireMockServer.stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
                 "[?]vfModuleModelUUID=GR-API-DEFAULT&vnfComponentType=vfModule&action=updateInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfComponentRecipe_GRAPI_Response.json"))
     }
     @Test
     public void inPlaceSoftwareUpdate() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/VnfInPlaceUpdate"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/VnfInPlaceUpdate"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
         
-        stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction[?]" +
+        wireMockServer.stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction[?]" +
                 "nfRole=GR-API-DEFAULT&action=inPlaceSoftwareUpdate"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfRecipeInPlaceUpdate_Response.json"))
     
     @Test
     public void deleteVfModuleInstance() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModule/search/findFirstVfModuleByModelInvariantUUIDAndModelVersion[?]" +
+        wireMockServer.stubFor(get(urlMatching(".*/vfModule/search/findFirstVfModuleByModelInvariantUUIDAndModelVersion[?]" +
                 "modelInvariantUUID=78ca26d0-246d-11e7-93ae-92361f002671&modelVersion=2"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModule_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
         
-        stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
+        wireMockServer.stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
                 "[?]vfModuleModelUUID=GR-API-DEFAULT&vnfComponentType=vfModule&action=deleteInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfComponentRecipeDeleteVfModule_Response.json"))
     }
     @Test
     public void deleteVfModuleNoModelInvariantId() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
         
-        stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
+        wireMockServer.stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
                 "[?]vfModuleModelUUID=VNF-API-DEFAULT&vnfComponentType=vfModule&action=deleteInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfComponentRecipeDeleteVfModule_Response.json"))
     }
     @Test
     public void deactivateAndCloudDeleteVfModuleInstance() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModule/search/findFirstVfModuleByModelInvariantUUIDAndModelVersion[?]" +
+        wireMockServer.stubFor(get(urlMatching(".*/vfModule/search/findFirstVfModuleByModelInvariantUUIDAndModelVersion[?]" +
                 "modelInvariantUUID=78ca26d0-246d-11e7-93ae-92361f002671&modelVersion=2"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModule_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
+        wireMockServer.stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
                 "[?]vfModuleModelUUID=GR-API-DEFAULT&vnfComponentType=vfModule&action=deactivateAndCloudDelete"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfComponentRecipeDeactivate_Response.json"))
     }
     @Test
     public void createVolumeGroupInstance() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002671"))
+        wireMockServer.stubFor(get(urlMatching(".*/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002671"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModuleCustomizationVolGrp_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002671/vfModule"))
+        wireMockServer.stubFor(get(urlMatching(".*/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002671/vfModule"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModuleVolGroup_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
+        wireMockServer.stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
                 "[?]vfModuleModelUUID=GR-API-DEFAULT&vnfComponentType=volumeGroup&action=createInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfComponentRecipeVolGrp_GRAPI_Response.json"))
     }
     @Test
     public void updateVolumeGroupInstance() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002671"))
+        wireMockServer.stubFor(get(urlMatching(".*/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002671"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModuleCustomizationVolGrp_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002671/vfModule"))
+        wireMockServer.stubFor(get(urlMatching(".*/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002671/vfModule"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModuleVolGroup_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
+        wireMockServer.stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
                 "[?]vfModuleModelUUID=GR-API-DEFAULT&vnfComponentType=volumeGroup&action=updateInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfComponentRecipeVolGrp_GRAPI_Response.json"))
     }
     @Test
     public void deleteVolumeGroupInstance() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002671"))
+        wireMockServer.stubFor(get(urlMatching(".*/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002671"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModuleCustomizationVolGrp_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002671/vfModule"))
+        wireMockServer.stubFor(get(urlMatching(".*/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002671/vfModule"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModuleVolGroup_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
+        wireMockServer.stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
                 "[?]vfModuleModelUUID=GR-API-DEFAULT&vnfComponentType=volumeGroup&action=deleteInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfComponentRecipeVolGrp_GRAPI_Response.json"))
     }
     @Test
     public void createNetworkInstance() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac"))
+        wireMockServer.stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("networkResourceCustomization_Response.json"))
                         .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac/networkResource"))
+        wireMockServer.stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac/networkResource"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("networkResource_Response.json"))
                         .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/networkRecipe/search/findFirstByModelNameAndAction[?]" +
+        wireMockServer.stubFor(get(urlMatching(".*/networkRecipe/search/findFirstByModelNameAndAction[?]" +
                 "modelName=GR-API-DEFAULT&action=createInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("networkRecipe_Response.json"))
     }
     @Test
     public void updateNetworkInstance() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac"))
+        wireMockServer.stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("networkResourceCustomization_Response.json"))
                         .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac/networkResource"))
+        wireMockServer.stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac/networkResource"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("networkResource_Response.json"))
                         .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/networkRecipe/search/findFirstByModelNameAndAction[?]" +
+        wireMockServer.stubFor(get(urlMatching(".*/networkRecipe/search/findFirstByModelNameAndAction[?]" +
                 "modelName=GR-API-DEFAULT&action=updateInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("networkRecipe_Response.json"))
     }
     @Test
     public void deleteNetworkInstance() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac"))
+        wireMockServer.stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("networkResourceCustomization_Response.json"))
                         .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac/networkResource"))
+        wireMockServer.stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac/networkResource"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                .withBody(getWiremockResponseForCatalogdb("networkResource_Response.json"))
                         .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/networkRecipe/search/findFirstByModelNameAndAction[?]" +
+        wireMockServer.stubFor(get(urlMatching(".*/networkRecipe/search/findFirstByModelNameAndAction[?]" +
                 "modelName=VNF-API-DEFAULT&action=deleteInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("networkRecipe_Response.json"))
     }
     @Test
     public void deleteNetworkInstanceNoReqParams() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/networkRecipe/search/findFirstByModelNameAndAction[?]" +
+        wireMockServer.stubFor(get(urlMatching(".*/networkRecipe/search/findFirstByModelNameAndAction[?]" +
                 "modelName=GR-API-DEFAULT&action=deleteInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("networkRecipe_Response.json"))
 
     @Test
     public void creatServiceInstanceGRTestApiNoCustomRecipeFound() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
         Service defaultService = new Service();
         defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a");
         
-        stubFor(get(urlMatching(".*/service/.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/service/.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(defaultService))
                         .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(serviceRecipe))
                         .withStatus(HttpStatus.SC_OK)));
 
     @Test
     public void createNetworkInstanceTestApiUndefinedUsePropertiesDefault() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac"))
+        wireMockServer.stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("networkResourceCustomization_Response.json"))
                         .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac/networkResource"))
+        wireMockServer.stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac/networkResource"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("networkResource_Response.json"))
                         .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/networkRecipe/search/findFirstByModelNameAndAction[?]" +
+        wireMockServer.stubFor(get(urlMatching(".*/networkRecipe/search/findFirstByModelNameAndAction[?]" +
                 "modelName=GR-API-DEFAULT&action=createInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("networkRecipe_Response.json"))
 
     @Test
     public void createNetworkInstanceTestApiIncorrectUsePropertiesDefault() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
 
     @Test
     public void createNetworkInstanceTestApiGrApi() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac"))
+        wireMockServer.stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("networkResourceCustomization_Response.json"))
                         .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac/networkResource"))
+        wireMockServer.stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac/networkResource"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("networkResource_Response.json"))
                         .withStatus(HttpStatus.SC_OK)));
         
-        stubFor(get(urlMatching(".*/networkRecipe/search/findFirstByModelNameAndAction[?]" +
+        wireMockServer.stubFor(get(urlMatching(".*/networkRecipe/search/findFirstByModelNameAndAction[?]" +
                 "modelName=GR-API-DEFAULT&action=createInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("networkRecipe_Response.json"))
 
     @Test
     public void createNetworkInstanceTestApiVnfApi() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/CreateNetworkInstance"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/CreateNetworkInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac"))
+        wireMockServer.stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("networkResourceCustomization_Response.json"))
                         .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac/networkResource"))
+        wireMockServer.stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac/networkResource"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("networkResource_Response.json"))
                         .withStatus(HttpStatus.SC_OK)));
         
-        stubFor(get(urlMatching(".*/networkRecipe/search/findFirstByModelNameAndAction[?]" +
+        wireMockServer.stubFor(get(urlMatching(".*/networkRecipe/search/findFirstByModelNameAndAction[?]" +
                 "modelName=VNF-API-DEFAULT&action=createInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("networkRecipeVNF_API_Response.json"))
         Service defaultService = new Service();
         defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a");
            
-           stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+           wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/service/.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/service/.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(defaultService))
                         .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(serviceRecipe))
                         .withStatus(HttpStatus.SC_OK)));
         Service defaultService = new Service();
         defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a");
            
-           stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+           wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponseInvalid2.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/service/.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/service/.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(defaultService))
                         .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(serviceRecipe))
                         .withStatus(HttpStatus.SC_OK)));
         Service defaultService = new Service();
         defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a");
            
-           stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+           wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/UnauthorizedResponse.json").withStatus(org.apache.http.HttpStatus.SC_UNAUTHORIZED)));
 
-        stubFor(get(urlMatching(".*/service/.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/service/.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(defaultService))
                         .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(serviceRecipe))
                         .withStatus(HttpStatus.SC_OK)));
         Service defaultService = new Service();
         defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a");
            
-           stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+           wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponseInvalid.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/service/.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/service/.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(defaultService))
                         .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(serviceRecipe))
                         .withStatus(HttpStatus.SC_OK)));
         Service defaultService = new Service();
         defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a");
            
-           stubFor(post(urlPathEqualTo("/mso/async/services/CreateMacroServiceNetworkVnf"))
+           wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/CreateMacroServiceNetworkVnf"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponseInvalid.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/service/.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/service/.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(defaultService))
                         .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(serviceRecipe))
                         .withStatus(HttpStatus.SC_OK)));
     }
     @Test
     public void scaleOutVfModule() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModuleCustomization/cb82ffd8-252a-11e7-93ae-92361f002671"))
+        wireMockServer.stubFor(get(urlMatching(".*/vfModuleCustomization/cb82ffd8-252a-11e7-93ae-92361f002671"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModuleCustomization_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModuleCustomization/cb82ffd8-252a-11e7-93ae-92361f002671/vfModule"))
+        wireMockServer.stubFor(get(urlMatching(".*/vfModuleCustomization/cb82ffd8-252a-11e7-93ae-92361f002671/vfModule"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModule_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vfModule/20c4431c-246d-11e7-93ae-92361f002671"))
+        wireMockServer.stubFor(get(urlMatching(".*/vfModule/20c4431c-246d-11e7-93ae-92361f002671"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModule_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
 
-        stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
+        wireMockServer.stubFor(get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" +
                 "[?]vfModuleModelUUID=GR-API-DEFAULT&vnfComponentType=vfModule&action=scaleOut"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfComponentRecipeVfModuleScaleOut_Response.json")).withStatus(org.apache.http.HttpStatus.SC_OK)));
         
-        stubFor(get(urlMatching(".*/vfModule/search/findByModelInvariantUUIDOrderByModelVersionDesc[?]modelInvariantUUID=78ca26d0-246d-11e7-93ae-92361f002671"))
+        wireMockServer.stubFor(get(urlMatching(".*/vfModule/search/findByModelInvariantUUIDOrderByModelVersionDesc[?]modelInvariantUUID=78ca26d0-246d-11e7-93ae-92361f002671"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vfModulesListByInvariantId_Response.json")).withStatus(org.apache.http.HttpStatus.SC_OK)));
         
           Service defaultService = new Service();
           defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a");
            
-           stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+           wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                   .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                           .withBodyFile("Camunda/TestBadResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-          stubFor(get(urlMatching(".*/service/.*"))
+          wireMockServer.stubFor(get(urlMatching(".*/service/.*"))
                   .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                           .withBody(mapper.writeValueAsString(defaultService))
                           .withStatus(HttpStatus.SC_OK)));
 
-          stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
+          wireMockServer.stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
                   .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                           .withBody(mapper.writeValueAsString(serviceRecipe))
                           .withStatus(HttpStatus.SC_OK)));
     }
     @Test
     public void createServiceInstanceDuplicateError() throws IOException{
-               stubFor(post(urlMatching(".*/infraActiveRequests/checkInstanceNameDuplicate"))
+               wireMockServer.stubFor(post(urlMatching(".*/infraActiveRequests/checkInstanceNameDuplicate"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
           
     }
     @Test
     public void createServiceInstanceDuplicateHistoryCheck() throws IOException{
-               stubFor(post(urlMatching(".*/infraActiveRequests/checkInstanceNameDuplicate"))
+               wireMockServer.stubFor(post(urlMatching(".*/infraActiveRequests/checkInstanceNameDuplicate"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBodyFile("InfraActiveRequests/createInfraActiveRequests.json")
                                                .withStatus(HttpStatus.SC_ACCEPTED)));
-               stubFor(get(("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
+               wireMockServer.stubFor(get(("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/HistoryCheckResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
           
     }
     @Test
     public void createServiceInstanceDuplicateHistoryCheckException() throws IOException{
-               stubFor(post(urlMatching(".*/infraActiveRequests/checkInstanceNameDuplicate"))
+               wireMockServer.stubFor(post(urlMatching(".*/infraActiveRequests/checkInstanceNameDuplicate"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBodyFile("InfraActiveRequests/createInfraActiveRequests.json")
                                                .withStatus(HttpStatus.SC_ACCEPTED)));
-               stubFor(get(("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
+               wireMockServer.stubFor(get(("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withStatus(org.apache.http.HttpStatus.SC_INTERNAL_SERVER_ERROR)));
           
     }
     @Test
     public void createServiceInstanceDuplicate() throws IOException{
-               stubFor(post(urlMatching(".*/infraActiveRequests/checkInstanceNameDuplicate"))
+               wireMockServer.stubFor(post(urlMatching(".*/infraActiveRequests/checkInstanceNameDuplicate"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
           
         serviceRecipe.setRecipeTimeout(180);
         Service defaultService = new Service();
         defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a");
-               stubFor(post(urlMatching(".*/infraActiveRequests/"))
+               wireMockServer.stubFor(post(urlMatching(".*/infraActiveRequests/"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
-               stubFor(get(urlMatching(".*/service/.*"))
+               wireMockServer.stubFor(get(urlMatching(".*/service/.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(defaultService))
                         .withStatus(HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/serviceRecipe/search.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(mapper.writeValueAsString(serviceRecipe))
                         .withStatus(HttpStatus.SC_OK)));
     }
     @Test
     public void createPortConfigurationSaveError() throws IOException {
-       stubFor(post(urlMatching(".*/infraActiveRequests/"))
+       wireMockServer.stubFor(post(urlMatching(".*/infraActiveRequests/"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
-        stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/ALaCarteOrchestrator"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
         
     }
     @Test
     public void createPortConfigDbUpdateError() throws IOException {
-       stubFor(post(urlMatching(".*/infraActiveRequests/"))
+       wireMockServer.stubFor(post(urlMatching(".*/infraActiveRequests/"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
        
     @Test
     public void vnfUpdateWithNetworkInstanceGroup() throws IOException{
        TestAppender.events.clear();
-       stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+       wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfResourceCustomization/2ccae1b4-7d9e-46fa-a452-9180ce008d17"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResourceCustomization/2ccae1b4-7d9e-46fa-a452-9180ce008d17"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfResourceCustomization_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002674/vnfResources"))
+        wireMockServer.stubFor(get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002674/vnfResources"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("vnfResources_Response.json"))
                         .withStatus(org.apache.http.HttpStatus.SC_OK)));
         
-        stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction" +
+        wireMockServer.stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction" +
                 "[?]nfRole=GR-API-DEFAULT&action=updateInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("UpdateVnfRecipe_Response.json"))
     }
     @Test
     public void createInstanceGroup() throws IOException{
-       stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+       wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
        
     }
     @Test
     public void deleteInstanceGroup() throws IOException{
-       stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+       wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
        
     }
     @Test
     public void addMembers() throws IOException{
-       stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+       wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
         //expect 
     }
     @Test
     public void removeMembers() throws IOException{
-       stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+       wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
         //expect
     }
     @Test
     public void deleteNetworkInstanceNoCustomizationEntry() throws IOException {
-        stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
+        wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
 
-        stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac"))
+        wireMockServer.stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withStatus(HttpStatus.SC_NOT_FOUND)));
 
-        stubFor(get(urlMatching(".*/networkRecipe/search/findFirstByModelNameAndAction[?]" +
+        wireMockServer.stubFor(get(urlMatching(".*/networkRecipe/search/findFirstByModelNameAndAction[?]" +
                 "modelName=VNF-API-DEFAULT&action=deleteInstance"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withBody(getWiremockResponseForCatalogdb("networkRecipe_Response.json"))
     }
     @Test
     public void updateNetworkInstanceNoCustomizationEntry() throws IOException {
-       stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac"))
+       wireMockServer.stubFor(get(urlMatching(".*/networkResourceCustomization/3bdbb104-476c-483e-9f8b-c095b3d308ac"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withStatus(HttpStatus.SC_NOT_FOUND)));
        
 
 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;
        
        @Test
        public void getTasksTestByOriginalRequestId() throws ParseException, JSONException, JsonParseException, JsonMappingException, IOException{
-               stubFor(post(urlPathEqualTo("/sobpmnengine/task"))
+               wireMockServer.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"))
+               wireMockServer.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";
 
 
 package org.onap.so.apihandlerinfra.tenantisolation;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+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.urlPathEqualTo;
+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.http.HttpStatus;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.util.UriComponentsBuilder;
 
-import javax.ws.rs.core.MediaType;
-import java.io.File;
-import java.io.IOException;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 
 public class CloudOrchestrationTest extends BaseTest {
 
        @Before
        public void setupTestClass() throws Exception{
-               stubFor(post(urlPathEqualTo(getTestUrl(""))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON).withStatus(HttpStatus.SC_CREATED)));
+               wireMockServer.stubFor(post(urlPathEqualTo(getTestUrl(""))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON).withStatus(HttpStatus.SC_CREATED)));
        }
 
        @Test
        
        @Test
        public void testCreateOpEnvReqRecordDuplicateCheck() throws IOException {
-               stubFor(post(urlPathEqualTo(getTestUrl("checkInstanceNameDuplicate"))).withRequestBody(equalTo("{\"instanceIdMap\":null,\"instanceName\":\"myOpEnv\",\"requestScope\":\"operationalEnvironment\"}")).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+               wireMockServer.stubFor(post(urlPathEqualTo(getTestUrl("checkInstanceNameDuplicate"))).withRequestBody(equalTo("{\"instanceIdMap\":null,\"instanceName\":\"myOpEnv\",\"requestScope\":\"operationalEnvironment\"}")).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                .withBody(String.format(getResponseTemplate, "123", "PENDING"))
                                .withStatus(HttpStatus.SC_OK)));
                ObjectMapper mapper = new ObjectMapper();
                HttpEntity<TenantIsolationRequest> entity = new HttpEntity<TenantIsolationRequest>(request, headers);
        
                UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/operationalEnvironments");
-               stubFor(post(urlPathEqualTo(getTestUrl("checkInstanceNameDuplicate"))).withRequestBody(equalTo("{\"instanceIdMap\":null,\"instanceName\":\"myOpEnv\",\"requestScope\":\"operationalEnvironment\"}")).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+               wireMockServer.stubFor(post(urlPathEqualTo(getTestUrl("checkInstanceNameDuplicate"))).withRequestBody(equalTo("{\"instanceIdMap\":null,\"instanceName\":\"myOpEnv\",\"requestScope\":\"operationalEnvironment\"}")).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                .withStatus(HttpStatus.SC_NOT_FOUND)));
                ResponseEntity<String> response = restTemplate.exchange(
                                builder.toUriString(),
        
        @Test
        public void testCreateVNFDuplicateCheck() throws IOException {
-               stubFor(post(urlPathEqualTo(getTestUrl("checkInstanceNameDuplicate"))).withRequestBody(equalTo("{\"instanceIdMap\":null,\"instanceName\":\"myVnfOpEnv\",\"requestScope\":\"operationalEnvironment\"}")).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+               wireMockServer.stubFor(post(urlPathEqualTo(getTestUrl("checkInstanceNameDuplicate"))).withRequestBody(equalTo("{\"instanceIdMap\":null,\"instanceName\":\"myVnfOpEnv\",\"requestScope\":\"operationalEnvironment\"}")).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                .withBody(String.format(getResponseTemplate, "requestId", Status.IN_PROGRESS.toString()))
                                .withStatus(HttpStatus.SC_OK)));
                ObjectMapper mapper = new ObjectMapper();
                HttpEntity<TenantIsolationRequest> entity = new HttpEntity<TenantIsolationRequest>(request, headers);
        
                UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/operationalEnvironments");
-               stubFor(post(urlPathEqualTo(getTestUrl("checkInstanceNameDuplicate"))).withRequestBody(equalTo("{\"instanceIdMap\":null,\"instanceName\":\"myVnfOpEnv\",\"requestScope\":\"operationalEnvironment\"}")).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+               wireMockServer.stubFor(post(urlPathEqualTo(getTestUrl("checkInstanceNameDuplicate"))).withRequestBody(equalTo("{\"instanceIdMap\":null,\"instanceName\":\"myVnfOpEnv\",\"requestScope\":\"operationalEnvironment\"}")).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                .withStatus(HttpStatus.SC_NOT_FOUND)));
 
                ResponseEntity<String> response = restTemplate.exchange(
                HttpEntity<TenantIsolationRequest> entity = new HttpEntity<TenantIsolationRequest>(request, headers);
        
                UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/operationalEnvironments/ff3514e3-5a33-55df-13ab-12abad84e7ff/activate");
-               stubFor(post(urlPathEqualTo(getTestUrl("checkInstanceNameDuplicate"))).withRequestBody(equalTo("{\"instanceIdMap\":{\"operationalEnvironmentId\":\"ff3514e3-5a33-55df-13ab-12abad84e7ff\"},\"instanceName\":\"myVnfOpEnv\",\"requestScope\":\"operationalEnvironment\"}")).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+               wireMockServer.stubFor(post(urlPathEqualTo(getTestUrl("checkInstanceNameDuplicate"))).withRequestBody(equalTo("{\"instanceIdMap\":{\"operationalEnvironmentId\":\"ff3514e3-5a33-55df-13ab-12abad84e7ff\"},\"instanceName\":\"myVnfOpEnv\",\"requestScope\":\"operationalEnvironment\"}")).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                .withStatus(HttpStatus.SC_NOT_FOUND)));
 
-               stubFor(get(urlPathEqualTo(getTestUrl("checkVnfIdStatus/ff3514e3-5a33-55df-13ab-12abad84e7ff"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+               wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl("checkVnfIdStatus/ff3514e3-5a33-55df-13ab-12abad84e7ff"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                .withStatus(HttpStatus.SC_OK)));
 
                ResponseEntity<String> response = restTemplate.exchange(
                HttpEntity<TenantIsolationRequest> entity = new HttpEntity<TenantIsolationRequest>(request, headers);
 
 
-//             stubFor(post(urlPathEqualTo(getTestUrl("checkInstanceNameDuplicate"))).withRequestBody(equalTo("{\"instanceIdMap\":{\"operationalEnvironmentId\":\"ff3514e3-5a33-55df-13ab-12abad84e7fa\"},\"instanceName\":null,\"requestScope\":\"operationalEnvironment\"}")).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+//             wireMockServer.stubFor(post(urlPathEqualTo(getTestUrl("checkInstanceNameDuplicate"))).withRequestBody(equalTo("{\"instanceIdMap\":{\"operationalEnvironmentId\":\"ff3514e3-5a33-55df-13ab-12abad84e7fa\"},\"instanceName\":null,\"requestScope\":\"operationalEnvironment\"}")).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
 //                             .withBodyFile((String.format(getResponseTemplate, "ff3514e3-5a33-55df-13ab-12abad84e7fa", Status.COMPLETE.toString()))).withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlPathEqualTo(getTestUrl("checkVnfIdStatus/ff3514e3-5a33-55df-13ab-12abad84e7fa"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+               wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl("checkVnfIdStatus/ff3514e3-5a33-55df-13ab-12abad84e7fa"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                .withStatus(HttpStatus.SC_OK)));
 
                UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/operationalEnvironments/ff3514e3-5a33-55df-13ab-12abad84e7fa/deactivate");
 
 
 package org.onap.so.apihandlerinfra.tenantisolation;
 
+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.urlPathEqualTo;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.text.ParseException;
+
+import javax.ws.rs.core.MediaType;
+
 import org.apache.http.HttpStatus;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.util.UriComponentsBuilder;
 
-import javax.ws.rs.core.MediaType;
-import java.text.ParseException;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 
 public class CloudResourcesOrchestrationTest extends BaseTest{
        
        HttpHeaders headers = new HttpHeaders();
        @Before
        public void setupTestClass() throws Exception{
-               stubFor(post(urlPathEqualTo(getTestUrl(""))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON).withStatus(HttpStatus.SC_CREATED)));
+               wireMockServer.stubFor(post(urlPathEqualTo(getTestUrl(""))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON).withStatus(HttpStatus.SC_CREATED)));
        }
        @Test
        public void testUnlockFailObjectMapping() {
        
        @Test
        public void testGetInfraActiveRequestNull() {
-               stubFor(get(urlPathEqualTo(getTestUrl("request-id-null-check"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+               wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl("request-id-null-check"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                .withStatus(HttpStatus.SC_OK)));
                headers.set("Accept", MediaType.APPLICATION_JSON);
                headers.set("Content-Type", MediaType.APPLICATION_JSON);
 
        @Test
        public void testUnlock() throws ParseException {
-               stubFor(get(urlPathEqualTo(getTestUrl("requestIdtestUnlock"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+               wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl("requestIdtestUnlock"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                .withBody(String.format(getResponseTemplate, "requestIdtestUnlock", "IN_PROGRESS"))
                                .withStatus(HttpStatus.SC_OK)));
                headers.set("Accept", MediaType.APPLICATION_JSON);
        
        @Test
        public void testUnlockComplete() throws ParseException {
-               stubFor(get(urlPathEqualTo(getTestUrl("requestIdtestUnlockComplete"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+               wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl("requestIdtestUnlockComplete"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                .withBody(String.format(getResponseTemplate, "requestIdtestUnlockComplete", "COMPLETE"))
                                .withStatus(HttpStatus.SC_OK)));
 
        
        @Test
        public void testGetOperationalEnvFilter() {
-               stubFor(get(urlPathEqualTo(getTestUrl("not-there"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+               wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl("not-there"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                .withStatus(HttpStatus.SC_OK)));
                headers.set("Accept", MediaType.APPLICATION_JSON);
                headers.set("Content-Type", MediaType.APPLICATION_JSON);
        
        @Test
        public void testGetOperationalEnvSuccess() throws ParseException {
-               stubFor(get(urlPathEqualTo(getTestUrl("90c56827-1c78-4827-bc4d-6afcdb37a51f"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+               wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl("90c56827-1c78-4827-bc4d-6afcdb37a51f"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                .withBody(String.format(getResponseTemplateNoBody, "90c56827-1c78-4827-bc4d-6afcdb37a51f", "COMPLETE"))
                                .withStatus(HttpStatus.SC_OK)));
                headers.set("Accept", MediaType.APPLICATION_JSON);
        
        @Test
        public void testGetOperationalEnvFilterSuccess() throws ParseException {
-               stubFor(get(urlPathEqualTo(getTestUrl("requestIdtestGetOperationalEnvFilterSuccess"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+               wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl("requestIdtestGetOperationalEnvFilterSuccess"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                .withBody(String.format(getResponseTemplate, "requestIdtestGetOperationalEnvFilterSuccess", "COMPLETE"))
                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(post(urlPathEqualTo(getTestUrl("getCloudOrchestrationFiltersFromInfraActive"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+               wireMockServer.stubFor(post(urlPathEqualTo(getTestUrl("getCloudOrchestrationFiltersFromInfraActive"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                .withBody("{\"requestId\":\"getCloudOrchestrationFiltersFromInfraActive\", \"operationalEnvironmentName\":\"myVnfOpEnv\"}")
                                .withBody("["+String.format(getResponseTemplateNoBody, "requestIdtestGetOperationalEnvFilterSuccess", "COMPLETE")+"]")
                                .withStatus(HttpStatus.SC_OK)));
 
 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;
        
        @Test
        public void testGetAaiOperationalEnvironmentSuccess() throws Exception { 
-               stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+               wireMockServer.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");
        
        @Test
        public void testUpdateSuccess() { 
-               stubFor(post(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+               wireMockServer.stubFor(post(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_ACCEPTED)));
                
                OperationalEnvironment ecompEnv = new OperationalEnvironment();
        
        @Test
        public void testUpdateMapSuccess() { 
-               stubFor(post(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+               wireMockServer.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>();
        
        @Test
        public void testCreateSuccess() { 
-               stubFor(put(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+               wireMockServer.stubFor(put(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_ACCEPTED)));
                
                OperationalEnvironment ecompEnv = new OperationalEnvironment();
        
        @Test
        public void testcreateRelationshipSuccess() { 
-               stubFor(put(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+               wireMockServer.stubFor(put(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_ACCEPTED)));
                
                OperationalEnvironment ecompEnv = new OperationalEnvironment();
 
 
 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;
                jsonObject.put("message", "Success");
                jsonObject.put("distributionId", "TEST_distributionId");
 
-               stubFor(post(urlPathMatching("/sdc/v1/catalog/services/TEST_uuid1/distr.*"))
+               wireMockServer.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);
                JSONObject jsonErrorResponse = new JSONObject();
                jsonErrorResponse.put("requestError", "");
 
-               stubFor(post(urlPathMatching("/sdc/v1/catalog/services/TEST_uuid1/distr.*"))
+               wireMockServer.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);
 
 package org.onap.so.apihandlerinfra.tenantisolation.process;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.containing;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 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 com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.containing;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+
 import org.apache.http.HttpStatus;
 import org.json.JSONObject;
 import org.junit.Before;
 import org.onap.so.apihandlerinfra.exceptions.ValidateException;
 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.apihandlerinfra.tenantisolationbeans.RecoveryAction;
-import org.onap.so.apihandlerinfra.tenantisolationbeans.Manifest;
 import org.onap.so.client.aai.AAIVersion;
 import org.onap.so.client.aai.entities.AAIResultWrapper;
 import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 
 public class ActivateVnfOperationalEnvironmentTest extends BaseTest{
 
        @Before
        public void init(){
-               stubFor(post(urlPathEqualTo("/operationalEnvServiceModelStatus/"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/operationalEnvServiceModelStatus/"))
                                .withRequestBody(equalTo("{\"requestId\":\"TEST_requestId\",\"operationalEnvId\":\"1dfe7154-eae0-44f2-8e7a-8e5e7882e55d\",\"serviceModelVersionId\":\"TEST_serviceModelVersionId\",\"serviceModelVersionDistrStatus\":\"SENT\",\"recoveryAction\":\"RETRY\",\"retryCount\":3,\"workloadContext\":\"PVT\",\"createTime\":null,\"modifyTime\":null,\"vnfOperationalEnvId\":\"1dfe7154-eae0-44f2-8e7a-8e5e7882e66d\"}"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(post(urlPathEqualTo("/operationalEnvDistributionStatus/"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/operationalEnvDistributionStatus/"))
                                .withRequestBody(equalTo("{\"distributionId\":\"TEST_distributionId\",\"operationalEnvId\":\"1dfe7154-eae0-44f2-8e7a-8e5e7882e55d\",\"serviceModelVersionId\":\"TEST_serviceModelVersionId\",\"requestId\":\"TEST_requestId\",\"distributionIdStatus\":\"SENT\",\"distributionIdErrorReason\":\"\",\"createTime\":null,\"modifyTime\":null}"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
 
                OperationalEnvironment aaiOpEnv;
 
-               stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+               wireMockServer.stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json").withBodyFile("vnfoperenv/ecompOperationalEnvironmentWithRelationship.json").withStatus(HttpStatus.SC_ACCEPTED)));
                
                AAIResultWrapper wrapper = clientHelper.getAaiOperationalEnvironment("EMOE-001");
                jsonObject.put("message", "Success");
                jsonObject.put("distributionId", sdcDistributionId);
                
-               stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+               wireMockServer.stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json").withBodyFile("vnfoperenv/activateOperationalEnvironmentWithRelationship.json").withStatus(HttpStatus.SC_ACCEPTED)));
-               stubFor(post(urlPathMatching("/sdc/v1/catalog/services/TEST_serviceModelVersionId/distr.*"))
+               wireMockServer.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);
        }                       
                serviceModelList1.setServiceModelVersionId(serviceModelVersionId);
                serviceModelVersionIdList.add(serviceModelList1);
                
-               stubFor(post(urlPathMatching("/sdc/v1/catalog/services/TEST_serviceModelVersionId/distr.*"))
+               wireMockServer.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, vnfOperationalEnvironmentId);
                InfraActiveRequests iar = new InfraActiveRequests();
                iar.setRequestId(requestId);
                iar.setRequestStatus("PENDING");
-               stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestId))
+               wireMockServer.stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestId))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(iar))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(post(urlPathMatching("/sdc/v1/catalog/services/TEST_serviceModelVersionId/distr.*"))
+               wireMockServer.stubFor(post(urlPathMatching("/sdc/v1/catalog/services/TEST_serviceModelVersionId/distr.*"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(jsonErrorResponse.toString()).withStatus(HttpStatus.SC_CONFLICT)));
-               stubFor(post(urlPathEqualTo("/infraActiveRequests/"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/infraActiveRequests/"))
                                .withRequestBody(containing("operationalEnvId\":\"1dfe7154-eae0-44f2-8e7a-8e5e7882e55d\""))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
 
 package org.onap.so.apihandlerinfra.tenantisolation.process;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.containing;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 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 com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.containing;
+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.assertThat;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+
 import org.apache.http.HttpStatus;
 import org.json.JSONObject;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.Ignore;
 import org.junit.rules.ExpectedException;
 import org.onap.so.apihandler.common.ErrorNumbers;
 import org.onap.so.apihandlerinfra.BaseTest;
 import org.onap.so.db.request.beans.OperationalEnvServiceModelStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class ActivateVnfStatusOperationalEnvironmentTest extends BaseTest{
 
                iar.setRequestId(requestIdOrig);
                iar.setRequestStatus("PENDING");
 
-               stubFor(get(urlPathEqualTo("/operationalEnvServiceModelStatus/search/findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId"))
+               wireMockServer.stubFor(get(urlPathEqualTo("/operationalEnvServiceModelStatus/search/findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(serviceModelDb))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestIdOrig))
+               wireMockServer.stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestIdOrig))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(iar))
                                                .withStatus(HttpStatus.SC_OK)));
                serviceModelDb.setRetryCount(retryCountZero);
                serviceModelDb.setServiceModelVersionDistrStatus(statusError);
                serviceModelDb.setVnfOperationalEnvId(vnfOperationalEnvironmentId);             
-               stubFor(get(urlPathEqualTo("/operationalEnvServiceModelStatus/search/findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId"))
+               wireMockServer.stubFor(get(urlPathEqualTo("/operationalEnvServiceModelStatus/search/findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(serviceModelDb))
                                                .withStatus(HttpStatus.SC_OK)));
                iar.setRequestId(requestIdOrig);
                iar.setRequestStatus("PENDING");
 
-               stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestIdOrig))
+               wireMockServer.stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestIdOrig))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(iar))
                                                .withStatus(HttpStatus.SC_OK)));
                serviceModelDb.setRetryCount(retryCountTwo);
                serviceModelDb.setServiceModelVersionDistrStatus(statusError);
                serviceModelDb.setVnfOperationalEnvId(vnfOperationalEnvironmentId);             
-               stubFor(get(urlPathEqualTo("/operationalEnvServiceModelStatus/search/findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId"))
+               wireMockServer.stubFor(get(urlPathEqualTo("/operationalEnvServiceModelStatus/search/findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(serviceModelDb))
                                                .withStatus(HttpStatus.SC_OK)));
                iar.setRequestId(requestIdOrig);
                iar.setRequestStatus("PENDING");
                
-               stubFor(get(urlPathEqualTo("/operationalEnvServiceModelStatus/search/findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId"))
+               wireMockServer.stubFor(get(urlPathEqualTo("/operationalEnvServiceModelStatus/search/findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(serviceModelDb))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(get(urlPathEqualTo("/operationalEnvDistributionStatus/"+sdcDistributionId))
+               wireMockServer.stubFor(get(urlPathEqualTo("/operationalEnvDistributionStatus/"+sdcDistributionId))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(distributionDb))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestIdOrig))
+               wireMockServer.stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestIdOrig))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(iar))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(post(urlPathEqualTo("/operationalEnvServiceModelStatus/"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/operationalEnvServiceModelStatus/"))
                                .withRequestBody(equalTo("{\"requestId\":\"TEST_requestIdOrig\",\"operationalEnvId\":\"TEST_operationalEnvironmentId\",\"serviceModelVersionId\":\"TEST_serviceModelVersionId\",\"serviceModelVersionDistrStatus\":\"DISTRIBUTION_COMPLETE_OK\",\"recoveryAction\":\"RETRY\",\"retryCount\":0,\"workloadContext\":\"TEST_workloadContext\",\"createTime\":null,\"modifyTime\":null,\"vnfOperationalEnvId\":\"VNF_operationalEnvironmentId\"}"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(post(urlPathEqualTo("/operationalEnvDistributionStatus/"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/operationalEnvDistributionStatus/"))
                                .withRequestBody(equalTo("{\"distributionId\":\"TEST_distributionId\",\"operationalEnvId\":\"TEST_operationalEnvironmentId\",\"serviceModelVersionId\":\"TEST_serviceModelVersionId\",\"requestId\":\"TEST_requestIdOrig\",\"distributionIdStatus\":\"DISTRIBUTION_COMPLETE_OK\",\"distributionIdErrorReason\":\"\",\"createTime\":null,\"modifyTime\":null}"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
                
-               stubFor(get(urlPathEqualTo("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/operational-environment/VNF_operationalEnvironmentId"))
+               wireMockServer.stubFor(get(urlPathEqualTo("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/operational-environment/VNF_operationalEnvironmentId"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(json).withStatus(HttpStatus.SC_ACCEPTED)));
-               stubFor(put(urlPathEqualTo("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/operational-environment/VNF_operationalEnvironmentId"))
+               wireMockServer.stubFor(put(urlPathEqualTo("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/operational-environment/VNF_operationalEnvironmentId"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_ACCEPTED)));
                
                activateVnfStatus.execute(requestId, request);          
                serviceModelDb.setRetryCount(retryCountThree);
                serviceModelDb.setServiceModelVersionDistrStatus(statusError);
                serviceModelDb.setVnfOperationalEnvId(vnfOperationalEnvironmentId);
-               stubFor(get(urlPathEqualTo("/operationalEnvServiceModelStatus/search/findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId"))
+               wireMockServer.stubFor(get(urlPathEqualTo("/operationalEnvServiceModelStatus/search/findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(serviceModelDb))
                                                .withStatus(HttpStatus.SC_OK)));
                jsonObject.put("message", "Success");
                jsonObject.put("distributionId", sdcDistributionId1);
                
-               stubFor(post(urlPathMatching("/sdc/v1/catalog/services/.*"))
+               wireMockServer.stubFor(post(urlPathMatching("/sdc/v1/catalog/services/.*"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(jsonObject.toString()).withStatus(HttpStatus.SC_ACCEPTED)));
-               stubFor(get(urlPathEqualTo("/operationalEnvServiceModelStatus/search/findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId"))
+               wireMockServer.stubFor(get(urlPathEqualTo("/operationalEnvServiceModelStatus/search/findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(serviceModelDb))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(get(urlPathEqualTo("/operationalEnvDistributionStatus/"+sdcDistributionId))
+               wireMockServer.stubFor(get(urlPathEqualTo("/operationalEnvDistributionStatus/"+sdcDistributionId))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(distributionDb))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(post(urlPathEqualTo("/operationalEnvDistributionStatus/"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/operationalEnvDistributionStatus/"))
                                .withRequestBody(equalTo("{\"distributionId\":\"TEST_distributionId\",\"operationalEnvId\":\"TEST_operationalEnvironmentId\",\"serviceModelVersionId\":\"TEST_serviceModelVersionId\",\"requestId\":\"TEST_requestIdOrig\",\"distributionIdStatus\":\"DISTRIBUTION_COMPLETE_ERROR\",\"distributionIdErrorReason\":\"Unable to process.\",\"createTime\":null,\"modifyTime\":null,\"handler\":{}}"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(post(urlPathEqualTo("/operationalEnvDistributionStatus/"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/operationalEnvDistributionStatus/"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(post(urlPathEqualTo("/operationalEnvServiceModelStatus/"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/operationalEnvServiceModelStatus/"))
                                .withRequestBody(equalTo("{\"requestId\":\"TEST_requestIdOrig\",\"operationalEnvId\":\"TEST_operationalEnvironmentId\",\"serviceModelVersionId\":\"TEST_serviceModelVersionId\",\"serviceModelVersionDistrStatus\":\"SENT\",\"recoveryAction\":\"RETRY\",\"retryCount\":2,\"workloadContext\":\"TEST_workloadContext\",\"createTime\":null,\"modifyTime\":null,\"vnfOperationalEnvId\":\"VNF_operationalEnvironmentId\"}"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
                
-               stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+               wireMockServer.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/.*"))
+               wireMockServer.stubFor(put(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_ACCEPTED)));
                
                activateVnfStatus.execute(requestId, request);  
                iar.setRequestId(requestIdOrig);
                iar.setRequestStatus("PENDING");
 
-               stubFor(get(urlPathEqualTo("/operationalEnvServiceModelStatus/search/findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId"))
+               wireMockServer.stubFor(get(urlPathEqualTo("/operationalEnvServiceModelStatus/search/findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(serviceModelDb))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(get(urlPathEqualTo("/operationalEnvDistributionStatus/"+sdcDistributionId))
+               wireMockServer.stubFor(get(urlPathEqualTo("/operationalEnvDistributionStatus/"+sdcDistributionId))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(distributionDb))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestIdOrig))
+               wireMockServer.stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestIdOrig))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(iar))
                                                .withStatus(HttpStatus.SC_OK)));
                
-               stubFor(post(urlPathMatching("/sdc/v1/catalog/services/.*"))
+               wireMockServer.stubFor(post(urlPathMatching("/sdc/v1/catalog/services/.*"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(jsonObject.toString()).withStatus(HttpStatus.SC_ACCEPTED)));
 
-               stubFor(post(urlPathEqualTo("/operationalEnvServiceModelStatus/"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/operationalEnvServiceModelStatus/"))
                                .withRequestBody(equalTo("{\"requestId\":\"TEST_requestIdOrig\",\"operationalEnvId\":\"TEST_operationalEnvironmentId\",\"serviceModelVersionId\":\"TEST_serviceModelVersionId\",\"serviceModelVersionDistrStatus\":\"SENT\",\"recoveryAction\":\"RETRY\",\"retryCount\":2,\"workloadContext\":\"TEST_workloadContext\",\"createTime\":null,\"modifyTime\":null,\"handler\":{}}"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+               wireMockServer.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/.*"))
+               wireMockServer.stubFor(put(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_ACCEPTED)));
                
         try {
                InfraActiveRequests iar = new InfraActiveRequests();
                iar.setRequestId(requestIdOrig);
                iar.setRequestStatus("PENDING");
-               stubFor(get(urlPathEqualTo("/operationalEnvServiceModelStatus/search/findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId"))
+               wireMockServer.stubFor(get(urlPathEqualTo("/operationalEnvServiceModelStatus/search/findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(serviceModelDb))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(get(urlPathEqualTo("/operationalEnvDistributionStatus/"+sdcDistributionId))
+               wireMockServer.stubFor(get(urlPathEqualTo("/operationalEnvDistributionStatus/"+sdcDistributionId))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(distributionDb))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestIdOrig))
+               wireMockServer.stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestIdOrig))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(iar))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(post(urlPathEqualTo("/infraActiveRequests/"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/infraActiveRequests/"))
                                .withRequestBody(containing("operationalEnvId\":\"VNF_operationalEnvironmentId\""))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
                
-               stubFor(post(urlPathMatching("/sdc/v1/catalog/services/.*"))
+               wireMockServer.stubFor(post(urlPathMatching("/sdc/v1/catalog/services/.*"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(jsonMessages.toString()).withStatus(HttpStatus.SC_CONFLICT)));
 
-               stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+               wireMockServer.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/.*"))
+               wireMockServer.stubFor(put(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_ACCEPTED)));
                
                try {
                iar.setRequestId(requestIdOrig);
                iar.setRequestStatus("PENDING");
 
-               stubFor(get(urlPathEqualTo("/operationalEnvServiceModelStatus/search/findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId"))
+               wireMockServer.stubFor(get(urlPathEqualTo("/operationalEnvServiceModelStatus/search/findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(serviceModelDb))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(get(urlPathEqualTo("/operationalEnvDistributionStatus/"+sdcDistributionId))
+               wireMockServer.stubFor(get(urlPathEqualTo("/operationalEnvDistributionStatus/"+sdcDistributionId))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(distributionDb))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestIdOrig))
+               wireMockServer.stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestIdOrig))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(iar))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(post(urlPathEqualTo("/operationalEnvServiceModelStatus/"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/operationalEnvServiceModelStatus/"))
                                .withRequestBody(equalTo("{\"requestId\":\"TEST_requestIdOrig\",\"operationalEnvId\":\"TEST_operationalEnvironmentId\",\"serviceModelVersionId\":\"TEST_serviceModelVersionId\",\"serviceModelVersionDistrStatus\":\"DISTRIBUTION_COMPLETE_OK\",\"recoveryAction\":\"SKIP\",\"retryCount\":0,\"workloadContext\":\"TEST_workloadContext\",\"createTime\":null,\"modifyTime\":null,\"vnfOperationalEnvId\":\"VNF_operationalEnvironmentId\"}"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(post(urlPathEqualTo("/operationalEnvDistributionStatus/"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/operationalEnvDistributionStatus/"))
                                .withRequestBody(equalTo("{\"distributionId\":\"TEST_distributionId\",\"operationalEnvId\":\"TEST_operationalEnvironmentId\",\"serviceModelVersionId\":\"TEST_serviceModelVersionId\",\"requestId\":\"TEST_requestIdOrig\",\"distributionIdStatus\":\"DISTRIBUTION_COMPLETE_OK\",\"distributionIdErrorReason\":\"\",\"createTime\":null,\"modifyTime\":null}"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+               wireMockServer.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/.*"))
+               wireMockServer.stubFor(put(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_ACCEPTED)));
                
                activateVnfStatus.execute(requestId, request);                  
                iar.setRequestId(requestIdOrig);
                iar.setRequestStatus("PENDING");
 
-               stubFor(get(urlPathEqualTo("/operationalEnvServiceModelStatus/search/findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId"))
+               wireMockServer.stubFor(get(urlPathEqualTo("/operationalEnvServiceModelStatus/search/findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(serviceModelDb))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(get(urlPathEqualTo("/operationalEnvDistributionStatus/"+sdcDistributionId))
+               wireMockServer.stubFor(get(urlPathEqualTo("/operationalEnvDistributionStatus/"+sdcDistributionId))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(distributionDb))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestIdOrig))
+               wireMockServer.stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestIdOrig))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(iar))
                                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(post(urlPathEqualTo("/operationalEnvDistributionStatus/"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/operationalEnvDistributionStatus/"))
                                .withRequestBody(containing("{\"distributionId\":\"TEST_distributionId\",\"operationalEnvId\":\"TEST_operationalEnvironmentId\",\"serviceModelVersionId\":\"TEST_serviceModelVersionId\",\"requestId\":\"TEST_requestIdOrig\",\"distributionIdStatus\":\"DISTRIBUTION_COMPLETE_ERROR\""))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(post(urlPathEqualTo("/operationalEnvServiceModelStatus/"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/operationalEnvServiceModelStatus/"))
                                .withRequestBody(containing("{\"requestId\":\"TEST_requestIdOrig\",\"operationalEnvId\":\"TEST_operationalEnvironmentId\",\"serviceModelVersionId\":\"TEST_serviceModelVersionId\",\"serviceModelVersionDistrStatus\":\"DISTRIBUTION_COMPLETE_ERROR\""))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
                
-               stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+               wireMockServer.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/.*"))
+               wireMockServer.stubFor(put(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_ACCEPTED)));
                
         try {
                request.setDistributionId(sdcDistributionId);
                request.setOperationalEnvironmentId(operationalEnvironmentId);          
                
-               stubFor(post(urlPathMatching("/sdc/v1/catalog/services/TEST_serviceModelVersionId/distr.*"))
+               wireMockServer.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); 
 
 
 package org.onap.so.apihandlerinfra.tenantisolation.process;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.containing;
+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.urlPathEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;
 import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
 import static org.junit.Assert.assertThat;
+
 import java.util.UUID;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+
 import org.apache.http.HttpStatus;
 import org.junit.Test;
 import org.onap.so.apihandler.common.ErrorNumbers;
 import org.onap.so.logger.MessageEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 
 public class CreateEcompOperationalEnvironmentTest extends BaseTest{
        
        @Test
        public void testProcess() throws ApiException, JsonProcessingException {
-               stubFor(put(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+               wireMockServer.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/.*"))
+               wireMockServer.stubFor(post(urlPathMatching("/events/.*"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_ACCEPTED)));
                
                InfraActiveRequests iar = new InfraActiveRequests();
                iar.setRequestScope("create");
                iar.setRequestStatus("PENDING");
                iar.setRequestAction("UNKNOWN");
-               stubFor(get(urlPathEqualTo("/infraActiveRequests/123"))
+               wireMockServer.stubFor(get(urlPathEqualTo("/infraActiveRequests/123"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(iar))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(post(urlPathEqualTo("/infraActiveRequests/"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/infraActiveRequests/"))
                                .withRequestBody(containing("{\"requestId\":\"123\",\"clientRequestId\":null,\"action\":null,\"requestStatus\":\"COMPLETE\",\"statusMessage\":\"SUCCESSFUL, operationalEnvironmentId - operationalEnvId; Success Message: SUCCESSFULLY Created ECOMP OperationalEnvironment.\",\"rollbackStatusMessage\":null,\"flowStatus\":null,\"retryStatusMessage\":null,\"progress\":100"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
        
        @Test
        public void testProcessException() throws JsonProcessingException {
-               stubFor(put(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+               wireMockServer.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/.*"))
+               wireMockServer.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, ErrorCode.DataError).build();
         ValidateException expectedException = new ValidateException.Builder("Could not publish DMaap", HttpStatus.SC_BAD_REQUEST, ErrorNumbers.SVC_BAD_PARAMETER)
                iar.setRequestScope("create");
                iar.setRequestStatus("PENDING");
                iar.setRequestAction("UNKNOWN");
-               stubFor(get(urlPathEqualTo("/infraActiveRequests/"+uuid))
+               wireMockServer.stubFor(get(urlPathEqualTo("/infraActiveRequests/"+uuid))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(iar))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(post(urlPathEqualTo("/infraActiveRequests/"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/infraActiveRequests/"))
                                .withRequestBody(containing("{\"requestId\":\""+uuid+ "\",\"clientRequestId\":null,\"action\":null,\"requestStatus\":\"FAILED\",\"statusMessage\":\"FAILURE, operationalEnvironmentId - operationalEnvId; Error message:"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
 
 
 package org.onap.so.apihandlerinfra.tenantisolation.process;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.containing;
+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.urlPathEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
 import java.util.List;
 import java.util.UUID;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+
 import org.apache.http.HttpStatus;
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-
 
 public class CreateVnfOperationalEnvironmentTest extends BaseTest{
        
        
        @Test
        public void testExecute() throws ApiException, JsonProcessingException {
-               stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+               wireMockServer.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"))
+               wireMockServer.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"))
+               wireMockServer.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/.*"))
+               wireMockServer.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.setRequestStatus("PENDING");
                iar.setRequestAction("UNKNOWN");
                ObjectMapper mapper = new ObjectMapper();
-               stubFor(post(urlPathEqualTo("/infraActiveRequests/"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/infraActiveRequests/"))
                                .withRequestBody(containing("{\"requestId\":\""+ requestId+"\",\"clientRequestId\":null,\"action\":null,\"requestStatus\":\"COMPLETE\",\"statusMessage\":\"SUCCESSFUL"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestId))
+               wireMockServer.stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestId))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(iar))
                                                .withStatus(HttpStatus.SC_OK)));
        
        @Test
        public void testExecuteEndpointsListBeginWithUppercase() throws ApiException, JsonProcessingException {
-               stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+               wireMockServer.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"))
+               wireMockServer.stubFor(post(urlPathMatching("/GRMLWPService/v1/serviceEndPoint/findRunning"))
                                .willReturn(aResponse().withHeader("Content-Type", "application/json").withBodyFile("vnfoperenv/endpoints2.json").withStatus(HttpStatus.SC_ACCEPTED)));
-               stubFor(post(urlPathMatching("/GRMLWPService/v1/serviceEndPoint/add"))
+               wireMockServer.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/.*"))
+               wireMockServer.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.setRequestStatus("PENDING");
                iar.setRequestAction("UNKNOWN");
                ObjectMapper mapper = new ObjectMapper();
-               stubFor(post(urlPathEqualTo("/infraActiveRequests/"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/infraActiveRequests/"))
                                .withRequestBody(containing("{\"requestId\":\""+ requestId+"\",\"clientRequestId\":null,\"action\":null,\"requestStatus\":\"COMPLETE\",\"statusMessage\":\"SUCCESSFUL"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
 
-               stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestId))
+               wireMockServer.stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestId))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(iar))
                                                .withStatus(HttpStatus.SC_OK)));
 
 
 package org.onap.so.apihandlerinfra.tenantisolation.process;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.containing;
+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.urlPathEqualTo;
+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 com.fasterxml.jackson.databind.ObjectMapper;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+
 import org.apache.http.HttpStatus;
 import org.junit.Before;
 import org.junit.Rule;
 import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class DeactivateVnfOperationalEnvironmentTest extends BaseTest{
 
        
        @Before
        public void init(){
-               stubFor(post(urlPathEqualTo("/infraActiveRequests/"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/infraActiveRequests/"))
                                .withRequestBody(containing("{\"requestId\":\""+ requestId+"\",\"clientRequestId\":null,\"action\":null,\"requestStatus\":\"COMPLETE\",\"statusMessage\":\"SUCCESSFUL"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
 
                String json = "{\"operational-environment-status\" : \"ACTIVE\"}";
                
-               stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+               wireMockServer.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/.*"))
+               wireMockServer.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/.*"))
+               wireMockServer.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.setRequestScope("create");
                iar.setRequestStatus("PENDING");
                iar.setRequestAction("UNKNOWN");
-               stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestId))
+               wireMockServer.stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestId))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(iar))
                                                .withStatus(HttpStatus.SC_OK)));
 
                String json = "{\"operational-environment-status\" : \"SUCCESS\"}";
                
-               stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+               wireMockServer.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);
                iar.setRequestScope("create");
                iar.setRequestStatus("PENDING");
                iar.setRequestAction("UNKNOWN");
-               stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestId))
+               wireMockServer.stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestId))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(iar))
                                                .withStatus(HttpStatus.SC_OK)));
-               stubFor(post(urlPathEqualTo("/infraActiveRequests/"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/infraActiveRequests/"))
                                .withRequestBody(containing("{\"requestId\":\""+ requestId+"\",\"clientRequestId\":null,\"action\":null,\"requestStatus\":\"FAILED\",\"statusMessage\":\"FAILURE"))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withStatus(HttpStatus.SC_OK)));
 
                String json = "{\"operational-environment-status\" : \"INACTIVE\"}";
                
-               stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+               wireMockServer.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.setRequestScope("create");
                iar.setRequestStatus("PENDING");
                iar.setRequestAction("UNKNOWN");
-               stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestId))
+               wireMockServer.stubFor(get(urlPathEqualTo("/infraActiveRequests/"+requestId))
                                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                                .withBody(mapper.writeValueAsString(iar))
                                                .withStatus(HttpStatus.SC_OK)));
 
                String json = "{\"operational-environment-status\" : \"\"}";
                
-               stubFor(get(urlPathMatching("/aai/" + AAIVersion.LATEST + "/cloud-infrastructure/operational-environments/.*"))
+               wireMockServer.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);
 
 import static com.github.tomakehurst.wiremock.client.WireMock.matching;
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.verify;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 import org.onap.logging.ref.slf4j.ONAPLogConstants;
 import org.onap.so.apihandlerinfra.BaseTest;
 import org.onap.so.apihandlerinfra.TestAppender;
-import org.onap.so.client.grm.GRMClient;
 import org.onap.so.client.grm.beans.ServiceEndPoint;
 import org.onap.so.client.grm.beans.ServiceEndPointList;
 import org.onap.so.client.grm.beans.ServiceEndPointLookupRequest;
        public void testFind() throws Exception {
         TestAppender.events.clear();
                String endpoints = getFileContentsAsString("__files/grm/endpoints.json");
-               stubFor(post(urlPathEqualTo("/GRMLWPService/v1/serviceEndPoint/findRunning"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/GRMLWPService/v1/serviceEndPoint/findRunning"))
                        .willReturn(aResponse()
                                .withStatus(200)
                                .withHeader("Content-Type", MediaType.APPLICATION_JSON)
         if(!foundInvokeReturn)
             fail("INVOKE RETURN Marker not found");
         
-        verify(postRequestedFor(urlEqualTo("/GRMLWPService/v1/serviceEndPoint/findRunning"))
+       wireMockServer.verify(postRequestedFor(urlEqualTo("/GRMLWPService/v1/serviceEndPoint/findRunning"))
                 .withHeader(ONAPLogConstants.Headers.INVOCATION_ID.toString(), matching(uuidRegex))
                         .withHeader(ONAPLogConstants.Headers.REQUEST_ID.toString(), matching(uuidRegex))
                                 .withHeader(ONAPLogConstants.Headers.PARTNER_NAME.toString(), equalTo("SO")));
        
        @Test 
        public void testFindFail() throws Exception {           
-               stubFor(post(urlPathEqualTo("/GRMLWPService/v1/serviceEndPoint/findRunning"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/GRMLWPService/v1/serviceEndPoint/findRunning"))
                        .willReturn(aResponse()
                                .withStatus(400)
                                .withHeader("Content-Type", MediaType.APPLICATION_JSON)
        
        @Test
        public void testAddFail() throws Exception {
-               stubFor(post(urlPathEqualTo("/GRMLWPService/v1/serviceEndPoint/add"))
+               wireMockServer.stubFor(post(urlPathEqualTo("/GRMLWPService/v1/serviceEndPoint/add"))
                                .willReturn(aResponse()
                                        .withStatus(404)
                                        .withHeader("Content-Type", MediaType.APPLICATION_JSON)
 
                                                        <so.log.level>DEBUG</so.log.level>
                                                </systemPropertyVariables>
                                                <rerunFailingTestsCount>2</rerunFailingTestsCount>
+                                               <parallel>classes</parallel>
+                                               <useUnlimitedThreads>false</useUnlimitedThreads>
+                                               <threadCount>1</threadCount>
                                        </configuration>
                                </plugin>
                                <plugin>