diff options
author | Patrick Brady <pb071s@att.com> | 2017-12-13 11:09:30 -0800 |
---|---|---|
committer | Patrick Brady <pb071s@att.com> | 2017-12-13 11:09:41 -0800 |
commit | 0756759f39e125b02d63b4e93de83b3c6b13beea (patch) | |
tree | 274e9830e522007c590ace136a57efaa806e19d5 /appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test | |
parent | cb81f75d84c1df021730341cd61ed650adc7ba3a (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')
6 files changed, 48 insertions, 48 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; diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties index c781956d7..bb888132a 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties +++ b/appc-adapters/appc-chef-adapter/appc-chef-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-chef-adapter/appc-chef-adapter-bundle/src/test/resources/test.properties b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/test.properties index 4805e4316..2623f283a 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/test.properties +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/test.properties @@ -1,5 +1,5 @@ -org.openecomp.appc.adapter.chef.chefclient.userId=test -org.openecomp.appc.adapter.chef.chefclient.pemPath=/src/test/resources/testclient.pem -org.openecomp.appc.adapter.chef.chefclient.endPoint=http://test.com -org.openecomp.appc.adapter.chef.chefclient.organizations=onap -org.openecomp.appc.adapter.chef.chefclient.path=/test/path +org.onap.appc.adapter.chef.chefclient.userId=test +org.onap.appc.adapter.chef.chefclient.pemPath=/src/test/resources/testclient.pem +org.onap.appc.adapter.chef.chefclient.endPoint=http://test.com +org.onap.appc.adapter.chef.chefclient.organizations=onap +org.onap.appc.adapter.chef.chefclient.path=/test/path |