Renaming ansible and saltstanck adapter to adaptor

Issue-ID: CCSDK-3212
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Ibf0366b31a37173050602bd692627647f4f29bb7

25 files changed, 0 insertions, 3808 deletions

diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/AnsibleAdapter.java b/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/AnsibleAdapter.java
deleted file mode 100644
index 65f80a1c2..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/AnsibleAdapter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : SLI
- * ================================================================================
- * Copyright (C) 2021 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.
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.ccsdk.sli.adaptors.ansible;
-
-import java.util.Map;
-import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-import org.onap.ccsdk.sli.core.sli.SvcLogicException;
-import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
-
-/**
- * This interface defines the operations that the Ansible adapter exposes.
- */
-public interface AnsibleAdapter extends SvcLogicJavaPlugin {
-    /**
-     * Returns the symbolic name of the adapter
-     *
-     * @return The adapter name
-     */
-    String getAdapterName();
-
-    /* Method to post request for execution of Playbook */
-    void reqExec(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException;
-
-    /* Method to get result of a playbook execution request */
-    void reqExecResult(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException;
-
-    /* Method to get log of a playbook execution request */
-    void reqExecLog(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException;
-
-    /* Method to get output of a playbook execution request */
-    void reqExecOutput(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException;
-
-}
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/AnsibleAdapterConstants.java b/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/AnsibleAdapterConstants.java
deleted file mode 100644
index 20a8400bb..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/AnsibleAdapterConstants.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.onap.ccsdk.sli.adaptors.ansible;
-
-public class AnsibleAdapterConstants {
-
-    public static final String ID = "Id";
-    public static final String USER = "User";
-    public static final String PSWD = "Password";
-    public static final String SERVERIP = "ServerIP";
-    public static final String AGENT_URL = "AgentUrl";
-    public static final String NODE_LIST = "NodeList";
-    public static final String ANSIBLE_SERVER = "AnsibleServer";
-
-    public static final String APPC_PROPS = "/appc.properties";
-    public static final String SDNC_CONFIG_DIR = "SDNC_CONFIG_DIR";
-    public static final String PROPDIR = System.getenv(SDNC_CONFIG_DIR);
-
-    public static final String ACTION = "Action";
-    public static final String OUTPUT = "Output";
-    public static final String TIMEOUT = "Timeout";
-    public static final String VERSION = "Version";
-
-    public static final String FAILURE = "failure";
-    public static final String SUCCESS = "success";
-    public static final String STATUS_CODE = "StatusCode";
-    public static final String STATUS_MESSAGE = "StatusMessage";
-
-    public static final String EXTRA_VARS = "ExtraVars";
-    public static final String PLAYBOOK_NAME = "PlaybookName";
-    public static final String AUTO_NODE_LIST = "AutoNodeList";
-    public static final String ENV_PARAMETERS = "EnvParameters";
-    public static final String FILE_PARAMETERS = "FileParameters";
-    public static final String INVENTORY_NAMES = "InventoryNames";
-    public static final String LOCAL_PARAMETERS = "LocalParameters";
-
-    public static final String ID_ATTRIBUTE_NAME = "org.onap.appc.adapter.ansible.Id";
-    public static final String LOG_ATTRIBUTE_NAME = "org.onap.appc.adapter.ansible.log";
-    public static final String OUTPUT_ATTRIBUTE_NAME = "org.onap.appc.adapter.ansible.output";
-    public static final String TIMEOUT_PROPERTY_NAME = "org.onap.appc.adapter.ansible.timeout";
-    public static final String MESSAGE_ATTRIBUTE_NAME = "org.onap.appc.adapter.ansible.message";
-    public static final String RESULTS_ATTRIBUTE_NAME = "org.onap.appc.adapter.ansible.results";
-    public static final String RESULT_CODE_ATTRIBUTE_NAME = "org.onap.appc.adapter.ansible.result.code";
-
-    public static final String TRUSTSTORE_PROPERTY_NAME = "org.onap.appc.adapter.ansible.trustStore";
-    public static final String CLIENT_TYPE_PROPERTY_NAME = "org.onap.appc.adapter.ansible.clientType";
-    public static final String POLL_INTERVAL_PROPERTY_NAME = "org.onap.appc.adapter.ansible.pollInterval";
-    public static final String SOCKET_TIMEOUT_PROPERTY_NAME = "org.onap.appc.adapter.ansible.socketTimeout";
-    public static final String TRUSTSTORE_PASS_PROPERTY_NAME = "org.onap.appc.adapter.ansible.trustStore.trustPasswd";
-
-
-}
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/AnsibleAdapterPropertiesProvider.java b/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/AnsibleAdapterPropertiesProvider.java
deleted file mode 100755
index 671b1e488..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/AnsibleAdapterPropertiesProvider.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : SLI
- * ================================================================================
- * Copyright (C) 2021 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.
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.ccsdk.sli.adaptors.ansible;
-
-import java.util.Properties;
-
-public interface AnsibleAdapterPropertiesProvider {
-
-    Properties getProperties();
-
-}
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/impl/AnsibleAdapterImpl.java b/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/impl/AnsibleAdapterImpl.java
deleted file mode 100644
index bc0af2782..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/impl/AnsibleAdapterImpl.java
+++ /dev/null
@@ -1,620 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : SLI
- * ================================================================================
- * Copyright (C) 2021 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.
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.ccsdk.sli.adaptors.ansible.impl;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import org.apache.commons.lang.StringUtils;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter;
-import org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapterPropertiesProvider;
-import org.onap.ccsdk.sli.adaptors.ansible.model.AnsibleMessageParser;
-import org.onap.ccsdk.sli.adaptors.ansible.model.AnsibleResult;
-import org.onap.ccsdk.sli.adaptors.ansible.model.AnsibleResultCodes;
-import org.onap.ccsdk.sli.adaptors.ansible.model.AnsibleServerEmulator;
-import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-import org.onap.ccsdk.sli.core.sli.SvcLogicException;
-import org.onap.ccsdk.sli.core.utils.encryption.EncryptionTool;
-
-import static org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapterConstants.*;
-
-/**
- * This class implements the {@link AnsibleAdapter} interface. This interface defines the behaviors
- * that our service provides.
- */
-public class AnsibleAdapterImpl implements AnsibleAdapter {
-
-    /**
-     * Adapter Name
-     */
-    private static final String ADAPTER_NAME = "Ansible Adapter";
-    private static final String APPC_EXCEPTION_CAUGHT = "APPCException caught";
-
-    /**
-     * The logger to be used
-     */
-    private static final EELFLogger logger = EELFManager.getInstance().getLogger(AnsibleAdapterImpl.class);
-    private int defaultTimeout = 600 * 1000;
-    private int defaultSocketTimeout = 60 * 1000;
-    private int defaultPollInterval = 60 * 1000;
-    /**
-     * Ansible API Message Handlers
-     **/
-    private AnsibleMessageParser messageProcessor;
-
-    /**
-     * indicator whether in test mode
-     **/
-    private boolean testMode = false;
-
-    /**
-     * server emulator object to be used if in test mode
-     **/
-    private AnsibleServerEmulator testServer;
-
-    /**
-     * This default constructor is used as a work around because the activator wasn't getting called
-     */
-    public AnsibleAdapterImpl() {
-        initialize(new AnsibleAdapterPropertiesProviderImpl());
-    }
-
-    /**
-     * Instantiates a new Ansible adapter.
-     *
-     * @param propProvider the prop provider
-     */
-    public AnsibleAdapterImpl(AnsibleAdapterPropertiesProvider propProvider) {
-        initialize(propProvider);
-    }
-
-    /**
-     * Used for jUnit test and testing interface
-     *
-     * @param mode the mode
-     */
-    public AnsibleAdapterImpl(boolean mode) {
-        testMode = mode;
-        testServer = new AnsibleServerEmulator();
-        messageProcessor = new AnsibleMessageParser();
-    }
-
-    /**
-     * Returns the symbolic name of the adapter
-     *
-     * @return The adapter name
-     */
-    @Override
-    public String getAdapterName() {
-        return ADAPTER_NAME;
-    }
-
-    @SuppressWarnings("static-method")
-    private void doFailure(SvcLogicContext svcLogic, int code, String message) throws SvcLogicException {
-        svcLogic.markFailed();
-        svcLogic.setAttribute(RESULT_CODE_ATTRIBUTE_NAME, Integer.toString(code));
-        svcLogic.setAttribute(MESSAGE_ATTRIBUTE_NAME, message);
-        throw new SvcLogicException("Ansible Adapter Error = " + message);
-    }
-
-    /**
-     * initialize the Ansible adapter based on default and over-ride configuration data
-     */
-    private void initialize(AnsibleAdapterPropertiesProvider propProvider) {
-        Properties props = propProvider.getProperties();
-        // Create the message processor instance
-        messageProcessor = new AnsibleMessageParser();
-
-        //continuing for checking defaultTimeout
-        try {
-            String timeoutStr = props.getProperty(TIMEOUT_PROPERTY_NAME);
-            defaultTimeout = Integer.parseInt(timeoutStr) * 1000;
-        } catch (Exception e) {
-            defaultTimeout = 600 * 1000;
-            logger.error("Error while reading time out property", e);
-        }
-        //continuing for checking defaultSocketTimeout
-        try {
-            String timeoutStr = props.getProperty(SOCKET_TIMEOUT_PROPERTY_NAME);
-            defaultSocketTimeout = Integer.parseInt(timeoutStr) * 1000;
-        } catch (Exception e) {
-            defaultSocketTimeout = 60 * 1000;
-            logger.error("Error while reading socket time out property", e);
-        }
-        //continuing for checking defaultPollInterval
-        try {
-            String timeoutStr = props.getProperty(POLL_INTERVAL_PROPERTY_NAME);
-            defaultPollInterval = Integer.parseInt(timeoutStr) * 1000;
-        } catch (Exception e) {
-            defaultPollInterval = 60 * 1000;
-            logger.error("Error while reading poll interval property", e);
-        }
-        logger.info("Initialized Ansible Adapter");
-    }
-
-    private ConnectionBuilder getHttpConn(int timeout, String serverIP) {
-        String path = PROPDIR + APPC_PROPS;
-        File propFile = new File(path);
-        Properties props = new Properties();
-        InputStream input;
-        try {
-            input = new FileInputStream(propFile);
-            props.load(input);
-        } catch (Exception ex) {
-            logger.error("Error while reading appc.properties file {}", ex.getMessage());
-        }
-        // Create the http client instance
-        // type of client is extracted from the property file parameter
-        // org.onap.appc.adapter.ansible.clientType
-        // It can be :
-        // 1. TRUST_ALL (trust all SSL certs). To be used ONLY in dev
-        // 2. TRUST_CERT (trust only those whose certificates have been stored in the trustStore file)
-        // 3. DEFAULT (trust only well known certificates). This is standard behavior to which it will
-        // revert. To be used in PROD
-        ConnectionBuilder httpClientLocal = null;
-        try {
-            String clientType = props.getProperty(CLIENT_TYPE_PROPERTY_NAME);
-            logger.info("Ansible http client type set to {}", clientType);
-            if ("TRUST_ALL".equals(clientType)) {
-                logger.info("Creating http client to trust ALL ssl certificates. WARNING. This should be done only in dev environments");
-                httpClientLocal = new ConnectionBuilder(1, timeout);
-            } else if ("TRUST_CERT".equals(clientType)) {
-                // set path to keystore file
-                String trustStoreFile = props.getProperty(TRUSTSTORE_PROPERTY_NAME);
-                String key = props.getProperty(TRUSTSTORE_PASS_PROPERTY_NAME);
-                char[] trustStorePasswd = EncryptionTool.getInstance().decrypt(key).toCharArray();
-                logger.info("Creating http client with trust manager from {}", trustStoreFile);
-                httpClientLocal = new ConnectionBuilder(trustStoreFile, trustStorePasswd, timeout, serverIP);
-            } else {
-                logger.info("Creating http client with default behaviour");
-                httpClientLocal = new ConnectionBuilder(0, timeout);
-            }
-        } catch (Exception e) {
-            logger.error("Error Getting HTTP Connection Builder due to Unknown Exception", e);
-        }
-
-        logger.info("Got HTTP Connection Builder");
-        return httpClientLocal;
-    }
-
-    // Public Method to post request to execute playbook. Posts the following back
-    // to Svc context memory
-    //  org.onap.appc.adapter.ansible.req.code : 100 if successful
-    //  org.onap.appc.adapter.ansible.req.messge : any message
-    //  org.onap.appc.adapter.ansible.req.Id : a unique uuid to reference the request
-    @Override
-    public void reqExec(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
-        String playbookName = StringUtils.EMPTY;
-        String payload = StringUtils.EMPTY;
-        String agentUrl = StringUtils.EMPTY;
-        String user = StringUtils.EMPTY;
-        String pswd = StringUtils.EMPTY;
-        String id = StringUtils.EMPTY;
-
-        try {
-            // create json object to send request
-            JSONObject jsonPayload = messageProcessor.reqMessage(params);
-            logger.info("Initial Payload = {}", jsonPayload.toString());
-
-            agentUrl = (String) jsonPayload.remove("AgentUrl");
-            id = jsonPayload.getString("Id");
-            user = (String) jsonPayload.remove(USER);
-            pswd = (String) jsonPayload.remove(PSWD);
-            if (StringUtils.isNotBlank(pswd)) {
-                pswd = EncryptionTool.getInstance().decrypt(pswd);
-            }
-            String timeout = jsonPayload.getString("Timeout");
-            if (StringUtils.isBlank(timeout)) {
-                timeout = "600";
-            }
-
-            String autoNodeList = (String) jsonPayload.remove("AutoNodeList");
-            if (Boolean.parseBoolean(autoNodeList)) {
-                JSONArray generatedNodeList = generateNodeList(params, ctx);
-                if (generatedNodeList.length() > 0) {
-                    jsonPayload.put("NodeList", generatedNodeList);
-                    jsonPayload.put("InventoryNames", "VM");
-                } else {
-                    doFailure(ctx, AnsibleResultCodes.INVALID_PAYLOAD.getValue(),
-                            "Auto generation of Node List Failed - no elements on the list");
-                }
-            } else {
-                logger.debug("Auto Node List is DISABLED");
-            }
-
-            payload = jsonPayload.toString();
-            ctx.setAttribute("AnsibleTimeout", timeout);
-            logger.info("Updated Payload = {} timeout = {}", payload, timeout);
-        } catch (SvcLogicException e) {
-            logger.error(APPC_EXCEPTION_CAUGHT, e);
-            doFailure(ctx, AnsibleResultCodes.INVALID_PAYLOAD.getValue(),
-                    "Error constructing request for execution of playbook due to missing mandatory parameters. Reason = "
-                    + e.getMessage());
-        } catch (JSONException e) {
-            logger.error("JSONException caught", e);
-            doFailure(ctx, AnsibleResultCodes.INVALID_PAYLOAD.getValue(),
-                    "Error constructing request for execution of playbook due to invalid JSON block. Reason = "
-                    + e.getMessage());
-        } catch (NumberFormatException e) {
-            logger.error("NumberFormatException caught", e);
-            doFailure(ctx, AnsibleResultCodes.INVALID_PAYLOAD.getValue(),
-                    "Error constructing request for execution of playbook due to invalid parameter values. Reason = "
-                    + e.getMessage());
-        }
-
-        int code = -1;
-        String message = StringUtils.EMPTY;
-
-        try {
-            // post the test request
-            logger.info("Posting ansible request = {} to url = {}", payload, agentUrl);
-            AnsibleResult testResult = postExecRequest(agentUrl, payload, user, pswd);
-            if (testResult != null) {
-                logger.info("Received response on ansible post request {}", testResult.getStatusMessage());
-                // Process if HTTP was successful
-                if (testResult.getStatusCode() == 200) {
-                    testResult = messageProcessor.parsePostResponse(testResult.getStatusMessage());
-                } else {
-                    doFailure(ctx, testResult.getStatusCode(),
-                            "Error posting request. Reason = " + testResult.getStatusMessage());
-                }
-
-                code = testResult.getStatusCode();
-                message = testResult.getStatusMessage();
-                ctx.setAttribute(OUTPUT_ATTRIBUTE_NAME, testResult.getOutput());
-                ctx.setAttribute(SERVERIP, StringUtils.defaultIfBlank(testResult.getServerIp(), ""));
-                // Check status of test request returned by Agent
-                if (code == AnsibleResultCodes.PENDING.getValue()) {
-                    logger.info("Submission of Test {} successful.", playbookName);
-                    // test request accepted. We are in asynchronous case
-                } else {
-                    doFailure(ctx, code, "Request for execution of playbook rejected. Reason = " + message);
-                }
-            } else {
-                doFailure(ctx, code, "Ansible Test result is null");
-            }
-        } catch (SvcLogicException e) {
-            logger.error(APPC_EXCEPTION_CAUGHT, e);
-            doFailure(ctx, AnsibleResultCodes.UNKNOWN_EXCEPTION.getValue(),
-                    "Exception encountered when posting request for execution of playbook. Reason = " + e.getMessage());
-        }
-
-        ctx.setAttribute(RESULT_CODE_ATTRIBUTE_NAME, Integer.toString(code));
-        ctx.setAttribute(MESSAGE_ATTRIBUTE_NAME, message);
-        ctx.setAttribute(ID_ATTRIBUTE_NAME, id);
-    }
-
-    /**
-     * Method is used to automatically generate NodeList section base on the svc context
-     */
-    private JSONArray generateNodeList(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
-        String vfModuleId = StringUtils.trimToNull(params.get("vf-module-id"));
-        String vnfcName = StringUtils.trimToNull(params.get("vnfc-name"));
-        String vServerId = StringUtils.trimToNull(params.get("vserver-id"));
-        String vnfcType = StringUtils.trimToNull(params.get("vnfc-type"));
-
-        JSONArray result = new JSONArray();
-        logger.info("GENERATING NODE LIST");
-        logger.debug("Auto Node List filtering parameter vserver-id {} | vnfc-name {} | vnfc-type {} | vf-module-id {}",
-                vServerId, vnfcName, vnfcType, vfModuleId);
-
-        Map<String, JSONObject> candidates = new HashMap<>();
-        for (int i = 0; ; i++) {
-            String vmKey = "tmp.vnfInfo.vm[" + i + "]";
-            logger.info("Looking for attributes of: {}", vmKey);
-            if (ctx.getAttribute(vmKey + ".vnfc-name") != null) {
-                String debugText = "Auto Node List candidate ";
-                String vmVnfcName = ctx.getAttribute(vmKey + ".vnfc-name");
-                String vmVnfcIpv4Address = ctx.getAttribute(vmKey + ".vnfc-ipaddress-v4-oam-vip");
-                String vmVnfcType = ctx.getAttribute(vmKey + ".vnfc-type");
-
-                if (vmVnfcName != null && vmVnfcIpv4Address != null && vmVnfcType != null
-                    && !vmVnfcName.equals("") && !vmVnfcIpv4Address.equals("") && !vmVnfcType.equals("")) {
-                    if (vServerId != null) {
-                        String vmVserverId = ctx.getAttribute(vmKey + ".vserver-id");
-                        if (!vServerId.equals(vmVserverId)) {
-                            logger.debug("{}{} dropped. vserver-id mismatch", debugText, vmVnfcName);
-                            continue;
-                        }
-                    }
-                    if (vfModuleId != null) {
-                        String vmVfModuleId = ctx.getAttribute(vmKey + ".vf-module-id");
-                        if (!vfModuleId.equals(vmVfModuleId)) {
-                            logger.debug("{}{} dropped. vf-module-id mismatch", debugText, vmVnfcName);
-                            continue;
-                        }
-                    }
-                    if (vnfcName != null && !vmVnfcName.equals(vnfcName)) {
-                        logger.debug("{}{} dropped. vnfc-name mismatch", debugText, vmVnfcName);
-                        continue;
-                    }
-                    if (vnfcType != null && !vmVnfcType.equals(vnfcType)) {
-                        logger.debug("{}{} dropped. vnfc-type mismatch", debugText, vmVnfcType);
-                        continue;
-                    }
-
-                    logger.info("{}{} [{},{}]", debugText, vmVnfcName, vmVnfcIpv4Address, vmVnfcType);
-
-                    JSONObject vnfTypeCandidates;
-                    JSONArray vmList;
-                    if (!candidates.containsKey(vmVnfcType)) {
-                        vnfTypeCandidates = new JSONObject();
-                        vmList = new JSONArray();
-                        vnfTypeCandidates.put("site", "site");
-                        vnfTypeCandidates.put("vnfc-type", vmVnfcType);
-                        vnfTypeCandidates.put("vm-info", vmList);
-                        candidates.put(vmVnfcType, vnfTypeCandidates);
-                    } else {
-                        vnfTypeCandidates = candidates.get(vmVnfcType);
-                        vmList = (JSONArray) vnfTypeCandidates.get("vm-info");
-                    }
-
-                    JSONObject candidate = new JSONObject();
-                    candidate.put("ne_id", vmVnfcName);
-                    candidate.put("fixed_ip_address", vmVnfcIpv4Address);
-                    vmList.put(candidate);
-                } else {
-                    logger.warn("Incomplete information for Auto Node List candidate {}", vmKey);
-                }
-            } else {
-                break;
-            }
-        }
-
-        for (JSONObject vnfcCandidates : candidates.values()) {
-            result.put(vnfcCandidates);
-        }
-
-        logger.info("GENERATING NODE LIST COMPLETED");
-        return result;
-    }
-
-    /**
-     * Public method to query status of a specific request It blocks till the Ansible Server
-     * responds or the session times out (non-Javadoc)
-     *
-     * @see org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter#reqExecResult(java.util.Map,
-     * org.onap.ccsdk.sli.core.sli.SvcLogicContext)
-     */
-    @Override
-    public void reqExecResult(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
-        // Get URI
-        String reqUri;
-
-        try {
-            String serverIp = ctx.getAttribute(SERVERIP);
-            if (StringUtils.isNotBlank(serverIp)) {
-                reqUri = messageProcessor.reqUriResultWithIP(params, serverIp);
-            } else {
-                reqUri = messageProcessor.reqUriResult(params);
-            }
-            logger.info("Got uri {}", reqUri);
-        } catch (SvcLogicException e) {
-            logger.error(APPC_EXCEPTION_CAUGHT, e);
-            doFailure(ctx, AnsibleResultCodes.INVALID_PAYLOAD.getValue(),
-                    "Error constructing request to retrieve result due to missing parameters. Reason = "
-                    + e.getMessage());
-            return;
-        } catch (NumberFormatException e) {
-            logger.error("NumberFormatException caught", e);
-            doFailure(ctx, AnsibleResultCodes.INVALID_PAYLOAD.getValue(),
-                    "Error constructing request to retrieve result due to invalid parameters value. Reason = "
-                    + e.getMessage());
-            return;
-        }
-
-        int code;
-        String message;
-        String output;
-        String configData;
-        String results = StringUtils.EMPTY;
-        String finalResponse = StringUtils.EMPTY;
-        try {
-            // Try to retrieve the test results (modify the URL for that)
-            AnsibleResult testResult = queryServer(reqUri, params.get(USER),
-                    EncryptionTool.getInstance().decrypt(params.get(PSWD)), ctx);
-            code = testResult.getStatusCode();
-            message = testResult.getStatusMessage();
-
-            if (code == 200 || code == 400 || "FINISHED".equalsIgnoreCase(message)) {
-                logger.info("Parsing response from ansible Server = {}", message);
-                // Valid HTTP. process the Ansible message
-                testResult = messageProcessor.parseGetResponse(message);
-                code = testResult.getStatusCode();
-                message = testResult.getStatusMessage();
-                results = testResult.getResults();
-                output = testResult.getOutput();
-                configData = testResult.getConfigData();
-                if ((StringUtils.isBlank(output)) || (output.trim().equalsIgnoreCase("{}"))) {
-                    finalResponse = results;
-                } else {
-                    finalResponse = output;
-                }
-                logger.info("configData from ansible's response = {}", configData);
-                ctx.setAttribute("device-running-config", configData);
-            }
-            logger.info("Request response = " + message);
-        } catch (SvcLogicException e) {
-            logger.error(APPC_EXCEPTION_CAUGHT, e);
-            ctx.setAttribute(RESULTS_ATTRIBUTE_NAME, results);
-            ctx.setAttribute(OUTPUT_ATTRIBUTE_NAME, finalResponse);
-            doFailure(ctx, AnsibleResultCodes.UNKNOWN_EXCEPTION.getValue(),
-                    "Exception encountered retrieving result : " + e.getMessage());
-            return;
-        }
-
-        // We were able to get and process the results. Determine if playbook succeeded
-
-        if (code == AnsibleResultCodes.FINAL_SUCCESS.getValue()) {
-            message = String.format("Ansible Request  %s finished with Result = %s, Message = %s", params.get("Id"),
-                    SUCCESS, message);
-            logger.info(message);
-        } else {
-            logger.info(String.format("Ansible Request  %s finished with Result %s, Message = %s", params.get("Id"),
-                    FAILURE, message));
-            ctx.setAttribute(RESULTS_ATTRIBUTE_NAME, results);
-            ctx.setAttribute(OUTPUT_ATTRIBUTE_NAME, finalResponse);
-            doFailure(ctx, code, message);
-            return;
-        }
-
-        // In case of 200, 400, FINISHED return 400
-        ctx.setAttribute(RESULT_CODE_ATTRIBUTE_NAME, Integer.toString(400));
-        ctx.setAttribute(MESSAGE_ATTRIBUTE_NAME, message);
-        ctx.setAttribute(RESULTS_ATTRIBUTE_NAME, results);
-        ctx.setAttribute(OUTPUT_ATTRIBUTE_NAME, finalResponse);
-        ctx.markSuccess();
-    }
-
-    /**
-     * Public method to get logs from playbook execution for a specific request
-     * <p>
-     * It blocks till the Ansible Server responds or the session times out very similar to
-     * reqExecResult logs are returned in the DG context variable org.onap.appc.adapter.ansible.log
-     */
-    @Override
-    public void reqExecLog(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
-        String reqUri = StringUtils.EMPTY;
-        try {
-            reqUri = messageProcessor.reqUriLog(params);
-            logger.info("Retrieving results from {}", reqUri);
-        } catch (Exception e) {
-            logger.error("Exception caught", e);
-            doFailure(ctx, AnsibleResultCodes.INVALID_PAYLOAD.getValue(), e.getMessage());
-        }
-
-        queryServerAndProcessResult(params, ctx, reqUri, LOG_ATTRIBUTE_NAME);
-    }
-
-    /**
-     * Public method to get output from playbook execution for a specific request
-     * <p>
-     * It blocks till the Ansible Server responds or the session times out very similar to
-     * reqExecResult and output is returned in the DG context variable org.onap.appc.adapter.ansible.output
-     */
-    @Override
-    public void reqExecOutput(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
-        String reqUri = StringUtils.EMPTY;
-        try {
-            reqUri = messageProcessor.reqUriOutput(params);
-            logger.info("Retrieving results from {}", reqUri);
-        } catch (Exception e) {
-            logger.error("Exception caught", e);
-            doFailure(ctx, AnsibleResultCodes.INVALID_PAYLOAD.getValue(), e.getMessage());
-        }
-
-        queryServerAndProcessResult(params, ctx, reqUri, OUTPUT_ATTRIBUTE_NAME);
-    }
-
-    /**
-     * Method that posts the request
-     */
-    private AnsibleResult postExecRequest(String agentUrl, String payload, String user, String pswd) {
-        AnsibleResult testResult = null;
-        ConnectionBuilder httpClientLocal = getHttpConn(defaultSocketTimeout, "");
-        if (!testMode) {
-            if (httpClientLocal != null) {
-                httpClientLocal.setHttpContext(user, pswd);
-                testResult = httpClientLocal.post(agentUrl, payload);
-                httpClientLocal.close();
-            }
-        } else {
-            testResult = testServer.post(payload);
-        }
-        return testResult;
-    }
-
-    private void queryServerAndProcessResult(Map<String, String> params, SvcLogicContext ctx, String reqUri, String attributeName)
-            throws SvcLogicException {
-        try {
-            // Try to retrieve the test results (modify the url for that)
-            AnsibleResult testResult = queryServer(reqUri, params.get(USER),
-                    EncryptionTool.getInstance().decrypt(params.get(PSWD)), ctx);
-            String message = testResult.getStatusMessage();
-            logger.info("Request output = {}", message);
-            ctx.setAttribute(attributeName, message);
-            ctx.markSuccess();
-        } catch (Exception e) {
-            logger.error("Exception caught: {}", e.getMessage(), e);
-            doFailure(ctx, AnsibleResultCodes.UNKNOWN_EXCEPTION.getValue(),
-                    String.format("Exception encountered retrieving output: %s", e.getMessage()));
-        }
-    }
-
-    /**
-     * Method to query Ansible server
-     */
-    private AnsibleResult queryServer(String agentUrl, String user, String pswd, SvcLogicContext ctx) {
-        AnsibleResult testResult = new AnsibleResult();
-        int timeout;
-        try {
-            timeout = Integer.parseInt(ctx.getAttribute("AnsibleTimeout")) * 1000;
-        } catch (Exception e) {
-            timeout = defaultTimeout;
-        }
-        long endTime = System.currentTimeMillis() + timeout;
-
-        while (System.currentTimeMillis() < endTime) {
-            String serverIP = ctx.getAttribute(SERVERIP);
-            ConnectionBuilder httpClientLocal = getHttpConn(defaultSocketTimeout, serverIP);
-            logger.info("Querying ansible GetResult URL = {}", agentUrl);
-
-            if (!testMode) {
-                if (httpClientLocal != null) {
-                    httpClientLocal.setHttpContext(user, pswd);
-                    testResult = httpClientLocal.get(agentUrl);
-                    httpClientLocal.close();
-                }
-            } else {
-                testResult = testServer.get(agentUrl);
-            }
-            if (testResult.getStatusCode() != AnsibleResultCodes.IO_EXCEPTION.getValue()
-                && testResult.getStatusCode() != AnsibleResultCodes.PENDING.getValue()) {
-                break;
-            }
-
-            try {
-                Thread.sleep(defaultPollInterval);
-            } catch (InterruptedException ex) {
-                logger.error("Thread Interrupted Exception", ex);
-                Thread.currentThread().interrupt();
-            }
-
-        }
-        if (testResult.getStatusCode() == AnsibleResultCodes.PENDING.getValue()) {
-            testResult.setStatusCode(AnsibleResultCodes.IO_EXCEPTION.getValue());
-            testResult.setStatusMessage("Request timed out");
-        }
-
-        return testResult;
-    }
-
-}
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/impl/AnsibleAdapterPropertiesProviderImpl.java b/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/impl/AnsibleAdapterPropertiesProviderImpl.java
deleted file mode 100755
index e465e1378..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/impl/AnsibleAdapterPropertiesProviderImpl.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : SLI
- * ================================================================================
- * Copyright (C) 2021 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.
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.ccsdk.sli.adaptors.ansible.impl;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.Properties;
-import org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapterPropertiesProvider;
-import org.onap.ccsdk.sli.core.sli.ConfigurationException;
-import org.onap.ccsdk.sli.core.utils.JREFileResolver;
-import org.onap.ccsdk.sli.core.utils.KarafRootFileResolver;
-import org.onap.ccsdk.sli.core.utils.PropertiesFileResolver;
-import org.onap.ccsdk.sli.core.utils.common.CoreDefaultFileResolver;
-import org.onap.ccsdk.sli.core.utils.common.EnvProperties;
-import org.onap.ccsdk.sli.core.utils.common.SdncConfigEnvVarFileResolver;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Responsible for determining the properties file to use and instantiating the
- * <code>SqlResource</code> Service. The priority for properties file
- * resolution is as follows:
- *
- * <ol>
- * <li>A directory identified by the system environment variable
- * <code>SDNC_CONFIG_DIR</code></li>
- * <li>The default directory <code>DEFAULT_DBLIB_PROP_DIR</code></li>
- * <li>A directory identified by the JRE argument
- * <code>sql-resource.properties</code></li>
- * <li>A <code>sql-resource.properties</code> file located in the karaf root
- * directory</li>
- * </ol>
- */
-public class AnsibleAdapterPropertiesProviderImpl implements AnsibleAdapterPropertiesProvider {
-
-    private static final Logger LOG = LoggerFactory.getLogger(AnsibleAdapterPropertiesProviderImpl.class);
-
-    /**
-     * The name of the properties file for database configuration
-     */
-    private static final String ANSIBLE_ADAPTER_PROPERTIES = "ansible-adapter.properties";
-
-    /**
-     * A prioritized list of strategies for resolving sql-resource properties files.
-     */
-    private final List<PropertiesFileResolver> ansibleAdapterPropertiesFileResolvers = new ArrayList<>();
-
-    /**
-     * The configuration properties for the db connection.
-     */
-    private Properties properties;
-
-    /**
-     * Set up the prioritized list of strategies for resolving dblib properties
-     * files.
-     */
-    public AnsibleAdapterPropertiesProviderImpl() {
-        ansibleAdapterPropertiesFileResolvers
-                .add(new SdncConfigEnvVarFileResolver("Using property file (1) from environment variable"));
-        ansibleAdapterPropertiesFileResolvers
-                .add(new CoreDefaultFileResolver("Using property file (2) from default directory"));
-        ansibleAdapterPropertiesFileResolvers
-                .add(new JREFileResolver("Using property file (3) from JRE argument", AnsibleAdapterPropertiesProviderImpl.class));
-        ansibleAdapterPropertiesFileResolvers
-                .add(new KarafRootFileResolver("Using property file (4) from karaf root", this));
-
-        // determines properties file as according to the priority described in the
-        // class header comment
-        final File propertiesFile = determinePropertiesFile();
-        if (propertiesFile != null) {
-            try (FileInputStream fileInputStream = new FileInputStream(propertiesFile)) {
-                properties = new EnvProperties();
-                properties.load(fileInputStream);
-            } catch (final IOException e) {
-                LOG.error("Failed to load properties for file: {}", propertiesFile,
-                        new ConfigurationException("Failed to load properties for file: " + propertiesFile, e));
-            }
-        } else {
-            // Try to read properties as resource
-            InputStream propStr = getClass().getResourceAsStream("/" + ANSIBLE_ADAPTER_PROPERTIES);
-            if (propStr != null) {
-                properties = new EnvProperties();
-                try {
-                    properties.load(propStr);
-                    propStr.close();
-                } catch (IOException e) {
-                    properties = null;
-                }
-            }
-        }
-        if (properties == null) {
-            reportFailure(new ConfigurationException(
-                    "Missing configuration properties resource(3): " + ANSIBLE_ADAPTER_PROPERTIES));
-            LOG.info("Defaulting org.onap.appc.adapter.ansible.clientType to TRUST_ALL");
-            properties = new Properties();
-            properties.setProperty("org.onap.appc.adapter.ansible.clientType", "TRUST_ALL");
-        }
-
-    }
-
-    /**
-     * Instantiates a new Ansible adapter properties provider.
-     *
-     * @param configFilePath the config file path
-     */
-    public AnsibleAdapterPropertiesProviderImpl(String configFilePath) {
-        properties = new EnvProperties();
-        try {
-            properties.load(new FileInputStream(configFilePath));
-        } catch (IOException e) {
-            properties = null;
-        }
-        if (properties == null) {
-            reportFailure(new ConfigurationException(
-                    "Missing configuration properties resource(3): " + ANSIBLE_ADAPTER_PROPERTIES));
-            LOG.info("Defaulting org.onap.appc.adapter.ansible.clientType to TRUST_ALL");
-            properties = new Properties();
-            properties.setProperty("org.onap.appc.adapter.ansible.clientType", "TRUST_ALL");
-        }
-
-    }
-
-    /**
-     * Reports the method chosen for properties resolution to the
-     * <code>Logger</code>.
-     *
-     * @param message      Some user friendly message
-     * @param fileOptional The file location of the chosen properties file
-     *
-     * @return the file location of the chosen properties file
-     */
-    private static File reportSuccess(final String message, final Optional<File> fileOptional) {
-        if (fileOptional.isPresent()) {
-            final File file = fileOptional.get();
-            LOG.info("{} {}", message, file.getPath());
-            return file;
-        }
-        return null;
-    }
-
-    /**
-     * Reports fatal errors. This is the case in which no properties file could be
-     * found.
-     *
-     * @param configurationException An exception describing what went wrong during resolution
-     */
-    private static void reportFailure(final ConfigurationException configurationException) {
-        LOG.error("{}", "Missing configuration properties resource(3)", configurationException);
-    }
-
-    /**
-     * Extract svclogic config properties.
-     *
-     * @return the svclogic config properties
-     */
-    public Properties getProperties() {
-        return properties;
-    }
-
-    /**
-     * Determines the sql-resource properties file to use based on the following priority:
-     * <ol>
-     * <li>A directory identified by the system environment variable
-     * <code>SDNC_CONFIG_DIR</code></li>
-     * <li>The default directory <code>DEFAULT_DBLIB_PROP_DIR</code></li>
-     * <li>A directory identified by the JRE argument
-     * <code>sql-resource.properties</code></li>
-     * <li>A <code>sql-resource.properties</code> file located in the karaf root
-     * directory</li>
-     * </ol>
-     */
-    File determinePropertiesFile() {
-        for (final PropertiesFileResolver propertiesFileResolver : ansibleAdapterPropertiesFileResolvers) {
-            final Optional<File> fileOptional = propertiesFileResolver.resolveFile(ANSIBLE_ADAPTER_PROPERTIES);
-            if (fileOptional.isPresent()) {
-                return reportSuccess(propertiesFileResolver.getSuccessfulResolutionMessage(), fileOptional);
-            }
-        }
-
-        return null;
-    }
-
-}
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/impl/ConnectionBuilder.java b/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/impl/ConnectionBuilder.java
deleted file mode 100644
index 1fbf20633..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/impl/ConnectionBuilder.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : SLI
- * ================================================================================
- * Copyright (C) 2021 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.
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.ccsdk.sli.adaptors.ansible.impl;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import java.io.Closeable;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import javax.net.ssl.SSLContext;
-import org.apache.commons.lang.StringUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLContexts;
-import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.json.JSONObject;
-import org.onap.ccsdk.sli.adaptors.ansible.model.AnsibleResult;
-import org.onap.ccsdk.sli.adaptors.ansible.model.AnsibleResultCodes;
-import org.onap.ccsdk.sli.core.utils.PathValidator;
-
-/**
- * Returns a custom http client
- * - based on options
- * - can create one with ssl using an X509 certificate that does NOT have a known CA
- * - create one which trusts ALL SSL certificates
- * - return default httpclient (which only trusts known CAs from default cacerts file for process) this is the default
- * option
- **/
-
-public class ConnectionBuilder implements Closeable {
-    private static final String STATUS_CODE_KEY = "StatusCode";
-    private static final EELFLogger logger = EELFManager.getInstance().getLogger(ConnectionBuilder.class);
-
-    private final CloseableHttpClient httpClient;
-    private final HttpClientContext httpContext = new HttpClientContext();
-
-    /**
-     * Constructor that initializes an http client based on certificate
-     **/
-    public ConnectionBuilder(String certFile, int timeout) throws KeyStoreException, CertificateException, IOException,
-            KeyManagementException, NoSuchAlgorithmException {
-
-        /* Point to the certificate */
-        try (FileInputStream fs = new FileInputStream(certFile)) {
-            /* Generate a certificate from the X509 */
-            CertificateFactory cf = CertificateFactory.getInstance("X.509");
-            X509Certificate cert = (X509Certificate) cf.generateCertificate(fs);
-
-            /* Create a keystore object and load the certificate there */
-            KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType());
-            keystore.load(null, null);
-            keystore.setCertificateEntry("cacert", cert);
-
-            SSLContext sslcontext = SSLContexts.custom().loadTrustMaterial(keystore).build();
-            SSLConnectionSocketFactory factory = new SSLConnectionSocketFactory(sslcontext,
-                    SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
-
-            RequestConfig config = RequestConfig.custom().setSocketTimeout(timeout).build();
-            httpClient = HttpClients.custom().setDefaultRequestConfig(config).setSSLSocketFactory(factory).build();
-        }
-    }
-
-    /**
-     * Constructor which trusts all certificates in a specific java keystore file (assumes a JKS
-     * file)
-     **/
-    public ConnectionBuilder(String trustStoreFile, char[] trustStorePasswd, int timeout, String serverIP)
-            throws KeyStoreException, IOException, KeyManagementException, NoSuchAlgorithmException,
-            CertificateException {
-        if (!PathValidator.isValidFilePath(trustStoreFile)) {
-            throw new IOException("Invalid trust store file path");
-        }
-
-        /* Load the specified trustStore */
-        KeyStore keystore = KeyStore.getInstance("JKS");
-        FileInputStream readStream = new FileInputStream(trustStoreFile);
-        keystore.load(readStream, trustStorePasswd);
-        if (StringUtils.isNotBlank(serverIP)) {
-            SSLContext sslcontext = SSLContexts.custom().loadTrustMaterial(null, new TrustSelfSignedStrategy()).build();
-            SSLConnectionSocketFactory factory = new SSLConnectionSocketFactory(sslcontext, new NoopHostnameVerifier());
-
-            RequestConfig config = RequestConfig.custom().setSocketTimeout(timeout).build();
-            httpClient = HttpClients.custom().setDefaultRequestConfig(config).setSSLSocketFactory(factory).build();
-        } else {
-            SSLContext sslcontext = SSLContexts.custom().loadTrustMaterial(keystore).build();
-            SSLConnectionSocketFactory factory = new SSLConnectionSocketFactory(sslcontext,
-                    SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
-            RequestConfig config = RequestConfig.custom().setSocketTimeout(timeout).build();
-            httpClient = HttpClients.custom().setDefaultRequestConfig(config).setSSLSocketFactory(factory).build();
-        }
-    }
-
-    /**
-     * Constructor that trusts ALL SSl certificates (NOTE : ONLY FOR DEV TESTING) if Mode == 1 or
-     * Default if Mode == 0
-     */
-    public ConnectionBuilder(int mode, int timeout)
-            throws NoSuchAlgorithmException, KeyStoreException, KeyManagementException {
-        RequestConfig config = RequestConfig.custom().setSocketTimeout(timeout).build();
-        if (mode == 1) {
-            SSLContext sslcontext = SSLContexts.custom().loadTrustMaterial(null, new TrustSelfSignedStrategy()).build();
-            SSLConnectionSocketFactory factory = new SSLConnectionSocketFactory(sslcontext,
-                    SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
-
-            httpClient = HttpClients.custom().setDefaultRequestConfig(config).setSSLSocketFactory(factory).build();
-        } else {
-            httpClient = HttpClients.custom().setDefaultRequestConfig(config).build();
-        }
-    }
-
-    // Use to create an http context with auth headers
-    public void setHttpContext(String user, String pswd) {
-
-        // Are credential provided ? If so, set the context to be used
-        if (user != null && !user.isEmpty() && pswd != null && !pswd.isEmpty()) {
-            UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(user, pswd);
-            AuthScope authscope = new AuthScope(AuthScope.ANY_HOST, AuthScope.ANY_PORT);
-            BasicCredentialsProvider credsprovider = new BasicCredentialsProvider();
-            credsprovider.setCredentials(authscope, credentials);
-            httpContext.setCredentialsProvider(credsprovider);
-        }
-    }
-
-    // Method posts to the ansible server and writes out response to
-    // Ansible result object
-    public AnsibleResult post(String agentUrl, String payload) {
-
-        AnsibleResult result = new AnsibleResult();
-        try {
-
-            HttpPost postObj = new HttpPost(agentUrl);
-            StringEntity bodyParams = new StringEntity(payload, "UTF-8");
-            postObj.setEntity(bodyParams);
-            postObj.addHeader("Content-type", "application/json");
-
-            HttpResponse response = httpClient.execute(postObj, httpContext);
-            HttpEntity entity = response.getEntity();
-            String responseOutput = entity != null ? EntityUtils.toString(entity) : null;
-            int responseCode = response.getStatusLine().getStatusCode();
-            result.setStatusCode(responseCode);
-            result.setStatusMessage(responseOutput);
-        } catch (IOException io) {
-            logger.error("Caught IOException", io);
-            result.setStatusCode(AnsibleResultCodes.IO_EXCEPTION.getValue());
-            result.setStatusMessage(io.getMessage());
-        }
-        return result;
-    }
-
-    // Method gets information from an Ansible server and writes out response to
-    // Ansible result object
-
-    public AnsibleResult get(String agentUrl) {
-
-        AnsibleResult result = new AnsibleResult();
-
-        try {
-            HttpGet getObj = new HttpGet(agentUrl);
-            HttpResponse response = httpClient.execute(getObj, httpContext);
-            HttpEntity entity = response.getEntity();
-            String responseOutput = entity != null ? EntityUtils.toString(entity) : null;
-            int responseCode = response.getStatusLine().getStatusCode();
-            logger.info("GetResult response for ansible GET URL" + agentUrl + " returned " + responseOutput);
-            JSONObject postResponse = new JSONObject(responseOutput);
-            if (postResponse.has(STATUS_CODE_KEY)) {
-                int codeStatus = postResponse.getInt(STATUS_CODE_KEY);
-                if (codeStatus == AnsibleResultCodes.PENDING.getValue()) {
-                    result.setStatusCode(codeStatus);
-                } else {
-                    result.setStatusCode(responseCode);
-                }
-            } else {
-                result.setStatusCode(responseCode);
-            }
-            result.setStatusMessage(responseOutput);
-        } catch (IOException io) {
-            result.setStatusCode(AnsibleResultCodes.IO_EXCEPTION.getValue());
-            result.setStatusMessage(io.getMessage());
-            logger.error("Caught IOException", io);
-        }
-        return result;
-    }
-
-    @Override
-    public void close() {
-        try {
-            if (httpClient != null) {
-                httpClient.close();
-            }
-        } catch (IOException e) {
-            logger.error("Caught IOException during httpClient close", e);
-        }
-    }
-
-}
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/model/AnsibleMessageParser.java b/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/model/AnsibleMessageParser.java
deleted file mode 100644
index e448f1c47..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/model/AnsibleMessageParser.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : SLI
- * ================================================================================
- * Copyright (C) 2021 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.
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.ccsdk.sli.adaptors.ansible.model;
-
-import com.google.common.base.Strings;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import org.apache.commons.lang.StringUtils;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapterConstants;
-import org.onap.ccsdk.sli.core.sli.SvcLogicException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapterConstants.*;
-
-/**
- * Class that validates and constructs requests sent/received from
- * Ansible Server
- */
-public class AnsibleMessageParser {
-
-
-    private static final String JSON_ERROR_MESSAGE = "JSONException: Error parsing response";
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(AnsibleMessageParser.class);
-
-    /**
-     * Accepts a map of strings and
-     * a) validates if all parameters are appropriate (else, throws an exception) and
-     * b) if correct returns a JSON object with appropriate key-value pairs to send to the server.
-     * <p>
-     * Mandatory parameters, that must be in the supplied information to the Ansible Adapter
-     * 1. URL to connect to
-     * 2. credentials for URL (assume user pswd for now)
-     * 3. Playbook name
-     */
-    public JSONObject reqMessage(Map<String, String> params) throws SvcLogicException {
-        final String[] mandatoryTestParams = {AGENT_URL, PLAYBOOK_NAME, USER, PSWD};
-        final String[] optionalTestParams = {ENV_PARAMETERS, NODE_LIST, LOCAL_PARAMETERS, TIMEOUT, VERSION, FILE_PARAMETERS,
-                                             ACTION, INVENTORY_NAMES, AUTO_NODE_LIST};
-        JSONObject jsonPayload = new JSONObject();
-
-        for (String key : mandatoryTestParams) {
-            throwIfMissingMandatoryParam(params, key);
-            jsonPayload.put(key, params.get(key));
-        }
-
-        parseOptionalParams(params, optionalTestParams, jsonPayload);
-
-        // Generate a unique uuid for the test
-        String reqId = UUID.randomUUID().toString();
-        jsonPayload.put(ID, reqId);
-        return jsonPayload;
-    }
-
-    /**
-     * Method that validates that the Map has enough information
-     * to query Ansible server for a result. If so, it returns
-     * the appropriate url, else an empty string.
-     */
-    public String reqUriResult(Map<String, String> params) throws SvcLogicException {
-        final String[] mandatoryTestParams = {AGENT_URL, ID, USER, PSWD};
-        for (String key : mandatoryTestParams) {
-            throwIfMissingMandatoryParam(params, key);
-        }
-        return params.get(AGENT_URL) + "?Id=" + params.get(ID) + "&Type=GetResult";
-    }
-
-    /**
-     * Method that validates that the Map has enough information to query Ansible
-     * server for a result. If so, it returns the appropriate url, else an empty
-     * string.
-     */
-    public String reqUriResultWithIP(Map<String, String> params, String serverIP) throws SvcLogicException {
-        final String[] mandatoryTestParams = {AGENT_URL, ID, USER, PSWD};
-        for (String key : mandatoryTestParams) {
-            throwIfMissingMandatoryParam(params, key);
-        }
-        String[] arr1 = params.get(AGENT_URL).split("//", 2);
-        String[] arr2 = arr1[1].split(":", 2);
-        return arr1[0] + "//" + serverIP + ":" + arr2[1] + "?Id=" + params.get(ID) + "&Type=GetResult";
-    }
-
-    /**
-     * Method that validates that the Map has enough information to query Ansible
-     * server for logs. If so, it populates the appropriate returns the appropriate
-     * url, else an empty string.
-     */
-    public String reqUriLog(Map<String, String> params) throws SvcLogicException {
-        final String[] mandatoryTestParams = {AGENT_URL, ID, USER, PSWD};
-        for (String mandatoryParam : mandatoryTestParams) {
-            throwIfMissingMandatoryParam(params, mandatoryParam);
-        }
-        return params.get(AGENT_URL) + "?Id=" + params.get(ID) + "&Type=GetLog";
-    }
-
-    /**
-     * Method that validates that the Map has enough information
-     * to query Ansible server for an output. If so, it returns
-     * the appropriate url, else an empty string.
-     */
-    public String reqUriOutput(Map<String, String> params) throws SvcLogicException {
-        final String[] mandatoryTestParams = {AGENT_URL, ID, USER, PSWD};
-        for (String mandatoryParam : mandatoryTestParams) {
-            throwIfMissingMandatoryParam(params, mandatoryParam);
-        }
-        return params.get(AGENT_URL) + "?Id=" + params.get(ID) + "&Type=GetOutput";
-    }
-
-    /**
-     * This method parses response from the Ansible Server when we do a post
-     * and returns an AnsibleResult object.
-     */
-    public AnsibleResult parsePostResponse(String input) throws SvcLogicException {
-        AnsibleResult ansibleResult;
-        try {
-            JSONObject postResponse = new JSONObject(input);
-            int code = postResponse.getInt(STATUS_CODE);
-            int initResponseValue = AnsibleResultCodes.INITRESPONSE.getValue();
-            boolean validCode = AnsibleResultCodes.CODE.checkValidCode(initResponseValue, code);
-            if (!validCode) {
-                throw new SvcLogicException(String.format("Invalid InitResponse code = %s received. MUST be one of %s",
-                        code, AnsibleResultCodes.CODE.getValidCodes(initResponseValue)));
-            }
-
-            ansibleResult = new AnsibleResult(code, postResponse.getString(STATUS_MESSAGE));
-            if (postResponse.has(ANSIBLE_SERVER) && StringUtils.isNotBlank(postResponse.getString(ANSIBLE_SERVER))) {
-                ansibleResult.setServerIp(postResponse.getString(ANSIBLE_SERVER));
-            }
-            if (!postResponse.isNull(OUTPUT)) {
-                LOGGER.info("Processing results-output in post response");
-                JSONObject output = postResponse.getJSONObject(OUTPUT);
-                ansibleResult.setOutput(output.toString());
-            }
-        } catch (JSONException e) {
-            LOGGER.error(JSON_ERROR_MESSAGE, e);
-            ansibleResult = new AnsibleResult(600, "Error parsing response = " + input + ". Error = " + e.getMessage());
-        }
-        return ansibleResult;
-    }
-
-    /**
-     * This method parses response from an Ansible server when we do a GET for a result
-     * and returns an AnsibleResult object.
-     **/
-    public AnsibleResult parseGetResponse(String input) throws SvcLogicException {
-        AnsibleResult ansibleResult = new AnsibleResult();
-        try {
-            JSONObject postResponse = new JSONObject(input);
-            parseGetResponseNested(ansibleResult, postResponse);
-        } catch (JSONException e) {
-            LOGGER.error(JSON_ERROR_MESSAGE, e);
-            ansibleResult = new AnsibleResult(AnsibleResultCodes.INVALID_PAYLOAD.getValue(),
-                    "Error parsing response = " + input + ". Error = " + e.getMessage(), "");
-        }
-        return ansibleResult;
-    }
-
-    private void parseGetResponseNested(AnsibleResult ansibleResult, JSONObject postRsp) throws SvcLogicException {
-        String messageStatus = postRsp.getString(STATUS_MESSAGE);
-        int codeStatus = postRsp.getInt(STATUS_CODE);
-        int finalCode = AnsibleResultCodes.FINAL_SUCCESS.getValue();
-        boolean valCode = AnsibleResultCodes.CODE.checkValidCode(AnsibleResultCodes.FINALRESPONSE.getValue(), codeStatus);
-        if (!valCode) {
-            throw new SvcLogicException(String.format("Invalid InitResponse code = %s received. MUST be one of %s",
-                    codeStatus, AnsibleResultCodes.CODE.getValidCodes(AnsibleResultCodes.FINALRESPONSE.getValue())));
-        }
-
-        ansibleResult.setStatusCode(codeStatus);
-        ansibleResult.setStatusMessage(messageStatus);
-        ansibleResult.setConfigData("UNKNOWN");
-        LOGGER.info("Received response with code = {}, Message = {}", codeStatus, messageStatus);
-
-        if (!postRsp.isNull("Results")) {
-
-            // Results are available. process them
-            // Results is a dictionary of the form
-
-            LOGGER.info("Processing results in response");
-            JSONObject results = postRsp.getJSONObject("Results");
-
-            LOGGER.info("Get JSON dictionary from Results by Iterating through hosts");
-            Iterator<String> hosts = results.keys();
-            while (hosts.hasNext()) {
-                String host = hosts.next();
-                LOGGER.info("Processing host = {}",
-                        (host.matches("^[\\w\\-.]+$")) ? host : "[unexpected value, logging suppressed]");
-                try {
-                    JSONObject hostResponse = results.getJSONObject(host);
-                    int subCode = hostResponse.getInt(STATUS_CODE);
-                    String message = hostResponse.getString(STATUS_MESSAGE);
-
-                    LOGGER.info("Code = {}, Message = {}", subCode, message);
-
-                    if (subCode != 200 || !"SUCCESS".equals(message)) {
-                        finalCode = AnsibleResultCodes.REQ_FAILURE.getValue();
-                    }
-                    if ((hostResponse.optJSONObject(OUTPUT)) != null) {
-                        JSONObject hostResponseObjectInfo = hostResponse.optJSONObject(OUTPUT).optJSONObject("info");
-                        JSONObject hostResponseConfigData = hostResponseObjectInfo.optJSONObject("configData");
-                        if (hostResponseConfigData != null) {
-                            ansibleResult.setConfigData(hostResponseConfigData.toString());
-                        }
-                    }
-                } catch (JSONException e) {
-                    LOGGER.error(JSON_ERROR_MESSAGE, e);
-                    ansibleResult.setStatusCode(AnsibleResultCodes.INVALID_RESPONSE.getValue());
-                    ansibleResult.setStatusMessage(String.format("Error processing response message = %s from host %s",
-                            results.getString(host), host));
-                    break;
-                }
-            }
-            ansibleResult.setStatusCode(finalCode);
-
-            // We return entire Results object as message
-            ansibleResult.setResults(results.toString());
-        } else {
-            ansibleResult.setStatusCode(AnsibleResultCodes.INVALID_RESPONSE.getValue());
-            ansibleResult.setStatusMessage("Results not found in GET for response");
-        }
-        if (!postRsp.isNull(OUTPUT)) {
-            LOGGER.info("Processing results-output in response");
-            JSONObject output = postRsp.getJSONObject(OUTPUT);
-            ansibleResult.setOutput(output.toString());
-        }
-    }
-
-    private void parseOptionalParams(Map<String, String> params, String[] optionalTestParams, JSONObject jsonPayload) {
-
-        Set<String> optionalParamsSet = new HashSet<>();
-        Collections.addAll(optionalParamsSet, optionalTestParams);
-
-        //@formatter:off
-        params.entrySet().stream().filter(entry -> optionalParamsSet.contains(entry.getKey()))
-                .filter(entry -> !Strings.isNullOrEmpty(entry.getValue()))
-                .forEach(entry -> parseOptionalParam(entry, jsonPayload));
-        //@formatter:on
-    }
-
-    private void parseOptionalParam(Map.Entry<String, String> params, JSONObject jsonPayload) {
-        String key = params.getKey();
-        String payload = params.getValue();
-
-        switch (key) {
-            case TIMEOUT:
-                if (dataIsVariable(payload)) {
-                    break;
-                }
-                int timeout = Integer.parseInt(payload);
-                if (timeout < 0) {
-                    throw new NumberFormatException(" : specified negative integer for timeout = " + payload);
-                }
-                jsonPayload.put(key, payload);
-                break;
-            case AUTO_NODE_LIST:
-                if (payload.equalsIgnoreCase("true") || payload.equalsIgnoreCase("false")) {
-                    jsonPayload.put(key, payload);
-                } else {
-                    throw new IllegalArgumentException(" : specified invalid boolean value of AutoNodeList = " + payload);
-                }
-                break;
-            case VERSION:
-                if (dataIsVariable(payload)) {
-                    break;
-                }
-            case INVENTORY_NAMES:
-                jsonPayload.put(key, payload);
-                break;
-
-            case LOCAL_PARAMETERS:
-            case ENV_PARAMETERS:
-            case EXTRA_VARS:
-                JSONObject paramsJson = new JSONObject(payload);
-                jsonDataIsVariable(paramsJson);
-                jsonPayload.put(key, paramsJson);
-                break;
-
-            case NODE_LIST:
-                if (payload.startsWith("$")) {
-                    break;
-                }
-                JSONArray paramsArray = new JSONArray(payload);
-                jsonPayload.put(key, paramsArray);
-                break;
-
-            case FILE_PARAMETERS:
-                if (dataIsVariable(payload)) {
-                    break;
-                }
-                jsonPayload.put(key, getFilePayload(payload));
-                break;
-
-            default:
-                break;
-        }
-    }
-
-    /**
-     * Return payload with escaped newlines
-     */
-    private JSONObject getFilePayload(String payload) {
-        String formattedPayload = payload.replace("\n", "\\n").replace("\r", "\\r");
-        return new JSONObject(formattedPayload);
-    }
-
-    private void throwIfMissingMandatoryParam(Map<String, String> params, String key) throws SvcLogicException {
-        if (!params.containsKey(key)) {
-            throw new SvcLogicException(String.format(
-                    "Ansible: Mandatory AnsibleAdapter key %s not found in parameters provided by calling agent !", key));
-        }
-        if (Strings.isNullOrEmpty(params.get(key))) {
-            throw new SvcLogicException(String.format(
-                    "Ansible: Mandatory AnsibleAdapter key %s not found in parameters provided by calling agent !", key));
-        }
-        if (StringUtils.startsWith(params.get(key), "$")) {
-            throw new SvcLogicException(String.format(
-                    "Ansible: Mandatory AnsibleAdapter key %s is a variable", key));
-        }
-    }
-
-    private boolean dataIsVariable(String payload) {
-        return StringUtils.startsWith(payload, "$") || StringUtils.isEmpty(payload);
-    }
-
-    private void jsonDataIsVariable(JSONObject paramsJson) {
-        LOGGER.info("input json is " + paramsJson);
-        String[] keys = JSONObject.getNames(paramsJson);
-        for (String k : keys) {
-            Object a = paramsJson.get(k);
-            if (a instanceof String) {
-                if (StringUtils.startsWith(a.toString(), "$") || StringUtils.isEmpty(a.toString())) {
-                    LOGGER.info("removing key " + k);
-                    paramsJson.remove(k);
-                }
-            }
-        }
-        LOGGER.info("returning json as {}", paramsJson);
-    }
-
-}
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/model/AnsibleResult.java b/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/model/AnsibleResult.java
deleted file mode 100644
index bad0f5e20..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/model/AnsibleResult.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : SLI
- * ================================================================================
- * Copyright (C) 2021 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.
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.ccsdk.sli.adaptors.ansible.model;
-
-/**
- * Simple class to store code and message returned by POST/GET to an Ansible Server
- */
-public class AnsibleResult {
-
-    private static final String EMPTY_VALUE = "UNKNOWN";
-
-    private int statusCode;
-    private String statusMessage;
-    private String results;
-    private String output;
-    private String serverIp;
-    private String configData;
-
-    public AnsibleResult() {
-        this(-1, EMPTY_VALUE, EMPTY_VALUE);
-    }
-
-    public AnsibleResult(int code, String message) {
-        this(code, message, EMPTY_VALUE);
-    }
-
-    public AnsibleResult(int code, String message, String result) {
-        statusCode = code;
-        statusMessage = message;
-        results = result;
-    }
-
-    public AnsibleResult(int code, String message, String result, String outputData) {
-        statusCode = code;
-        statusMessage = message;
-        results = result;
-        output = outputData;
-    }
-
-    public String getOutput() {
-        return output;
-    }
-
-    public void setOutput(String output) {
-        this.output = output;
-    }
-
-    void set(int code, String message, String results, String output) {
-        this.statusCode = code;
-        this.statusMessage = message;
-        this.results = results;
-        this.output = output;
-    }
-
-    public int getStatusCode() {
-        return this.statusCode;
-    }
-
-    public void setStatusCode(int code) {
-        this.statusCode = code;
-    }
-
-    public String getStatusMessage() {
-        return this.statusMessage;
-    }
-
-    public void setStatusMessage(String message) {
-        this.statusMessage = message;
-    }
-
-    public String getResults() {
-        return this.results;
-    }
-
-    public void setResults(String results) {
-        this.results = results;
-    }
-
-    public String getServerIp() {
-        return this.serverIp;
-    }
-
-    public void setServerIp(String serverIp) {
-        this.serverIp = serverIp;
-    }
-
-    public String getConfigData() {
-        return this.configData;
-    }
-
-    public void setConfigData(String configData) {
-        this.configData = configData;
-    }
-
-}
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/model/AnsibleResultCodes.java b/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/model/AnsibleResultCodes.java
deleted file mode 100644
index 55a1e7086..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/model/AnsibleResultCodes.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : SLI
- * ================================================================================
- * Copyright (C) 2021 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.
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.ccsdk.sli.adaptors.ansible.model;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * enum of the various codes that APP-C uses to resolve different
- * status of response from Ansible Server
- **/
-
-public enum AnsibleResultCodes {
-
-    // @formatter:off
-    SUCCESS(400),
-    KEYSTORE_EXCEPTION(622),
-    CERTIFICATE_ERROR(610),
-    IO_EXCEPTION(611),
-    HOST_UNKNOWN(625),
-    USER_UNAUTHORIZED(613),
-    UNKNOWN_EXCEPTION(699),
-    SSL_EXCEPTION(697),
-    INVALID_PAYLOAD(698),
-    INVALID_RESPONSE(601),
-    PENDING(100),
-    REJECTED(101),
-    FINAL_SUCCESS(200),
-    REQ_FAILURE(401),
-    MESSAGE(1),
-    CODE(0),
-    INITRESPONSE(0),
-    FINALRESPONSE(1);
-    // @formatter:on
-
-    private final Set<Integer> initCodes = new HashSet<>(Arrays.asList(100, 101));
-    private final Set<Integer> finalCodes = new HashSet<>(Arrays.asList(200, 500));
-    private final ArrayList<Set<Integer>> codeSets = new ArrayList<>(Arrays.asList(initCodes, finalCodes));
-    private final Set<String> messageSet = new HashSet<>(Arrays.asList("PENDING", "FINISHED", "TERMINATED"));
-    private final int value;
-
-    AnsibleResultCodes(int value) {
-        this.value = value;
-    }
-
-    public int getValue() {
-        return value;
-    }
-
-    public boolean checkValidCode(int type, int code) {
-        return codeSets.get(type).contains(code);
-    }
-
-    public String getValidCodes(int type) {
-        StringBuilder sb = new StringBuilder("[ ");
-        codeSets.get(type).forEach(s -> sb.append(s).append(","));
-        return sb.append("]").toString();
-    }
-
-    public boolean checkValidMessage(String message) {
-        return messageSet.contains(message);
-    }
-
-    public String getValidMessages() {
-        StringBuilder sb = new StringBuilder("[ ");
-        messageSet.forEach(s -> sb.append(s).append(","));
-        return sb.append("]").toString();
-    }
-}
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/model/AnsibleServerEmulator.java b/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/model/AnsibleServerEmulator.java
deleted file mode 100644
index a10a0aeb2..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/model/AnsibleServerEmulator.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : SLI
- * ================================================================================
- * Copyright (C) 2021 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.
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.ccsdk.sli.adaptors.ansible.model;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.apache.commons.lang.StringUtils;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import static org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapterConstants.PLAYBOOK_NAME;
-import static org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapterConstants.STATUS_CODE;
-import static org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapterConstants.STATUS_MESSAGE;
-
-public class AnsibleServerEmulator {
-
-    private final EELFLogger logger = EELFManager.getInstance().getLogger(AnsibleServerEmulator.class);
-
-    /**
-     * Method that emulates the response from an Ansible Server
-     * when presented with a request to execute a playbook
-     * Returns an ansible object result. The response code is always the http code 200 (i.e connection successful)
-     * payload is json string as would be sent back by Ansible Server
-     **/
-    public AnsibleResult post(String payload) {
-        AnsibleResult result = new AnsibleResult();
-
-        try {
-            // Request must be a JSON object
-
-            JSONObject message = new JSONObject(payload);
-            String playbookName = "test_playbook.yaml";
-            if (message.isNull("Id")) {
-                rejectRequest(result, "Must provide a valid Id");
-            } else if (message.isNull(PLAYBOOK_NAME)) {
-                rejectRequest(result, "Must provide a playbook Name");
-            } else if (!message.getString(PLAYBOOK_NAME).equals(playbookName)) {
-                rejectRequest(result, "Playbook " + message.getString(PLAYBOOK_NAME) + "  not found in catalog");
-            } else {
-                acceptRequest(result);
-            }
-        } catch (JSONException e) {
-            logger.error("JSONException caught", e);
-            rejectRequest(result, e.getMessage());
-        }
-        return result;
-    }
-
-    /**
-     * Method to emulate response from an Ansible
-     * Server when presented with a GET request
-     * Returns an ansibl object result. The response code is always the http code 200 (i.e connection successful)
-     * payload is json string as would be sent back by Ansible Server
-     **/
-    public AnsibleResult get(String agentUrl) {
-
-        Pattern pattern = Pattern.compile(".*?\\?Id=(.*?)&Type.*");
-        Matcher matcher = pattern.matcher(agentUrl);
-        String id = StringUtils.EMPTY;
-        String vmAddress = "192.168.1.10";
-
-        if (matcher.find()) {
-            id = matcher.group(1);
-        }
-
-        AnsibleResult getResult = new AnsibleResult();
-
-        JSONObject response = new JSONObject();
-        response.put(STATUS_CODE, 200);
-        response.put(STATUS_MESSAGE, "FINISHED");
-
-        JSONObject results = new JSONObject();
-
-        JSONObject vmResults = new JSONObject();
-        vmResults.put(STATUS_CODE, 200);
-        vmResults.put(STATUS_MESSAGE, "SUCCESS");
-        vmResults.put("Id", id);
-        results.put(vmAddress, vmResults);
-
-        response.put("Results", results);
-
-        getResult.setStatusCode(200);
-        getResult.setStatusMessage(response.toString());
-
-        return getResult;
-    }
-
-    private void rejectRequest(AnsibleResult result, String Message) {
-        result.setStatusCode(200);
-        JSONObject response = new JSONObject();
-        response.put(STATUS_CODE, AnsibleResultCodes.REJECTED.getValue());
-        response.put(STATUS_MESSAGE, Message);
-        result.setStatusMessage(response.toString());
-    }
-
-    private void acceptRequest(AnsibleResult result) {
-        result.setStatusCode(200);
-        JSONObject response = new JSONObject();
-        response.put(STATUS_CODE, AnsibleResultCodes.PENDING.getValue());
-        response.put(STATUS_MESSAGE, "PENDING");
-        result.setStatusMessage(response.toString());
-    }
-
-}
\ No newline at end of file
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/resources/OSGI-INF/blueprint/ansible-adapter-blueprint.xml b/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/resources/OSGI-INF/blueprint/ansible-adapter-blueprint.xml
deleted file mode 100755
index 76abc8276..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/resources/OSGI-INF/blueprint/ansible-adapter-blueprint.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ONAP : SLI
-  ================================================================================
-  Copyright (C) 2021 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.
-
-  ECOMP is a trademark and service mark of AT&T Intellectual Property.
-  ============LICENSE_END=========================================================
-  -->
-
-<blueprint xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-           xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           odl:use-default-for-reference-types="true">
-
-    <bean id="propProvider" class="org.onap.ccsdk.sli.adaptors.ansible.impl.AnsibleAdapterPropertiesProviderImpl"/>
-
-    <bean id="ansibleAdapterInstance" class="org.onap.ccsdk.sli.adaptors.ansible.impl.AnsibleAdapterImpl">
-        <argument ref="propProvider"/>
-    </bean>
-
-    <service ref="ansibleAdapterInstance">
-        <interfaces>
-            <value>org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter</value>
-        </interfaces>
-    </service>
-
-</blueprint>
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adapter.properties b/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adapter.properties
deleted file mode 100644
index 8def3da30..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adapter.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP : SLI
-# ================================================================================
-# Copyright (C) 2021 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.
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-# ============LICENSE_END=========================================================
-
-###
-#
-# Default properties for the APP-C Provider Adapter
-#
-# -------------------------------------------------------------------------------------------------
-#
-# Define the name and path of any user-provided configuration (bootstrap) file that can be loaded
-# to supply configuration options
-org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=${user.home},/opt/opendaylight/current/properties,.
-appc.application.name=APPC
-#
-# Define the message resource bundle name to be loaded
-org.onap.appc.resources=org/onap/appc/i18n/MessageResources
-#
-# The name of the adapter.
-org.onap.appc.provider.adaptor.name=org.onap.appc.appc_ansible_adapter
-# Default truststore path and password
-org.onap.appc.adapter.ansible.trustStore=/opt/opendaylight/tls-client/mykeystore.js
-org.onap.appc.adapter.ansible.trustStore.trustPasswd=changeit
-org.onap.appc.adapter.ansible.clientType=TRUST_ALL
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/resources/org/opendaylight/blueprint/ansible-adapter-blueprint.xml b/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/resources/org/opendaylight/blueprint/ansible-adapter-blueprint.xml
deleted file mode 100755
index 76abc8276..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/main/resources/org/opendaylight/blueprint/ansible-adapter-blueprint.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ONAP : SLI
-  ================================================================================
-  Copyright (C) 2021 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.
-
-  ECOMP is a trademark and service mark of AT&T Intellectual Property.
-  ============LICENSE_END=========================================================
-  -->
-
-<blueprint xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-           xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           odl:use-default-for-reference-types="true">
-
-    <bean id="propProvider" class="org.onap.ccsdk.sli.adaptors.ansible.impl.AnsibleAdapterPropertiesProviderImpl"/>
-
-    <bean id="ansibleAdapterInstance" class="org.onap.ccsdk.sli.adaptors.ansible.impl.AnsibleAdapterImpl">
-        <argument ref="propProvider"/>
-    </bean>
-
-    <service ref="ansibleAdapterInstance">
-        <interfaces>
-            <value>org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter</value>
-        </interfaces>
-    </service>
-
-</blueprint>
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/adapter/ansible/impl/TestAnsibleAdapterImpl.java b/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/adapter/ansible/impl/TestAnsibleAdapterImpl.java
deleted file mode 100644
index be4bfd8f2..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/adapter/ansible/impl/TestAnsibleAdapterImpl.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : SLI
- * ================================================================================
- * Copyright (C) 2021 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.
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.ccsdk.adapter.ansible.impl;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.onap.ccsdk.sli.adaptors.ansible.impl.AnsibleAdapterImpl;
-import org.onap.ccsdk.sli.adaptors.ansible.impl.AnsibleAdapterPropertiesProviderImpl;
-import org.onap.ccsdk.sli.adaptors.ansible.model.AnsibleMessageParser;
-import org.onap.ccsdk.sli.adaptors.ansible.model.AnsibleResult;
-import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-import org.onap.ccsdk.sli.core.sli.SvcLogicException;
-import org.powermock.reflect.Whitebox;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.when;
-import static org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapterConstants.*;
-@RunWith(MockitoJUnitRunner.class)
-public class TestAnsibleAdapterImpl {
-
-    private static final String PENDING = "100";
-    private static final String AGENT_URL = "https://192.168.1.1";
-
-    private static String KEYSTORE_PSWD;
-    private static Properties properties;
-    private boolean testMode = true;
-
-    private AnsibleAdapterImpl adapter;
-    private AnsibleResult result;
-    private AnsibleAdapterImpl spyAdapter;
-    private Map<String, String> params;
-    private SvcLogicContext svcContext;
-    private JSONObject jsonPayload;
-
-    @Mock
-    private AnsibleMessageParser messageProcessor;
-
-    @BeforeClass
-    public static void once() {
-        properties = new AnsibleAdapterPropertiesProviderImpl().getProperties();
-        KEYSTORE_PSWD = properties.getProperty("org.onap.appc.adapter.ansible.trustStore.trustPasswd");
-    }
-
-    /**
-     * Use reflection to locate fields and methods so that they can be manipulated
-     * during the test to change the internal state accordingly.
-     */
-    @Before
-    public void setup() {
-        testMode = true;
-        svcContext = new SvcLogicContext();
-        adapter = new AnsibleAdapterImpl(testMode);
-        params = new HashMap<>();
-        params.put("AgentUrl", AGENT_URL);
-        jsonPayload = new JSONObject();
-        jsonPayload.put("Id", "100");
-        jsonPayload.put("User", "test");
-        jsonPayload.put("Password", "test");
-        jsonPayload.put("PlaybookName", "test_playbook.yaml");
-        jsonPayload.put("Timeout", "60000");
-        jsonPayload.put("AgentUrl", AGENT_URL);
-        result = new AnsibleResult();
-        result.setStatusMessage("Success");
-        result.setResults("Success");
-        result.setOutput("{}");
-        Whitebox.setInternalState(adapter, "messageProcessor", messageProcessor);
-        spyAdapter = Mockito.spy(adapter);
-    }
-
-    @After
-    public void tearDown() {
-        testMode = false;
-        adapter = null;
-        params = null;
-        svcContext = null;
-    }
-
-    @Test
-    public void reqExec_shouldSetPending() throws SvcLogicException {
-        result.setStatusCode(Integer.parseInt(PENDING));
-        when(messageProcessor.reqMessage(params)).thenReturn(jsonPayload);
-        when(messageProcessor.parsePostResponse(anyString())).thenReturn(result);
-        spyAdapter.reqExec(params, svcContext);
-        assertEquals(PENDING, svcContext.getAttribute(RESULT_CODE_ATTRIBUTE_NAME));
-    }
-
-    @Test(expected = SvcLogicException.class)
-    public void reqExecResult_shouldSetSuccess() throws SvcLogicException {
-        params.put("Id", "100");
-        result.setStatusMessage(SUCCESS);
-        when(messageProcessor.reqUriResult(params)).thenReturn(AGENT_URL);
-        when(messageProcessor.parseGetResponse(anyString())).thenReturn(result);
-        spyAdapter.reqExecResult(params, svcContext);
-        assertEquals(SUCCESS, svcContext.getAttribute(SUCCESS));
-    }
-    @Test(expected = SvcLogicException.class)
-    public void reqExecResult_Failure() throws SvcLogicException {
-        params.put("Id", "100");
-        result.setStatusCode(100);
-        result.setStatusMessage("Failed");
-        JSONObject cData = new JSONObject();
-        cData.put("GatewayInfo", "Radius");
-        result.setConfigData(cData.toString());
-        result.setOutput(cData.toString());
-        when(messageProcessor.reqUriResult(params)).thenReturn(AGENT_URL);
-        when(messageProcessor.parseGetResponse(anyString())).thenReturn(result);
-        adapter.reqExecResult(params, svcContext);
-    }
-
-    @Test(expected = SvcLogicException.class)
-    public void reqExecResult_SvcLogicException() throws SvcLogicException {
-        when(messageProcessor.reqUriResult(params)).thenThrow(new SvcLogicException());
-        adapter.reqExecResult(params, svcContext);
-    }
-
-    @Test(expected = SvcLogicException.class)
-    public void reqExecResult_numberFormatException()
-            throws IllegalStateException, IllegalArgumentException, SvcLogicException {
-        when(messageProcessor.reqUriResult(params)).thenThrow(new NumberFormatException());
-        adapter.reqExecResult(params, svcContext);
-    }
-
-    @Test
-    public void reqExecLog_shouldSetMessage() throws SvcLogicException {
-        params.put("Id", "101");
-        when(messageProcessor.reqUriLog(params)).thenReturn(AGENT_URL);
-        adapter.reqExecLog(params, svcContext);
-        String message = getResponseMessage();
-        assertEquals(message, svcContext.getAttribute(LOG_ATTRIBUTE_NAME));
-    }
-
-    private String getResponseMessage() {
-        JSONObject response = new JSONObject();
-        response.put(STATUS_CODE, 200);
-        response.put(STATUS_MESSAGE, "FINISHED");
-        JSONObject results = new JSONObject();
-
-        JSONObject vmResults = new JSONObject();
-        vmResults.put(STATUS_CODE, 200);
-        vmResults.put(STATUS_MESSAGE, "SUCCESS");
-        vmResults.put("Id", "");
-        results.put("192.168.1.10", vmResults);
-
-        response.put("Results", results);
-        return response.toString();
-    }
-
-    @Test(expected = SvcLogicException.class)
-    public void reqExecException()
-            throws IllegalStateException, IllegalArgumentException, SvcLogicException {
-        when(messageProcessor.reqUriLog(params)).thenThrow(new SvcLogicException("Appc Exception"));
-        adapter.reqExecLog(params, svcContext);
-    }
-
-    @Test(expected = SvcLogicException.class)
-    public void reqExec_SvcLogicException()
-            throws IllegalStateException, IllegalArgumentException, SvcLogicException {
-        when(messageProcessor.reqMessage(params)).thenThrow(new SvcLogicException());
-        adapter.reqExec(params, svcContext);
-    }
-
-    @Test(expected = SvcLogicException.class)
-    public void reqExec_JsonException()
-            throws IllegalStateException, IllegalArgumentException, SvcLogicException {
-        when(messageProcessor.reqMessage(params)).thenThrow(new JSONException("Json Exception"));
-        adapter.reqExec(params, svcContext);
-    }
-
-    @Test(expected = SvcLogicException.class)
-    public void reqExec_NumberFormatException()
-            throws IllegalStateException, IllegalArgumentException, SvcLogicException {
-        when(messageProcessor.reqMessage(params)).thenThrow(new NumberFormatException("Numbre Format Exception"));
-        adapter.reqExec(params, svcContext);
-    }
-
-    @Test
-    public void testInitializeWithDefault() {
-        properties.setProperty("org.onap.appc.adapter.ansible.clientType", "");
-        adapter = new AnsibleAdapterImpl();
-        assertNotNull(adapter);
-    }
-
-    @Test
-    public void testInitializeWithTrustAll() {
-        properties.setProperty("org.onap.appc.adapter.ansible.clientType", "TRUST_ALL");
-        adapter = new AnsibleAdapterImpl();
-        assertNotNull(adapter);
-    }
-
-    @Test
-    public void testInitializeWithTrustCert() {
-        properties.setProperty("org.onap.appc.adapter.ansible.clientType", "TRUST_CERT");
-        properties.setProperty("org.onap.appc.adapter.ansible.trustStore.trustPasswd", KEYSTORE_PSWD);
-        adapter = new AnsibleAdapterImpl();
-        assertNotNull(adapter);
-    }
-
-    @Test
-    public void testInitializeWithException() {
-        properties.setProperty("org.onap.appc.adapter.ansible.clientType", "TRUST_CERT");
-        properties.setProperty("org.onap.appc.adapter.ansible.trustStore.trustPasswd", "appc");
-        adapter = new AnsibleAdapterImpl();
-        assertNotNull(adapter);
-    }
-
-}
\ No newline at end of file
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/adapter/ansible/impl/TestAnsibleAdapterPropertiesProviderImpl.java b/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/adapter/ansible/impl/TestAnsibleAdapterPropertiesProviderImpl.java
deleted file mode 100644
index 5ce1712d3..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/adapter/ansible/impl/TestAnsibleAdapterPropertiesProviderImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : SLI
- * ================================================================================
- * Copyright (C) 2021 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.
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.ccsdk.adapter.ansible.impl;
-
-import java.io.File;
-import java.util.Properties;
-import org.junit.Test;
-import org.onap.ccsdk.sli.adaptors.ansible.impl.AnsibleAdapterPropertiesProviderImpl;
-
-import static org.junit.Assert.assertEquals;
-import static org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapterConstants.*;
-
-public class TestAnsibleAdapterPropertiesProviderImpl {
-
-    @Test
-    public void testGetProperties() throws IllegalStateException, IllegalArgumentException {
-        Properties prop = new AnsibleAdapterPropertiesProviderImpl().getProperties();
-
-        assertEquals("TRUST_ALL", prop.getProperty(CLIENT_TYPE_PROPERTY_NAME));
-        assertEquals("org.onap.appc.appc_ansible_adapter", prop.getProperty("org.onap.appc.provider.adaptor.name"));
-        assertEquals("changeit", prop.getProperty(TRUSTSTORE_PASS_PROPERTY_NAME));
-        assertEquals("${user.home},/opt/opendaylight/current/properties,.", prop.getProperty("org.onap.appc.bootstrap.path"));
-        assertEquals("APPC", prop.getProperty("appc.application.name"));
-        assertEquals("appc.properties", prop.getProperty("org.onap.appc.bootstrap.file"));
-        assertEquals("org/onap/appc/i18n/MessageResources", prop.getProperty("org.onap.appc.resources"));
-        assertEquals("/opt/opendaylight/tls-client/mykeystore.js", prop.getProperty(TRUSTSTORE_PROPERTY_NAME));
-    }
-
-    @Test
-    public void testGetTestProperties() throws IllegalStateException, IllegalArgumentException {
-        final String configFilePath = "src/test/resources/properties/ansible-adapter-test.properties".replace("/", File.separator);
-        Properties prop = new AnsibleAdapterPropertiesProviderImpl(configFilePath).getProperties();
-
-        assertEquals("appc", prop.getProperty(CLIENT_TYPE_PROPERTY_NAME));
-        assertEquals("org.onap.appc.appc_ansible_adapter", prop.getProperty("org.onap.appc.provider.adaptor.name"));
-        assertEquals("Aa123456", prop.getProperty(TRUSTSTORE_PASS_PROPERTY_NAME));
-        assertEquals("${user.home},/opt/opendaylight/current/properties,.", prop.getProperty("org.onap.appc.bootstrap.path"));
-        assertEquals("APPC", prop.getProperty("appc.application.name"));
-        assertEquals("appc.properties", prop.getProperty("org.onap.appc.bootstrap.file"));
-        assertEquals("org/onap/appc/i18n/MessageResources", prop.getProperty("org.onap.appc.resources"));
-        assertEquals("src/test/resources/org/onap/appc/asdc-client.jks", prop.getProperty(TRUSTSTORE_PROPERTY_NAME));
-    }
-
-}
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/adapter/ansible/impl/TestConnectionBuilder.java b/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/adapter/ansible/impl/TestConnectionBuilder.java
deleted file mode 100644
index 25f89863d..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/adapter/ansible/impl/TestConnectionBuilder.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : SLI
- * ================================================================================
- * Copyright (C) 2021 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.
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.ccsdk.adapter.ansible.impl;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-import java.util.Properties;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.StatusLine;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.onap.ccsdk.sli.adaptors.ansible.impl.AnsibleAdapterPropertiesProviderImpl;
-import org.onap.ccsdk.sli.adaptors.ansible.impl.ConnectionBuilder;
-import org.onap.ccsdk.sli.adaptors.ansible.model.AnsibleResult;
-import org.onap.ccsdk.sli.adaptors.ansible.model.AnsibleResultCodes;
-import org.powermock.reflect.Whitebox;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapterConstants.*;
-
-@RunWith(MockitoJUnitRunner.class)
-public class TestConnectionBuilder {
-
-    private static String KEYSTORE_FILE;
-    private static String KEYSTORE_PSWD;
-    private static String KEYSTORE_CERTIFICATE;
-    private static String USER;
-    private static String PSWD;
-    private static String URL;
-
-    private final int SUCCESS_STATUS = 200;
-    private ConnectionBuilder connectionBuilder;
-
-    @Mock
-    private CloseableHttpClient httpClient;
-
-    @Mock
-    private HttpClientContext httpClientContext;
-
-    @Mock
-    private CloseableHttpResponse response;
-
-    @Mock
-    private HttpEntity entity;
-
-    @Mock
-    private StatusLine statusLine;
-
-    /**
-     * Load the configuration properties
-     */
-    @BeforeClass
-    public static void once() {
-        final String configFilePath = "src/test/resources/properties/ansible-adapter-test.properties".replace("/", File.separator);
-        Properties properties = new AnsibleAdapterPropertiesProviderImpl(configFilePath).getProperties();
-
-        KEYSTORE_FILE = properties.getProperty(TRUSTSTORE_PROPERTY_NAME);
-        KEYSTORE_PSWD = properties.getProperty(TRUSTSTORE_PASS_PROPERTY_NAME);
-        KEYSTORE_CERTIFICATE = properties.getProperty("org.onap.appc.adapter.ansible.cert");
-        USER = properties.getProperty("org.onap.appc.adapter.ansible.username");
-        PSWD = properties.getProperty("org.onap.appc.adapter.ansible.password");
-        URL = properties.getProperty("org.onap.appc.adapter.ansible.identity");
-    }
-
-    @Before
-    public void setup() throws KeyManagementException, NoSuchAlgorithmException, KeyStoreException {
-        connectionBuilder = new ConnectionBuilder(1, 2000);
-        Whitebox.setInternalState(connectionBuilder, "httpClient", httpClient);
-        Whitebox.setInternalState(connectionBuilder, "httpContext", httpClientContext);
-        HttpResponse httpResponse = response;
-        when(httpResponse.getEntity()).thenReturn(entity);
-        when(httpResponse.getStatusLine()).thenReturn(statusLine);
-        when(statusLine.getStatusCode()).thenReturn(SUCCESS_STATUS);
-    }
-
-    @After
-    public void tearDown() {
-        connectionBuilder = null;
-    }
-
-    @Test
-    public void testConnectionBuilder() throws KeyManagementException, KeyStoreException, CertificateException,
-            NoSuchAlgorithmException, IOException {
-        char[] trustStorePassword = KEYSTORE_PSWD.toCharArray();
-        ConnectionBuilder connectionBuilder = new ConnectionBuilder(KEYSTORE_FILE, trustStorePassword, 600000, "");
-        assertNotNull(connectionBuilder);
-    }
-
-    @Test
-    public void testConnectionBuilderWithFilePath() throws KeyManagementException, KeyStoreException,
-            CertificateException, NoSuchAlgorithmException, IOException {
-        new ConnectionBuilder(KEYSTORE_CERTIFICATE, 600000);
-    }
-
-    @Test
-    public void testSetHttpContext() {
-        ConnectionBuilder spyConnectionBuilder = Mockito.spy(connectionBuilder);
-        spyConnectionBuilder.setHttpContext(USER, PSWD);
-        verify(spyConnectionBuilder, times(1)).setHttpContext(USER, PSWD);
-    }
-
-    @Test
-    public void testPost() throws IOException {
-        when(httpClient.execute(anyObject(), eq(httpClientContext))).thenReturn(response);
-        AnsibleResult result = connectionBuilder.post(URL, "appc");
-        assertNull(result.getStatusMessage());
-        assertEquals(SUCCESS_STATUS, result.getStatusCode());
-        assertEquals("UNKNOWN", result.getResults());
-    }
-
-    @Test
-    public void testPostWithException() throws IOException {
-        when(httpClient.execute(anyObject(), eq(httpClientContext))).thenThrow(new IOException());
-        AnsibleResult result = connectionBuilder.post(URL, "appc");
-        assertEquals(AnsibleResultCodes.IO_EXCEPTION.getValue(), result.getStatusCode());
-    }
-
-    @Ignore
-    @Test
-    public void testGet() throws IOException {
-        when(httpClient.execute(anyObject(), eq(httpClientContext))).thenReturn(response);
-        AnsibleResult result = connectionBuilder.get(URL);
-        assertNull(result.getStatusMessage());
-        assertEquals(SUCCESS_STATUS, result.getStatusCode());
-        assertEquals("UNKNOWN", result.getResults());
-    }
-
-    @Test
-    public void testGetWithException() throws IOException {
-        when(httpClient.execute(anyObject(), eq(httpClientContext))).thenThrow(new IOException());
-        AnsibleResult result = connectionBuilder.get(URL);
-        assertEquals(AnsibleResultCodes.IO_EXCEPTION.getValue(), result.getStatusCode());
-    }
-
-    @Test
-    public void testClose() {
-        connectionBuilder.close();
-    }
-
-    @Test
-    public void testGetMode() throws NoSuchAlgorithmException, KeyStoreException, KeyManagementException {
-        connectionBuilder = new ConnectionBuilder(2, 2000);
-        connectionBuilder.setHttpContext(USER, PSWD);
-        AnsibleResult result = connectionBuilder.get("test.server.com");
-
-        assertEquals(611, result.getStatusCode());
-        assertNull(result.getStatusMessage());
-        assertEquals("UNKNOWN", result.getResults());
-    }
-
-    @Test (expected = FileNotFoundException.class)
-    public void testGetModeNoCert() throws KeyStoreException, CertificateException, IOException,
-            KeyManagementException, NoSuchAlgorithmException {
-        String certFile = "testCert";
-
-        connectionBuilder = new ConnectionBuilder(certFile, 2000);
-        connectionBuilder.setHttpContext(USER, PSWD);
-        AnsibleResult result = connectionBuilder.get(URL);
-
-        assertEquals(611, result.getStatusCode());
-        assertNull(result.getStatusMessage());
-        assertEquals("UNKNOWN", result.getResults());
-    }
-
-    @Test
-    public void testGetModeCert() throws KeyStoreException, CertificateException, IOException,
-            KeyManagementException, NoSuchAlgorithmException {
-        String certFile = "src/test/resources/cert";
-
-        connectionBuilder = new ConnectionBuilder(certFile, 2000);
-        connectionBuilder.setHttpContext(USER, PSWD);
-        AnsibleResult result = connectionBuilder.get("test.server.com");
-
-        assertEquals(611, result.getStatusCode());
-        assertNull(result.getStatusMessage());
-        assertEquals("UNKNOWN", result.getResults());
-    }
-
-    @Test (expected = IOException.class)
-    public void testGetModeStore() throws KeyStoreException, CertificateException, IOException,
-            KeyManagementException, NoSuchAlgorithmException {
-        String store = "src/test/resources/cert";
-
-        connectionBuilder = new ConnectionBuilder(store, new char['t'], 2000, "1.1.1.1" );
-        connectionBuilder.setHttpContext(USER, PSWD);
-        AnsibleResult result = connectionBuilder.get(URL);
-
-        assertEquals(611, result.getStatusCode());
-        assertNull(result.getStatusMessage());
-        assertEquals("UNKNOWN", result.getResults());
-    }
-
-}
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/adapter/ansible/model/TestAnsibleAdapter.java b/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/adapter/ansible/model/TestAnsibleAdapter.java
deleted file mode 100644
index 3e1929bf5..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/adapter/ansible/model/TestAnsibleAdapter.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : SLI
- * ================================================================================
- * Copyright (C) 2021 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.
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.ccsdk.adapter.ansible.model;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import org.json.JSONObject;
-import org.junit.Test;
-import org.onap.ccsdk.sli.adaptors.ansible.model.AnsibleMessageParser;
-import org.onap.ccsdk.sli.adaptors.ansible.model.AnsibleResult;
-import org.onap.ccsdk.sli.adaptors.ansible.model.AnsibleServerEmulator;
-
-import static org.junit.Assert.assertNotNull;
-
-public class TestAnsibleAdapter {
-
-    @Test
-    public void callPrivateConstructorsMethodsForCodeCoverage()
-            throws SecurityException, NoSuchMethodException, IllegalArgumentException, InstantiationException, IllegalAccessException,
-            InvocationTargetException {
-
-        /* test constructors */
-        Class<?>[] classesOne = {AnsibleMessageParser.class};
-        for (Class<?> clazz : classesOne) {
-            Constructor<?> constructor = clazz.getDeclaredConstructor();
-            constructor.setAccessible(true);
-            assertNotNull(constructor.newInstance());
-        }
-        Class<?>[] classesTwo = {AnsibleServerEmulator.class};
-        for (Class<?> clazz : classesTwo) {
-            Constructor<?> constructor = clazz.getDeclaredConstructor();
-            constructor.setAccessible(true);
-            assertNotNull(constructor.newInstance());
-        }
-        Class<?>[] classesThree = {AnsibleResult.class};
-        for (Class<?> clazz : classesThree) {
-            Constructor<?> constructor = clazz.getDeclaredConstructor();
-            constructor.setAccessible(true);
-            assertNotNull(constructor.newInstance());
-        }
-
-        /* test methods */
-        AnsibleMessageParser ansibleMessageParser = new AnsibleMessageParser();
-        Class<?>[] parameterTypes = new Class[1];
-        parameterTypes[0] = java.lang.String.class;
-
-        Method m = ansibleMessageParser.getClass().getDeclaredMethod("getFilePayload", parameterTypes);
-        m.setAccessible(true);
-        assertNotNull(m.invoke(ansibleMessageParser, "{\"test\": test}"));
-
-        // test logging-suppression for an invalid host value (Fortify Log Forging fix)
-        String input = "{"
-                       + "  \"Results\": {"
-                       + "    \"192.168.1.10\": {"
-                       + "      \"Id\": \"101\","
-                       + "      \"StatusCode\": 200,"
-                       + "      \"StatusMessage\": \"SUCCESS\""
-                       + "    },"
-                       + "    \"192%168%1%10\": {"
-                       + "      \"Id\": \"102\","
-                       + "      \"StatusCode\": 200,"
-                       + "      \"StatusMessage\": \"SUCCESS\""
-                       + "    },"
-                       + "    \"server-dev.att.com\": {"
-                       + "      \"Id\": \"103\","
-                       + "      \"StatusCode\": 200,"
-                       + "      \"StatusMessage\": \"SUCCESS\""
-                       + "    }"
-                       + "  },"
-                       + "  \"StatusCode\": 200,"
-                       + "  \"StatusMessage\": \"FINISHED\""
-                       + "}";
-        Method m2 = ansibleMessageParser.getClass().getDeclaredMethod("parseGetResponseNested", AnsibleResult.class, JSONObject.class);
-        m2.setAccessible(true);
-        m2.invoke(ansibleMessageParser, new AnsibleResult(), new JSONObject(input));
-    }
-
-}
-
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/adapter/ansible/model/TestAnsibleMessageParser.java b/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/adapter/ansible/model/TestAnsibleMessageParser.java
deleted file mode 100644
index bcf18e3b2..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/adapter/ansible/model/TestAnsibleMessageParser.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : SLI
- * ================================================================================
- * Copyright (C) 2021 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.
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.ccsdk.adapter.ansible.model;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.json.JSONObject;
-import org.junit.Before;
-import org.junit.Test;
-import org.onap.ccsdk.sli.adaptors.ansible.model.AnsibleMessageParser;
-import org.onap.ccsdk.sli.core.sli.SvcLogicException;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public class TestAnsibleMessageParser {
-    private AnsibleMessageParser msgParser;
-
-    @Before
-    public void setup() {
-        msgParser = new AnsibleMessageParser();
-    }
-
-    @Test
-    public void testReqMessage() throws Exception {
-        // String result = "{"\AgentUrl : TestAgentUrl}";
-        Map<String, String> params = new HashMap<>();
-        params.put("AgentUrl", "TestAgentUrl");
-        params.put("PlaybookName", "TestPlaybookName");
-        params.put("User", "TestUser");
-        params.put("Password", "TestPass");
-
-        assertEquals("TestAgentUrl", msgParser.reqMessage(params).get("AgentUrl"));
-    }
-
-    @Test
-    public void testReqUriResult() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("AgentUrl", "TestAgentUrl");
-        params.put("Id", "TestId");
-        params.put("User", "TestUser");
-        params.put("Password", "TestPass");
-
-        assertTrue(msgParser.reqUriResult(params).contains("TestId"));
-    }
-
-    @Test
-    public void testReqUriLog() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("AgentUrl", "TestAgent-Url");
-        params.put("Id", "TestId");
-        params.put("User", "TestUser");
-        params.put("Password", "TestPass");
-
-        assertTrue(msgParser.reqUriLog(params).contains("TestAgent-Url"));
-    }
-
-    @Test
-    public void TestParsePostResponse() throws Exception {
-        String input = "{\"StatusCode\":\"100\",\"StatusMessage\":\"TestMessage\"}";
-        assertEquals("TestMessage", msgParser.parsePostResponse(input).getStatusMessage());
-
-    }
-
-    @Test(expected = SvcLogicException.class)
-    public void TestParsePostResponseException() throws Exception {
-        String input = "{\"StatusCode\":\"600\",\"StatusMessage\":\"TestMessage\"}";
-        assertTrue(msgParser.parsePostResponse(input).getStatusMessage().contains("Error parsing response"));
-    }
-
-    @Test(expected = SvcLogicException.class)
-    public void TestParsePostResponseException2() throws Exception {
-        String input = "{\"StatusCode\":\"600\"}";
-        assertTrue(msgParser.parsePostResponse(input).getStatusMessage().contains("Error parsing response"));
-    }
-
-    @Test(expected = SvcLogicException.class)
-    public void TestParseGetResponseException() throws Exception {
-        String input = "{\"StatusCode\":\"100\",\"StatusMessage\":\"TestMessage\"}";
-        assertTrue(msgParser.parseGetResponse(input).getStatusMessage().contains("Invalid FinalResponse code"));
-    }
-
-    @Test
-    public void TestParseGetResponseExec() throws Exception {
-        String input = "{\"StatusCode\":\"200\",\"StatusMessage\":\"TestMessage\"}";
-        assertTrue(msgParser.parseGetResponse(input).getStatusMessage().contains("Results not found in GET for response"));
-    }
-
-    @Test
-    public void TestParseGetResponse() throws Exception {
-        String input = "{"
-                       + "  \"StatusCode\": \"200\","
-                       + "  \"StatusMessage\": \"TestMessage\","
-                       + "  \"Results\": {"
-                       + "    \"host\": {"
-                       + "      \"StatusCode\": \"200\","
-                       + "      \"StatusMessage\": \"SUCCESS\""
-                       + "    }"
-                       + "  },"
-                       + "  \"Output\": {"
-                       + "    \"results-output\": {"
-                       + "      \"OutputResult\": \"TestOutPutResult\""
-                       + "    }"
-                       + "  }"
-                       + "}";
-        assertTrue(msgParser.parseGetResponse(input).getOutput().contains("TestOutPutResult"));
-    }
-
-    @Test
-    public void TestParseGetResponseEx() throws Exception {
-        String input = "{\"StatusCode\":\"200\",\"StatusMessage\":\"TestMessage\",\"Results\":{\"host\":\"TestHost\"}}";
-        assertTrue(msgParser.parseGetResponse(input).getStatusMessage().contains("Error processing response message"));
-    }
-
-    @Test
-    public void TestParseGetResponseJsonEx() throws Exception {
-        String input = "{\"StatusCode\":\"200\",\"StatusMessage\":\"TestMessage\",\"Results\":\"host\":\"TestHost\"}";
-        assertTrue(msgParser.parseGetResponse(input).getStatusMessage().contains("Error parsing response"));
-    }
-
-    @Test
-    public void TestParseGetResponseResultEx() throws Exception {
-        String input = "{"
-                       + "  \"StatusCode\": \"200\","
-                       + "  \"StatusMessage\": \"TestMessage\","
-                       + "  \"Results\": {"
-                       + "    \"host\": {"
-                       + "      \"StatusCode\": \"100\","
-                       + "      \"StatusMessage\": \"Failure\""
-                       + "    }"
-                       + "  },"
-                       + "  \"Output\": {"
-                       + "    \"results-output\": {"
-                       + "      \"OutputResult\": \"TestOutPutResult\""
-                       + "    }"
-                       + "  }"
-                       + "}";
-        assertTrue(msgParser.parseGetResponse(input).getOutput().contains("TestOutPutResult"));
-    }
-
-    @Test
-    public void testParseOptionalParam() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("AgentUrl", "TestAgentUrl");
-        params.put("PlaybookName", "TestPlaybookName");
-        params.put("User", "TestUser");
-        params.put("Password", "TestPass");
-        params.put("Timeout", "3");
-        params.put("Version", "1");
-        params.put("InventoryNames", "VNFC");
-
-        JSONObject jObject = msgParser.reqMessage(params);
-        assertEquals("1", jObject.get("Version"));
-        assertEquals("VNFC", jObject.get("InventoryNames"));
-    }
-
-    @Test
-    public void testParseOptionalParamForEnvParameters() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("AgentUrl", "TestAgentUrl");
-        params.put("PlaybookName", "TestPlaybookName");
-        params.put("User", "TestUser");
-        params.put("Password", "TestPass");
-        params.put("EnvParameters", "{name:value}");
-
-        JSONObject result = msgParser.reqMessage(params);
-        assertEquals("TestAgentUrl", result.get("AgentUrl"));
-        assertEquals("TestPlaybookName", result.get("PlaybookName"));
-        assertEquals("TestUser", result.get("User"));
-        assertEquals("TestPass", result.get("Password"));
-    }
-
-    @Test
-    public void TestParseGetConfigResponseResult() throws Exception {
-        String input = "{"
-                       + "  \"StatusCode\": \"200\","
-                       + "  \"StatusMessage\": \"TestMessage\","
-                       + "  \"Results\": {"
-                       + "    \"host\": {"
-                       + "      \"StatusCode\": \"200\","
-                       + "      \"StatusMessage\": \"SUCCESS\","
-                       + "      \"Output\": {"
-                       + "        \"info\": {"
-                       + "          \"configData\": {"
-                       + "            \"abc\": \"TestOutPutResult\","
-                       + "            \"rtr\": \"vfc\""
-                       + "          }"
-                       + "        }"
-                       + "      }"
-                       + "    }"
-                       + "  }"
-                       + "}";
-        assertTrue(msgParser.parseGetResponse(input).getConfigData().contains("abc"));
-    }
-
-    @Test
-    public void testParseOptionalParamTest2() throws Exception {
-
-        Map<String, String> params = new HashMap<>();
-        params.put("AgentUrl", "TestAgentUrl");
-        params.put("PlaybookName", "TestPlaybookName");
-        params.put("User", "TestUser");
-        params.put("Password", "TestPass");
-        //params.put("Timeout", "3");
-        params.put("Version", "1");
-        params.put("InventoryNames", "VNFC");
-        params.put("Timeout", "4");
-        params.put("EnvParameters", "{ \"userID\": \"$0002\", \"vnf-type\" : \"\", \"vnf\" : \"abc\" }");
-        params.put("NodeList", "${Nodelist}");
-
-        JSONObject jObject = msgParser.reqMessage(params);
-        assertEquals("1", jObject.get("Version"));
-        assertEquals("4", jObject.get("Timeout"));
-    }
-
-    @Test
-    public void testReqUriResultWithIPs() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("AgentUrl", "http://xx:yy:zz");
-        params.put("Id", "TestId");
-        params.put("User", "TestUser");
-        params.put("Password", "TestPass");
-        String serverIp = "10.0.2.3";
-        String actual = msgParser.reqUriResultWithIP(params, serverIp);
-        String expected = "http://10.0.2.3:yy:zz?Id=TestId&Type=GetResult";
-        assertEquals(expected, actual);
-    }
-
-}
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/adapter/ansible/model/TestAnsibleResult.java b/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/adapter/ansible/model/TestAnsibleResult.java
deleted file mode 100644
index 301cce135..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/adapter/ansible/model/TestAnsibleResult.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : SLI
- * ================================================================================
- * Copyright (C) 2021 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.
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.ccsdk.adapter.ansible.model;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.onap.ccsdk.sli.adaptors.ansible.model.AnsibleResult;
-
-import static org.junit.Assert.assertEquals;
-
-public class TestAnsibleResult {
-    private AnsibleResult ansibleResult;
-
-    @Before
-    public void setUp() {
-        ansibleResult = new AnsibleResult(10, "message", "result", "outputData");
-    }
-
-    @Test
-    public void testServerIp() {
-        ansibleResult.setServerIp("10.0.9.87");
-        assertEquals("10.0.9.87", ansibleResult.getServerIp());
-    }
-
-}
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/test/ExecutorHarness.java b/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/test/ExecutorHarness.java
deleted file mode 100644
index b6476d9dc..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/test/ExecutorHarness.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : SLI
- * ================================================================================
- * Copyright (C) 2021 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.
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-
-package org.onap.ccsdk.test;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
-
-/**
- * This class is used as a test harness to wrap the call to an executor node.
- */
-
-public class ExecutorHarness {
-
-    /**
-     * The executor to be tested
-     */
-    private SvcLogicJavaPlugin executor;
-
-    /**
-     * The collection of all exec methods found on the class
-     */
-    private final Map<String, Method> methods;
-
-    /**
-     * Create the harness and initialize it
-     *
-     * @throws SecurityException        If a security manager, s, is present and any of the following conditions is met:
-     *                                  <ul>
-     *                                  <li>invocation of s.checkMemberAccess(this, Member.DECLARED) denies access to the declared field</li>
-     *                                  <li>the caller's class loader is not the same as or an ancestor of the class loader for the current
-     *                                  class and invocation of s.checkPackageAccess() denies access to the package of this class</li>
-     *                                  </ul>
-     * @throws NoSuchFieldException     if a field with the specified name is not found.
-     * @throws IllegalAccessException   if this Field object is enforcing Java language access control and the underlying field is either
-     *                                  inaccessible or final.
-     * @throws IllegalArgumentException if the specified object is not an instance of the class or interface declaring the underlying field
-     *                                  (or a subclass or implementor thereof), or if an unwrapping conversion fails.
-     */
-    @SuppressWarnings("nls")
-    public ExecutorHarness() throws NoSuchFieldException, SecurityException, IllegalArgumentException,
-            IllegalAccessException {
-        methods = new HashMap<>();
-        new SvcLogicContext();
-
-        Class<?> contextClass = SvcLogicContext.class;
-        /**
-         * The field of the class being tested that contains the reference to the logger to be used. This is modified to
-         * point to our interception logger for the test.
-         */
-        Field contextLogger = contextClass.getDeclaredField("LOG");
-        contextLogger.setAccessible(true);
-        /**
-         * The interception logger that buffers all messages logged and allows us to look at them as part of the test case.
-         */
-        InterceptLogger logger = new InterceptLogger();
-        contextLogger.set(null, logger);
-    }
-
-    /**
-     * Convenience constructor
-     *
-     * @param executor The executor to be tested by the harness
-     *
-     * @throws SecurityException        If a security manager, s, is present and any of the following conditions is met:
-     *                                  <ul>
-     *                                  <li>invocation of s.checkMemberAccess(this, Member.DECLARED) denies access to the declared field</li>
-     *                                  <li>the caller's class loader is not the same as or an ancestor of the class loader for the current
-     *                                  class and invocation of s.checkPackageAccess() denies access to the package of this class</li>
-     *                                  </ul>
-     * @throws NoSuchFieldException     if a field with the specified name is not found.
-     * @throws IllegalAccessException   if this Field object is enforcing Java language access control and the underlying field is either
-     *                                  inaccessible or final.
-     * @throws IllegalArgumentException if the specified object is not an instance of the class or interface declaring the underlying field
-     *                                  (or a subclass or implementor thereof), or if an unwrapping conversion fails.
-     */
-    public ExecutorHarness(SvcLogicJavaPlugin executor) throws NoSuchFieldException, SecurityException,
-            IllegalArgumentException, IllegalAccessException {
-        this();
-        setExecutor(executor);
-    }
-
-    /**
-     * @return The java plugin class to be executed
-     */
-    public SvcLogicJavaPlugin getExecutor() {
-        return executor;
-    }
-
-    /**
-     * @param executor The java plugin class to be executed
-     */
-    public void setExecutor(SvcLogicJavaPlugin executor) {
-        this.executor = executor;
-        scanExecutor();
-    }
-
-    /**
-     * @return The set of all methods that meet the signature requirements
-     */
-    public List<String> getExecMethodNames() {
-        List<String> names = new ArrayList<>();
-        names.addAll(methods.keySet());
-        return names;
-    }
-
-    /**
-     * Returns an indication if the named method is a valid executor method that could be called from a DG execute node
-     *
-     * @param methodName The method name to be validated
-     *
-     * @return True if the method name meets the signature requirements, false if the method either does not exist or
-     * does not meet the requirements.
-     */
-    public boolean isExecMethod(String methodName) {
-        return methods.containsKey(methodName);
-    }
-
-    /**
-     * This method scans the executor class hierarchy to locate all methods that match the required signature of the
-     * executor and records these methods in a map.
-     */
-    private void scanExecutor() {
-        methods.clear();
-        Class<?> executorClass = executor.getClass();
-        Method[] publicMethods = executorClass.getMethods();
-        for (Method method : publicMethods) {
-            if (method.getReturnType().equals(Void.class)) {
-                Class<?>[] paramTypes = method.getParameterTypes();
-                if (paramTypes.length == 2) {
-                    if (Map.class.isAssignableFrom(paramTypes[0])
-                        && SvcLogicContext.class.isAssignableFrom(paramTypes[1])) {
-                        methods.put(method.getName(), method);
-                    }
-                }
-            }
-        }
-    }
-
-}
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/test/InterceptLogger.java b/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/test/InterceptLogger.java
deleted file mode 100644
index 3ed32376a..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/java/org/onap/ccsdk/test/InterceptLogger.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : SLI
- * ================================================================================
- * Copyright (C) 2021 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.
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-
-package org.onap.ccsdk.test;
-
-import ch.qos.logback.classic.Level;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-import org.slf4j.Marker;
-
-/**
- * This class is used as an intercept logger that can be used in testing to intercept and record all messages that are
- * logged, thus allowing a junit test case to examine the log output and make assertions.
- */
-public class InterceptLogger implements org.slf4j.Logger {
-
-    /**
-     * The list of all intercepted log events
-     */
-    private final List<LogRecord> events;
-
-    /**
-     * Create the intercept logger
-     */
-    public InterceptLogger() {
-        events = new ArrayList<>(1000);
-    }
-
-    /**
-     * @return Returns all intercepted log events
-     */
-    public List<LogRecord> getLogRecords() {
-        return events;
-    }
-
-    /**
-     * Clears all log events
-     */
-    public void clear() {
-        events.clear();
-    }
-
-    @Override
-    public void debug(Marker marker, String msg) {
-        debug(msg);
-    }
-
-    @Override
-    public void debug(Marker marker, String format, Object arg) {
-        debug(MessageFormat.format(format, arg));
-    }
-
-    @Override
-    public void debug(Marker marker, String format, Object... arguments) {
-        debug(MessageFormat.format(format, arguments));
-    }
-
-    @Override
-    public void debug(Marker marker, String format, Object arg1, Object arg2) {
-        debug(MessageFormat.format(format, arg1, arg2));
-    }
-
-    @Override
-    public void debug(Marker marker, String msg, Throwable t) {
-        debug(msg, t);
-    }
-
-    @Override
-    public void debug(String msg) {
-        events.add(new LogRecord(Level.DEBUG, msg));
-    }
-
-    @Override
-    public void debug(String format, Object arg) {
-        events.add(new LogRecord(Level.DEBUG, MessageFormat.format(format, arg)));
-    }
-
-    @Override
-    public void debug(String format, Object... arguments) {
-        events.add(new LogRecord(Level.DEBUG, MessageFormat.format(format, arguments)));
-    }
-
-    @Override
-    public void debug(String format, Object arg1, Object arg2) {
-        events.add(new LogRecord(Level.DEBUG, MessageFormat.format(format, arg1, arg2)));
-    }
-
-    @Override
-    public void debug(String msg, Throwable t) {
-        events.add(new LogRecord(Level.DEBUG, msg, t));
-    }
-
-    @Override
-    public void error(Marker marker, String msg) {
-        error(msg);
-    }
-
-    @Override
-    public void error(Marker marker, String format, Object arg) {
-        error(format, arg);
-    }
-
-    @Override
-    public void error(Marker marker, String format, Object... arguments) {
-        error(format, arguments);
-    }
-
-    @Override
-    public void error(Marker marker, String format, Object arg1, Object arg2) {
-        error(format, arg1, arg2);
-    }
-
-    @Override
-    public void error(Marker marker, String msg, Throwable t) {
-        events.add(new LogRecord(Level.ERROR, msg, t));
-    }
-
-    @Override
-    public void error(String msg) {
-        events.add(new LogRecord(Level.ERROR, msg));
-    }
-
-    @Override
-    public void error(String format, Object arg) {
-        events.add(new LogRecord(Level.ERROR, MessageFormat.format(format, arg)));
-    }
-
-    @Override
-    public void error(String format, Object... arguments) {
-        events.add(new LogRecord(Level.ERROR, MessageFormat.format(format, arguments)));
-    }
-
-    @Override
-    public void error(String format, Object arg1, Object arg2) {
-        events.add(new LogRecord(Level.ERROR, MessageFormat.format(format, arg1, arg2)));
-    }
-
-    @Override
-    public void error(String msg, Throwable t) {
-        events.add(new LogRecord(Level.ERROR, msg, t));
-    }
-
-    @Override
-    public String getName() {
-        return null;
-    }
-
-    @Override
-    public void info(Marker marker, String msg) {
-        info(msg);
-    }
-
-    @Override
-    public void info(Marker marker, String format, Object arg) {
-        info(format, arg);
-    }
-
-    @Override
-    public void info(Marker marker, String format, Object... arguments) {
-        info(format, arguments);
-    }
-
-    @Override
-    public void info(Marker marker, String format, Object arg1, Object arg2) {
-        info(format, arg1, arg2);
-    }
-
-    @Override
-    public void info(Marker marker, String msg, Throwable t) {
-        events.add(new LogRecord(Level.INFO, msg, t));
-    }
-
-    @Override
-    public void info(String msg) {
-        events.add(new LogRecord(Level.INFO, msg));
-    }
-
-    @Override
-    public void info(String format, Object arg) {
-        events.add(new LogRecord(Level.INFO, MessageFormat.format(format, arg)));
-    }
-
-    @Override
-    public void info(String format, Object... arguments) {
-        events.add(new LogRecord(Level.INFO, MessageFormat.format(format, arguments)));
-    }
-
-    @Override
-    public void info(String format, Object arg1, Object arg2) {
-        events.add(new LogRecord(Level.INFO, MessageFormat.format(format, arg1, arg2)));
-    }
-
-    @Override
-    public void info(String msg, Throwable t) {
-        events.add(new LogRecord(Level.INFO, msg, t));
-    }
-
-    @Override
-    public boolean isDebugEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isDebugEnabled(Marker marker) {
-        return true;
-    }
-
-    @Override
-    public boolean isErrorEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isErrorEnabled(Marker marker) {
-        return true;
-    }
-
-    @Override
-    public boolean isInfoEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isInfoEnabled(Marker marker) {
-        return true;
-    }
-
-    @Override
-    public boolean isTraceEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isTraceEnabled(Marker marker) {
-        return true;
-    }
-
-    @Override
-    public boolean isWarnEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isWarnEnabled(Marker marker) {
-        return true;
-    }
-
-    @Override
-    public void trace(Marker marker, String msg) {
-        trace(msg);
-    }
-
-    @Override
-    public void trace(Marker marker, String format, Object arg) {
-        trace(format, arg);
-    }
-
-    @Override
-    public void trace(Marker marker, String format, Object... argArray) {
-        trace(format, argArray);
-    }
-
-    @Override
-    public void trace(Marker marker, String format, Object arg1, Object arg2) {
-        trace(format, arg1, arg2);
-    }
-
-    @Override
-    public void trace(Marker marker, String msg, Throwable t) {
-        trace(msg, t);
-    }
-
-    @Override
-    public void trace(String msg) {
-        events.add(new LogRecord(Level.TRACE, msg));
-    }
-
-    @Override
-    public void trace(String format, Object arg) {
-        events.add(new LogRecord(Level.TRACE, MessageFormat.format(format, arg)));
-    }
-
-    @Override
-    public void trace(String format, Object... arguments) {
-        events.add(new LogRecord(Level.TRACE, MessageFormat.format(format, arguments)));
-    }
-
-    @Override
-    public void trace(String format, Object arg1, Object arg2) {
-        events.add(new LogRecord(Level.TRACE, MessageFormat.format(format, arg1, arg2)));
-    }
-
-    @Override
-    public void trace(String msg, Throwable t) {
-        events.add(new LogRecord(Level.TRACE, msg, t));
-    }
-
-    @Override
-    public void warn(Marker marker, String msg) {
-        warn(msg);
-    }
-
-    @Override
-    public void warn(Marker marker, String format, Object arg) {
-        warn(format, arg);
-    }
-
-    @Override
-    public void warn(Marker marker, String format, Object... arguments) {
-        warn(format, arguments);
-    }
-
-    @Override
-    public void warn(Marker marker, String format, Object arg1, Object arg2) {
-        warn(format, arg1, arg2);
-    }
-
-    @Override
-    public void warn(Marker marker, String msg, Throwable t) {
-        events.add(new LogRecord(Level.WARN, msg, t));
-    }
-
-    @Override
-    public void warn(String msg) {
-        events.add(new LogRecord(Level.WARN, msg));
-    }
-
-    @Override
-    public void warn(String format, Object arg) {
-        events.add(new LogRecord(Level.WARN, MessageFormat.format(format, arg)));
-    }
-
-    @Override
-    public void warn(String format, Object... arguments) {
-        events.add(new LogRecord(Level.WARN, MessageFormat.format(format, arguments)));
-    }
-
-    @Override
-    public void warn(String format, Object arg1, Object arg2) {
-        events.add(new LogRecord(Level.WARN, MessageFormat.format(format, arg1, arg2)));
-    }
-
-    @Override
-    public void warn(String msg, Throwable t) {
-        events.add(new LogRecord(Level.WARN, msg, t));
-    }
-
-    /**
-     * This inner class represents an intercepted log event
-     */
-    public class LogRecord {
-        private Level level;
-        private String message;
-        private long timestamp;
-        private Throwable t;
-
-        public LogRecord(Level level, String message) {
-            setLevel(level);
-            setTimestamp(System.currentTimeMillis());
-            setMessage(message);
-        }
-
-        public LogRecord(Level level, String message, Throwable t) {
-            this(level, message);
-            setThrowable(t);
-        }
-
-        /**
-         * @return the value of level
-         */
-        public Level getLevel() {
-            return level;
-        }
-
-        /**
-         * @param level the value for level
-         */
-        public void setLevel(Level level) {
-            this.level = level;
-        }
-
-        /**
-         * @return the value of message
-         */
-        public String getMessage() {
-            return message;
-        }
-
-        /**
-         * @param message the value for message
-         */
-        public void setMessage(String message) {
-            this.message = message;
-        }
-
-        /**
-         * @return the value of timestamp
-         */
-        public long getTimestamp() {
-            return timestamp;
-        }
-
-        /**
-         * @param timestamp the value for timestamp
-         */
-        public void setTimestamp(long timestamp) {
-            this.timestamp = timestamp;
-        }
-
-        /**
-         * @return the value of t
-         */
-        public Throwable getThrowable() {
-            return t;
-        }
-
-        /**
-         * @param t the value for t
-         */
-        public void setThrowable(Throwable t) {
-            this.t = t;
-        }
-
-    }
-
-}
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/resources/cert b/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/resources/cert
deleted file mode 100644
index cc2921c4b..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/resources/cert
+++ /dev/null
@@ -1,125 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=FR, ST=Alsace, L=Strasbourg, O=www.freelan.org, OU=freelan, CN=Freelan Sample Certificate Authority/emailAddress=contact@freelan.org
-        Validity
-            Not Before: Apr 27 10:31:18 2012 GMT
-            Not After : Apr 25 10:31:18 2022 GMT
-        Subject: C=FR, ST=Alsace, O=www.freelan.org, OU=freelan, CN=alice/emailAddress=contact@freelan.org
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:dd:6d:bd:f8:80:fa:d7:de:1b:1f:a7:a3:2e:b2:
-                    02:e2:16:f6:52:0a:3c:bf:a6:42:f8:ca:dc:93:67:
-                    4d:60:c3:4f:8d:c3:8a:00:1b:f1:c4:4b:41:6a:69:
-                    d2:69:e5:3f:21:8e:c5:0b:f8:22:37:ad:b6:2c:4b:
-                    55:ff:7a:03:72:bb:9a:d3:ec:96:b9:56:9f:cb:19:
-                    99:c9:32:94:6f:8f:c6:52:06:9f:45:03:df:fd:e8:
-                    97:f6:ea:d6:ba:bb:48:2b:b5:e0:34:61:4d:52:36:
-                    0f:ab:87:52:25:03:cf:87:00:87:13:f2:ca:03:29:
-                    16:9d:90:57:46:b5:f4:0e:ae:17:c8:0a:4d:92:ed:
-                    08:a6:32:23:11:71:fe:f2:2c:44:d7:6c:07:f3:0b:
-                    7b:0c:4b:dd:3b:b4:f7:37:70:9f:51:b6:88:4e:5d:
-                    6a:05:7f:8d:9b:66:7a:ab:80:20:fe:ee:6b:97:c3:
-                    49:7d:78:3b:d5:99:97:03:75:ce:8f:bc:c5:be:9c:
-                    9a:a5:12:19:70:f9:a4:bd:96:27:ed:23:02:a7:c7:
-                    57:c9:71:cf:76:94:a2:21:62:f6:b8:1d:ca:88:ee:
-                    09:ad:46:2f:b7:61:b3:2c:15:13:86:9f:a5:35:26:
-                    5a:67:f4:37:c8:e6:80:01:49:0e:c7:ed:61:d3:cd:
-                    bc:e4:f8:be:3f:c9:4e:f8:7d:97:89:ce:12:bc:ca:
-                    b5:c6:d2:e0:d9:b3:68:3c:2e:4a:9d:b4:5f:b8:53:
-                    ee:50:3d:bf:dd:d4:a2:8a:b6:a0:27:ab:98:0c:b3:
-                    b2:58:90:e2:bc:a1:ad:ff:bd:8e:55:31:0f:00:bf:
-                    68:e9:3d:a9:19:9a:f0:6d:0b:a2:14:6a:c6:4c:c6:
-                    4e:bd:63:12:a5:0b:4d:97:eb:42:09:79:53:e2:65:
-                    aa:24:34:70:b8:c1:ab:23:80:e7:9c:6c:ed:dc:82:
-                    aa:37:04:b8:43:2a:3d:2a:a8:cc:20:fc:27:5d:90:
-                    26:58:f9:b7:14:e2:9e:e2:c1:70:73:97:e9:6b:02:
-                    8e:d3:52:59:7b:00:ec:61:30:f1:56:3f:9c:c1:7c:
-                    05:c5:b1:36:c8:18:85:cf:61:40:1f:07:e8:a7:06:
-                    87:df:9a:77:0b:a9:64:72:03:f6:93:fc:e0:02:59:
-                    c1:96:ec:c0:09:42:3e:30:a2:7f:1b:48:2f:fe:e0:
-                    21:8f:53:87:25:0d:cb:ea:49:f5:4a:9b:d0:e3:5f:
-                    ee:78:18:e5:ba:71:31:a9:04:98:0f:b1:ad:67:52:
-                    a0:f2:e3:9c:ab:6a:fe:58:84:84:dd:07:3d:32:94:
-                    05:16:45:15:96:59:a0:58:6c:18:0e:e3:77:66:c7:
-                    b3:f7:99
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints:
-                CA:FALSE
-            Netscape Comment:
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier:
-                59:5F:C9:13:BA:1B:CC:B9:A8:41:4A:8A:49:79:6A:36:F6:7D:3E:D7
-            X509v3 Authority Key Identifier:
-                keyid:23:6C:2D:3D:3E:29:5D:78:B8:6C:3E:AA:E2:BB:2E:1E:6C:87:F2:53
-
-    Signature Algorithm: sha1WithRSAEncryption
-        13:e7:02:45:3e:a7:ab:bd:b8:da:e7:ef:74:88:ac:62:d5:dd:
-        10:56:d5:46:07:ec:fa:6a:80:0c:b9:62:be:aa:08:b4:be:0b:
-        eb:9a:ef:68:b7:69:6f:4d:20:92:9d:18:63:7a:23:f4:48:87:
-        6a:14:c3:91:98:1b:4e:08:59:3f:91:80:e9:f4:cf:fd:d5:bf:
-        af:4b:e4:bd:78:09:71:ac:d0:81:e5:53:9f:3e:ac:44:3e:9f:
-        f0:bf:5a:c1:70:4e:06:04:ef:dc:e8:77:05:a2:7d:c5:fa:80:
-        58:0a:c5:10:6d:90:ca:49:26:71:84:39:b7:9a:3e:e9:6f:ae:
-        c5:35:b6:5b:24:8c:c9:ef:41:c3:b1:17:b6:3b:4e:28:89:3c:
-        7e:87:a8:3a:a5:6d:dc:39:03:20:20:0b:c5:80:a3:79:13:1e:
-        f6:ec:ae:36:df:40:74:34:87:46:93:3b:a3:e0:a4:8c:2f:43:
-        4c:b2:54:80:71:76:78:d4:ea:12:28:d8:f2:e3:80:55:11:9b:
-        f4:65:dc:53:0e:b4:4c:e0:4c:09:b4:dc:a0:80:5c:e6:b5:3b:
-        95:d3:69:e4:52:3d:5b:61:86:02:e5:fd:0b:00:3a:fa:b3:45:
-        cc:c9:a3:64:f2:dc:25:59:89:58:0d:9e:6e:28:3a:55:45:50:
-        5f:88:67:2a:d2:e2:48:cc:8b:de:9a:1b:93:ae:87:e1:f2:90:
-        50:40:d9:0f:44:31:53:46:ad:62:4e:8d:48:86:19:77:fc:59:
-        75:91:79:35:59:1d:e3:4e:33:5b:e2:31:d7:ee:52:28:5f:0a:
-        70:a7:be:bb:1c:03:ca:1a:18:d0:f5:c1:5b:9c:73:04:b6:4a:
-        e8:46:52:58:76:d4:6a:e6:67:1c:0e:dc:13:d0:61:72:a0:92:
-        cb:05:97:47:1c:c1:c9:cf:41:7d:1f:b1:4d:93:6b:53:41:03:
-        21:2b:93:15:63:08:3e:2c:86:9e:7b:9f:3a:09:05:6a:7d:bb:
-        1c:a7:b7:af:96:08:cb:5b:df:07:fb:9c:f2:95:11:c0:82:81:
-        f6:1b:bf:5a:1e:58:cd:28:ca:7d:04:eb:aa:e9:29:c4:82:51:
-        2c:89:61:95:b6:ed:a5:86:7c:7c:48:1d:ec:54:96:47:79:ea:
-        fc:7f:f5:10:43:0a:9b:00:ef:8a:77:2e:f4:36:66:d2:6a:a6:
-        95:b6:9f:23:3b:12:e2:89:d5:a4:c1:2c:91:4e:cb:94:e8:3f:
-        22:0e:21:f9:b8:4a:81:5c:4c:63:ae:3d:05:b2:5c:5c:54:a7:
-        55:8f:98:25:55:c4:a6:90:bc:19:29:b1:14:d4:e2:b0:95:e4:
-        ff:89:71:61:be:8a:16:85
------BEGIN CERTIFICATE-----
-MIIGJzCCBA+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UEBhMCRlIx
-DzANBgNVBAgMBkFsc2FjZTETMBEGA1UEBwwKU3RyYXNib3VyZzEYMBYGA1UECgwP
-d3d3LmZyZWVsYW4ub3JnMRAwDgYDVQQLDAdmcmVlbGFuMS0wKwYDVQQDDCRGcmVl
-bGFuIFNhbXBsZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxIjAgBgkqhkiG9w0BCQEW
-E2NvbnRhY3RAZnJlZWxhbi5vcmcwHhcNMTIwNDI3MTAzMTE4WhcNMjIwNDI1MTAz
-MTE4WjB+MQswCQYDVQQGEwJGUjEPMA0GA1UECAwGQWxzYWNlMRgwFgYDVQQKDA93
-d3cuZnJlZWxhbi5vcmcxEDAOBgNVBAsMB2ZyZWVsYW4xDjAMBgNVBAMMBWFsaWNl
-MSIwIAYJKoZIhvcNAQkBFhNjb250YWN0QGZyZWVsYW4ub3JnMIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEA3W29+ID6194bH6ejLrIC4hb2Ugo8v6ZC+Mrc
-k2dNYMNPjcOKABvxxEtBamnSaeU/IY7FC/giN622LEtV/3oDcrua0+yWuVafyxmZ
-yTKUb4/GUgafRQPf/eiX9urWurtIK7XgNGFNUjYPq4dSJQPPhwCHE/LKAykWnZBX
-RrX0Dq4XyApNku0IpjIjEXH+8ixE12wH8wt7DEvdO7T3N3CfUbaITl1qBX+Nm2Z6
-q4Ag/u5rl8NJfXg71ZmXA3XOj7zFvpyapRIZcPmkvZYn7SMCp8dXyXHPdpSiIWL2
-uB3KiO4JrUYvt2GzLBUThp+lNSZaZ/Q3yOaAAUkOx+1h08285Pi+P8lO+H2Xic4S
-vMq1xtLg2bNoPC5KnbRfuFPuUD2/3dSiiragJ6uYDLOyWJDivKGt/72OVTEPAL9o
-6T2pGZrwbQuiFGrGTMZOvWMSpQtNl+tCCXlT4mWqJDRwuMGrI4DnnGzt3IKqNwS4
-Qyo9KqjMIPwnXZAmWPm3FOKe4sFwc5fpawKO01JZewDsYTDxVj+cwXwFxbE2yBiF
-z2FAHwfopwaH35p3C6lkcgP2k/zgAlnBluzACUI+MKJ/G0gv/uAhj1OHJQ3L6kn1
-SpvQ41/ueBjlunExqQSYD7GtZ1Kg8uOcq2r+WISE3Qc9MpQFFkUVllmgWGwYDuN3
-Zsez95kCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNT
-TCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFFlfyRO6G8y5qEFKikl5
-ajb2fT7XMB8GA1UdIwQYMBaAFCNsLT0+KV14uGw+quK7Lh5sh/JTMA0GCSqGSIb3
-DQEBBQUAA4ICAQAT5wJFPqervbja5+90iKxi1d0QVtVGB+z6aoAMuWK+qgi0vgvr
-mu9ot2lvTSCSnRhjeiP0SIdqFMORmBtOCFk/kYDp9M/91b+vS+S9eAlxrNCB5VOf
-PqxEPp/wv1rBcE4GBO/c6HcFon3F+oBYCsUQbZDKSSZxhDm3mj7pb67FNbZbJIzJ
-70HDsRe2O04oiTx+h6g6pW3cOQMgIAvFgKN5Ex727K4230B0NIdGkzuj4KSML0NM
-slSAcXZ41OoSKNjy44BVEZv0ZdxTDrRM4EwJtNyggFzmtTuV02nkUj1bYYYC5f0L
-ADr6s0XMyaNk8twlWYlYDZ5uKDpVRVBfiGcq0uJIzIvemhuTrofh8pBQQNkPRDFT
-Rq1iTo1Ihhl3/Fl1kXk1WR3jTjNb4jHX7lIoXwpwp767HAPKGhjQ9cFbnHMEtkro
-RlJYdtRq5mccDtwT0GFyoJLLBZdHHMHJz0F9H7FNk2tTQQMhK5MVYwg+LIaee586
-CQVqfbscp7evlgjLW98H+5zylRHAgoH2G79aHljNKMp9BOuq6SnEglEsiWGVtu2l
-hnx8SB3sVJZHeer8f/UQQwqbAO+Kdy70NmbSaqaVtp8jOxLiidWkwSyRTsuU6D8i
-DiH5uEqBXExjrj0FslxcVKdVj5glVcSmkLwZKbEU1OKwleT/iXFhvooWhQ==
------END CERTIFICATE-----
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/resources/org/onap/appc/asdc-client-cert.crt b/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/resources/org/onap/appc/asdc-client-cert.crt
deleted file mode 100644
index 941c1d8f4..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/resources/org/onap/appc/asdc-client-cert.crt
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN CERTIFICATE-----
-  MIIBezCCASWgAwIBAgIQyWD8dLUoqpJFyDxrfRlrsTANBgkqhkiG9w0BAQQFADAW
-  MRQwEgYDVQQDEwtSb290IEFnZW5jeTAeFw0wMTEwMTkxMjU5MjZaFw0zOTEyMzEy
-  MzU5NTlaMBoxGDAWBgNVBAMTD1Jvb3RDZXJ0aWZpY2F0ZTBcMA0GCSqGSIb3DQEB
-  AQUAA0sAMEgCQQC+NFKszPjatUZKWmyWaFjir1wB93FX2u5SL+GMjgUsMs1JcTKQ
-  Kh0cnnQKknNkV4cTW4NPn31YCoB1+0KA3mknAgMBAAGjSzBJMEcGA1UdAQRAMD6A
-  EBLkCS0GHR1PAI1hIdwWZGOhGDAWMRQwEgYDVQQDEwtSb290IEFnZW5jeYIQBjds
-  AKoAZIoRz7jUqlw19DANBgkqhkiG9w0BAQQFAANBACJxAfP57yqaT9N+nRgAOugM
-  JG0aN3/peCIvL3p29epRL2xoWFvxpUUlsH2I39OZ6b8+twWCebhkv1I62segXAk=
-  -----END CERTIFICATE-----
\ No newline at end of file
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/resources/org/onap/appc/asdc-client.jks b/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/resources/org/onap/appc/asdc-client.jks
deleted file mode 100644
index eb0a0d35a..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/resources/org/onap/appc/asdc-client.jks
+++ /dev/null
diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/resources/properties/ansible-adapter-test.properties b/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/resources/properties/ansible-adapter-test.properties
deleted file mode 100644
index ef4bfb2e9..000000000
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/src/test/resources/properties/ansible-adapter-test.properties
+++ /dev/null
@@ -1,109 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP : SLI
-# ================================================================================
-# Copyright (C) 2021 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.
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-# ============LICENSE_END=========================================================
-
-###
-#
-# Default properties for the APP-C Provider Adapter
-#
-# -------------------------------------------------------------------------------------------------
-#
-# Define the name and path of any user-provided configuration (bootstrap) file that can be loaded
-# to supply configuration options
-org.onap.appc.bootstrap.file=appc.properties
-org.onap.appc.bootstrap.path=${user.home},/opt/opendaylight/current/properties,.
-appc.application.name=APPC
-#Define ansible property
-org.onap.appc.adapter.ansible.clientType=appc
-org.onap.appc.adapter.ansible.trustStore=src/test/resources/org/onap/appc/asdc-client.jks
-org.onap.appc.adapter.ansible.trustStore.trustPasswd=Aa123456
-org.onap.appc.adapter.ansible.cert=src/test/resources/org/onap/appc/asdc-client-cert.crt
-org.onap.appc.adapter.ansible.identity=http://localhost:9081/v2.0
-org.onap.appc.adapter.ansible.username=appc
-org.onap.appc.adapter.ansible.password=appc
-#
-# Define the message resource bundle name to be loaded
-org.onap.appc.resources=org/onap/appc/i18n/MessageResources
-#
-# The name of the adapter.
-org.onap.appc.provider.adaptor.name=org.onap.appc.appc_ansible_adapter
-#
-# Set up the logging environment
-#
-org.onap.appc.logging.file=org/onap/appc/logback.xml
-org.onap.appc.logging.path=${user.home};etc;../etc
-org.onap.appc.logger=org.onap.appc
-org.onap.appc.security.logger=org.onap.appc.security
-#
-# The minimum and maximum provider/tenant context pool sizes.  Min=1 means that as soon
-# as the provider/tenant is referenced a Context is opened and added to the pool.  Max=0
-# means that the upper bound on the pool is unbounded.
-org.onap.appc.provider.min.pool=1
-org.onap.appc.provider.max.pool=0
-#
-# The following properties are used to configure the retry logic for connection to the
-# IaaS provider(s).  The retry delay property is the amount of time, in seconds, the
-# application waits between retry attempts.  The retry limit is the number of retries
-# that are allowed before the request is failed.
-org.onap.appc.provider.retry.delay=30
-org.onap.appc.provider.retry.limit=10
-#
-# The trusted hosts list for SSL access when a certificate is not provided.
-#
-provider.trusted.hosts=*
-#
-# The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc).
-# If the server does not change state to a valid state within the alloted time, the operation
-# fails.
-org.onap.appc.server.state.change.timeout=300
-#
-# The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider
-# to refresh the status of a resource we are waiting on.
-#
-org.onap.appc.openstack.poll.interval=20
-#
-# The connection information to connect to the provider we are using.  These properties
-# are "structured" properties, in that the name is a compound name, where the nodes
-# of the name can be ordered (1, 2, 3, ...).  All of the properties with the same ordinal
-# position are defining the same entity.  For example, provider1.type and provider1.name
-# are defining the same provider, whereas provider2.name and provider2.type are defining
-# the values for a different provider.  Any number of providers can be defined in this
-# way.
-#
-# Don't change these 2 right now since they are hard coded in the DG
-#provider1.type=appc
-#provider1.name=appc
-#These you can change
-#provider1.identity=appc
-#provider1.tenant1.name=appc
-#provider1.tenant1.userid=appc
-#provider1.tenant1.password=appc
-# After a change to the provider make sure to recheck these values with an api call to provider1.identity/tokens
-test.expected-regions=1
-test.expected-endpoints=1
-#Your OpenStack IP
-#test.ip=192.168.1.2
-# Your OpenStack Platform's Keystone Port (default is 5000)
-#test.port=5000
-#test.tenantid=abcde12345fghijk6789lmnopq123rst
-#test.vmid=abc12345-1234-5678-890a-abcdefg12345
-# Port 8774 below is default port for OpenStack's Nova API Service
-#test.url=http://192.168.1.2:8774/v2/abcde12345fghijk6789lmnopq123rst/servers/abc12345-1234-5678-890a-abcdefg12345
-