From 0756759f39e125b02d63b4e93de83b3c6b13beea Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Wed, 13 Dec 2017 11:09:30 -0800 Subject: 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 Issue-ID: APPC-13 --- .../ansible/impl/TestAnsibleAdapterImpl.java | 26 ++++++++++---------- .../org/openecomp/appc/test/ExecutorHarness.java | 4 ++-- .../org/openecomp/appc/test/InterceptLogger.java | 2 +- .../org/openecomp/appc/default.properties | 28 +++++++++++----------- 4 files changed, 30 insertions(+), 30 deletions(-) (limited to 'appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test') 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 -- cgit 1.2.3-korg