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-iaas-adapter/appc-iaas-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-iaas-adapter/appc-iaas-adapter-bundle/src/test')
12 files changed, 52 insertions, 52 deletions
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestIdentityUrl.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestIdentityUrl.java index d7dc2a8dc..dac22eadb 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestIdentityUrl.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestIdentityUrl.java @@ -23,7 +23,7 @@ */ -package org.openecomp.appc.adapter.iaas.impl; +package org.onap.appc.adapter.iaas.impl; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -31,8 +31,8 @@ import static org.junit.Assert.assertTrue; import java.util.Properties; import org.junit.BeforeClass; import org.junit.Test; -import org.openecomp.appc.adapter.iaas.impl.IdentityURL; -import org.openecomp.appc.configuration.ConfigurationFactory; +import org.onap.appc.adapter.iaas.impl.IdentityURL; +import org.onap.appc.configuration.ConfigurationFactory; public class TestIdentityUrl { diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderAdapterImpl.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderAdapterImpl.java index cbca170e0..386c1115b 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderAdapterImpl.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderAdapterImpl.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.impl; +package org.onap.appc.adapter.iaas.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -41,16 +41,16 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.openecomp.appc.Constants; -import org.openecomp.appc.adapter.iaas.ProviderAdapter; -import org.openecomp.appc.adapter.iaas.impl.ProviderAdapterImpl; -import org.openecomp.appc.adapter.iaas.impl.ProviderCache; -import org.openecomp.appc.adapter.iaas.impl.ServiceCatalog; -import org.openecomp.appc.adapter.iaas.impl.TenantCache; -import org.openecomp.appc.adapter.iaas.impl.VMURL; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.exceptions.UnknownProviderException; +import org.onap.appc.Constants; +import org.onap.appc.adapter.iaas.ProviderAdapter; +import org.onap.appc.adapter.iaas.impl.ProviderAdapterImpl; +import org.onap.appc.adapter.iaas.impl.ProviderCache; +import org.onap.appc.adapter.iaas.impl.ServiceCatalog; +import org.onap.appc.adapter.iaas.impl.TenantCache; +import org.onap.appc.adapter.iaas.impl.VMURL; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.exceptions.UnknownProviderException; import com.att.cdp.exceptions.ZoneException; import com.att.cdp.zones.ComputeService; import com.att.cdp.zones.Context; @@ -64,7 +64,7 @@ import com.woorea.openstack.keystone.model.Access.Service.Endpoint; /** * Test the ProviderAdapter implementation. */ -@Category(org.openecomp.appc.adapter.iaas.impl.TestProviderAdapterImpl.class) +@Category(org.onap.appc.adapter.iaas.impl.TestProviderAdapterImpl.class) public class TestProviderAdapterImpl { @SuppressWarnings("nls") diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderOperation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderOperation.java index 56c67ddd9..c080cf953 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderOperation.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderOperation.java @@ -22,20 +22,20 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.impl; +package org.onap.appc.adapter.iaas.impl; import java.lang.reflect.Field; import java.util.Map; -import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderOperation; -import org.openecomp.appc.exceptions.APPCException; +import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderOperation; +import org.onap.appc.exceptions.APPCException; import com.att.cdp.zones.model.ModelObject; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.MDC; -import org.openecomp.appc.configuration.ConfigurationFactory; +import org.onap.appc.configuration.ConfigurationFactory; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; -import static org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Constants.MDC_SERVICE; +import static org.onap.appc.adapter.iaas.provider.operation.common.constants.Constants.MDC_SERVICE; /** * This class is used to test methods and functions of the adapter implementation that do not diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestRequestContext.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestRequestContext.java index efb40dfac..7ea30635c 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestRequestContext.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestRequestContext.java @@ -23,15 +23,15 @@ */ -package org.openecomp.appc.adapter.iaas.impl; +package org.onap.appc.adapter.iaas.impl; import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; -import org.openecomp.appc.Constants; -import org.openecomp.appc.adapter.iaas.impl.RequestContext; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; +import org.onap.appc.Constants; +import org.onap.appc.adapter.iaas.impl.RequestContext; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; /** * Test the RequestContext object diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalog.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalog.java index be769a066..c1a41f209 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalog.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalog.java @@ -24,7 +24,7 @@ -package org.openecomp.appc.adapter.iaas.impl; +package org.onap.appc.adapter.iaas.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -40,7 +40,7 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; import org.mockito.Mockito; -import org.openecomp.appc.configuration.ConfigurationFactory; +import org.onap.appc.configuration.ConfigurationFactory; import com.att.cdp.exceptions.ZoneException; import com.woorea.openstack.keystone.model.Access.Service; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogFactory.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogFactory.java index e97e64d10..e974d27ba 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogFactory.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogFactory.java @@ -22,7 +22,7 @@ * ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
import java.util.Properties;
import org.junit.Assert;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV2.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV2.java index c26b3bee1..58b56e06f 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV2.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV2.java @@ -22,7 +22,7 @@ * ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -36,7 +36,7 @@ import org.junit.Before; import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.configuration.ConfigurationFactory;
/**
* This class tests the service catalog against a known provider.
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV3.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV3.java index 14f44d10c..26a4d7dbf 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV3.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV3.java @@ -24,7 +24,7 @@ -package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -38,7 +38,7 @@ import org.junit.Before; import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.configuration.ConfigurationFactory;
/**
* This class tests the service catalog against a known provider.
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestVMURL.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestVMURL.java index 5986fdd64..d433afb64 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestVMURL.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestVMURL.java @@ -24,7 +24,7 @@ -package org.openecomp.appc.adapter.iaas.impl; +package org.onap.appc.adapter.iaas.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -32,8 +32,8 @@ import static org.junit.Assert.assertNull; import java.util.Properties; import org.junit.BeforeClass; import org.junit.Test; -import org.openecomp.appc.adapter.iaas.impl.VMURL; -import org.openecomp.appc.configuration.ConfigurationFactory; +import org.onap.appc.adapter.iaas.impl.VMURL; +import org.onap.appc.configuration.ConfigurationFactory; public class TestVMURL { diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java index a05474a34..7a03a8d84 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java @@ -24,7 +24,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.ArrayList; 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-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java index efc84a1e4..6c81a6c6e 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-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-iaas-adapter/appc-iaas-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties index 0c171a99c..d63c49143 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-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 |