aboutsummaryrefslogtreecommitdiffstats
path: root/appc-adapters/appc-ansible-adapter
diff options
context:
space:
mode:
authorPatrick Brady <pb071s@att.com>2017-12-13 11:09:30 -0800
committerPatrick Brady <pb071s@att.com>2017-12-13 11:09:41 -0800
commit0756759f39e125b02d63b4e93de83b3c6b13beea (patch)
tree274e9830e522007c590ace136a57efaa806e19d5 /appc-adapters/appc-ansible-adapter
parentcb81f75d84c1df021730341cd61ed650adc7ba3a (diff)
First part of onap rename
This is the first commit of the rename. This commit changes refereces to org.openecomp.appc > org.onap.appc that occur within files. The package folder structure is not changed in this commit. Change-Id: Ic95d749eb99d8a6f4f2b9ee9b06eb41c5cfa7e1c Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-13
Diffstat (limited to 'appc-adapters/appc-ansible-adapter')
-rw-r--r--appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml8
-rw-r--r--appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleActivator.java12
-rw-r--r--appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleAdapter.java4
-rw-r--r--appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/AnsibleAdapterImpl.java56
-rw-r--r--appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/ConnectionBuilder.java8
-rw-r--r--appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleMessageParser.java6
-rw-r--r--appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResult.java2
-rw-r--r--appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResultCodes.java2
-rw-r--r--appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleServerEmulator.java6
-rw-r--r--appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties14
-rw-r--r--appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java26
-rw-r--r--appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java4
-rw-r--r--appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java2
-rw-r--r--appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties28
-rw-r--r--appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/pom.xml4
-rw-r--r--appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/src/main/resources/features.xml4
-rw-r--r--appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/pom.xml8
-rw-r--r--appc-adapters/appc-ansible-adapter/pom.xml6
18 files changed, 100 insertions, 100 deletions
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml
index 4e2577135..ef7896ae0 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml
@@ -25,7 +25,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-ansible-adapter</artifactId>
<version>1.3.0-SNAPSHOT</version>
</parent>
@@ -54,7 +54,7 @@
<!-- http://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore -->
<dependency>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-common</artifactId>
<version>${project.version}</version>
</dependency>
@@ -195,8 +195,8 @@
<configuration>
<instructions>
<Bundle-SymbolicName>appc-ansible-adapter</Bundle-SymbolicName>
- <Bundle-Activator>org.openecomp.appc.adapter.ansible.AnsibleActivator</Bundle-Activator>
- <Export-Package>org.openecomp.appc.adapter.ansible</Export-Package>
+ <Bundle-Activator>org.onap.appc.adapter.ansible.AnsibleActivator</Bundle-Activator>
+ <Export-Package>org.onap.appc.adapter.ansible</Export-Package>
<Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*, javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*, javax.security.*</Import-Package>
<Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleActivator.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleActivator.java
index 865841db2..d76cd50f1 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleActivator.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleActivator.java
@@ -22,17 +22,17 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.adapter.ansible;
+package org.onap.appc.adapter.ansible;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.ansible.impl.AnsibleAdapterImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.ansible.impl.AnsibleAdapterImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.i18n.Msg;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleAdapter.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleAdapter.java
index da710f34f..7bff184bc 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleAdapter.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleAdapter.java
@@ -22,11 +22,11 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.adapter.ansible;
+package org.onap.appc.adapter.ansible;
import java.util.Map;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/AnsibleAdapterImpl.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/AnsibleAdapterImpl.java
index 434fbe673..0b426bb26 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/AnsibleAdapterImpl.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/AnsibleAdapterImpl.java
@@ -22,16 +22,16 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.adapter.ansible.impl;
+package org.onap.appc.adapter.ansible.impl;
import java.util.Map;
import java.util.Properties;
import java.lang.*;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
@@ -44,12 +44,12 @@ import org.json.JSONException;
-import org.openecomp.appc.adapter.ansible.AnsibleAdapter;
+import org.onap.appc.adapter.ansible.AnsibleAdapter;
-import org.openecomp.appc.adapter.ansible.model.AnsibleResult;
-import org.openecomp.appc.adapter.ansible.model.AnsibleMessageParser;
-import org.openecomp.appc.adapter.ansible.model.AnsibleResultCodes;
-import org.openecomp.appc.adapter.ansible.model.AnsibleServerEmulator;
+import org.onap.appc.adapter.ansible.model.AnsibleResult;
+import org.onap.appc.adapter.ansible.model.AnsibleMessageParser;
+import org.onap.appc.adapter.ansible.model.AnsibleResultCodes;
+import org.onap.appc.adapter.ansible.model.AnsibleServerEmulator;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
@@ -166,7 +166,7 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
* Returns the symbolic name of the adapter
*
* @return The adapter name
- * @see org.openecomp.appc.adapter.rest.AnsibleAdapter#getAdapterName()
+ * @see org.onap.appc.adapter.rest.AnsibleAdapter#getAdapterName()
*/
@Override
public String getAdapterName() {
@@ -184,8 +184,8 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
private void doFailure(SvcLogicContext svcLogic, int code, String message) throws SvcLogicException {
svcLogic.setStatus(OUTCOME_FAILURE);
- svcLogic.setAttribute("org.openecomp.appc.adapter.ansible.result.code",Integer.toString(code));
- svcLogic.setAttribute("org.openecomp.appc.adapter.ansible.message",message);
+ svcLogic.setAttribute("org.onap.appc.adapter.ansible.result.code",Integer.toString(code));
+ svcLogic.setAttribute("org.onap.appc.adapter.ansible.message",message);
throw new SvcLogicException("Ansible Adapter Error = " + message );
}
@@ -204,7 +204,7 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
// Create the http client instance
// type of client is extracted from the property file parameter
- // org.openecomp.appc.adapter.ansible.clientType
+ // 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)
@@ -212,7 +212,7 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
// revert. To be used in PROD
try{
- String clientType = props.getProperty("org.openecomp.appc.adapter.ansible.clientType");
+ String clientType = props.getProperty("org.onap.appc.adapter.ansible.clientType");
logger.info("Ansible http client type set to " + clientType);
if (clientType.equals("TRUST_ALL")){
@@ -221,8 +221,8 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
}
else if (clientType.equals("TRUST_CERT")){
// set path to keystore file
- String trustStoreFile = props.getProperty("org.openecomp.appc.adapter.ansible.trustStore");
- String key = props.getProperty("org.openecomp.appc.adapter.ansible.trustStore.trustPasswd");
+ String trustStoreFile = props.getProperty("org.onap.appc.adapter.ansible.trustStore");
+ String key = props.getProperty("org.onap.appc.adapter.ansible.trustStore.trustPasswd");
char [] trustStorePasswd = key.toCharArray();
String trustStoreType = "JKS";
logger.info("Creating http client with trustmanager from " + trustStoreFile);
@@ -251,9 +251,9 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
// Public Method to post request to execute playbook. Posts the following back
// to Svc context memory
- // org.openecomp.appc.adapter.ansible.req.code : 100 if successful
- // org.openecomp.appc.adapter.ansible.req.messge : any message
- // org.openecomp.appc.adapter.ansible.req.Id : a unique uuid to reference the request
+ // 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
public void reqExec(Map <String, String> params, SvcLogicContext ctx) throws SvcLogicException {
@@ -329,9 +329,9 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
}
- ctx.setAttribute("org.openecomp.appc.adapter.ansible.result.code", Integer.toString(code));
- ctx.setAttribute("org.openecomp.appc.adapter.ansible.message", message );
- ctx.setAttribute("org.openecomp.appc.adapter.ansible.Id", Id);
+ ctx.setAttribute("org.onap.appc.adapter.ansible.result.code", Integer.toString(code));
+ ctx.setAttribute("org.onap.appc.adapter.ansible.message", message );
+ ctx.setAttribute("org.onap.appc.adapter.ansible.Id", Id);
}
@@ -394,15 +394,15 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
}
else {
logger.info(String.format("Ansible Request %s finished with Result %s, Message = %s", params.get("Id"), OUTCOME_FAILURE, message));
- ctx.setAttribute("org.openecomp.appc.adapter.ansible.results", results);
+ ctx.setAttribute("org.onap.appc.adapter.ansible.results", results);
doFailure(ctx, code, message );
return;
}
- ctx.setAttribute("org.openecomp.appc.adapter.ansible.result.code", Integer.toString(400));
- ctx.setAttribute("org.openecomp.appc.adapter.ansible.message",message);
- ctx.setAttribute("org.openecomp.appc.adapter.ansible.results", results);
+ ctx.setAttribute("org.onap.appc.adapter.ansible.result.code", Integer.toString(400));
+ ctx.setAttribute("org.onap.appc.adapter.ansible.message",message);
+ ctx.setAttribute("org.onap.appc.adapter.ansible.results", results);
ctx.setStatus(OUTCOME_SUCCESS);
}
@@ -410,7 +410,7 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
// Public method to get logs from plyabook execution for a specifcic request
// 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.openecomp.appc.adapter.ansible.log
+ // logs are returned in the DG context variable org.onap.appc.adapter.ansible.log
public void reqExecLog(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException{
@@ -442,7 +442,7 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
doFailure(ctx, AnsibleResultCodes.UNKNOWN_EXCEPTION.getValue(), "Exception encountered retreiving output : " + e.getMessage());
}
- ctx.setAttribute("org.openecomp.appc.adapter.ansible.log",message);
+ ctx.setAttribute("org.onap.appc.adapter.ansible.log",message);
ctx.setStatus(OUTCOME_SUCCESS);
}
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/ConnectionBuilder.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/ConnectionBuilder.java
index b3d1d4c02..e84a85a0c 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/ConnectionBuilder.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/ConnectionBuilder.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.adapter.ansible.impl;
+package org.onap.appc.adapter.ansible.impl;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
@@ -56,9 +56,9 @@ import org.apache.http.conn.ssl.SSLContexts;
import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.adapter.ansible.model.AnsibleResult;
-import org.openecomp.appc.adapter.ansible.model.AnsibleResultCodes;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.adapter.ansible.model.AnsibleResult;
+import org.onap.appc.adapter.ansible.model.AnsibleResultCodes;
/**
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleMessageParser.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleMessageParser.java
index a1798e164..6bebd73fe 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleMessageParser.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleMessageParser.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.adapter.ansible.model;
+package org.onap.appc.adapter.ansible.model;
/**
* This module imples the APP-C/Ansible Server interface
@@ -36,8 +36,8 @@ import com.google.common.base.Strings;
import org.json.JSONObject;
import org.json.JSONArray;
import org.json.JSONException;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.adapter.ansible.model.AnsibleResult;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.adapter.ansible.model.AnsibleResult;
/**
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResult.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResult.java
index 29228e574..a4bbcbef8 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResult.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResult.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.adapter.ansible.model;
+package org.onap.appc.adapter.ansible.model;
/* Simple class to store code and message returned by POST/GET to an Ansible Server */
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResultCodes.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResultCodes.java
index dbcdb75ee..986ad3e6a 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResultCodes.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResultCodes.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.adapter.ansible.model;
+package org.onap.appc.adapter.ansible.model;
import java.util.*;
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleServerEmulator.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleServerEmulator.java
index aabced364..c430743ad 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleServerEmulator.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleServerEmulator.java
@@ -30,7 +30,7 @@
as a replacement for methods from ConnectionBuilder class
*/
-package org.openecomp.appc.adapter.ansible.model;
+package org.onap.appc.adapter.ansible.model;
import java.util.*;
import java.util.regex.Pattern;
@@ -40,8 +40,8 @@ import com.google.common.base.Strings;
import org.json.JSONObject;
import org.json.JSONArray;
import org.json.JSONException;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.adapter.ansible.model.AnsibleResult;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.adapter.ansible.model.AnsibleResult;
public class AnsibleServerEmulator {
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
index 0736b963a..d49c0396c 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -29,20 +29,20 @@
#
# Define the name and path of any user-provided configuration (bootstrap) file that can be loaded
# to supply configuration options
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=${user.home},/opt/opendaylight/current/properties
+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.openecomp.appc.resources=org.openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org.onap/appc/i18n/MessageResources
#
# The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_ansible_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_ansible_adapter
# Default truststore path and password
-org.openecomp.appc.adapter.ansible.trustStore=/opt/opendaylight/tls-client/mykeystore.js
-org.openecomp.appc.adapter.ansible.trustStore.trustPasswd=changeit
-org.openecomp.appc.adapter.ansible.clientType=DEFAULT
+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=DEFAULT
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java
index a4e49643a..88425700e 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.adapter.ansible.impl;
+package org.onap.appc.adapter.ansible.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -42,15 +42,15 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.Constants;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.slf4j.MDC;
-import org.openecomp.appc.adapter.ansible.AnsibleAdapter;
-import org.openecomp.appc.adapter.ansible.impl.AnsibleAdapterImpl;
+import org.onap.appc.adapter.ansible.AnsibleAdapter;
+import org.onap.appc.adapter.ansible.impl.AnsibleAdapterImpl;
public class TestAnsibleAdapterImpl {
@@ -85,14 +85,14 @@ public class TestAnsibleAdapterImpl {
try{
String Pending = "100";
adapter.reqExec(params, svcContext);
- String status=svcContext.getAttribute("org.openecomp.appc.adapter.ansible.result.code");
- TestId=svcContext.getAttribute("org.openecomp.appc.adapter.ansible.result.Id");
+ String status=svcContext.getAttribute("org.onap.appc.adapter.ansible.result.code");
+ TestId=svcContext.getAttribute("org.onap.appc.adapter.ansible.result.Id");
System.out.println("Comparing " + Pending + " and " + status);
assertEquals(Pending,status);
}
catch(SvcLogicException e){
- String message =svcContext.getAttribute("org.openecomp.appc.adapter.ansible.result.message");
- String status=svcContext.getAttribute("org.openecomp.appc.adapter.ansible.result.code");
+ String message =svcContext.getAttribute("org.onap.appc.adapter.ansible.result.message");
+ String status=svcContext.getAttribute("org.onap.appc.adapter.ansible.result.code");
fail(e.getMessage() + " Code = " + status);
}
catch(Exception e){
@@ -120,12 +120,12 @@ public class TestAnsibleAdapterImpl {
try{
adapter.reqExecResult(params, svcContext);
- String status=svcContext.getAttribute("org.openecomp.appc.adapter.ansible.result.code");
+ String status=svcContext.getAttribute("org.onap.appc.adapter.ansible.result.code");
assertEquals("400",status);
}
catch(SvcLogicException e){
- String message = svcContext.getAttribute("org.openecomp.appc.adapter.ansible.result.message");
- String status=svcContext.getAttribute("org.openecomp.appc.adapter.ansible.result.code");
+ String message = svcContext.getAttribute("org.onap.appc.adapter.ansible.result.message");
+ String status=svcContext.getAttribute("org.onap.appc.adapter.ansible.result.code");
fail(e.getMessage() + " Code = " + status);
}
catch(Exception e){
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
index 62470cc01..13b5fdfb3 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
@@ -23,7 +23,7 @@
*/
-package org.openecomp.appc.test;
+package org.onap.appc.test;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -32,7 +32,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.openecomp.appc.test.InterceptLogger;
+import org.onap.appc.test.InterceptLogger;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
index 8a06b31be..b101ecee4 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
@@ -23,7 +23,7 @@
*/
-package org.openecomp.appc.test;
+package org.onap.appc.test;
import java.text.MessageFormat;
import java.util.ArrayList;
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
index c781956d7..bb888132a 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
@@ -29,38 +29,38 @@
#
# Define the name and path of any user-provided configuration (bootstrap) file that can be loaded
# to supply configuration options
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
appc.application.name=APPC
#
# Define the message resource bundle name to be loaded
-org.openecomp.appc.resources=org/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org/onap/appc/i18n/MessageResources
#
# The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
#
# Set up the logging environment
#
-org.openecomp.appc.logging.file=org/openecomp/appc/logback.xml
-org.openecomp.appc.logging.path=${user.home};etc;../etc
-org.openecomp.appc.logger=org.openecomp.appc
-org.openecomp.appc.security.logger=org.openecomp.appc.security
+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.openecomp.appc.provider.min.pool=1
-org.openecomp.appc.provider.max.pool=0
+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.openecomp.appc.provider.retry.delay = 30
-org.openecomp.appc.provider.retry.limit = 10
+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.
@@ -70,12 +70,12 @@ 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.openecomp.appc.server.state.change.timeout=300
+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.openecomp.appc.openstack.poll.interval=20
+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
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/pom.xml
index 32511435d..16d41128d 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/pom.xml
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/pom.xml
@@ -26,7 +26,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>appc-ansible-adapter</artifactId>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>appc-ansible-adapter-features</artifactId>
@@ -36,7 +36,7 @@
<dependencies>
<dependency>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-ansible-adapter-bundle</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/src/main/resources/features.xml
index 64587b5c2..69d3b9b07 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/src/main/resources/features.xml
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/src/main/resources/features.xml
@@ -33,8 +33,8 @@
<feature name='appc-ansible-adapter' description="appc-ansible-adapter" version='${project.version}'>
<feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
<feature>sdnc-sli</feature>
- <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
- <bundle>mvn:org.openecomp.appc/appc-ansible-adapter-bundle/${project.version}</bundle>
+ <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle>
+ <bundle>mvn:org.onap.appc/appc-ansible-adapter-bundle/${project.version}</bundle>
</feature>
</features>
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/pom.xml
index 29ccc06ca..75fde2a63 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/pom.xml
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/pom.xml
@@ -26,7 +26,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>appc-ansible-adapter</artifactId>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>appc-ansible-adapter-installer</artifactId>
@@ -35,12 +35,12 @@
<properties>
<application.name>appc-ansible-adapter</application.name>
<features.boot>appc-ansible-adapter</features.boot>
- <features.repositories>mvn:org.openecomp.appc/appc-ansible-adapter-features/${project.version}/xml/features</features.repositories>
+ <features.repositories>mvn:org.onap.appc/appc-ansible-adapter-features/${project.version}/xml/features</features.repositories>
<include.transitive.dependencies>false</include.transitive.dependencies>
</properties>
<dependencies>
<dependency>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-ansible-adapter-features</artifactId>
<classifier>features</classifier>
<type>xml</type>
@@ -52,7 +52,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-ansible-adapter-bundle</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/appc-adapters/appc-ansible-adapter/pom.xml b/appc-adapters/appc-ansible-adapter/pom.xml
index fd91e620a..c1766bd50 100644
--- a/appc-adapters/appc-ansible-adapter/pom.xml
+++ b/appc-adapters/appc-ansible-adapter/pom.xml
@@ -26,7 +26,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-adapters</artifactId>
<version>1.3.0-SNAPSHOT</version>
</parent>
@@ -150,7 +150,7 @@
<dependencies>
<dependency>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-ansible-adapter-features</artifactId>
<classifier>features</classifier>
<type>xml</type>
@@ -158,7 +158,7 @@
</dependency>
<dependency>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-ansible-adapter-provider</artifactId>
<version>${project.version}</version>
</dependency>