move sdn clients to own package

Began moving the sdn clients into one central isolated location
Added test files, removed unused methods, fixed poms
Fixed the client so that is doesnt have to import bpmn and can be built
at top level
Fixed bad merge that hapeened due to conflicts
Added missing test files for sdno unit test
Added maria db driver java client for spring test and jersey depend

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

51 files changed, 34 insertions, 2503 deletions

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/GCTopologyOperationRequestMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/GCTopologyOperationRequestMapper.java
index 6af8c2f9c5..5b6043f303 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/GCTopologyOperationRequestMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/GCTopologyOperationRequestMapper.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.so.client.sdnc.mapper;
+package org.onap.so.bpmn.infrastructure.sdnc.mapper;
 
 import java.net.URI;
 import java.util.UUID;
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/GeneralTopologyObjectMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/GeneralTopologyObjectMapper.java
index a9611cbde5..48a384c48a 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/GeneralTopologyObjectMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/GeneralTopologyObjectMapper.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.so.client.sdnc.mapper;
+package org.onap.so.bpmn.infrastructure.sdnc.mapper;
 
 import java.util.List;
 import java.util.Map;
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/NetworkTopologyOperationRequestMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/NetworkTopologyOperationRequestMapper.java
index b1c95154c6..593c15d6cc 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/NetworkTopologyOperationRequestMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/NetworkTopologyOperationRequestMapper.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.so.client.sdnc.mapper;
+package org.onap.so.bpmn.infrastructure.sdnc.mapper;
 
 import java.util.Map;
 import java.util.UUID;
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/ServiceTopologyOperationMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/ServiceTopologyOperationMapper.java
index b5957b3009..69606393c3 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/ServiceTopologyOperationMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/ServiceTopologyOperationMapper.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.so.client.sdnc.mapper;
+package org.onap.so.bpmn.infrastructure.sdnc.mapper;
 
 import java.util.Map;
 import java.util.UUID;
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VfModuleTopologyOperationRequestMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/VfModuleTopologyOperationRequestMapper.java
index f6642ab76a..901187e231 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VfModuleTopologyOperationRequestMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/VfModuleTopologyOperationRequestMapper.java
@@ -20,7 +20,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.so.client.sdnc.mapper;
+package org.onap.so.bpmn.infrastructure.sdnc.mapper;
 
 import java.net.URI;
 import java.util.Map;
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VnfTopologyOperationRequestMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/VnfTopologyOperationRequestMapper.java
index fd0af3a4dd..c2dcb8f290 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VnfTopologyOperationRequestMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/VnfTopologyOperationRequestMapper.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.so.client.sdnc.mapper;
+package org.onap.so.bpmn.infrastructure.sdnc.mapper;
 
 import java.net.URI;
 import java.util.ArrayList;
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNCConfigurationResources.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNCConfigurationResources.java
index 4aa6a1026a..da675bb498 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNCConfigurationResources.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNCConfigurationResources.java
@@ -21,6 +21,7 @@
 package org.onap.so.client.orchestration;
 
 
+import org.onap.so.bpmn.infrastructure.sdnc.mapper.GCTopologyOperationRequestMapper;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Configuration;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
@@ -29,7 +30,6 @@ import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
 import org.onap.so.client.exception.BadResponseException;
 import org.onap.so.client.exception.MapperException;
 import org.onap.so.client.sdnc.beans.SDNCSvcAction;
-import org.onap.so.client.sdnc.mapper.GCTopologyOperationRequestMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import java.net.URI;
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNCNetworkResources.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNCNetworkResources.java
index 0123eb67be..dc59969492 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNCNetworkResources.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNCNetworkResources.java
@@ -24,6 +24,7 @@ package org.onap.so.client.orchestration;
 
 import org.onap.sdnc.northbound.client.model.GenericResourceApiNetworkOperationInformation;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiRequestActionEnumeration;
+import org.onap.so.bpmn.infrastructure.sdnc.mapper.NetworkTopologyOperationRequestMapper;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.L3Network;
@@ -31,7 +32,6 @@ import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
 import org.onap.so.bpmn.servicedecomposition.generalobjects.RequestContext;
 import org.onap.so.client.sdnc.beans.SDNCSvcAction;
 import org.onap.so.client.sdnc.beans.SDNCSvcOperation;
-import org.onap.so.client.sdnc.mapper.NetworkTopologyOperationRequestMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNCServiceInstanceResources.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNCServiceInstanceResources.java
index 960efea2f0..54efd23bf9 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNCServiceInstanceResources.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNCServiceInstanceResources.java
@@ -22,6 +22,7 @@ package org.onap.so.client.orchestration;
 
 import org.onap.sdnc.northbound.client.model.GenericResourceApiRequestActionEnumeration;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiServiceOperationInformation;
+import org.onap.so.bpmn.infrastructure.sdnc.mapper.ServiceTopologyOperationMapper;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
 import org.onap.so.bpmn.servicedecomposition.generalobjects.RequestContext;
@@ -29,7 +30,6 @@ import org.onap.so.client.exception.BadResponseException;
 import org.onap.so.client.exception.MapperException;
 import org.onap.so.client.sdnc.beans.SDNCSvcAction;
 import org.onap.so.client.sdnc.beans.SDNCSvcOperation;
-import org.onap.so.client.sdnc.mapper.ServiceTopologyOperationMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNCVfModuleResources.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNCVfModuleResources.java
index 01511eaccc..c500374dc1 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNCVfModuleResources.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNCVfModuleResources.java
@@ -24,6 +24,7 @@ package org.onap.so.client.orchestration;
 
 import java.net.URI;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiVfModuleOperationInformation;
+import org.onap.so.bpmn.infrastructure.sdnc.mapper.VfModuleTopologyOperationRequestMapper;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
@@ -36,7 +37,6 @@ import org.onap.so.client.exception.MapperException;
 import org.onap.so.client.sdnc.SDNCClient;
 import org.onap.so.client.sdnc.beans.SDNCSvcAction;
 import org.onap.so.client.sdnc.beans.SDNCSvcOperation;
-import org.onap.so.client.sdnc.mapper.VfModuleTopologyOperationRequestMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNCVnfResources.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNCVnfResources.java
index 27edeed02a..d198756b1e 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNCVnfResources.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNCVnfResources.java
@@ -25,6 +25,7 @@ package org.onap.so.client.orchestration;
 import java.net.URI;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiRequestActionEnumeration;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiVnfOperationInformation;
+import org.onap.so.bpmn.infrastructure.sdnc.mapper.VnfTopologyOperationRequestMapper;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
@@ -35,7 +36,6 @@ import org.onap.so.client.exception.MapperException;
 import org.onap.so.client.sdnc.SDNCClient;
 import org.onap.so.client.sdnc.beans.SDNCSvcAction;
 import org.onap.so.client.sdnc.beans.SDNCSvcOperation;
-import org.onap.so.client.sdnc.mapper.VnfTopologyOperationRequestMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/SDNCClient.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/SDNCClient.java
deleted file mode 100644
index 7d2fc10d0b..0000000000
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/SDNCClient.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- * 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.client.sdnc;
-
-import java.util.LinkedHashMap;
-import javax.ws.rs.core.UriBuilder;
-import org.onap.so.client.BaseClient;
-import org.onap.so.client.exception.BadResponseException;
-import org.onap.so.client.exception.MapperException;
-import org.onap.so.client.sdnc.beans.SDNCProperties;
-import org.onap.so.client.sdnc.endpoint.SDNCTopology;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpHeaders;
-import org.springframework.stereotype.Component;
-
-@Component
-public class SDNCClient {
-
-    @Autowired
-    private SDNCProperties properties;
-    @Autowired
-    private SdnCommonTasks sdnCommonTasks;
-
-    /**
-     * 
-     * @param request - takes in a generated object from sdnc client - creates a json request string and sends it to
-     *        sdnc - receives and validates the linkedhashmap sent back from sdnc
-     * @throws MapperException
-     * @throws BadResponseException
-     */
-    public String post(Object request, SDNCTopology topology) throws MapperException, BadResponseException {
-        String jsonRequest = sdnCommonTasks.buildJsonRequest(request);
-        String targetUrl = properties.getHost() + properties.getPath() + ":" + topology.toString() + "/";
-        BaseClient<String, LinkedHashMap<String, Object>> STOClient = new BaseClient<>();
-
-        STOClient.setTargetUrl(targetUrl);
-        HttpHeaders httpHeader = sdnCommonTasks.getHttpHeaders(properties.getAuth(), true);
-        STOClient.setHttpHeader(httpHeader);
-        LinkedHashMap<String, Object> output =
-                STOClient.post(jsonRequest, new ParameterizedTypeReference<LinkedHashMap<String, Object>>() {});
-        return sdnCommonTasks.validateSDNResponse(output);
-    }
-
-
-    public String post(Object request, String url) throws MapperException, BadResponseException {
-        String jsonRequest = sdnCommonTasks.buildJsonRequest(request);
-        BaseClient<String, LinkedHashMap<String, Object>> STOClient = new BaseClient<>();
-        STOClient.setTargetUrl(url);
-        HttpHeaders httpHeader = sdnCommonTasks.getHttpHeaders(properties.getAuth(), true);
-        STOClient.setHttpHeader(httpHeader);
-        LinkedHashMap<String, Object> output =
-                STOClient.post(jsonRequest, new ParameterizedTypeReference<LinkedHashMap<String, Object>>() {});
-        return sdnCommonTasks.validateSDNResponse(output);
-    }
-
-    /**
-     * 
-     * @param queryLink - takes in a link to topology that needs to be queried - creates a json request string and sends
-     *        it to sdnc - receives and validates the linkedhashmap sent back from sdnc *
-     * @throws MapperException
-     * @throws BadResponseException
-     */
-    public String get(String queryLink) throws MapperException, BadResponseException {
-        String request = "";
-        String jsonRequest = sdnCommonTasks.buildJsonRequest(request);
-        String targetUrl = UriBuilder.fromUri(properties.getHost()).path(queryLink).build().toString();
-        BaseClient<String, LinkedHashMap<String, Object>> STOClient = new BaseClient<>();
-        STOClient.setTargetUrl(targetUrl);
-        HttpHeaders httpHeader = sdnCommonTasks.getHttpHeaders(properties.getAuth(), false);
-        STOClient.setHttpHeader(httpHeader);
-        LinkedHashMap<String, Object> output =
-                STOClient.get(jsonRequest, new ParameterizedTypeReference<LinkedHashMap<String, Object>>() {});
-        return sdnCommonTasks.validateSDNGetResponse(output);
-    }
-
-}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/SdnCommonTasks.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/SdnCommonTasks.java
deleted file mode 100644
index 01ac675d83..0000000000
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/SdnCommonTasks.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- * 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.client.sdnc;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import org.onap.so.logger.LoggingAnchor;
-import org.apache.commons.lang.StringUtils;
-import org.apache.http.HttpStatus;
-import org.onap.so.client.exception.BadResponseException;
-import org.onap.so.client.exception.MapperException;
-import org.onap.logging.filter.base.ErrorCode;
-import org.onap.so.logger.MessageEnum;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@Component
-public class SdnCommonTasks {
-
-    private static final Logger logger = LoggerFactory.getLogger(SDNCClient.class);
-    private static final String RESPONSE_CODE = "response-code";
-    private static final String RESPONSE_MESSAGE = "response-message";
-    private static final String NO_RESPONSE_FROM_SDNC = "Error did not receive a response from SDNC.";
-    private static final String BAD_RESPONSE_FROM_SDNC = "Error received a bad response from SDNC.";
-    private static final String SDNC_CODE_NOT_0_OR_IN_200_299 = "Error from SDNC: %s";
-    private static final String COULD_NOT_CONVERT_SDNC_POJO_TO_JSON =
-            "ERROR: Could not convert SDNC pojo to json string.";
-    private static final String BRACKETS = LoggingAnchor.FIVE;
-
-    /***
-     * 
-     * @param request
-     * @return
-     * @throws MapperException
-     */
-    public String buildJsonRequest(Object request) throws MapperException {
-        String jsonRequest;
-        ObjectMapper objMapper = new ObjectMapper();
-        objMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-        try {
-            jsonRequest = objMapper.writerWithDefaultPrettyPrinter().writeValueAsString(request);
-        } catch (JsonProcessingException e) {
-            logger.error(BRACKETS, MessageEnum.JAXB_EXCEPTION.toString(), COULD_NOT_CONVERT_SDNC_POJO_TO_JSON, "BPMN",
-                    ErrorCode.DataError.getValue(), e.getMessage());
-            throw new MapperException(COULD_NOT_CONVERT_SDNC_POJO_TO_JSON);
-        }
-        jsonRequest = "{\"input\":" + jsonRequest + "}";
-        logger.info(jsonRequest);
-        return jsonRequest;
-    }
-
-    /***
-     * 
-     * @param auth
-     * @return
-     */
-    public HttpHeaders getHttpHeaders(String auth, boolean includeContentType) {
-        HttpHeaders httpHeader = new HttpHeaders();
-        httpHeader.set("Authorization", auth);
-        if (includeContentType) {
-            httpHeader.setContentType(MediaType.APPLICATION_JSON);
-        }
-        List<MediaType> acceptMediaTypes = new ArrayList<>();
-        acceptMediaTypes.add(MediaType.APPLICATION_JSON);
-        httpHeader.setAccept(acceptMediaTypes);
-        return httpHeader;
-    }
-
-    /***
-     * 
-     * @param output
-     * @return
-     * @throws BadResponseException
-     */
-    public String validateSDNResponse(LinkedHashMap<String, Object> output) throws BadResponseException {
-        if (CollectionUtils.isEmpty(output)) {
-            logger.error(BRACKETS, MessageEnum.RA_RESPONSE_FROM_SDNC.toString(), NO_RESPONSE_FROM_SDNC, "BPMN",
-                    ErrorCode.UnknownError.getValue(), NO_RESPONSE_FROM_SDNC);
-            throw new BadResponseException(NO_RESPONSE_FROM_SDNC);
-        }
-        LinkedHashMap<String, Object> embeddedResponse = (LinkedHashMap<String, Object>) output.get("output");
-        String responseCode = "";
-        String responseMessage = "";
-        if (embeddedResponse != null) {
-            responseCode = (String) embeddedResponse.get(RESPONSE_CODE);
-            responseMessage = (String) embeddedResponse.get(RESPONSE_MESSAGE);
-        }
-        ObjectMapper objMapper = new ObjectMapper();
-        String jsonResponse;
-        try {
-            jsonResponse = objMapper.writeValueAsString(output);
-            logger.debug(jsonResponse);
-        } catch (JsonProcessingException e) {
-            logger.warn("Could not convert SDNC Response to String", e);
-            jsonResponse = "";
-        }
-        logger.info("ResponseCode: {} ResponseMessage: {}", responseCode, responseMessage);
-        int code = StringUtils.isNotEmpty(responseCode) ? Integer.parseInt(responseCode) : 0;
-        if (isHttpCodeSuccess(code)) {
-            logger.info("Successful Response from SDNC");
-            return jsonResponse;
-        } else {
-            String errorMessage = String.format(SDNC_CODE_NOT_0_OR_IN_200_299, responseMessage);
-            logger.error(BRACKETS, MessageEnum.RA_RESPONSE_FROM_SDNC.toString(), errorMessage, "BPMN",
-                    ErrorCode.DataError.getValue(), errorMessage);
-            throw new BadResponseException(errorMessage);
-        }
-    }
-
-    /***
-     * 
-     * @param output
-     * @return
-     * @throws BadResponseException
-     */
-    public String validateSDNGetResponse(LinkedHashMap<String, Object> output) throws BadResponseException {
-        if (CollectionUtils.isEmpty(output)) {
-            logger.error(BRACKETS, MessageEnum.RA_RESPONSE_FROM_SDNC.toString(), NO_RESPONSE_FROM_SDNC, "BPMN",
-                    ErrorCode.UnknownError.getValue(), NO_RESPONSE_FROM_SDNC);
-            throw new BadResponseException(NO_RESPONSE_FROM_SDNC);
-        }
-        ObjectMapper objMapper = new ObjectMapper();
-        logger.debug("Using object mapper");
-        String stringOutput = "";
-        try {
-            stringOutput = objMapper.writeValueAsString(output);
-        } catch (Exception e) {
-            logger.error(BRACKETS, MessageEnum.RA_RESPONSE_FROM_SDNC.toString(), BAD_RESPONSE_FROM_SDNC, "BPMN",
-                    ErrorCode.UnknownError.getValue(), BAD_RESPONSE_FROM_SDNC);
-            throw new BadResponseException(BAD_RESPONSE_FROM_SDNC);
-        }
-        logger.debug("Received from GET request: {}", stringOutput);
-        return stringOutput;
-    }
-
-
-    private boolean isHttpCodeSuccess(int code) {
-        return code >= HttpStatus.SC_OK && code < HttpStatus.SC_MULTIPLE_CHOICES || code == 0;
-    }
-}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCProperties.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCProperties.java
deleted file mode 100644
index 15076fa45a..0000000000
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCProperties.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.sdnc.beans;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ConfigurationProperties(prefix = "sdnc")
-public class SDNCProperties {
-
-    private String host;
-    private String path;
-    private String auth;
-
-    public String getHost() {
-        return host;
-    }
-
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    public String getPath() {
-        return path;
-    }
-
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    public String getAuth() {
-        return auth;
-    }
-
-    public void setAuth(String auth) {
-        this.auth = auth;
-    }
-}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCRequest.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCRequest.java
deleted file mode 100644
index 2c8bdd931c..0000000000
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCRequest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * ============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.client.sdnc.beans;
-
-import java.io.Serializable;
-import java.util.UUID;
-import org.onap.so.client.sdnc.endpoint.SDNCTopology;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-
-public class SDNCRequest implements Serializable {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = 4679678988657593282L;
-    private String timeOut = "PT1H";
-    private SDNCTopology topology;
-    private String correlationValue = UUID.randomUUID().toString();
-    private String correlationName = "SDNCCallback";
-    private transient Object sdncPayload;
-
-
-    public String getTimeOut() {
-        return timeOut;
-    }
-
-    public void setTimeOut(String timeOut) {
-        this.timeOut = timeOut;
-    }
-
-    public SDNCTopology getTopology() {
-        return topology;
-    }
-
-    public void setTopology(SDNCTopology topology) {
-        this.topology = topology;
-    }
-
-    public String getCorrelationValue() {
-        return correlationValue;
-    }
-
-    public void setCorrelationValue(String correlationValue) {
-        this.correlationValue = correlationValue;
-    }
-
-    public String getCorrelationName() {
-        return correlationName;
-    }
-
-    public void setCorrelationName(String correlationName) {
-        this.correlationName = correlationName;
-    }
-
-    public Object getSDNCPayload() {
-        return sdncPayload;
-    }
-
-    public void setSDNCPayload(Object sDNCPayload) {
-        this.sdncPayload = sDNCPayload;
-    }
-
-    @Override
-    public boolean equals(final Object other) {
-        if (!(other instanceof SDNCRequest)) {
-            return false;
-        }
-        SDNCRequest castOther = (SDNCRequest) other;
-        return new EqualsBuilder().append(correlationValue, castOther.correlationValue)
-                .append(correlationName, castOther.correlationName).isEquals();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(correlationValue).append(correlationName).toHashCode();
-    }
-
-}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCSvcAction.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCSvcAction.java
deleted file mode 100644
index d6216c509d..0000000000
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCSvcAction.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.sdnc.beans;
-
-import org.onap.sdnc.northbound.client.model.GenericResourceApiSvcActionEnumeration;
-
-public enum SDNCSvcAction {
-    ACTIVATE("activate", GenericResourceApiSvcActionEnumeration.ACTIVATE),
-    DELETE("delete", GenericResourceApiSvcActionEnumeration.DELETE),
-    ASSIGN("assign", GenericResourceApiSvcActionEnumeration.ASSIGN),
-    ROLLBACK("rollback", GenericResourceApiSvcActionEnumeration.ROLLBACK),
-    UNASSIGN("unassign", GenericResourceApiSvcActionEnumeration.UNASSIGN),
-    DEACTIVATE("deactivate", GenericResourceApiSvcActionEnumeration.DEACTIVATE),
-    CHANGE_DELETE("changedelete", GenericResourceApiSvcActionEnumeration.CHANGEDELETE),
-    CHANGE_ASSIGN("changeassign", GenericResourceApiSvcActionEnumeration.CHANGEASSIGN),
-    CREATE("create", GenericResourceApiSvcActionEnumeration.CREATE),
-    ENABLE("enable", GenericResourceApiSvcActionEnumeration.ENABLE),
-    DISABLE("disable", GenericResourceApiSvcActionEnumeration.DISABLE);
-
-    private final String name;
-
-    private GenericResourceApiSvcActionEnumeration sdncApiAction;
-
-    private SDNCSvcAction(String name, GenericResourceApiSvcActionEnumeration sdncApiAction) {
-        this.name = name;
-        this.sdncApiAction = sdncApiAction;
-    }
-
-    public GenericResourceApiSvcActionEnumeration getSdncApiAction() {
-        return this.sdncApiAction;
-    }
-
-    @Override
-    public String toString() {
-        return name;
-    }
-}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCSvcOperation.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCSvcOperation.java
deleted file mode 100644
index 4edbf37bad..0000000000
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCSvcOperation.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.sdnc.beans;
-
-public enum SDNCSvcOperation {
-
-    VF_MODULE_TOPOLOGY_OPERATION("vf-module-topology-operation"),
-    NETWORK_TOPOLOGY_OPERATION("network-topology-operation"),
-    VNF_TOPOLOGY_OPERATION("vnf-topology-operation"),
-    CONTRAIL_ROUTE_TOPOLOGY_OPERATION("contrail-route-topology-operation"),
-    SECURITY_ZONE_TOPOLOGY_OPERATION("security-zone-topology-operation"),
-    PORT_MIRROR_TOPOLOGY_OPERATION("port-mirror-topology-operation"),
-    SERVICE_TOPOLOGY_OPERATION("service-topology-operation"),
-    GENERIC_CONFIGURATION_TOPOLOGY_OPERATION("generic-configuration-topology-operation");
-
-    private final String name;
-
-    private SDNCSvcOperation(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String toString() {
-        return name;
-    }
-}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/endpoint/SDNCTopology.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/endpoint/SDNCTopology.java
deleted file mode 100644
index ae9fe6ad70..0000000000
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/endpoint/SDNCTopology.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.sdnc.endpoint;
-
-public enum SDNCTopology {
-
-    SERVICE("service-topology-operation"),
-    VNF("vnf-topology-operation"),
-    VFMODULE("vf-module-topology-operation"),
-    CONTRAILROUTE("contrail-route-topology-operation"),
-    PORTMIRROR("port-mirror-topology-operation"),
-    NETWORK("network-topology-operation"),
-    SECURITYZONE("security-zone-topology-operation"),
-    CONFIGURATION("generic-configuration-topology-operation");
-
-    private final String topology;
-
-    private SDNCTopology(String topology) {
-        this.topology = topology;
-    }
-
-    @Override
-    public String toString() {
-        return this.topology;
-    }
-}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/SDNOHealthCheckClient.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/SDNOHealthCheckClient.java
deleted file mode 100644
index 9b857dc08c..0000000000
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/SDNOHealthCheckClient.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.sdno;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import org.onap.so.client.dmaap.DmaapConsumer;
-import org.onap.so.client.dmaap.DmaapPublisher;
-import org.onap.so.client.sdno.beans.AAIParamList;
-import org.onap.so.client.sdno.beans.Body;
-import org.onap.so.client.sdno.beans.Input;
-import org.onap.so.client.sdno.beans.RequestHdCustom;
-import org.onap.so.client.sdno.beans.SDNO;
-import org.onap.so.client.sdno.dmaap.SDNOHealthCheckDmaapConsumer;
-import org.onap.so.client.sdno.dmaap.SDNOHealthCheckDmaapPublisher;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-public class SDNOHealthCheckClient {
-
-    private static final String NODE_TYPE = "VROUTER";
-    private static final String API_OPERATION_TYPE = "health-diagnostic-custom";
-    private static final String MIRRORING_CHECK = "mirroring_check";
-    private static final String CLIENT_NAME = "MSO";
-    private static final String PRE_CHECK_CODE = "VROUTER000003";
-    private static final String POST_CHECK_CODE = "VROUTER000004";
-    private static final String LPORT_MIRRORING_CHECK = "lport_mirroring_check";
-    private static final String CONFIGURATION_ID = "configuration-id";
-
-
-    public boolean lPortMirrorHealthPreCheck(String userId, String requestId, Optional<String> clliCode,
-            String configurationId, String interfaceId) throws Exception {
-        String request = buildLPortMirrorCheckPreRequest(userId, requestId, clliCode, configurationId, interfaceId);
-        return this.execute(requestId, request);
-    }
-
-    public boolean lPortMirrorHealthPostCheck(String userId, String requestId, Optional<String> clliCode,
-            String configurationId, String interfaceId) throws Exception {
-        String request = buildLPortMirrorCheckPostRequest(userId, requestId, clliCode, configurationId, interfaceId);
-        return this.execute(requestId, request);
-    }
-
-    public boolean portMirrorHealthPreCheck(String userId, String requestId, Optional<String> clliCode,
-            String configurationId) throws Exception {
-        final String request = this.buildPortMirrorPreCheckRequest(userId, requestId, clliCode, configurationId);
-        return this.execute(requestId, request);
-    }
-
-    public boolean portMirrorHealthPostCheck(String userId, String requestId, Optional<String> clliCode,
-            String configurationId) throws Exception {
-        final String request = this.buildPortMirrorPostCheckRequest(userId, requestId, clliCode, configurationId);
-        return this.execute(requestId, request);
-    }
-
-    protected String buildLPortMirrorCheckPreRequest(String userId, String requestId, Optional<String> clliCode,
-            String configurationId, String interfaceId) throws JsonProcessingException {
-        return this.buildLPortMirrorCheckRequest(userId, requestId, clliCode, configurationId, interfaceId,
-                PRE_CHECK_CODE);
-    }
-
-    protected String buildLPortMirrorCheckPostRequest(String userId, String requestId, Optional<String> clliCode,
-            String configurationId, String interfaceId) throws JsonProcessingException {
-        return this.buildLPortMirrorCheckRequest(userId, requestId, clliCode, configurationId, interfaceId,
-                POST_CHECK_CODE);
-    }
-
-    protected String buildPortMirrorPreCheckRequest(String userId, String requestId, Optional<String> clliCode,
-            String configurationId) throws JsonProcessingException {
-        return this.buildPortMirrorCheckRequest(userId, requestId, clliCode, configurationId, PRE_CHECK_CODE);
-    }
-
-    protected String buildPortMirrorPostCheckRequest(String userId, String requestId, Optional<String> clliCode,
-            String configurationId) throws JsonProcessingException {
-        return this.buildPortMirrorCheckRequest(userId, requestId, clliCode, configurationId, POST_CHECK_CODE);
-    }
-
-    protected String buildPortMirrorCheckRequest(String userId, String requestId, Optional<String> clliCode,
-            String configurationId, String diagnosticCode) throws JsonProcessingException {
-        final AAIParamList list = new AAIParamList();
-        list.setKey(CONFIGURATION_ID);
-        list.setValue(configurationId);
-
-        return this.buildRequest(userId, requestId, clliCode, diagnosticCode, MIRRORING_CHECK,
-                Collections.singletonList(list));
-    }
-
-    protected String buildLPortMirrorCheckRequest(String userId, String requestId, Optional<String> clliCode,
-            String configurationId, String interfaceId, String diagnosticCode) throws JsonProcessingException {
-
-        final AAIParamList configurationIdParam = new AAIParamList();
-        configurationIdParam.setKey(CONFIGURATION_ID);
-        configurationIdParam.setValue(configurationId);
-        final AAIParamList interfaceIdParam = new AAIParamList();
-        interfaceIdParam.setKey("interface-id");
-        interfaceIdParam.setValue(interfaceId);
-        final List<AAIParamList> list = new ArrayList<>();
-        list.add(configurationIdParam);
-        list.add(interfaceIdParam);
-        return this.buildRequest(userId, requestId, clliCode, diagnosticCode, LPORT_MIRRORING_CHECK, list);
-    }
-
-
-    protected String buildRequest(String userId, String requestId, Optional<String> clliCode, String diagnosticCode,
-            String operationType, List<AAIParamList> paramList) throws JsonProcessingException {
-
-        final RequestHdCustom hdCustom = new RequestHdCustom();
-        hdCustom.withRequestUserId(userId).withRequestId(requestId).withRequestClientName(CLIENT_NAME)
-                .withHealthDiagnosticCode(diagnosticCode).withOperationType(operationType).withAaiParamList(paramList);
-
-        final Input input = new Input();
-        input.setRequestHdCustom(hdCustom);
-        final Body body = new Body();
-        body.setInput(input);
-        final SDNO request = new SDNO();
-        request.withBody(body).withOperation(API_OPERATION_TYPE).withNodeType(NODE_TYPE);
-        if (clliCode.isPresent()) {
-            request.setNodeLoc(clliCode.get());
-        }
-        return this.getJson(request);
-
-    }
-
-    protected String getJson(SDNO obj) throws JsonProcessingException {
-        final ObjectMapper mapper = new ObjectMapper();
-        return mapper.writeValueAsString(obj);
-    }
-
-    protected DmaapPublisher getPublisher() throws FileNotFoundException, IOException {
-        return new SDNOHealthCheckDmaapPublisher();
-    }
-
-    protected DmaapConsumer getConsumer(String requestId) throws FileNotFoundException, IOException {
-        return new SDNOHealthCheckDmaapConsumer(requestId);
-    }
-
-    protected boolean execute(String requestId, String request) throws Exception {
-        final DmaapPublisher publisher = this.getPublisher();
-        publisher.send(request);
-
-        final DmaapConsumer consumer = this.getConsumer(requestId);
-
-        return consumer.consume();
-    }
-
-}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/SDNOValidator.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/SDNOValidator.java
deleted file mode 100644
index 83624dec63..0000000000
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/SDNOValidator.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.sdno;
-
-import java.io.IOException;
-import java.util.UUID;
-import org.onap.aai.domain.yang.GenericVnf;
-
-public interface SDNOValidator {
-
-    /**
-     * Issues a health diagnostic request for a given vnf to SDN-O
-     * 
-     * @param vnfId
-     * @param uuid
-     * @param requestingUserId
-     * @return diagnostic result
-     * @throws IOException
-     * @throws Exception
-     */
-    public boolean healthDiagnostic(String vnfId, UUID uuid, String requestingUserId) throws IOException, Exception;
-
-
-    /**
-     * Issues a health diagnostic request for a given GenericVnf to SDN-O
-     * 
-     * @param genericVnf
-     * @param uuid
-     * @param requestingUserId
-     * @return diagnostic result
-     * @throws IOException
-     * @throws Exception
-     */
-    public boolean healthDiagnostic(GenericVnf genericVnf, UUID uuid, String requestingUserId)
-            throws IOException, Exception;
-
-}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/SDNOValidatorImpl.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/SDNOValidatorImpl.java
deleted file mode 100644
index 9fc95a6f3f..0000000000
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/SDNOValidatorImpl.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.sdno;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Optional;
-import java.util.UUID;
-import javax.ws.rs.NotFoundException;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aaiclient.client.aai.AAIObjectType;
-import org.onap.aaiclient.client.aai.AAIResourcesClient;
-import org.onap.aaiclient.client.aai.entities.uri.AAIResourceUri;
-import org.onap.aaiclient.client.aai.entities.uri.AAIUriFactory;
-import org.onap.so.client.dmaap.DmaapConsumer;
-import org.onap.so.client.dmaap.DmaapPublisher;
-import org.onap.so.client.sdno.beans.Body;
-import org.onap.so.client.sdno.beans.Input;
-import org.onap.so.client.sdno.beans.RequestHealthDiagnostic;
-import org.onap.so.client.sdno.beans.SDNO;
-import org.onap.so.client.sdno.dmaap.SDNOHealthCheckDmaapConsumer;
-import org.onap.so.client.sdno.dmaap.SDNOHealthCheckDmaapPublisher;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-public class SDNOValidatorImpl implements SDNOValidator {
-
-    private final static String clientName = "MSO";
-    private final static String HEALTH_DIAGNOSTIC_CODE_DEFAULT = "default";
-
-    @Override
-    public boolean healthDiagnostic(String vnfId, UUID uuid, String requestingUserId) throws IOException, Exception {
-
-        AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, vnfId);
-        AAIResourcesClient client = new AAIResourcesClient();
-        GenericVnf vnf = client.get(GenericVnf.class, uri)
-                .orElseThrow(() -> new NotFoundException(vnfId + " not found in A&AI"));
-
-        SDNO requestDiagnostic = buildRequestDiagnostic(vnf, uuid, requestingUserId);
-        ObjectMapper mapper = new ObjectMapper();
-        String json = mapper.writeValueAsString(requestDiagnostic);
-        this.submitRequest(json);
-        boolean status = this.pollForResponse(uuid.toString());
-        return status;
-    }
-
-    @Override
-    public boolean healthDiagnostic(GenericVnf genericVnf, UUID uuid, String requestingUserId)
-            throws IOException, Exception {
-
-        SDNO requestDiagnostic = buildRequestDiagnostic(genericVnf, uuid, requestingUserId);
-        ObjectMapper mapper = new ObjectMapper();
-        String json = mapper.writeValueAsString(requestDiagnostic);
-        this.submitRequest(json);
-        boolean status = this.pollForResponse(uuid.toString());
-        return status;
-    }
-
-    protected SDNO buildRequestDiagnostic(GenericVnf vnf, UUID uuid, String requestingUserId) {
-
-        Optional<String> nfRole;
-        if (vnf.getNfRole() == null) {
-            nfRole = Optional.empty();
-        } else {
-            nfRole = Optional.of(vnf.getNfRole());
-        }
-        Input input = new Input();
-        SDNO parentRequest = new SDNO();
-        Body body = new Body();
-        parentRequest.setBody(body);
-        parentRequest.setNodeType(nfRole.orElse("NONE").toUpperCase());
-        parentRequest.setOperation("health-diagnostic");
-
-        body.setInput(input);
-
-        RequestHealthDiagnostic request = new RequestHealthDiagnostic();
-
-        request.setRequestClientName(clientName);
-        request.setRequestNodeName(vnf.getVnfName());
-        request.setRequestNodeUuid(vnf.getVnfId());
-        request.setRequestNodeType(nfRole.orElse("NONE").toUpperCase());
-        request.setRequestNodeIp(vnf.getIpv4OamAddress()); // generic-vnf oam ip
-        request.setRequestUserId(requestingUserId); // mech id?
-        request.setRequestId(uuid.toString()); // something to identify this request by for polling
-        request.setHealthDiagnosticCode(HEALTH_DIAGNOSTIC_CODE_DEFAULT);
-
-        input.setRequestHealthDiagnostic(request);
-
-        return parentRequest;
-    }
-
-    protected void submitRequest(String json) throws FileNotFoundException, IOException, InterruptedException {
-
-        DmaapPublisher publisher = new SDNOHealthCheckDmaapPublisher();
-        publisher.send(json);
-    }
-
-    protected boolean pollForResponse(String uuid) throws Exception {
-        DmaapConsumer consumer = this.getConsumer(uuid);
-        return consumer.consume();
-    }
-
-
-
-    protected DmaapConsumer getConsumer(String uuid) throws FileNotFoundException, IOException {
-        return new SDNOHealthCheckDmaapConsumer(uuid);
-    }
-
-
-
-}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/AAIParamList.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/AAIParamList.java
deleted file mode 100644
index 7e98355b4d..0000000000
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/AAIParamList.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.sdno.beans;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({"key", "value"})
-public class AAIParamList {
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("value")
-    private String value;
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public AAIParamList() {}
-
-    /**
-     * 
-     * @param value
-     * @param key
-     */
-    public AAIParamList(String key, String value) {
-        super();
-        this.key = key;
-        this.value = value;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public AAIParamList withKey(String key) {
-        this.key = key;
-        return this;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public AAIParamList withValue(String value) {
-        this.value = value;
-        return this;
-    }
-
-}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/Body.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/Body.java
deleted file mode 100644
index 8c40b749a6..0000000000
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/Body.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.sdno.beans;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({"input"})
-public class Body implements Serializable {
-
-    @JsonProperty("input")
-    private Input input;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<>();
-    private static final long serialVersionUID = 9101706044452851559L;
-
-    @JsonProperty("input")
-    public Input getInput() {
-        return input;
-    }
-
-    @JsonProperty("input")
-    public void setInput(Input input) {
-        this.input = input;
-    }
-
-    public Body withInput(Input input) {
-        this.input = input;
-        return this;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> map) {
-        this.additionalProperties = map;
-    }
-
-    public Body withAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-        return this;
-    }
-
-}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/Input.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/Input.java
deleted file mode 100644
index c8122c06f6..0000000000
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/Input.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.sdno.beans;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({"request-healthdiagnostic", "request-hd-custom"})
-public class Input implements Serializable {
-
-    @JsonProperty("request-healthdiagnostic")
-    private RequestHealthDiagnostic RequestHealthDiagnostic;
-    @JsonProperty("request-hd-custom")
-    private RequestHdCustom requestHdCustom;
-
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<>();
-    private final static long serialVersionUID = 7155546785389227528L;
-
-    @JsonProperty("request-healthdiagnostic")
-    public RequestHealthDiagnostic getRequestHealthDiagnostic() {
-        return RequestHealthDiagnostic;
-    }
-
-    @JsonProperty("request-healthdiagnostic")
-    public void setRequestHealthDiagnostic(RequestHealthDiagnostic RequestHealthDiagnostic) {
-        this.RequestHealthDiagnostic = RequestHealthDiagnostic;
-    }
-
-    @JsonProperty("request-hd-custom")
-    public RequestHdCustom getRequestHdCustom() {
-        return requestHdCustom;
-    }
-
-    @JsonProperty("request-hd-custom")
-    public void setRequestHdCustom(RequestHdCustom requestHdCustom) {
-        this.requestHdCustom = requestHdCustom;
-    }
-
-    public Input withRequestHealthDiagnostic(RequestHealthDiagnostic RequestHealthDiagnostic) {
-        this.RequestHealthDiagnostic = RequestHealthDiagnostic;
-        return this;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> map) {
-        this.additionalProperties = map;
-    }
-
-    public Input withAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-        return this;
-    }
-
-}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/RequestHdCustom.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/RequestHdCustom.java
deleted file mode 100644
index 485f64673f..0000000000
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/RequestHdCustom.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.sdno.beans;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({"request-client-name", "request-user-id", "request-id", "health-diagnostic-code", "operation-type",
-        "send-detailed-cmd-response", "aai-param-list"})
-public class RequestHdCustom implements Serializable {
-
-    /**
-    	 * 
-    	 */
-    private static final long serialVersionUID = -206110458275127710L;
-    @JsonProperty("request-client-name")
-    private String requestClientName;
-    @JsonProperty("request-user-id")
-    private String requestUserId;
-    @JsonProperty("request-id")
-    private String requestId;
-    @JsonProperty("health-diagnostic-code")
-    private String healthDiagnosticCode;
-    @JsonProperty("operation-type")
-    private String operationType;
-    @JsonProperty("send-detailed-cmd-response")
-    private String sendDetailedCmdResponse = "false";
-    @JsonProperty("aai-param-list")
-    private List<AAIParamList> aaiParamList = new ArrayList<>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public RequestHdCustom() {}
-
-    /**
-     * 
-     * @param requestClientName
-     * @param operationType
-     * @param requestId
-     * @param healthDiagnosticCode
-     * @param aaiParamList
-     * @param requestUserId
-     */
-    public RequestHdCustom(String requestClientName, String requestUserId, String requestId,
-            String healthDiagnosticCode, String operationType, List<AAIParamList> aaiParamList) {
-        super();
-        this.requestClientName = requestClientName;
-        this.requestUserId = requestUserId;
-        this.requestId = requestId;
-        this.healthDiagnosticCode = healthDiagnosticCode;
-        this.operationType = operationType;
-        this.aaiParamList = aaiParamList;
-    }
-
-    @JsonProperty("request-client-name")
-    public String getRequestClientName() {
-        return requestClientName;
-    }
-
-    @JsonProperty("request-client-name")
-    public void setRequestClientName(String requestClientName) {
-        this.requestClientName = requestClientName;
-    }
-
-    public RequestHdCustom withRequestClientName(String requestClientName) {
-        this.requestClientName = requestClientName;
-        return this;
-    }
-
-    @JsonProperty("request-user-id")
-    public String getRequestUserId() {
-        return requestUserId;
-    }
-
-    @JsonProperty("request-user-id")
-    public void setRequestUserId(String requestUserId) {
-        this.requestUserId = requestUserId;
-    }
-
-    public RequestHdCustom withRequestUserId(String requestUserId) {
-        this.requestUserId = requestUserId;
-        return this;
-    }
-
-    @JsonProperty("request-id")
-    public String getRequestId() {
-        return requestId;
-    }
-
-    @JsonProperty("request-id")
-    public void setRequestId(String requestId) {
-        this.requestId = requestId;
-    }
-
-    public RequestHdCustom withRequestId(String requestId) {
-        this.requestId = requestId;
-        return this;
-    }
-
-    @JsonProperty("health-diagnostic-code")
-    public String getHealthDiagnosticCode() {
-        return healthDiagnosticCode;
-    }
-
-    @JsonProperty("health-diagnostic-code")
-    public void setHealthDiagnosticCode(String healthDiagnosticCode) {
-        this.healthDiagnosticCode = healthDiagnosticCode;
-    }
-
-    public RequestHdCustom withHealthDiagnosticCode(String healthDiagnosticCode) {
-        this.healthDiagnosticCode = healthDiagnosticCode;
-        return this;
-    }
-
-    @JsonProperty("operation-type")
-    public String getOperationType() {
-        return operationType;
-    }
-
-    @JsonProperty("operation-type")
-    public void setOperationType(String operationType) {
-        this.operationType = operationType;
-    }
-
-    public RequestHdCustom withOperationType(String operationType) {
-        this.operationType = operationType;
-        return this;
-    }
-
-    public void setSendDetailedCmdResponse(String sendDetailedCmdResponse) {
-        this.sendDetailedCmdResponse = sendDetailedCmdResponse;
-    }
-
-    public String getSendDetailedCmdResponse() {
-        return sendDetailedCmdResponse;
-    }
-
-    public RequestHdCustom withSendDetailedCmdResponse(String sendDetailedCmdResponse) {
-        this.sendDetailedCmdResponse = sendDetailedCmdResponse;
-        return this;
-    }
-
-    @JsonProperty("aai-param-list")
-    public List<AAIParamList> getAaiParamList() {
-        return aaiParamList;
-    }
-
-    @JsonProperty("aai-param-list")
-    public void setAaiParamList(List<AAIParamList> aaiParamList) {
-        this.aaiParamList = aaiParamList;
-    }
-
-    public RequestHdCustom withAaiParamList(List<AAIParamList> aaiParamList) {
-        this.aaiParamList = aaiParamList;
-        return this;
-    }
-
-}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/RequestHealthDiagnostic.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/RequestHealthDiagnostic.java
deleted file mode 100644
index b1b75ab412..0000000000
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/RequestHealthDiagnostic.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.sdno.beans;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({"request-client-name", "request-node-name", "request-node-uuid", "request-node-ip", "request-id",
-        "request-user-id", "request-node-type", "health-diagnostic-code"})
-public class RequestHealthDiagnostic implements Serializable {
-
-    @JsonProperty("request-client-name")
-    private String requestClientName;
-    @JsonProperty("request-node-name")
-    private String requestNodeName;
-    @JsonProperty("request-node-uuid")
-    private String requestNodeUuid;
-    @JsonProperty("request-node-ip")
-    private String requestNodeIp;
-    @JsonProperty("request-id")
-    private String requestId;
-    @JsonProperty("request-user-id")
-    private String requestUserId;
-    @JsonProperty("request-node-type")
-    private String requestNodeType;
-    @JsonProperty("health-diagnostic-code")
-    private String healthDiagnosticCode;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<>();
-    private static final long serialVersionUID = 1166788526178388021L;
-
-    @JsonProperty("request-client-name")
-    public String getRequestClientName() {
-        return requestClientName;
-    }
-
-    @JsonProperty("request-client-name")
-    public void setRequestClientName(String requestClientName) {
-        this.requestClientName = requestClientName;
-    }
-
-    public RequestHealthDiagnostic withRequestClientName(String requestClientName) {
-        this.requestClientName = requestClientName;
-        return this;
-    }
-
-    @JsonProperty("request-node-name")
-    public String getRequestNodeName() {
-        return requestNodeName;
-    }
-
-    @JsonProperty("request-node-name")
-    public void setRequestNodeName(String requestNodeName) {
-        this.requestNodeName = requestNodeName;
-    }
-
-    public RequestHealthDiagnostic withRequestNodeName(String requestNodeName) {
-        this.requestNodeName = requestNodeName;
-        return this;
-    }
-
-    @JsonProperty("request-node-uuid")
-    public String getRequestNodeUuid() {
-        return requestNodeUuid;
-    }
-
-    @JsonProperty("request-node-uuid")
-    public void setRequestNodeUuid(String requestNodeUuid) {
-        this.requestNodeUuid = requestNodeUuid;
-    }
-
-    public RequestHealthDiagnostic withRequestNodeUuid(String requestNodeUuid) {
-        this.requestNodeUuid = requestNodeUuid;
-        return this;
-    }
-
-    @JsonProperty("request-node-ip")
-    public String getRequestNodeIp() {
-        return requestNodeIp;
-    }
-
-    @JsonProperty("request-node-ip")
-    public void setRequestNodeIp(String requestNodeIp) {
-        this.requestNodeIp = requestNodeIp;
-    }
-
-    public RequestHealthDiagnostic withRequestNodeIp(String requestNodeIp) {
-        this.requestNodeIp = requestNodeIp;
-        return this;
-    }
-
-    @JsonProperty("request-id")
-    public String getRequestId() {
-        return requestId;
-    }
-
-    @JsonProperty("request-id")
-    public void setRequestId(String requestId) {
-        this.requestId = requestId;
-    }
-
-    public RequestHealthDiagnostic withRequestId(String requestId) {
-        this.requestId = requestId;
-        return this;
-    }
-
-    @JsonProperty("request-user-id")
-    public String getRequestUserId() {
-        return requestUserId;
-    }
-
-    @JsonProperty("request-user-id")
-    public void setRequestUserId(String requestUserId) {
-        this.requestUserId = requestUserId;
-    }
-
-    public RequestHealthDiagnostic withRequestUserId(String requestUserId) {
-        this.requestUserId = requestUserId;
-        return this;
-    }
-
-    @JsonProperty("request-node-type")
-    public String getRequestNodeType() {
-        return requestNodeType;
-    }
-
-    @JsonProperty("request-node-type")
-    public void setRequestNodeType(String requestNodeType) {
-        this.requestNodeType = requestNodeType;
-    }
-
-    public RequestHealthDiagnostic withRequestNodeType(String requestNodeType) {
-        this.requestNodeType = requestNodeType;
-        return this;
-    }
-
-    @JsonProperty("health-diagnostic-code")
-    public String getHealthDiagnosticCode() {
-        return healthDiagnosticCode;
-    }
-
-    @JsonProperty("health-diagnostic-code")
-    public void setHealthDiagnosticCode(String healthDiagnosticCode) {
-        this.healthDiagnosticCode = healthDiagnosticCode;
-    }
-
-    public RequestHealthDiagnostic withHealthDiagnosticCode(String healthDiagnosticCode) {
-        this.healthDiagnosticCode = healthDiagnosticCode;
-        return this;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> map) {
-        this.additionalProperties = map;
-    }
-
-    public RequestHealthDiagnostic withAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-        return this;
-    }
-
-}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/ResultInfo.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/ResultInfo.java
deleted file mode 100644
index 8b84cf6659..0000000000
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/ResultInfo.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.sdno.beans;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({"client-name", "code", "processing-host", "request-id", "status"})
-public class ResultInfo {
-
-    @JsonProperty("client-name")
-    private String clientName;
-    @JsonProperty("code")
-    private String code;
-    @JsonProperty("processing-host")
-    private String processingHost;
-    @JsonProperty("request-id")
-    private String requestId;
-    @JsonProperty("status")
-    private String status;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<>();
-
-    @JsonProperty("client-name")
-    public String getClientName() {
-        return clientName;
-    }
-
-    @JsonProperty("client-name")
-    public void setClientName(String clientName) {
-        this.clientName = clientName;
-    }
-
-    @JsonProperty("code")
-    public String getCode() {
-        return code;
-    }
-
-    @JsonProperty("code")
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    @JsonProperty("processing-host")
-    public String getProcessingHost() {
-        return processingHost;
-    }
-
-    @JsonProperty("processing-host")
-    public void setProcessingHost(String processingHost) {
-        this.processingHost = processingHost;
-    }
-
-    @JsonProperty("request-id")
-    public String getRequestId() {
-        return requestId;
-    }
-
-    @JsonProperty("request-id")
-    public void setRequestId(String requestId) {
-        this.requestId = requestId;
-    }
-
-    @JsonProperty("status")
-    public String getStatus() {
-        return status;
-    }
-
-    @JsonProperty("status")
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> map) {
-        this.additionalProperties = map;
-    }
-}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/SDNO.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/SDNO.java
deleted file mode 100644
index 46e2c1d1fc..0000000000
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/SDNO.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.sdno.beans;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({"operation", "nodeLoc", "nodeType", "body"})
-public class SDNO implements Serializable {
-
-    @JsonProperty("operation")
-    private String operation;
-    @JsonProperty("nodeLoc")
-    private String nodeLoc;
-    @JsonProperty("nodeType")
-    private String nodeType;
-    @JsonProperty("body")
-    private Body body;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<>();
-    private static final long serialVersionUID = -5303297382564282650L;
-
-    @JsonProperty("operation")
-    public String getOperation() {
-        return operation;
-    }
-
-    @JsonProperty("operation")
-    public void setOperation(String operation) {
-        this.operation = operation;
-    }
-
-    @JsonProperty("nodeLoc")
-    public String getNodeLoc() {
-        return nodeLoc;
-    }
-
-    @JsonProperty("nodeLoc")
-    public void setNodeLoc(String nodeLoc) {
-        this.nodeLoc = nodeLoc;
-    }
-
-    public SDNO withNodeLoc(String nodeLoc) {
-        this.nodeLoc = nodeLoc;
-        return this;
-    }
-
-    public SDNO withOperation(String operation) {
-        this.operation = operation;
-        return this;
-    }
-
-    @JsonProperty("nodeType")
-    public String getNodeType() {
-        return nodeType;
-    }
-
-    @JsonProperty("nodeType")
-    public void setNodeType(String nodeType) {
-        this.nodeType = nodeType;
-    }
-
-    public SDNO withNodeType(String nodeType) {
-        this.nodeType = nodeType;
-        return this;
-    }
-
-    @JsonProperty("body")
-    public Body getBody() {
-        return body;
-    }
-
-    @JsonProperty("body")
-    public void setBody(Body body) {
-        this.body = body;
-    }
-
-    public SDNO withBody(Body body) {
-        this.body = body;
-        return this;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> map) {
-        this.additionalProperties = map;
-    }
-
-    public SDNO SDNO(String name, Object value) {
-        this.additionalProperties.put(name, value);
-        return this;
-    }
-
-}
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/GCTopologyOperationRequestMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/GCTopologyOperationRequestMapperTest.java
index 0eb0304cdf..d4f1660986 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/GCTopologyOperationRequestMapperTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/GCTopologyOperationRequestMapperTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.so.client.sdnc.mapper;
+package org.onap.so.bpmn.infrastructure.sdnc.mapper;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -33,6 +33,8 @@ import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiGcTopologyOperationInformation;
 import org.onap.so.bpmn.common.data.TestDataSetup;
+import org.onap.so.bpmn.infrastructure.sdnc.mapper.GCTopologyOperationRequestMapper;
+import org.onap.so.bpmn.infrastructure.sdnc.mapper.GeneralTopologyObjectMapper;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Configuration;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.L3Network;
@@ -78,81 +80,4 @@ public class GCTopologyOperationRequestMapperTest extends TestDataSetup {
         Assert.assertEquals("MsoRequestId", genericInfo.getRequestInformation().getRequestId());
     }
 
-
-
-    private VpnBondingLink getVpnBondingLink() {
-        VpnBondingLink vpnBondingLink = new VpnBondingLink();
-        Configuration vrfConfiguration = getVRFConfiguration();
-        vpnBondingLink.setVrfConfiguration(vrfConfiguration);
-        Configuration vnrConfiguration = getVNRConfiguration();
-        vpnBondingLink.setVnrConfiguration(vnrConfiguration);
-        vpnBondingLink.setTransportServiceProxy(buildServiceProxy(buildServiceInstance(buildGenericVnf())));
-        return vpnBondingLink;
-    }
-
-    private RequestContext getRequestContext() {
-        RequestContext requestContext = new RequestContext();
-        requestContext.setMsoRequestId("MsoRequestId");
-        Map<String, Object> userParams = getUserParams();
-        requestContext.setUserParams(userParams);
-        return requestContext;
-    }
-
-    private Map<String, Object> getUserParams() {
-        Map<String, Object> userParams = new HashMap<>();
-        userParams.put("lppCustomerId", "lppCustomerId");
-        return userParams;
-    }
-
-    private ServiceProxy buildServiceProxy(ServiceInstance serviceInstance) {
-        ServiceProxy serviceProxy = new ServiceProxy();
-        serviceProxy.setServiceInstance(serviceInstance);
-        return serviceProxy;
-    }
-
-    private Configuration getVRFConfiguration() {
-        Configuration vrfConfiguration = new Configuration();
-        vrfConfiguration.setConfigurationId("ConfigurationId");
-        vrfConfiguration.setConfigurationName("ConfigurationName");
-        vrfConfiguration.setConfigurationSubType("ConfigurationSubType");
-        vrfConfiguration.setConfigurationType("VRF-ENTRY");
-        return vrfConfiguration;
-    }
-
-    public Configuration getVNRConfiguration() {
-        Configuration vnrConfiguration = new Configuration();
-        vnrConfiguration.setConfigurationId("ConfigurationId");
-        vnrConfiguration.setConfigurationName("ConfigurationName");
-        vnrConfiguration.setConfigurationSubType("ConfigurationSubType");
-        vnrConfiguration.setConfigurationType("VNRConfiguration");
-        L3Network l3Network = getL3Network();
-        vnrConfiguration.setNetwork(l3Network);
-        return vnrConfiguration;
-    }
-
-    public L3Network getL3Network() {
-        L3Network l3Network = new L3Network();
-        l3Network.setNetworkId("l3NetworkId");
-        Subnet ipv4subnet = getSubnet("ipv4CidrMask", "ipv4NetworkStartAddress", "IPV4");
-        Subnet ipv6subnet = getSubnet("ipv6CidrMask", "ipv6NetworkStartAddress", "IPV6");
-        l3Network.getSubnets().add(ipv4subnet);
-        l3Network.getSubnets().add(ipv6subnet);
-        return l3Network;
-    }
-
-    private Subnet getSubnet(String ipv4CidrMask, String ipv4NetworkStartAddress, String ipv4) {
-        Subnet ipv4subnet = new Subnet();
-        ipv4subnet.setCidrMask(ipv4CidrMask);
-        ipv4subnet.setNetworkStartAddress(ipv4NetworkStartAddress);
-        ipv4subnet.setIpVersion(ipv4);
-        return ipv4subnet;
-    }
-
-    private ServiceInstance buildServiceInstance(GenericVnf vnf) {
-        ServiceInstance serviceInstance = new ServiceInstance();
-        serviceInstance.setServiceInstanceId("ServiceInstanceId");
-        List<GenericVnf> vnfs = serviceInstance.getVnfs();
-        vnfs.add(vnf);
-        return serviceInstance;
-    }
 }
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/GeneralTopologyObjectMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/GeneralTopologyObjectMapperTest.java
index 88a291e68b..92fc13b633 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/GeneralTopologyObjectMapperTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/GeneralTopologyObjectMapperTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.so.client.sdnc.mapper;
+package org.onap.so.bpmn.infrastructure.sdnc.mapper;
 
 import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
 import static org.junit.Assert.assertEquals;
@@ -47,6 +47,7 @@ import org.onap.sdnc.northbound.client.model.GenericResourceApiSvcActionEnumerat
 import org.onap.sdnc.northbound.client.model.GenericResourceApiVfmoduleinformationVfModuleInformation;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiVnfinformationVnfInformation;
 import org.onap.so.bpmn.common.data.TestDataSetup;
+import org.onap.so.bpmn.infrastructure.sdnc.mapper.GeneralTopologyObjectMapper;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Configuration;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/NetworkTopologyOperationRequestMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/NetworkTopologyOperationRequestMapperTest.java
index 76e915781f..0952a35ab0 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/NetworkTopologyOperationRequestMapperTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/NetworkTopologyOperationRequestMapperTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.so.client.sdnc.mapper;
+package org.onap.so.bpmn.infrastructure.sdnc.mapper;
 
 import static com.shazam.shazamcrest.MatcherAssert.assertThat;
 import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
@@ -38,6 +38,8 @@ import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiNetworkOperationInformation;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiRequestActionEnumeration;
+import org.onap.so.bpmn.infrastructure.sdnc.mapper.GeneralTopologyObjectMapper;
+import org.onap.so.bpmn.infrastructure.sdnc.mapper.NetworkTopologyOperationRequestMapper;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Collection;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/ServiceTopologyOperationMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/ServiceTopologyOperationMapperTest.java
index f4006ab5d5..bd5c234e50 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/ServiceTopologyOperationMapperTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/ServiceTopologyOperationMapperTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.so.client.sdnc.mapper;
+package org.onap.so.bpmn.infrastructure.sdnc.mapper;
 
 import static com.shazam.shazamcrest.MatcherAssert.assertThat;
 import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
@@ -33,6 +33,8 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.so.bpmn.infrastructure.sdnc.mapper.GeneralTopologyObjectMapper;
+import org.onap.so.bpmn.infrastructure.sdnc.mapper.ServiceTopologyOperationMapper;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceSubscription;
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/VfModuleTopologyOperationRequestMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/VfModuleTopologyOperationRequestMapperTest.java
index 2fd684e0f0..e064300ab7 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/VfModuleTopologyOperationRequestMapperTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/VfModuleTopologyOperationRequestMapperTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.so.client.sdnc.mapper;
+package org.onap.so.bpmn.infrastructure.sdnc.mapper;
 
 import static com.shazam.shazamcrest.MatcherAssert.assertThat;
 import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
@@ -40,6 +40,8 @@ import org.mockito.InjectMocks;
 import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiVfModuleOperationInformation;
+import org.onap.so.bpmn.infrastructure.sdnc.mapper.GeneralTopologyObjectMapper;
+import org.onap.so.bpmn.infrastructure.sdnc.mapper.VfModuleTopologyOperationRequestMapper;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/VnfTopologyOperationRequestMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/VnfTopologyOperationRequestMapperTest.java
index 00836176f0..a042289281 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/VnfTopologyOperationRequestMapperTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/VnfTopologyOperationRequestMapperTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.so.client.sdnc.mapper;
+package org.onap.so.bpmn.infrastructure.sdnc.mapper;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -35,6 +35,8 @@ import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiRequestActionEnumeration;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiVnfOperationInformation;
+import org.onap.so.bpmn.infrastructure.sdnc.mapper.GeneralTopologyObjectMapper;
+import org.onap.so.bpmn.infrastructure.sdnc.mapper.VnfTopologyOperationRequestMapper;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNCConfigurationResourcesTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNCConfigurationResourcesTest.java
index 9049fe1965..3429a16f0b 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNCConfigurationResourcesTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNCConfigurationResourcesTest.java
@@ -35,6 +35,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiGcTopologyOperationInformation;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiRequestActionEnumeration;
 import org.onap.so.bpmn.common.data.TestDataSetup;
+import org.onap.so.bpmn.infrastructure.sdnc.mapper.GCTopologyOperationRequestMapper;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Configuration;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
@@ -45,7 +46,6 @@ import org.onap.so.client.exception.BadResponseException;
 import org.onap.so.client.exception.MapperException;
 import org.onap.so.client.sdnc.SDNCClient;
 import org.onap.so.client.sdnc.beans.SDNCSvcAction;
-import org.onap.so.client.sdnc.mapper.GCTopologyOperationRequestMapper;
 
 @RunWith(MockitoJUnitRunner.Silent.class)
 public class SDNCConfigurationResourcesTest extends TestDataSetup {
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNCNetworkResourcesTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNCNetworkResourcesTest.java
index 327bae5749..f86a712e33 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNCNetworkResourcesTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNCNetworkResourcesTest.java
@@ -32,6 +32,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiNetworkOperationInformation;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiRequestActionEnumeration;
 import org.onap.so.bpmn.common.data.TestDataSetup;
+import org.onap.so.bpmn.infrastructure.sdnc.mapper.NetworkTopologyOperationRequestMapper;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.L3Network;
@@ -42,7 +43,6 @@ import org.onap.so.client.exception.MapperException;
 import org.onap.so.client.sdnc.SDNCClient;
 import org.onap.so.client.sdnc.beans.SDNCSvcAction;
 import org.onap.so.client.sdnc.beans.SDNCSvcOperation;
-import org.onap.so.client.sdnc.mapper.NetworkTopologyOperationRequestMapper;
 
 @RunWith(MockitoJUnitRunner.Silent.class)
 public class SDNCNetworkResourcesTest extends TestDataSetup {
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNCServiceInstanceResourcesTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNCServiceInstanceResourcesTest.java
index ad05ac0072..4282b0d158 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNCServiceInstanceResourcesTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNCServiceInstanceResourcesTest.java
@@ -35,6 +35,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiRequestActionEnumeration;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiServiceOperationInformation;
 import org.onap.so.bpmn.common.data.TestDataSetup;
+import org.onap.so.bpmn.infrastructure.sdnc.mapper.ServiceTopologyOperationMapper;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
 import org.onap.so.bpmn.servicedecomposition.generalobjects.RequestContext;
@@ -42,7 +43,6 @@ import org.onap.so.client.exception.BadResponseException;
 import org.onap.so.client.exception.MapperException;
 import org.onap.so.client.sdnc.beans.SDNCSvcAction;
 import org.onap.so.client.sdnc.beans.SDNCSvcOperation;
-import org.onap.so.client.sdnc.mapper.ServiceTopologyOperationMapper;
 
 @RunWith(MockitoJUnitRunner.Silent.class)
 public class SDNCServiceInstanceResourcesTest extends TestDataSetup {
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNCVfModuleResourcesTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNCVfModuleResourcesTest.java
index 14e993281a..813c2f7cd4 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNCVfModuleResourcesTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNCVfModuleResourcesTest.java
@@ -33,6 +33,7 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiVfModuleOperationInformation;
 import org.onap.so.bpmn.common.data.TestDataSetup;
+import org.onap.so.bpmn.infrastructure.sdnc.mapper.VfModuleTopologyOperationRequestMapper;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
@@ -43,8 +44,7 @@ import org.onap.so.bpmn.servicedecomposition.generalobjects.RequestContext;
 import org.onap.so.client.exception.BadResponseException;
 import org.onap.so.client.exception.MapperException;
 import org.onap.so.client.sdnc.beans.SDNCSvcAction;
-import org.onap.so.client.sdnc.beans.SDNCSvcOperation;
-import org.onap.so.client.sdnc.mapper.VfModuleTopologyOperationRequestMapper;;
+import org.onap.so.client.sdnc.beans.SDNCSvcOperation;;
 
 @RunWith(MockitoJUnitRunner.Silent.class)
 public class SDNCVfModuleResourcesTest extends TestDataSetup {
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNCVnfResourcesTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNCVnfResourcesTest.java
index 0ccf056ddc..f9c380bc84 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNCVnfResourcesTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNCVnfResourcesTest.java
@@ -39,6 +39,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiRequestActionEnumeration;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiVnfOperationInformation;
 import org.onap.so.bpmn.common.data.TestDataSetup;
+import org.onap.so.bpmn.infrastructure.sdnc.mapper.VnfTopologyOperationRequestMapper;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
@@ -49,7 +50,6 @@ import org.onap.so.client.exception.MapperException;
 import org.onap.so.client.sdnc.SDNCClient;
 import org.onap.so.client.sdnc.beans.SDNCSvcAction;
 import org.onap.so.client.sdnc.beans.SDNCSvcOperation;
-import org.onap.so.client.sdnc.mapper.VnfTopologyOperationRequestMapper;
 
 @RunWith(MockitoJUnitRunner.Silent.class)
 public class SDNCVnfResourcesTest extends TestDataSetup {
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdn/common/SdnCommonTasksTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdn/common/SdnCommonTasksTest.java
deleted file mode 100644
index a8816e1b04..0000000000
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdn/common/SdnCommonTasksTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * ============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.client.sdn.common;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import java.util.LinkedHashMap;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.onap.so.client.exception.BadResponseException;
-import org.onap.so.client.exception.MapperException;
-import org.onap.so.client.sdnc.SdnCommonTasks;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-
-
-public class SdnCommonTasksTest {
-
-
-    SdnCommonTasks sdnCommonTasks = new SdnCommonTasks();
-
-    @Rule
-    public ExpectedException expectedException = ExpectedException.none();
-
-    @Test
-    public void buildJsonRequestTest() throws MapperException {
-        String jsonStr = sdnCommonTasks.buildJsonRequest("");
-        Assert.assertNotNull(jsonStr);
-    }
-
-    @Test
-    public void buildJsonRequestTestException() throws MapperException {
-        expectedException.expect(MapperException.class);
-        sdnCommonTasks.buildJsonRequest(new Object());
-    }
-
-    @Test
-    public void getHttpHeadersTest() {
-        HttpHeaders result = sdnCommonTasks.getHttpHeaders("auth", true);
-
-        assertEquals("auth", result.getFirst("Authorization"));
-        assertEquals(MediaType.APPLICATION_JSON.toString(), result.getFirst("Content-Type"));
-        assertEquals(MediaType.APPLICATION_JSON.toString(), result.getFirst("Accept"));
-    }
-
-    @Test
-    public void getHttpHeadersGetRequestTest() {
-        HttpHeaders result = sdnCommonTasks.getHttpHeaders("auth", false);
-
-        assertEquals("auth", result.getFirst("Authorization"));
-        assertEquals(MediaType.APPLICATION_JSON.toString(), result.getFirst("Accept"));
-        assertFalse(result.containsKey("Content-Type"));
-    }
-
-    @Test
-    public void validateSDNResponseTest() throws BadResponseException {
-        String jsonResponse = "{\"output\":{\"response-code\":\"0\",\"response-message\":\"success\"}}";
-        LinkedHashMap<String, Object> responseMap = new LinkedHashMap<>();
-        LinkedHashMap<String, Object> output = new LinkedHashMap<>();
-        output.put("response-code", "0");
-        output.put("response-message", "success");
-        responseMap.put("output", output);
-        assertEquals(jsonResponse, sdnCommonTasks.validateSDNResponse(responseMap));
-    }
-
-    @Test
-    public void validateSDNResponseTestException() throws BadResponseException {
-        expectedException.expect(BadResponseException.class);
-        LinkedHashMap responseMap = new LinkedHashMap();
-        Assert.assertNotNull(sdnCommonTasks.validateSDNResponse(responseMap));
-    }
-
-    @Test
-    public void validateSDNResponseTestRespCodeNot200() throws BadResponseException {
-        expectedException.expect(BadResponseException.class);
-        LinkedHashMap<String, Object> responseMap = new LinkedHashMap<>();
-        LinkedHashMap<String, Object> output = new LinkedHashMap<>();
-        output.put("response-code", "300");
-        output.put("response-message", "Failed");
-        responseMap.put("output", output);
-        sdnCommonTasks.validateSDNResponse(responseMap);
-    }
-
-}
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/SDNCClientIT.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/SDNCClientIT.java
deleted file mode 100644
index 0b338bde1d..0000000000
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/SDNCClientIT.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * ============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.client.sdnc;
-
-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.urlEqualTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import org.junit.Test;
-import org.onap.so.BaseIntegrationTest;
-import org.onap.so.client.exception.BadResponseException;
-import org.onap.so.client.exception.MapperException;
-import org.onap.so.client.sdnc.endpoint.SDNCTopology;
-import org.skyscreamer.jsonassert.JSONAssert;
-
-public class SDNCClientIT extends BaseIntegrationTest {
-    private final static String JSON_FILE_LOCATION = "src/test/resources/__files/";
-
-    @Test
-    public void getTest() throws BadResponseException, MapperException, IOException {
-        String responseJson =
-                new String(Files.readAllBytes(Paths.get(JSON_FILE_LOCATION + "SDNCClientGetResponse.json")));
-        String queryLink = "/topologyQuery";
-
-        wireMockServer.stubFor(get(urlEqualTo(queryLink)).willReturn(
-                aResponse().withStatus(200).withHeader("Content-Type", "application/json").withBody(responseJson)));
-        String response = SPY_sdncClient.get(queryLink);
-        JSONAssert.assertEquals(responseJson, response, false);
-    }
-
-    @Test(expected = BadResponseException.class)
-    public void post404Test() throws BadResponseException, MapperException, IOException {
-        String responseJson =
-                new String(Files.readAllBytes(Paths.get(JSON_FILE_LOCATION + "SDNCClientPut404Response.json")));
-
-        String queryLink = "/restconf/operations/GENERIC-RESOURCE-API:network-topology-operation/";
-
-        wireMockServer.stubFor(post(urlMatching(queryLink)).willReturn(
-                aResponse().withStatus(200).withHeader("Content-Type", "application/json").withBody(responseJson)));
-
-        SPY_sdncClient.post("", SDNCTopology.NETWORK);
-    }
-
-    @Test
-    public void post200Test() throws BadResponseException, MapperException, IOException {
-        String responseJson =
-                new String(Files.readAllBytes(Paths.get(JSON_FILE_LOCATION + "SDNCClientPut200Response.json")));
-
-        String queryLink = "/restconf/operations/GENERIC-RESOURCE-API:network-topology-operation/";
-
-        wireMockServer.stubFor(post(urlMatching(queryLink)).willReturn(
-                aResponse().withStatus(200).withHeader("Content-Type", "application/json").withBody(responseJson)));
-
-        String response = SPY_sdncClient.post("", SDNCTopology.NETWORK);
-        JSONAssert.assertEquals(responseJson, response, true);
-    }
-}
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOHealthCheckClientTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOHealthCheckClientTest.java
deleted file mode 100644
index 750e578558..0000000000
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOHealthCheckClientTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.sdno;
-
-import static org.junit.Assert.assertEquals;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.Optional;
-import org.junit.Test;
-import org.onap.so.client.sdno.beans.SDNO;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-public class SDNOHealthCheckClientTest {
-
-
-
-    private final String fileLocation = "src/test/resources/org/onap/so/client/sdno/health-check/";
-    private static final String userId = "test-user";
-    private static final Optional<String> clliCode = Optional.of("test-clli");
-    private static final String requestId = "test-request-id";
-    private static final String configurationId = "test-configuration-id";
-    private static final String interfaceId = "test-interface-id";
-
-    @Test
-    public void verfyLPortMirrorPreCheckRequest() throws IOException {
-        String content = this.getJson("custom-lport-mirror-pre-check-request.json");
-        ObjectMapper mapper = new ObjectMapper();
-        SDNO expected = mapper.readValue(content, SDNO.class);
-        SDNOHealthCheckClient client = new SDNOHealthCheckClient();
-        String actual =
-                client.buildLPortMirrorCheckPreRequest(userId, requestId, clliCode, configurationId, interfaceId);
-        assertEquals("payloads are equal", mapper.writeValueAsString(expected), actual);
-    }
-
-    @Test
-    public void verfyLPortMirrorPostCheckRequest() throws IOException {
-        String content = this.getJson("custom-lport-mirror-post-check-request.json");
-        ObjectMapper mapper = new ObjectMapper();
-        SDNO expected = mapper.readValue(content, SDNO.class);
-        SDNOHealthCheckClient client = new SDNOHealthCheckClient();
-        String actual =
-                client.buildLPortMirrorCheckPostRequest(userId, requestId, clliCode, configurationId, interfaceId);
-        assertEquals("payloads are equal", mapper.writeValueAsString(expected), actual);
-    }
-
-
-    @Test
-    public void verifyPortMirrorPostCheckRequest() throws IOException {
-        String content = this.getJson("custom-port-mirror-post-check-request.json");
-        ObjectMapper mapper = new ObjectMapper();
-        SDNO expected = mapper.readValue(content, SDNO.class);
-        SDNOHealthCheckClient client = new SDNOHealthCheckClient();
-        String actual = client.buildPortMirrorPostCheckRequest(userId, requestId, clliCode, configurationId);
-
-        assertEquals("payloads are equal", mapper.writeValueAsString(expected), actual);
-
-    }
-
-    @Test
-    public void verifyPortMirrorPreCheckRequest() throws IOException {
-        String content = this.getJson("custom-port-mirror-pre-check-request.json");
-        ObjectMapper mapper = new ObjectMapper();
-        SDNO expected = mapper.readValue(content, SDNO.class);
-        SDNOHealthCheckClient client = new SDNOHealthCheckClient();
-        String actual = client.buildPortMirrorPreCheckRequest(userId, requestId, clliCode, configurationId);
-
-        assertEquals("payloads are equal", mapper.writeValueAsString(expected), actual);
-
-    }
-
-    private String getJson(String filename) throws IOException {
-        return new String(Files.readAllBytes(Paths.get(fileLocation + filename)));
-    }
-
-}
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOValidatorIT.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOValidatorIT.java
deleted file mode 100644
index b91f83c1b7..0000000000
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOValidatorIT.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.sdno;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.UUID;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.so.BaseIntegrationTest;
-import org.onap.so.client.dmaap.Consumer;
-import org.onap.so.client.dmaap.exceptions.DMaaPConsumerFailure;
-import org.onap.so.client.exceptions.SDNOException;
-import org.onap.so.client.sdno.beans.SDNO;
-import org.onap.so.client.sdno.dmaap.SDNOHealthCheckDmaapConsumer;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-
-
-public class SDNOValidatorIT extends BaseIntegrationTest {
-
-
-    @Mock
-    private Consumer mrConsumer;
-    private SDNOHealthCheckDmaapConsumer dmaapConsumer;
-    private final String fileLocation = "src/test/resources/org/onap/so/client/sdno/";
-    private final String uuid = "xyz123";
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
-    @Before
-    public void setUpTests() {
-        MockitoAnnotations.initMocks(this);
-
-    }
-
-    @Test
-    public void success() throws IOException, Exception {
-        dmaapConsumer = spy(new SDNOHealthCheckDmaapConsumer());
-        when(dmaapConsumer.getConsumer()).thenReturn(mrConsumer);
-        when(mrConsumer.fetch())
-                .thenReturn(Arrays.asList(new String[] {getJson("response.json"), getJson("output-success.json")}));
-
-        SDNOValidatorImpl validator = new SDNOValidatorImpl();
-        SDNOValidatorImpl spy = spy(validator);
-        when(dmaapConsumer.getRequestId()).thenReturn("xyz123");
-        doReturn(dmaapConsumer).when(spy).getConsumer(any(String.class));
-        boolean result = spy.pollForResponse("xyz123");
-        assertEquals("result is true", result, true);
-    }
-
-    @Test
-    public void failure() throws IOException, Exception {
-        dmaapConsumer = spy(new SDNOHealthCheckDmaapConsumer());
-
-        when(dmaapConsumer.getConsumer()).thenReturn(mrConsumer);
-        when(mrConsumer.fetch())
-                .thenReturn(Arrays.asList(new String[] {getJson("response.json"), getJson("output-failure.json")}));
-
-        SDNOValidatorImpl validator = new SDNOValidatorImpl();
-        SDNOValidatorImpl spy = spy(validator);
-        when(dmaapConsumer.getRequestId()).thenReturn("xyz123");
-        doReturn(dmaapConsumer).when(spy).getConsumer(any(String.class));
-        thrown.expect(SDNOException.class);
-        thrown.expectMessage(containsString("my error message"));
-        boolean result = spy.pollForResponse("xyz123");
-
-    }
-
-    @Ignore
-    @Test
-    public void run() throws Exception {
-        SDNOValidatorImpl validator = new SDNOValidatorImpl();
-        UUID uuid = UUID.randomUUID();
-        GenericVnf vnf = new GenericVnf();
-        vnf.setVnfId("test");
-        vnf.setIpv4OamAddress("1.2.3.4");
-        vnf.setNfRole("VPE");
-        SDNO request = validator.buildRequestDiagnostic(vnf, uuid, "mechid");
-        ObjectMapper mapper = new ObjectMapper();
-        String json = mapper.writeValueAsString(request);
-        validator.submitRequest(json);
-        thrown.expect(DMaaPConsumerFailure.class);
-        boolean result = validator.pollForResponse(uuid.toString());
-        System.out.println(json);
-
-    }
-
-    private String getJson(String filename) throws IOException {
-        return new String(Files.readAllBytes(Paths.get(fileLocation + filename)));
-    }
-}
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOValidatorImplTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOValidatorImplTest.java
deleted file mode 100644
index c2278c26f9..0000000000
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOValidatorImplTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.sdno;
-
-import static org.junit.Assert.assertEquals;
-import java.util.UUID;
-import org.junit.Test;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.so.client.sdno.beans.RequestHealthDiagnostic;
-import org.onap.so.client.sdno.beans.SDNO;
-
-public class SDNOValidatorImplTest {
-
-    @Test
-    public void buildRequestDiagnosticTest() throws Exception {
-        SDNOValidatorImpl validator = new SDNOValidatorImpl();
-        UUID uuid = UUID.randomUUID();
-        GenericVnf vnf = new GenericVnf();
-        vnf.setVnfName("VNFNAME");
-        vnf.setVnfId("test");
-        vnf.setIpv4OamAddress("1.2.3.4");
-        vnf.setNfRole("VPE");
-        SDNO request = validator.buildRequestDiagnostic(vnf, uuid, "mechid");
-        assertEquals(request.getNodeType(), "VPE");
-        assertEquals(request.getOperation(), "health-diagnostic");
-
-        RequestHealthDiagnostic innerRequest = request.getBody().getInput().getRequestHealthDiagnostic();
-        assertEquals(innerRequest.getRequestClientName(), "MSO");
-        assertEquals(innerRequest.getRequestNodeName(), "VNFNAME");
-        assertEquals(innerRequest.getRequestNodeUuid(), "test");
-        assertEquals(innerRequest.getRequestNodeType(), "VPE");
-        assertEquals(innerRequest.getRequestNodeIp(), "1.2.3.4");
-        assertEquals(innerRequest.getRequestUserId(), "mechid");
-        assertEquals(innerRequest.getRequestId(), uuid.toString());
-        assertEquals(innerRequest.getHealthDiagnosticCode(), "default");
-
-    }
-}
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-post-check-request.json b/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-post-check-request.json
deleted file mode 100644
index 2c46b5a8cb..0000000000
--- a/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-post-check-request.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"body": {
-		"input": {
-			"request-hd-custom": {
-				"request-client-name": "MSO",
-				"request-user-id": "test-user",
-				"request-id": "test-request-id",
-				"health-diagnostic-code": "VROUTER000004",
-				"operation-type": "lport_mirroring_check",
-				"send-detailed-cmd-response": "false",
-				"aai-param-list": [
-					{
-						"key": "configuration-id",
-						"value": "test-configuration-id"
-					},
-					{
-						"key": "interface-id",
-						"value": "test-interface-id"
-					}
-				]
-			}
-		}
-	},
-	"operation": "health-diagnostic-custom",
-	"nodeLoc": "test-clli",
-	"nodeType": "VROUTER"
-}
\ No newline at end of file
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-pre-check-request.json b/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-pre-check-request.json
deleted file mode 100644
index bf168b0028..0000000000
--- a/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-pre-check-request.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"body": {
-		"input": {
-			"request-hd-custom": {
-				"request-client-name": "MSO",
-				"request-user-id": "test-user",
-				"request-id": "test-request-id",
-				"health-diagnostic-code": "VROUTER000003",
-				"operation-type": "lport_mirroring_check",
-				"send-detailed-cmd-response": "false",
-				"aai-param-list": [
-					{
-						"key": "configuration-id",
-						"value": "test-configuration-id"
-					},
-					{
-						"key": "interface-id",
-						"value": "test-interface-id"
-					}
-				]
-			}
-		}
-	},
-	"operation": "health-diagnostic-custom",
-	"nodeLoc": "test-clli",
-	"nodeType": "VROUTER"
-}
\ No newline at end of file
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-post-check-request.json b/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-post-check-request.json
deleted file mode 100644
index 89e505e7d0..0000000000
--- a/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-post-check-request.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"body": {
-		"input": {
-			"request-hd-custom": {
-				"request-client-name": "MSO",
-				"request-user-id": "test-user",
-				"request-id": "test-request-id",
-				"health-diagnostic-code": "VROUTER000004",
-				"operation-type": "mirroring_check",
-				"send-detailed-cmd-response": "false",
-				"aai-param-list": [
-					{
-						"key": "configuration-id",
-						"value": "test-configuration-id"
-					}
-				]
-			}
-		}
-	},
-	"operation": "health-diagnostic-custom",
-	"nodeLoc": "test-clli",
-	"nodeType": "VROUTER"
-}
\ No newline at end of file
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-pre-check-request.json b/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-pre-check-request.json
deleted file mode 100644
index 86897c8a1f..0000000000
--- a/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-pre-check-request.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"body": {
-		"input": {
-			"request-hd-custom": {
-				"request-client-name": "MSO",
-				"request-user-id": "test-user",
-				"request-id": "test-request-id",
-				"health-diagnostic-code": "VROUTER000003",
-				"operation-type": "mirroring_check",
-				"send-detailed-cmd-response": "false",
-				"aai-param-list": [
-					{
-						"key": "configuration-id",
-						"value": "test-configuration-id"
-					}
-				]
-			}
-		}
-	},
-	"operation": "health-diagnostic-custom",
-	"nodeLoc": "test-clli",
-	"nodeType": "VROUTER"
-}
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/output-failure.json b/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/output-failure.json
deleted file mode 100644
index 8cf0a820cd..0000000000
--- a/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/output-failure.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"body": {
-		"output": {
-			"response-hd-custom": {
-				"response-status": "Failure",
-				"cached-data": "false",
-				"response-interface-type": "ansible",
-				"response-id": "191bf423-8473-4f7c-9fbb-e5dcbb40a12b",
-				"remote_end_time": "2017-10-13T14:51:53.490+0000",
-				"response-client-name": "MSO",
-				"user_id": "xxxxxx",
-				"remote_start_time": "2017-10-13T14:51:53.173+0000",
-				"error-message": "my error message",
-				"connection-failure-msg": "SDNO was unable to connect to an Ansible REST API server; Please ensure Ansible REST server is running"
-			}
-		}
-	},
-	"result-info": {
-		"code": "200",
-		"status": "SUCCESS",
-		"request-id": "xyz123",
-		"client-name": "MSO",
-		"processing-host": "sdno-sdno-mtsnjv9sdno01"
-	}
-}
\ No newline at end of file
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/output-success.json b/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/output-success.json
deleted file mode 100644
index a6794327d8..0000000000
--- a/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/output-success.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "body": {
-        "output": {
-             "response-healthdiagnostic": {
-			      "response-node-ip": "192.20.127.76",
-			      "response-id": "xyz123",
-			      "response-node-name": "mtvnjv9aads11",
-			      "response-status": "Success",
-			      "response-interface-type": "ssh",
-			      "response-details-json": "result",
-			      "cached-data": "false"
-			    }
-        }
-    },
-    "result-info": {
-        "client-name": "MSO",
-        "code": "200",
-        "processing-host": "sdno1-host01",
-        "request-id": "xyz123",
-        "status": "SUCCESS"
-    }
-}
\ No newline at end of file
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/response.json b/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/response.json
deleted file mode 100644
index 2355e86938..0000000000
--- a/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/response.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-
-    "result-info": {
-
-        "client-name": "MSO",
-
-        "code": "202",
-
-        "processing-host": "sdno1-host01",
-
-        "request-id": "xyz123",
-
-        "status": "ACCEPTED"
-
-    }
-
-}
\ No newline at end of file