Second part of onap rename

This is the second commit of the rename. The folder structure
is renamed for appc-adapters and appc-config in this commit.

Change-Id: Iaa2b8c937ff1ca1b5d1178128961fb115ee65d9b
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-13

3 files changed, 0 insertions, 378 deletions

diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterSshd.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterSshd.java
deleted file mode 100644
index a5bbe34e2..000000000
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterSshd.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.appc.adapter.ssh.sshd;
-
-import org.onap.appc.adapter.ssh.SshAdapter;
-import org.onap.appc.adapter.ssh.SshConnection;
-
-public class SshAdapterSshd implements SshAdapter {
-
-	@Override
-	public SshConnection getConnection(String host, int port, String username, String password) {
-		return new SshConnectionSshd(host, port, username, password);
-	}
-}
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshConnectionSshd.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshConnectionSshd.java
deleted file mode 100644
index c35c58798..000000000
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshConnectionSshd.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.appc.adapter.ssh.sshd;
-
-import org.onap.appc.adapter.ssh.Constants;
-import org.onap.appc.adapter.ssh.SshConnection;
-import org.onap.appc.adapter.ssh.SshException;
-import org.onap.appc.encryption.EncryptionTool;
-import org.onap.appc.configuration.Configuration;
-import org.onap.appc.configuration.ConfigurationFactory;
-import org.apache.sshd.ClientChannel;
-import org.apache.sshd.ClientSession;
-import org.apache.sshd.SshClient;
-import org.apache.sshd.client.channel.ChannelExec;
-import org.apache.sshd.client.future.AuthFuture;
-import org.apache.sshd.client.future.OpenFuture;
-import org.apache.sshd.common.KeyPairProvider;
-import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-
-import java.io.OutputStream;
-import java.security.KeyPair;
-
-/**
- * Implementation of SshConnection interface based on Apache MINA SSHD library.
- */
-class SshConnectionSshd implements SshConnection {
-
-    private static final EELFLogger logger = EELFManager.getInstance().getApplicationLogger();
-
-    private static final long AUTH_TIMEOUT = 60000;
-    private static final long EXEC_TIMEOUT = 120000;
-
-    private String host;
-    private int port;
-    private String username;
-    private String password;
-    private long timeout = EXEC_TIMEOUT;
-    private String keyFile;
-    private SshClient sshClient;
-    private ClientSession clientSession;
-    private static final Configuration configuration = ConfigurationFactory.getConfiguration();
-
-    public SshConnectionSshd(String host, int port, String username, String password, String keyFile) {
-        this.host = host;
-        this.port = port;
-        this.username = username;
-        this.password = password;
-        this.keyFile = keyFile;
-    }
-
-    public SshConnectionSshd(String host, int port, String username, String password) {
-        this(host, port, username, password, null);
-    }
-
-    public SshConnectionSshd(String host, int port, String keyFile) {
-        this(host, port, null, null, keyFile);
-    }
-
-    @Override
-    public void connect() {
-        sshClient = SshClient.setUpDefaultClient();
-        sshClient.start();
-        try {
-            clientSession =
-                sshClient.connect(EncryptionTool.getInstance().decrypt(username), host, port).await().getSession();
-            if (password != null) {
-                clientSession.addPasswordIdentity(EncryptionTool.getInstance().decrypt(password));
-            }
-            if (keyFile != null) {
-                KeyPairProvider keyPairProvider = new FileKeyPairProvider(new String[] {
-                    keyFile
-                });
-                KeyPair keyPair = keyPairProvider.loadKeys().iterator().next();
-                clientSession.addPublicKeyIdentity(keyPair);
-            }
-            AuthFuture authFuture = clientSession.auth();
-            authFuture.await(AUTH_TIMEOUT);
-            if (!authFuture.isSuccess()) {
-                throw new SshException("Error establishing ssh connection to [" + username + "@" + host + ":" + port
-                    + "]. Authentication failed.");
-            }
-        } catch (RuntimeException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new SshException("Error establishing ssh connection to [" + username + "@" + host + ":" + port + "].",
-                e);
-        }
-        if (logger.isDebugEnabled()) {
-            logger.debug("SSH: connected to [" + toString() + "]");
-        }
-    }
-
-    @Override
-    public void connectWithRetry() {
-        int retryCount = 0;
-        int retryDelay = 0;
-        int retriesLeft = 0;
-        retryCount = configuration.getIntegerProperty(Constants.CONNECTION_RETRY_COUNT,
-            Constants.DEFAULT_CONNECTION_RETRY_COUNT);
-        retryDelay = configuration.getIntegerProperty(Constants.CONNECTION_RETRY_DELAY,
-            Constants.DEFAULT_CONNECTION_RETRY_DELAY);
-        retriesLeft = retryCount + 1;
-        do {
-            try {
-                this.connect();
-                break;
-            } catch (RuntimeException e) {
-                if (retriesLeft > 1) {
-                    logger.debug("SSH Connection failed. Waiting for change in server's state.");
-                    waitForConnection(retryDelay);
-                    retriesLeft--;
-                    logger.debug("Retrying SSH connection. Attempt [" + Integer.toString(retryCount - retriesLeft + 1)
-                        + "] out of [" + retryCount + "]");
-                } else {
-                    throw e;
-                }
-            } catch (Exception e) {
-                throw e;
-            }
-        } while (retriesLeft > 0);
-    }
-
-    @Override
-    public void disconnect() {
-        try {
-            if (logger.isDebugEnabled()) {
-                logger.debug("SSH: disconnecting from [" + toString() + "]");
-            }
-            clientSession.close(false);
-        } finally {
-            if (sshClient != null) {
-                sshClient.stop();
-            }
-        }
-    }
-
-    @Override
-    public void setExecTimeout(long timeout) {
-        this.timeout = timeout;
-    }
-
-    @Override
-    public int execCommand(String cmd, OutputStream out, OutputStream err) {
-        return execCommand(cmd, out, err, false);
-    }
-
-    @Override
-    public int execCommandWithPty(String cmd, OutputStream out) {
-        return execCommand(cmd, out, out, true);
-    }
-
-    private int execCommand(String cmd, OutputStream out, OutputStream err, boolean usePty) {
-        try {
-            if (logger.isDebugEnabled()) {
-                logger.debug("SSH: executing command");
-            }
-            ChannelExec client = clientSession.createExecChannel(cmd);
-            client.setUsePty(usePty); // use pseudo-tty?
-            client.setOut(out);
-            client.setErr(err);
-            OpenFuture openFuture = client.open();
-            int exitStatus = 0;
-            try {
-                client.waitFor(ClientChannel.CLOSED, timeout);
-                openFuture.verify();
-                Integer exitStatusI = client.getExitStatus();
-                if (exitStatusI == null) {
-                    throw new SshException("Error executing command [" + cmd + "] over SSH [" + username + "@" + host
-                        + ":" + port + "]. Operation timed out.");
-                }
-                exitStatus = exitStatusI;
-            } finally {
-                client.close(false);
-            }
-            return exitStatus;
-        } catch (RuntimeException e) {
-            throw e;
-        } catch (Exception t) {
-            throw new SshException(
-                "Error executing command [" + cmd + "] over SSH [" + username + "@" + host + ":" + port + "]", t);
-        }
-    }
-
-    private void waitForConnection(int retryDelay) {
-        long time = retryDelay * 1000L;
-        long future = System.currentTimeMillis() + time;
-        if (time != 0) {
-            while (System.currentTimeMillis() < future && time > 0) {
-                try {
-                    Thread.sleep(time);
-                } catch (InterruptedException e) {
-                    /*
-                     * This is rare, but it can happen if another thread interrupts us while we are sleeping. In that
-                     * case, the thread is resumed before the delay time has actually expired, so re-calculate the
-                     * amount of delay time needed and reenter the sleep until we get to the future time.
-                     */
-                    time = future - System.currentTimeMillis();
-                }
-            }
-        }
-    }
-
-    @Override
-    public String toString() {
-        String address = host;
-        if (username != null) {
-            address = username + '@' + address;
-        }
-        return address;
-    }
-}
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshdDataAccessService.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshdDataAccessService.java
deleted file mode 100644
index 07a814083..000000000
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshdDataAccessService.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.appc.adapter.ssh.sshd;
-
-import javax.sql.rowset.CachedRowSet;
-
-import org.onap.appc.adapter.ssh.Constants;
-import org.onap.appc.adapter.ssh.SshConnectionDetails;
-import org.onap.appc.adapter.ssh.SshDataAccessException;
-import org.onap.appc.adapter.ssh.SshDataAccessService;
-import org.onap.ccsdk.sli.core.dblib.DbLibService;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-
-public class SshdDataAccessService implements SshDataAccessService {
-
-    private String schema = Constants.NETCONF_SCHEMA;
-    private DbLibService dbLibService;
-
-    @Override
-    public void setSchema(String schema) {
-        this.schema = schema;
-    }
-
-    @Override
-    public void setDbLibService(DbLibService dbLibService) {
-        this.dbLibService = dbLibService;
-    }
-
-    @Override
-    public boolean retrieveConnectionDetails(String vnfType, SshConnectionDetails connectionDetails) throws SshDataAccessException {
-
-        boolean recordFound = false;
-
-        String queryString = "select " + Constants.USER_NAME_TABLE_FIELD_NAME + "," + Constants.PASSWORD_TABLE_FIELD_NAME + "," + Constants.PORT_NUMBER_TABLE_FIELD_NAME + " " +
-                "from " + Constants.DEVICE_AUTHENTICATION_TABLE_NAME + " " +
-                "where " + Constants.VNF_TYPE_TABLE_FIELD_NAME + " = ?";
-
-        ArrayList<String> argList = new ArrayList<>();
-        argList.add(vnfType);
-
-        try {
-
-            final CachedRowSet data = dbLibService.getData(queryString, argList, schema);
-            if (data.first()) {
-                recordFound = true;
-                connectionDetails.setUsername(data.getString(Constants.USER_NAME_TABLE_FIELD_NAME));
-                connectionDetails.setPassword(data.getString(Constants.PASSWORD_TABLE_FIELD_NAME));
-                connectionDetails.setPort(data.getInt(Constants.PORT_NUMBER_TABLE_FIELD_NAME));
-            }
-
-        } catch (SQLException e) {
-            throw new SshDataAccessException(e);
-        }
-
-        return recordFound;
-    }
-
-    @Override
-    public String retrieveConfigFileName(String xmlID) throws SshDataAccessException {
-        String fileContent;
-
-        String queryString = "select " + Constants.FILE_CONTENT_TABLE_FIELD_NAME + " " +
-                "from " + Constants.CONFIGFILES_TABLE_NAME + " " +
-                "where " + Constants.FILE_NAME_TABLE_FIELD_NAME + " = ?";
-
-        ArrayList<String> argList = new ArrayList<>();
-        argList.add(xmlID);
-
-        try {
-
-            final CachedRowSet data = dbLibService.getData(queryString, argList, schema);
-            fileContent = data.getString(Constants.FILE_CONTENT_TABLE_FIELD_NAME);
-
-        } catch (SQLException e) {
-            throw new SshDataAccessException(e);
-        }
-
-        return fileContent;
-    }
-
-
-}