aboutsummaryrefslogtreecommitdiffstats
path: root/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java
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-chef-adapter/appc-chef-adapter-bundle/src/test/java
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-chef-adapter/appc-chef-adapter-bundle/src/test/java')
-rw-r--r--appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/chefclient/TestChefApiClient.java28
-rw-r--r--appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/impl/TestChefAdapterImpl.java24
-rw-r--r--appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java4
-rw-r--r--appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java2
4 files changed, 29 insertions, 29 deletions
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/chefclient/TestChefApiClient.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/chefclient/TestChefApiClient.java
index 3dc9ff20d..5ea152a8d 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/chefclient/TestChefApiClient.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/chefclient/TestChefApiClient.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.adapter.chef.chefclient;
+package org.onap.appc.adapter.chef.chefclient;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -14,11 +14,11 @@ import java.util.regex.Pattern;
import org.junit.Before;
import org.junit.Test;
-import org.openecomp.appc.adapter.chef.chefapi.ApiMethod;
-import org.openecomp.appc.adapter.chef.chefapi.Delete;
-import org.openecomp.appc.adapter.chef.chefapi.Get;
-import org.openecomp.appc.adapter.chef.chefapi.Post;
-import org.openecomp.appc.adapter.chef.chefapi.Put;
+import org.onap.appc.adapter.chef.chefapi.ApiMethod;
+import org.onap.appc.adapter.chef.chefapi.Delete;
+import org.onap.appc.adapter.chef.chefapi.Get;
+import org.onap.appc.adapter.chef.chefapi.Post;
+import org.onap.appc.adapter.chef.chefapi.Put;
public class TestChefApiClient {
@@ -41,16 +41,16 @@ public class TestChefApiClient {
fail("Could not initialize properties");
}
client = new ChefApiClient(
- props.getProperty("org.openecomp.appc.adapter.chef.chefclient.userId"),
+ props.getProperty("org.onap.appc.adapter.chef.chefclient.userId"),
System.getProperty("user.dir") +
- props.getProperty("org.openecomp.appc.adapter.chef.chefclient.pemPath"),
- props.getProperty("org.openecomp.appc.adapter.chef.chefclient.endPoint"),
- props.getProperty("org.openecomp.appc.adapter.chef.chefclient.organizations"));
+ props.getProperty("org.onap.appc.adapter.chef.chefclient.pemPath"),
+ props.getProperty("org.onap.appc.adapter.chef.chefclient.endPoint"),
+ props.getProperty("org.onap.appc.adapter.chef.chefclient.organizations"));
}
@Test
public void testGet(){
- Get get = client.get(props.getProperty("org.openecomp.appc.adapter.chef.chefclient.path"));
+ Get get = client.get(props.getProperty("org.onap.appc.adapter.chef.chefclient.path"));
ApiMethod method = get.createRequest();
String[] response = method.test.split("\n");
@@ -59,7 +59,7 @@ public class TestChefApiClient {
@Test
public void testPut(){
- Put put = client.put(props.getProperty("org.openecomp.appc.adapter.chef.chefclient.path"));
+ Put put = client.put(props.getProperty("org.onap.appc.adapter.chef.chefclient.path"));
ApiMethod method = put.createRequest();
String[] response = method.test.split("\n");
@@ -68,7 +68,7 @@ public class TestChefApiClient {
@Test
public void testPost() {
- Post post = client.post(props.getProperty("org.openecomp.appc.adapter.chef.chefclient.path"));
+ Post post = client.post(props.getProperty("org.onap.appc.adapter.chef.chefclient.path"));
ApiMethod method = post.createRequest();
String[] response = method.test.split("\n");
@@ -77,7 +77,7 @@ public class TestChefApiClient {
@Test
public void testDelete(){
- Delete delete = client.delete(props.getProperty("org.openecomp.appc.adapter.chef.chefclient.path"));
+ Delete delete = client.delete(props.getProperty("org.onap.appc.adapter.chef.chefclient.path"));
ApiMethod method = delete.createRequest();
String[] response = method.test.split("\n");
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/impl/TestChefAdapterImpl.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/impl/TestChefAdapterImpl.java
index bb63d342c..687ba8338 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/impl/TestChefAdapterImpl.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/impl/TestChefAdapterImpl.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.adapter.chef.impl;
+package org.onap.appc.adapter.chef.impl;
import static org.junit.Assert.assertEquals;
@@ -33,7 +33,7 @@ import java.util.Map;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
import com.att.cdp.exceptions.ZoneException;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
@@ -49,7 +49,7 @@ public class TestChefAdapterImpl {
public void setup() {
adapter = new ChefAdapterImpl(Boolean.TRUE);
params = new HashMap<>();
- params.put("org.openecomp.appc.instance.pemPath",
+ params.put("org.onap.appc.instance.pemPath",
"/src/test/resources/testclient.pem");
}
@@ -63,7 +63,7 @@ public class TestChefAdapterImpl {
@Test
public void testChefGetFail() throws IOException, IllegalStateException, IllegalArgumentException,
ZoneException, APPCException {
- params.put("org.openecomp.appc.instance.chefAction", "/nodes");
+ params.put("org.onap.appc.instance.chefAction", "/nodes");
givenParams(params, "chefGet");
thenResponseShouldFail();
@@ -72,10 +72,10 @@ public class TestChefAdapterImpl {
@Test
public void testChefPutFail() throws IOException, IllegalStateException, IllegalArgumentException,
ZoneException, APPCException {
- params.put("org.openecomp.appc.instance.chefAction", "/nodes/testnode");
- params.put("org.openecomp.appc.instance.runList", "recipe[commandtest]");
- params.put("org.openecomp.appc.instance.attributes", "");
- params.put("org.openecomp.appc.instance.chefRequestBody", "Test Body");
+ params.put("org.onap.appc.instance.chefAction", "/nodes/testnode");
+ params.put("org.onap.appc.instance.runList", "recipe[commandtest]");
+ params.put("org.onap.appc.instance.attributes", "");
+ params.put("org.onap.appc.instance.chefRequestBody", "Test Body");
givenParams(params, "chefPut");
thenResponseShouldFail();
@@ -84,7 +84,7 @@ public class TestChefAdapterImpl {
@Test
public void testTriggerFail() throws IOException, IllegalStateException, IllegalArgumentException,
ZoneException, APPCException {
- params.put("org.openecomp.appc.instance.ip", "");
+ params.put("org.onap.appc.instance.ip", "");
givenParams(params, "trigger");
thenResponseShouldFail();
@@ -94,15 +94,15 @@ public class TestChefAdapterImpl {
svcContext = new SvcLogicContext();
if (method == "chefGet"){
adapter.chefGet(adapterParams, svcContext);
- getAttribute = "org.openecomp.appc.chefServerResult.code";
+ getAttribute = "org.onap.appc.chefServerResult.code";
}
if (method == "chefPut"){
adapter.chefPut(adapterParams, svcContext);
- getAttribute = "org.openecomp.appc.chefServerResult.code";
+ getAttribute = "org.onap.appc.chefServerResult.code";
}
if (method == "trigger"){
adapter.trigger(adapterParams, svcContext);
- getAttribute = "org.openecomp.appc.chefAgent.code";
+ getAttribute = "org.onap.appc.chefAgent.code";
}
}
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
index 62470cc01..13b5fdfb3 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-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-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
index 8a06b31be..b101ecee4 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-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;