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 | |
| 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')
70 files changed, 419 insertions, 419 deletions
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml index 2fbd23398..fba72c9bc 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml @@ -2,7 +2,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-iaas-adapter</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> @@ -13,7 +13,7 @@ <dependencies> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-common</artifactId> <version>${project.version}</version> <scope>compile</scope> @@ -201,8 +201,8 @@ <configuration> <instructions> <Bundle-SymbolicName>appc-iaas-adapter</Bundle-SymbolicName> - <Bundle-Activator>org.openecomp.appc.adapter.iaas.AppcProviderAdapterActivator</Bundle-Activator> - <Export-Package>org.openecomp.appc.adapter.iaas,com.att.cdp.zones.model</Export-Package> + <Bundle-Activator>org.onap.appc.adapter.iaas.AppcProviderAdapterActivator</Bundle-Activator> + <Export-Package>org.onap.appc.adapter.iaas,com.att.cdp.zones.model</Export-Package> <DynamicImport-Package>javax.*</DynamicImport-Package> <Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,javax.net.ssl,org.xml.sax</Import-Package> <!-- <Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,javax.ws.rs.*,javax.net.*,javax.xml.*,org.xml.*</Import-Package> --> @@ -228,7 +228,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <excludedGroups>org.openecomp.appc.adapter.iaas.impl.TestProviderAdapterImpl</excludedGroups> + <excludedGroups>org.onap.appc.adapter.iaas.impl.TestProviderAdapterImpl</excludedGroups> </configuration> </plugin> </plugins> diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/AppcProviderAdapterActivator.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/AppcProviderAdapterActivator.java index f17584e2a..fbd650c39 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/AppcProviderAdapterActivator.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/AppcProviderAdapterActivator.java @@ -22,13 +22,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas; +package org.onap.appc.adapter.iaas; -import org.openecomp.appc.Constants; -import org.openecomp.appc.adapter.iaas.impl.ProviderAdapterImpl; -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.iaas.impl.ProviderAdapterImpl; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.i18n.Msg; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/ProviderAdapter.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/ProviderAdapter.java index 06a190cf3..c14c936e0 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/ProviderAdapter.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/ProviderAdapter.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas; +package org.onap.appc.adapter.iaas; import java.util.Map; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.exceptions.UnknownProviderException; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.exceptions.UnknownProviderException; import com.att.cdp.zones.model.Image; import com.att.cdp.zones.model.Server; import com.att.cdp.zones.model.Stack; @@ -49,47 +49,47 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin { * correct provider support through the CDP IaaS abstraction layer and can be OpenStackProvider, BareMetalProvider, * or any other supported provider type. */ - static final String PROPERTY_PROVIDER_TYPE = "org.openecomp.appc.provider.type"; + static final String PROPERTY_PROVIDER_TYPE = "org.onap.appc.provider.type"; /** * The adapter maintains a cache of providers organized by the name of the provider, not its type. This is * equivalent to the system or installation name. All regions within the same installation are assumed to be the * same type. */ - static final String PROPERTY_PROVIDER_NAME = "org.openecomp.appc.provider.name"; + static final String PROPERTY_PROVIDER_NAME = "org.onap.appc.provider.name"; /** * The fully-qualified URL of the instance to be manipulated as it is known to the provider. */ - static final String PROPERTY_INSTANCE_URL = "org.openecomp.appc.instance.url"; + static final String PROPERTY_INSTANCE_URL = "org.onap.appc.instance.url"; /** * The fully-qualified URL of the instance to be manipulated as it is known to the provider. */ - static final String PROPERTY_IDENTITY_URL = "org.openecomp.appc.identity.url"; + static final String PROPERTY_IDENTITY_URL = "org.onap.appc.identity.url"; /** * The Rebuild VM flag is an optional payload parameter for the Evacuate API. */ - static final String PROPERTY_REBUILD_VM = "org.openecomp.appc.rebuildvm"; + static final String PROPERTY_REBUILD_VM = "org.onap.appc.rebuildvm"; /** * The target host id is an optional payload parameter for the Evacuate API. */ - static final String PROPERTY_TARGETHOST_ID = "org.openecomp.appc.targethost.id"; + static final String PROPERTY_TARGETHOST_ID = "org.onap.appc.targethost.id"; /** * heat stack id to perform operation on stack */ - static final String PROPERTY_STACK_ID = "org.openecomp.appc.stack.id"; + static final String PROPERTY_STACK_ID = "org.onap.appc.stack.id"; static final String PROPERTY_SNAPSHOT_ID = "snapshot.id"; - static final String PROPERTY_INPUT_SNAPSHOT_ID = "org.openecomp.appc.snapshot.id"; + static final String PROPERTY_INPUT_SNAPSHOT_ID = "org.onap.appc.snapshot.id"; static final String DG_OUTPUT_PARAM_NAMESPACE = "output."; - static final String SKIP_HYPERVISOR_CHECK = "org.openecomp.appc.skiphypervisorcheck"; + static final String SKIP_HYPERVISOR_CHECK = "org.onap.appc.skiphypervisorcheck"; /** * This method is used to restart an existing virtual machine given the fully qualified URL of the machine. @@ -98,11 +98,11 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin { * passed to the method are passed as properties in a map. This method expects the following properties to be * defined: * <dl> - * <dt>org.openecomp.appc.provider.type</dt> + * <dt>org.onap.appc.provider.type</dt> * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported * provider types are legal.</dd> - * <dt>org.openecomp.appc.instance.url</dt> + * <dt>org.onap.appc.instance.url</dt> * <dd>The fully qualified URL of the instance to be restarted, as it is known to the provider (i.e., the self-link * URL of the server)</dd> * </dl> @@ -125,11 +125,11 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin { * passed to the method are passed as properties in a map. This method expects the following properties to be * defined: * <dl> - * <dt>org.openecomp.appc.provider.type</dt> + * <dt>org.onap.appc.provider.type</dt> * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported * provider types are legal.</dd> - * <dt>org.openecomp.appc.instance.url</dt> + * <dt>org.onap.appc.instance.url</dt> * <dd>The fully qualified URL of the instance to be stopped, as it is known to the provider (i.e., the self-link * URL of the server)</dd> * </dl> @@ -152,11 +152,11 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin { * passed to the method are passed as properties in a map. This method expects the following properties to be * defined: * <dl> - * <dt>org.openecomp.appc.provider.type</dt> + * <dt>org.onap.appc.provider.type</dt> * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported * provider types are legal.</dd> - * <dt>org.openecomp.appc.instance.url</dt> + * <dt>org.onap.appc.instance.url</dt> * <dd>The fully qualified URL of the instance to be started, as it is known to the provider (i.e., the self-link * URL of the server)</dd> * </dl> @@ -179,11 +179,11 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin { * passed to the method are passed as properties in a map. This method expects the following properties to be * defined: * <dl> - * <dt>org.openecomp.appc.provider.type</dt> + * <dt>org.onap.appc.provider.type</dt> * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported * provider types are legal.</dd> - * <dt>org.openecomp.appc.instance.url</dt> + * <dt>org.onap.appc.instance.url</dt> * <dd>The fully qualified URL of the instance to be rebuilt, as it is known to the provider (i.e., the self-link * URL of the server)</dd> * </dl> @@ -206,11 +206,11 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin { * passed to the method are passed as properties in a map. This method expects the following properties to be * defined: * <dl> - * <dt>org.openecomp.appc.provider.type</dt> + * <dt>org.onap.appc.provider.type</dt> * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported * provider types are legal.</dd> - * <dt>org.openecomp.appc.instance.url</dt> + * <dt>org.onap.appc.instance.url</dt> * <dd>The fully qualified URL of the instance to be terminate, as it is known to the provider (i.e., the self-link * URL of the server)</dd> * </dl> @@ -252,11 +252,11 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin { * passed to the method are passed as properties in a map. This method expects the following properties to be * defined: * <dl> - * <dt>org.openecomp.appc.provider.type</dt> + * <dt>org.onap.appc.provider.type</dt> * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported * provider types are legal.</dd> - * <dt>org.openecomp.appc.instance.url</dt> + * <dt>org.onap.appc.instance.url</dt> * <dd>The fully qualified URL of the instance to be lookup, as it is known to the provider (i.e., the self-link URL * of the server)</dd> * </dl> diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/IdentityURL.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/IdentityURL.java index 038b8de84..c98edc410 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/IdentityURL.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/IdentityURL.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.impl; +package org.onap.appc.adapter.iaas.impl; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderAdapterImpl.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderAdapterImpl.java index 95e8e27f4..ba6c8c678 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderAdapterImpl.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderAdapterImpl.java @@ -23,20 +23,20 @@ */ -package org.openecomp.appc.adapter.iaas.impl; - -import org.openecomp.appc.Constants; -import org.openecomp.appc.adapter.iaas.ProviderAdapter; -import org.openecomp.appc.adapter.iaas.provider.operation.api.IProviderOperation; -import org.openecomp.appc.adapter.iaas.provider.operation.api.ProviderOperationFactory; -import org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Property; -import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation; -import org.openecomp.appc.adapter.iaas.provider.operation.impl.EvacuateServer; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.util.StructuredPropertyHelper; -import org.openecomp.appc.util.StructuredPropertyHelper.Node; +package org.onap.appc.adapter.iaas.impl; + +import org.onap.appc.Constants; +import org.onap.appc.adapter.iaas.ProviderAdapter; +import org.onap.appc.adapter.iaas.provider.operation.api.IProviderOperation; +import org.onap.appc.adapter.iaas.provider.operation.api.ProviderOperationFactory; +import org.onap.appc.adapter.iaas.provider.operation.common.constants.Property; +import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation; +import org.onap.appc.adapter.iaas.provider.operation.impl.EvacuateServer; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.util.StructuredPropertyHelper; +import org.onap.appc.util.StructuredPropertyHelper.Node; import com.att.cdp.zones.model.Image; import com.att.cdp.zones.model.Server; import com.att.cdp.zones.model.Stack; @@ -269,7 +269,7 @@ public class ProviderAdapterImpl implements ProviderAdapter { * Returns the symbolic name of the adapter * * @return The adapter name - * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#getAdapterName() + * @see org.onap.appc.adapter.iaas.ProviderAdapter#getAdapterName() */ @Override public String getAdapterName() { diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderCache.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderCache.java index bbf85a71a..5453a9ec1 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderCache.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderCache.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.impl; +package org.onap.appc.adapter.iaas.impl; import java.util.HashMap; import java.util.Map; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestContext.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestContext.java index cec09266a..ef237f96d 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestContext.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestContext.java @@ -23,11 +23,11 @@ */ -package org.openecomp.appc.adapter.iaas.impl; +package org.onap.appc.adapter.iaas.impl; -import org.openecomp.appc.Constants; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; +import org.onap.appc.Constants; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; /** diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestFailedException.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestFailedException.java index 614f4bb1e..13df3900c 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestFailedException.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestFailedException.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.impl; +package org.onap.appc.adapter.iaas.impl; import org.glassfish.grizzly.http.util.HttpStatus; import com.att.cdp.zones.model.Server; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalog.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalog.java index b04814c32..c078eb7b3 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalog.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalog.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.impl; +package org.onap.appc.adapter.iaas.impl; import java.util.HashSet; import java.util.List; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogFactory.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogFactory.java index c6624e8b1..4c759b2c6 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogFactory.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogFactory.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;
@@ -31,7 +31,7 @@ import com.att.eelf.configuration.EELFManager; public class ServiceCatalogFactory {
- private static EELFLogger logger= EELFManager.getInstance().getLogger(org.openecomp.appc.adapter.iaas.impl.ServiceCatalogFactory.class);
+ private static EELFLogger logger= EELFManager.getInstance().getLogger(org.onap.appc.adapter.iaas.impl.ServiceCatalogFactory.class);
/**
* This method accepts a fully qualified identity service URL and uses that to determine which version of the
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV2.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV2.java index 889035510..1e7112cd3 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV2.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV2.java @@ -22,7 +22,7 @@ * ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
import com.att.cdp.exceptions.ContextConnectionException;
import com.att.cdp.exceptions.ZoneException;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV3.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV3.java index 9cd67995e..b1c47e5d5 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV3.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV3.java @@ -22,7 +22,7 @@ * ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
import com.att.cdp.exceptions.ContextConnectionException;
import com.att.cdp.exceptions.ZoneException;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/TenantCache.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/TenantCache.java index ff349c76b..659202d1c 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/TenantCache.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/TenantCache.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.impl; +package org.onap.appc.adapter.iaas.impl; import java.io.IOException; import java.util.HashMap; @@ -30,14 +30,14 @@ import java.util.Map; import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.openecomp.appc.Constants; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.pool.Allocator; -import org.openecomp.appc.pool.Destructor; -import org.openecomp.appc.pool.Pool; -import org.openecomp.appc.pool.PoolSpecificationException; +import org.onap.appc.Constants; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.i18n.Msg; +import org.onap.appc.pool.Allocator; +import org.onap.appc.pool.Destructor; +import org.onap.appc.pool.Pool; +import org.onap.appc.pool.PoolSpecificationException; import com.att.cdp.exceptions.ContextConnectionException; import com.att.cdp.exceptions.ZoneException; import com.att.cdp.zones.Context; @@ -339,7 +339,7 @@ public class TenantCache implements Allocator<Context>, Destructor<Context> { } /** - * @see org.openecomp.appc.pool.Allocator#allocate(org.openecomp.appc.pool.Pool) + * @see org.onap.appc.pool.Allocator#allocate(org.onap.appc.pool.Pool) */ @SuppressWarnings("unchecked") @Override @@ -362,7 +362,7 @@ public class TenantCache implements Allocator<Context>, Destructor<Context> { } /** - * @see org.openecomp.appc.pool.Destructor#destroy(java.lang.Object, org.openecomp.appc.pool.Pool) + * @see org.onap.appc.pool.Destructor#destroy(java.lang.Object, org.onap.appc.pool.Pool) */ @Override public void destroy(Context context, Pool<Context> pool) { diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/VMURL.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/VMURL.java index 2860b5aea..777327cad 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/VMURL.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/VMURL.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.impl; +package org.onap.appc.adapter.iaas.impl; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/IProviderOperation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/IProviderOperation.java index 6a1459772..3417762d1 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/IProviderOperation.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/IProviderOperation.java @@ -22,10 +22,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.api; +package org.onap.appc.adapter.iaas.provider.operation.api; -import org.openecomp.appc.adapter.iaas.impl.ProviderCache; -import org.openecomp.appc.exceptions.APPCException; +import org.onap.appc.adapter.iaas.impl.ProviderCache; +import org.onap.appc.exceptions.APPCException; import com.att.cdp.zones.model.ModelObject; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import java.util.Map; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/ProviderOperationFactory.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/ProviderOperationFactory.java index 39ef4a8ae..1eed4ef90 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/ProviderOperationFactory.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/ProviderOperationFactory.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.api; +package org.onap.appc.adapter.iaas.provider.operation.api; -import org.openecomp.appc.adapter.iaas.provider.operation.impl.*; -import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation; -import org.openecomp.appc.exceptions.APPCException; +import org.onap.appc.adapter.iaas.provider.operation.impl.*; +import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation; +import org.onap.appc.exceptions.APPCException; import java.util.HashMap; import java.util.Map; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Constants.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Constants.java index 5100602de..503cb1ae8 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Constants.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Constants.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.common.constants; +package org.onap.appc.adapter.iaas.provider.operation.common.constants; /** * @since September 26, 2016 diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Property.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Property.java index 23676a0c8..90532b92d 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Property.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Property.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.common.constants; +package org.onap.appc.adapter.iaas.provider.operation.common.constants; /** * @since September 26, 2016 @@ -37,5 +37,5 @@ public class Property { public static final String PROVIDER_TENANT_PASSWORD = "password"; public static final String PROVIDER_TENANT_USERID = "userid"; public static final String PROVIDER_TYPE = "type"; - public static final String SKIP_HYPERVISOR_CHECK = "org.openecomp.appc.iaas.skiphypervisorcheck"; + public static final String SKIP_HYPERVISOR_CHECK = "org.onap.appc.iaas.skiphypervisorcheck"; } diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Operation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Operation.java index 857c7a7f0..2f81fab9c 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Operation.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Operation.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.common.enums; +package org.onap.appc.adapter.iaas.provider.operation.common.enums; /** * @since September 26, 2016 diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Outcome.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Outcome.java index c62c1b25d..972409174 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Outcome.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Outcome.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.common.enums; +package org.onap.appc.adapter.iaas.provider.operation.common.enums; /** * @since September 26, 2016 diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/CreateSnapshot.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/CreateSnapshot.java index b4c55253d..5165b0ce0 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/CreateSnapshot.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/CreateSnapshot.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.impl; +package org.onap.appc.adapter.iaas.provider.operation.impl; import com.att.cdp.exceptions.ContextConnectionException; import com.att.cdp.exceptions.ResourceNotFoundException; @@ -38,26 +38,26 @@ import com.att.eelf.configuration.EELFManager; import com.att.eelf.i18n.EELFResourceManager; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.glassfish.grizzly.http.util.HttpStatus; -import org.openecomp.appc.Constants; -import org.openecomp.appc.adapter.iaas.ProviderAdapter; -import org.openecomp.appc.adapter.iaas.impl.IdentityURL; -import org.openecomp.appc.adapter.iaas.impl.RequestContext; -import org.openecomp.appc.adapter.iaas.impl.RequestFailedException; -import org.openecomp.appc.adapter.iaas.impl.VMURL; -import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation; -import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.i18n.Msg; +import org.onap.appc.Constants; +import org.onap.appc.adapter.iaas.ProviderAdapter; +import org.onap.appc.adapter.iaas.impl.IdentityURL; +import org.onap.appc.adapter.iaas.impl.RequestContext; +import org.onap.appc.adapter.iaas.impl.RequestFailedException; +import org.onap.appc.adapter.iaas.impl.VMURL; +import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation; +import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.i18n.Msg; import org.slf4j.MDC; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Map; import java.util.TimeZone; -import static org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Constants.DATE_FORMAT; -import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME; +import static org.onap.appc.adapter.iaas.provider.operation.common.constants.Constants.DATE_FORMAT; +import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME; public class CreateSnapshot extends ProviderServerOperation { @@ -228,6 +228,6 @@ public class CreateSnapshot extends ProviderServerOperation { MDC.put("ElapsedTime", durationStr); MDC.put("TargetEntity", "cdp"); MDC.put("TargetServiceName", "create snapshot"); - MDC.put("ClassName", "org.openecomp.appc.adapter.iaas.provider.operation.impl.CreateSnapshot"); + MDC.put("ClassName", "org.onap.appc.adapter.iaas.provider.operation.impl.CreateSnapshot"); } } diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java index 45473e349..7ddcd37e6 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java @@ -22,21 +22,21 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.impl; - -import org.openecomp.appc.Constants; -import org.openecomp.appc.adapter.iaas.ProviderAdapter; -import org.openecomp.appc.adapter.iaas.impl.IdentityURL; -import org.openecomp.appc.adapter.iaas.impl.ProviderAdapterImpl; -import org.openecomp.appc.adapter.iaas.impl.RequestContext; -import org.openecomp.appc.adapter.iaas.impl.RequestFailedException; -import org.openecomp.appc.adapter.iaas.impl.VMURL; -import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation; -import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.i18n.Msg; +package org.onap.appc.adapter.iaas.provider.operation.impl; + +import org.onap.appc.Constants; +import org.onap.appc.adapter.iaas.ProviderAdapter; +import org.onap.appc.adapter.iaas.impl.IdentityURL; +import org.onap.appc.adapter.iaas.impl.ProviderAdapterImpl; +import org.onap.appc.adapter.iaas.impl.RequestContext; +import org.onap.appc.adapter.iaas.impl.RequestFailedException; +import org.onap.appc.adapter.iaas.impl.VMURL; +import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation; +import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.i18n.Msg; import com.att.cdp.exceptions.ContextConnectionException; import com.att.cdp.exceptions.ResourceNotFoundException; import com.att.cdp.exceptions.ZoneException; @@ -62,7 +62,7 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.TimeZone; -import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME; +import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME; public class EvacuateServer extends ProviderServerOperation { @@ -137,7 +137,7 @@ public class EvacuateServer extends ProviderServerOperation { /** - * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#evacuateServer(java.util.Map, + * @see org.onap.appc.adapter.iaas.ProviderAdapter#evacuateServer(java.util.Map, * org.openecomp.sdnc.sli.SvcLogicContext) */ private Server evacuateServer(Map<String, String> params, SvcLogicContext ctx) throws APPCException { @@ -233,17 +233,17 @@ public class EvacuateServer extends ProviderServerOperation { // Check error code for rebuild errors. Evacuate had set it to 200 after // a successful evacuate. Rebuild updates the error code. String rebuildErrorCode = - ctx.getAttribute(org.openecomp.appc.Constants.ATTRIBUTE_ERROR_CODE); + ctx.getAttribute(org.onap.appc.Constants.ATTRIBUTE_ERROR_CODE); if (rebuildErrorCode != null) { try { int error_code = Integer.parseInt(rebuildErrorCode); if (error_code != HttpStatus.OK_200.getStatusCode()) { logger.debug("Rebuild after evacuate failed - error code=" + error_code + ", message=" + ctx.getAttribute( - org.openecomp.appc.Constants.ATTRIBUTE_ERROR_MESSAGE)); + org.onap.appc.Constants.ATTRIBUTE_ERROR_MESSAGE)); msg = EELFResourceManager.format(Msg.EVACUATE_SERVER_REBUILD_FAILED, server.getName(), hypervisor, hypervisor_after_evacuate, - ctx.getAttribute(org.openecomp.appc.Constants.ATTRIBUTE_ERROR_MESSAGE)); + ctx.getAttribute(org.onap.appc.Constants.ATTRIBUTE_ERROR_MESSAGE)); logger.error(msg); metricsLogger.error(msg); ctx.setAttribute("EVACUATE_STATUS", "ERROR"); @@ -346,7 +346,7 @@ public class EvacuateServer extends ProviderServerOperation { MDC.put("ElapsedTime", durationStr); MDC.put("TargetEntity", "cdp"); MDC.put("TargetServiceName", "evacuate server"); - MDC.put("ClassName", "org.openecomp.appc.adapter.iaas.provider.operation.impl.EvacuateServer"); + MDC.put("ClassName", "org.onap.appc.adapter.iaas.provider.operation.impl.EvacuateServer"); } public void setProvideAdapterRef(ProviderAdapterImpl pai) { diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/LookupServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/LookupServer.java index 4c5c61670..924322d1f 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/LookupServer.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/LookupServer.java @@ -22,19 +22,19 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.impl; +package org.onap.appc.adapter.iaas.provider.operation.impl; -import org.openecomp.appc.Constants; -import org.openecomp.appc.adapter.iaas.ProviderAdapter; -import org.openecomp.appc.adapter.iaas.impl.RequestContext; -import org.openecomp.appc.adapter.iaas.impl.RequestFailedException; -import org.openecomp.appc.adapter.iaas.impl.VMURL; -import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation; -import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.i18n.Msg; +import org.onap.appc.Constants; +import org.onap.appc.adapter.iaas.ProviderAdapter; +import org.onap.appc.adapter.iaas.impl.RequestContext; +import org.onap.appc.adapter.iaas.impl.RequestFailedException; +import org.onap.appc.adapter.iaas.impl.VMURL; +import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation; +import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.i18n.Msg; import com.att.cdp.exceptions.ZoneException; import com.att.cdp.zones.Context; import com.att.cdp.zones.model.ModelObject; @@ -46,7 +46,7 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.glassfish.grizzly.http.util.HttpStatus; import java.io.IOException; import java.util.Map; -import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME; +import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME; public class LookupServer extends ProviderServerOperation { @@ -81,7 +81,7 @@ public class LookupServer extends ProviderServerOperation { logger.debug(Msg.SERVER_FOUND, vm_url, context.getTenantName(), server.getStatus().toString()); ctx.setAttribute("serverFound", "success"); String msg = EELFResourceManager.format(Msg.SUCCESS_EVENT_MESSAGE, "LookupServer", vm_url); - ctx.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg); + ctx.setAttribute(org.onap.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg); doSuccess(rc); } } catch (ZoneException e) { diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/MigrateServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/MigrateServer.java index 919562cd5..b28918c09 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/MigrateServer.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/MigrateServer.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.impl; +package org.onap.appc.adapter.iaas.provider.operation.impl; import com.att.cdp.exceptions.ContextConnectionException; import com.att.cdp.exceptions.ResourceNotFoundException; @@ -35,19 +35,19 @@ import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.eelf.i18n.EELFResourceManager; import org.glassfish.grizzly.http.util.HttpStatus; -import org.openecomp.appc.Constants; -import org.openecomp.appc.adapter.iaas.ProviderAdapter; -import org.openecomp.appc.adapter.iaas.impl.IdentityURL; -import org.openecomp.appc.adapter.iaas.impl.RequestContext; -import org.openecomp.appc.adapter.iaas.impl.RequestFailedException; -import org.openecomp.appc.adapter.iaas.impl.VMURL; -import org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Property; -import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation; -import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.i18n.Msg; +import org.onap.appc.Constants; +import org.onap.appc.adapter.iaas.ProviderAdapter; +import org.onap.appc.adapter.iaas.impl.IdentityURL; +import org.onap.appc.adapter.iaas.impl.RequestContext; +import org.onap.appc.adapter.iaas.impl.RequestFailedException; +import org.onap.appc.adapter.iaas.impl.VMURL; +import org.onap.appc.adapter.iaas.provider.operation.common.constants.Property; +import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation; +import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.i18n.Msg; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.slf4j.MDC; import java.text.DateFormat; @@ -57,8 +57,8 @@ import java.util.Collection; import java.util.Date; import java.util.Map; import java.util.TimeZone; -import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.MIGRATE_SERVICE; -import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME; +import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.MIGRATE_SERVICE; +import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME; public class MigrateServer extends ProviderServerOperation { @@ -153,7 +153,7 @@ public class MigrateServer extends ProviderServerOperation { } /** - * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#migrateServer(java.util.Map, + * @see org.onap.appc.adapter.iaas.ProviderAdapter#migrateServer(java.util.Map, * org.openecomp.sdnc.sli.SvcLogicContext) */ private Server migrateServer(Map<String, String> params, SvcLogicContext ctx) throws APPCException { @@ -235,6 +235,6 @@ public class MigrateServer extends ProviderServerOperation { MDC.put("ElapsedTime", durationStr); MDC.put("TargetEntity", "cdp"); MDC.put("TargetServiceName", "migrate server"); - MDC.put("ClassName", "org.openecomp.appc.adapter.iaas.provider.operation.impl.MigrateServer"); + MDC.put("ClassName", "org.onap.appc.adapter.iaas.provider.operation.impl.MigrateServer"); } } diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RebuildServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RebuildServer.java index 9a185ffeb..a2b27f29a 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RebuildServer.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RebuildServer.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.impl; +package org.onap.appc.adapter.iaas.provider.operation.impl; import com.att.cdp.exceptions.ContextConnectionException; import com.att.cdp.exceptions.ResourceNotFoundException; @@ -39,20 +39,20 @@ import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.eelf.i18n.EELFResourceManager; import org.glassfish.grizzly.http.util.HttpStatus; -import org.openecomp.appc.Constants; -import org.openecomp.appc.adapter.iaas.ProviderAdapter; -import org.openecomp.appc.adapter.iaas.impl.IdentityURL; -import org.openecomp.appc.adapter.iaas.impl.RequestContext; -import org.openecomp.appc.adapter.iaas.impl.RequestFailedException; -import org.openecomp.appc.adapter.iaas.impl.VMURL; -import org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Property; -import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation; -import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome; -import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.i18n.Msg; +import org.onap.appc.Constants; +import org.onap.appc.adapter.iaas.ProviderAdapter; +import org.onap.appc.adapter.iaas.impl.IdentityURL; +import org.onap.appc.adapter.iaas.impl.RequestContext; +import org.onap.appc.adapter.iaas.impl.RequestFailedException; +import org.onap.appc.adapter.iaas.impl.VMURL; +import org.onap.appc.adapter.iaas.provider.operation.common.constants.Property; +import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation; +import org.onap.appc.adapter.iaas.provider.operation.common.enums.Outcome; +import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.i18n.Msg; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.slf4j.MDC; import java.text.DateFormat; @@ -61,8 +61,8 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.TimeZone; -import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.STOP_SERVICE; -import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME; +import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.STOP_SERVICE; +import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME; public class RebuildServer extends ProviderServerOperation { @@ -328,7 +328,7 @@ public class RebuildServer extends ProviderServerOperation { } /** - * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#rebuildServer(java.util.Map, + * @see org.onap.appc.adapter.iaas.ProviderAdapter#rebuildServer(java.util.Map, * org.openecomp.sdnc.sli.SvcLogicContext) */ @SuppressWarnings("nls") @@ -429,6 +429,6 @@ public class RebuildServer extends ProviderServerOperation { MDC.put("ElapsedTime", durationStr); MDC.put("TargetEntity", "cdp"); MDC.put("TargetServiceName", "rebuild server"); - MDC.put("ClassName", "org.openecomp.appc.adapter.iaas.provider.operation.impl.RebuildServer"); + MDC.put("ClassName", "org.onap.appc.adapter.iaas.provider.operation.impl.RebuildServer"); } } diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestartServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestartServer.java index 7d191a3d9..cc30ca833 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestartServer.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestartServer.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.impl; +package org.onap.appc.adapter.iaas.provider.operation.impl; import com.att.cdp.exceptions.ResourceNotFoundException; import com.att.cdp.exceptions.ZoneException; @@ -33,17 +33,17 @@ import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.eelf.i18n.EELFResourceManager; import org.glassfish.grizzly.http.util.HttpStatus; -import org.openecomp.appc.Constants; -import org.openecomp.appc.adapter.iaas.ProviderAdapter; -import org.openecomp.appc.adapter.iaas.impl.IdentityURL; -import org.openecomp.appc.adapter.iaas.impl.RequestContext; -import org.openecomp.appc.adapter.iaas.impl.RequestFailedException; -import org.openecomp.appc.adapter.iaas.impl.VMURL; -import org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Property; -import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome; -import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; -import org.openecomp.appc.exceptions.UnknownProviderException; -import org.openecomp.appc.i18n.Msg; +import org.onap.appc.Constants; +import org.onap.appc.adapter.iaas.ProviderAdapter; +import org.onap.appc.adapter.iaas.impl.IdentityURL; +import org.onap.appc.adapter.iaas.impl.RequestContext; +import org.onap.appc.adapter.iaas.impl.RequestFailedException; +import org.onap.appc.adapter.iaas.impl.VMURL; +import org.onap.appc.adapter.iaas.provider.operation.common.constants.Property; +import org.onap.appc.adapter.iaas.provider.operation.common.enums.Outcome; +import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; +import org.onap.appc.exceptions.UnknownProviderException; +import org.onap.appc.i18n.Msg; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.slf4j.MDC; import java.text.DateFormat; @@ -51,8 +51,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Map; import java.util.TimeZone; -import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.RESTART_SERVICE; -import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME; +import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.RESTART_SERVICE; +import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME; public class RestartServer extends ProviderServerOperation { @@ -176,7 +176,7 @@ public class RestartServer extends ProviderServerOperation { * * @throws UnknownProviderException If the provider cannot be found * @throws IllegalArgumentException if the expected argument(s) are not defined or are invalid - * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#restartServer(java.util.Map, + * @see org.onap.appc.adapter.iaas.ProviderAdapter#restartServer(java.util.Map, * org.openecomp.sdnc.sli.SvcLogicContext) */ @SuppressWarnings("nls") @@ -220,7 +220,7 @@ public class RestartServer extends ProviderServerOperation { doSuccess(rc); ctx.setAttribute("RESTART_STATUS", "SUCCESS"); String msg = EELFResourceManager.format(Msg.SUCCESS_EVENT_MESSAGE, "RestartServer", vm_url); - ctx.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg); + ctx.setAttribute(org.onap.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg); } } catch (RequestFailedException e) { doFailure(rc, e.getStatus(), e.getMessage()); @@ -270,6 +270,6 @@ public class RestartServer extends ProviderServerOperation { MDC.put("ElapsedTime", durationStr); MDC.put("TargetEntity", "cdp"); MDC.put("TargetServiceName", targetServiceName); - MDC.put("ClassName", "org.openecomp.appc.adapter.iaas.provider.operation.impl.RestartServer"); + MDC.put("ClassName", "org.onap.appc.adapter.iaas.provider.operation.impl.RestartServer"); } } diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestoreStack.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestoreStack.java index 397f63a56..7eeb23783 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestoreStack.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestoreStack.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.impl; +package org.onap.appc.adapter.iaas.provider.operation.impl; import com.att.cdp.exceptions.ResourceNotFoundException; import com.att.cdp.exceptions.ZoneException; @@ -39,19 +39,19 @@ import com.att.eelf.i18n.EELFResourceManager; import com.woorea.openstack.base.client.OpenStackBaseException; import com.woorea.openstack.heat.Heat; import org.glassfish.grizzly.http.util.HttpStatus; -import org.openecomp.appc.Constants; -import org.openecomp.appc.adapter.iaas.ProviderAdapter; -import org.openecomp.appc.adapter.iaas.impl.RequestContext; -import org.openecomp.appc.adapter.iaas.impl.RequestFailedException; -import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation; -import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderStackOperation; -import org.openecomp.appc.adapter.openstack.heat.SnapshotResource; -import org.openecomp.appc.adapter.openstack.heat.StackResource; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.i18n.Msg; +import org.onap.appc.Constants; +import org.onap.appc.adapter.iaas.ProviderAdapter; +import org.onap.appc.adapter.iaas.impl.RequestContext; +import org.onap.appc.adapter.iaas.impl.RequestFailedException; +import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation; +import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderStackOperation; +import org.onap.appc.adapter.openstack.heat.SnapshotResource; +import org.onap.appc.adapter.openstack.heat.StackResource; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.i18n.Msg; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import java.util.Map; -import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME; +import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME; public class RestoreStack extends ProviderStackOperation { diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/SnapshotStack.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/SnapshotStack.java index 97ac5c80a..bf7ebc755 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/SnapshotStack.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/SnapshotStack.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.impl; +package org.onap.appc.adapter.iaas.provider.operation.impl; import com.att.cdp.exceptions.ResourceNotFoundException; import com.att.cdp.exceptions.ZoneException; @@ -39,18 +39,18 @@ import com.att.eelf.i18n.EELFResourceManager; import com.woorea.openstack.base.client.OpenStackBaseException; import com.woorea.openstack.heat.Heat; import org.glassfish.grizzly.http.util.HttpStatus; -import org.openecomp.appc.Constants; -import org.openecomp.appc.adapter.iaas.ProviderAdapter; -import org.openecomp.appc.adapter.iaas.impl.RequestContext; -import org.openecomp.appc.adapter.iaas.impl.RequestFailedException; -import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation; -import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderStackOperation; -import org.openecomp.appc.adapter.openstack.heat.SnapshotResource; -import org.openecomp.appc.adapter.openstack.heat.StackResource; -import org.openecomp.appc.adapter.openstack.heat.model.CreateSnapshotParams; -import org.openecomp.appc.adapter.openstack.heat.model.Snapshot; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.i18n.Msg; +import org.onap.appc.Constants; +import org.onap.appc.adapter.iaas.ProviderAdapter; +import org.onap.appc.adapter.iaas.impl.RequestContext; +import org.onap.appc.adapter.iaas.impl.RequestFailedException; +import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation; +import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderStackOperation; +import org.onap.appc.adapter.openstack.heat.SnapshotResource; +import org.onap.appc.adapter.openstack.heat.StackResource; +import org.onap.appc.adapter.openstack.heat.model.CreateSnapshotParams; +import org.onap.appc.adapter.openstack.heat.model.Snapshot; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.i18n.Msg; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.slf4j.MDC; import java.text.DateFormat; @@ -58,7 +58,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Map; import java.util.TimeZone; -import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME; +import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME; public class SnapshotStack extends ProviderStackOperation { @@ -188,6 +188,6 @@ public class SnapshotStack extends ProviderStackOperation { MDC.put("ElapsedTime", durationStr); MDC.put("TargetEntity", "cdp"); MDC.put("TargetServiceName", "snapshot stack"); - MDC.put("ClassName", "org.openecomp.appc.adapter.iaas.provider.operation.impl.SnapshotStack"); + MDC.put("ClassName", "org.onap.appc.adapter.iaas.provider.operation.impl.SnapshotStack"); } } diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StartServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StartServer.java index 09781a254..1dbeacbf3 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StartServer.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StartServer.java @@ -22,18 +22,18 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.impl; - -import org.openecomp.appc.Constants; -import org.openecomp.appc.adapter.iaas.ProviderAdapter; -import org.openecomp.appc.adapter.iaas.impl.IdentityURL; -import org.openecomp.appc.adapter.iaas.impl.RequestContext; -import org.openecomp.appc.adapter.iaas.impl.RequestFailedException; -import org.openecomp.appc.adapter.iaas.impl.VMURL; -import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation; -import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.i18n.Msg; +package org.onap.appc.adapter.iaas.provider.operation.impl; + +import org.onap.appc.Constants; +import org.onap.appc.adapter.iaas.ProviderAdapter; +import org.onap.appc.adapter.iaas.impl.IdentityURL; +import org.onap.appc.adapter.iaas.impl.RequestContext; +import org.onap.appc.adapter.iaas.impl.RequestFailedException; +import org.onap.appc.adapter.iaas.impl.VMURL; +import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation; +import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.i18n.Msg; import com.att.cdp.exceptions.ResourceNotFoundException; import com.att.cdp.zones.Context; import com.att.cdp.zones.model.ModelObject; @@ -44,15 +44,15 @@ import com.att.eelf.i18n.EELFResourceManager; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.glassfish.grizzly.http.util.HttpStatus; import java.util.Map; -import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.START_SERVICE; -import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME; +import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.START_SERVICE; +import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME; public class StartServer extends ProviderServerOperation { private static final EELFLogger logger = EELFManager.getInstance().getLogger(StartServer.class); /** - * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#startServer(java.util.Map, + * @see org.onap.appc.adapter.iaas.ProviderAdapter#startServer(java.util.Map, * org.openecomp.sdnc.sli.SvcLogicContext) */ @SuppressWarnings("nls") diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StopServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StopServer.java index 0587061c7..df836b77c 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StopServer.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StopServer.java @@ -22,18 +22,18 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.impl; - -import org.openecomp.appc.Constants; -import org.openecomp.appc.adapter.iaas.ProviderAdapter; -import org.openecomp.appc.adapter.iaas.impl.IdentityURL; -import org.openecomp.appc.adapter.iaas.impl.RequestContext; -import org.openecomp.appc.adapter.iaas.impl.RequestFailedException; -import org.openecomp.appc.adapter.iaas.impl.VMURL; -import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome; -import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.i18n.Msg; +package org.onap.appc.adapter.iaas.provider.operation.impl; + +import org.onap.appc.Constants; +import org.onap.appc.adapter.iaas.ProviderAdapter; +import org.onap.appc.adapter.iaas.impl.IdentityURL; +import org.onap.appc.adapter.iaas.impl.RequestContext; +import org.onap.appc.adapter.iaas.impl.RequestFailedException; +import org.onap.appc.adapter.iaas.impl.VMURL; +import org.onap.appc.adapter.iaas.provider.operation.common.enums.Outcome; +import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.i18n.Msg; import com.att.cdp.exceptions.ResourceNotFoundException; import com.att.cdp.zones.Context; import com.att.cdp.zones.model.ModelObject; @@ -44,8 +44,8 @@ import com.att.eelf.i18n.EELFResourceManager; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.glassfish.grizzly.http.util.HttpStatus; import java.util.Map; -import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.STOP_SERVICE; -import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME; +import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.STOP_SERVICE; +import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME; public class StopServer extends ProviderServerOperation { @@ -53,7 +53,7 @@ public class StopServer extends ProviderServerOperation { private static EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger(); /** - * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#stopServer(java.util.Map, + * @see org.onap.appc.adapter.iaas.ProviderAdapter#stopServer(java.util.Map, * org.openecomp.sdnc.sli.SvcLogicContext) */ @SuppressWarnings("nls") @@ -168,7 +168,7 @@ public class StopServer extends ProviderServerOperation { doSuccess(rc); ctx.setAttribute("STOP_STATUS", "SUCCESS"); msg = EELFResourceManager.format(Msg.SUCCESS_EVENT_MESSAGE, "StopServer", vm_url); - ctx.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg); + ctx.setAttribute(org.onap.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg); } else { ctx.setAttribute("STOP_STATUS", "CONTEXT_NOT_FOUND"); diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateServer.java index 51000601a..73385ee35 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateServer.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateServer.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.impl; +package org.onap.appc.adapter.iaas.provider.operation.impl; import com.att.cdp.exceptions.ContextConnectionException; import com.att.cdp.exceptions.ResourceNotFoundException; @@ -36,21 +36,21 @@ import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.eelf.i18n.EELFResourceManager; import org.glassfish.grizzly.http.util.HttpStatus; -import org.openecomp.appc.Constants; -import org.openecomp.appc.adapter.iaas.ProviderAdapter; -import org.openecomp.appc.adapter.iaas.impl.IdentityURL; -import org.openecomp.appc.adapter.iaas.impl.RequestContext; -import org.openecomp.appc.adapter.iaas.impl.RequestFailedException; -import org.openecomp.appc.adapter.iaas.impl.VMURL; -import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome; -import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; -import org.openecomp.appc.exceptions.UnknownProviderException; -import org.openecomp.appc.i18n.Msg; +import org.onap.appc.Constants; +import org.onap.appc.adapter.iaas.ProviderAdapter; +import org.onap.appc.adapter.iaas.impl.IdentityURL; +import org.onap.appc.adapter.iaas.impl.RequestContext; +import org.onap.appc.adapter.iaas.impl.RequestFailedException; +import org.onap.appc.adapter.iaas.impl.VMURL; +import org.onap.appc.adapter.iaas.provider.operation.common.enums.Outcome; +import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; +import org.onap.appc.exceptions.UnknownProviderException; +import org.onap.appc.i18n.Msg; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import java.util.Map; -import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.RESTART_SERVICE; -import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.TERMINATE_SERVICE; -import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME; +import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.RESTART_SERVICE; +import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.TERMINATE_SERVICE; +import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME; public class TerminateServer extends ProviderServerOperation { @@ -173,7 +173,7 @@ public class TerminateServer extends ProviderServerOperation { * * @throws UnknownProviderException If the provider cannot be found * @throws IllegalArgumentException if the expected argument(s) are not defined or are invalid - * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#terminateServer(java.util.Map, + * @see org.onap.appc.adapter.iaas.ProviderAdapter#terminateServer(java.util.Map, * org.openecomp.sdnc.sli.SvcLogicContext) */ @SuppressWarnings("nls") diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateStack.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateStack.java index a9ee122db..1e3ce1e68 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateStack.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateStack.java @@ -22,16 +22,16 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.impl; +package org.onap.appc.adapter.iaas.provider.operation.impl; -import org.openecomp.appc.Constants; -import org.openecomp.appc.adapter.iaas.ProviderAdapter; -import org.openecomp.appc.adapter.iaas.impl.RequestContext; -import org.openecomp.appc.adapter.iaas.impl.RequestFailedException; -import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation; -import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderStackOperation; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.i18n.Msg; +import org.onap.appc.Constants; +import org.onap.appc.adapter.iaas.ProviderAdapter; +import org.onap.appc.adapter.iaas.impl.RequestContext; +import org.onap.appc.adapter.iaas.impl.RequestFailedException; +import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation; +import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderStackOperation; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.i18n.Msg; import com.att.cdp.exceptions.ResourceNotFoundException; import com.att.cdp.exceptions.ZoneException; import com.att.cdp.zones.Context; @@ -44,7 +44,7 @@ import com.att.eelf.i18n.EELFResourceManager; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.glassfish.grizzly.http.util.HttpStatus; import java.util.Map; -import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME; +import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME; public class TerminateStack extends ProviderStackOperation { @@ -98,7 +98,7 @@ public class TerminateStack extends ProviderStackOperation { context.close(); doSuccess(rc); String msg = EELFResourceManager.format(Msg.SUCCESS_EVENT_MESSAGE, "TerminateStack", vm_url); - ctx.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg); + ctx.setAttribute(org.onap.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg); } } catch (ResourceNotFoundException e) { String msg = EELFResourceManager.format(Msg.STACK_NOT_FOUND, e, vm_url); diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/VmStatuschecker.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/VmStatuschecker.java index 8175a14f5..9185e35fc 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/VmStatuschecker.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/VmStatuschecker.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.impl; +package org.onap.appc.adapter.iaas.provider.operation.impl; import com.att.cdp.exceptions.ResourceNotFoundException; import com.att.cdp.zones.Context; @@ -32,23 +32,23 @@ import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.eelf.i18n.EELFResourceManager; import org.glassfish.grizzly.http.util.HttpStatus; -import org.openecomp.appc.Constants; -import org.openecomp.appc.adapter.iaas.ProviderAdapter; -import org.openecomp.appc.adapter.iaas.impl.IdentityURL; -import org.openecomp.appc.adapter.iaas.impl.RequestContext; -import org.openecomp.appc.adapter.iaas.impl.RequestFailedException; -import org.openecomp.appc.adapter.iaas.impl.VMURL; -import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation; -import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome; -import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.exceptions.UnknownProviderException; -import org.openecomp.appc.i18n.Msg; +import org.onap.appc.Constants; +import org.onap.appc.adapter.iaas.ProviderAdapter; +import org.onap.appc.adapter.iaas.impl.IdentityURL; +import org.onap.appc.adapter.iaas.impl.RequestContext; +import org.onap.appc.adapter.iaas.impl.RequestFailedException; +import org.onap.appc.adapter.iaas.impl.VMURL; +import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation; +import org.onap.appc.adapter.iaas.provider.operation.common.enums.Outcome; +import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.exceptions.UnknownProviderException; +import org.onap.appc.i18n.Msg; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import java.util.Map; -import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.RESTART_SERVICE; -import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME; +import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.RESTART_SERVICE; +import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME; public class VmStatuschecker extends ProviderServerOperation { diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderOperation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderOperation.java index 02226bbc9..2b50dbe8a 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderOperation.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderOperation.java @@ -22,19 +22,19 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.impl.base; - -import org.openecomp.appc.adapter.iaas.ProviderAdapter; -import org.openecomp.appc.adapter.iaas.impl.*; -import org.openecomp.appc.adapter.iaas.provider.operation.api.IProviderOperation; -import org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Constants; -import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.pool.Pool; -import org.openecomp.appc.pool.PoolExtensionException; +package org.onap.appc.adapter.iaas.provider.operation.impl.base; + +import org.onap.appc.adapter.iaas.ProviderAdapter; +import org.onap.appc.adapter.iaas.impl.*; +import org.onap.appc.adapter.iaas.provider.operation.api.IProviderOperation; +import org.onap.appc.adapter.iaas.provider.operation.common.constants.Constants; +import org.onap.appc.adapter.iaas.provider.operation.common.enums.Outcome; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.i18n.Msg; +import org.onap.appc.pool.Pool; +import org.onap.appc.pool.PoolExtensionException; import com.att.cdp.zones.Context; import com.att.cdp.zones.model.ModelObject; import com.att.cdp.zones.model.Server; @@ -48,8 +48,8 @@ import java.net.URI; import java.util.Map; import java.util.Set; import java.util.regex.Pattern; -import static org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Constants.MDC_ADAPTER; -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_ADAPTER; +import static org.onap.appc.adapter.iaas.provider.operation.common.constants.Constants.MDC_SERVICE; import static com.att.eelf.configuration.Configuration.MDC_SERVICE_NAME; public abstract class ProviderOperation implements IProviderOperation { @@ -110,7 +110,7 @@ public abstract class ProviderOperation implements IProviderOperation { */ protected void logOperation(Msg msg, Map<String, String> params, SvcLogicContext context) { - String appName = configuration.getProperty(org.openecomp.appc.Constants.PROPERTY_APPLICATION_NAME); + String appName = configuration.getProperty(org.onap.appc.Constants.PROPERTY_APPLICATION_NAME); logger.info(msg, appName); debugParameters(params); @@ -223,8 +223,8 @@ public abstract class ProviderOperation implements IProviderOperation { status = "500"; } svcLogic.setStatus(Outcome.FAILURE.toString()); - svcLogic.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_ERROR_CODE, status); - svcLogic.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_ERROR_MESSAGE, msg); + svcLogic.setAttribute(org.onap.appc.Constants.ATTRIBUTE_ERROR_CODE, status); + svcLogic.setAttribute(org.onap.appc.Constants.ATTRIBUTE_ERROR_MESSAGE, msg); if (null != cause) throw new APPCException(cause); @@ -237,7 +237,7 @@ public abstract class ProviderOperation implements IProviderOperation { protected void doSuccess(RequestContext rc) { SvcLogicContext svcLogic = rc.getSvcLogicContext(); svcLogic.setStatus(Outcome.SUCCESS.toString()); - svcLogic.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_ERROR_CODE, + svcLogic.setAttribute(org.onap.appc.Constants.ATTRIBUTE_ERROR_CODE, Integer.toString(HttpStatus.OK_200.getStatusCode())); } @@ -317,7 +317,7 @@ public abstract class ProviderOperation implements IProviderOperation { protected Context getContext(RequestContext rc, String selfLinkURL, String providerName) { VMURL vm = VMURL.parseURL(selfLinkURL); IdentityURL ident = IdentityURL.parseURL(providerName); - String appName = configuration.getProperty(org.openecomp.appc.Constants.PROPERTY_APPLICATION_NAME); + String appName = configuration.getProperty(org.onap.appc.Constants.PROPERTY_APPLICATION_NAME); if (vm == null) { String msg = EELFResourceManager.format(Msg.INVALID_SELF_LINK_URL, appName, selfLinkURL); diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderServerOperation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderServerOperation.java index e503e05fd..9ef82aea2 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderServerOperation.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderServerOperation.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.impl.base; +package org.onap.appc.adapter.iaas.provider.operation.impl.base; -import org.openecomp.appc.Constants; -import org.openecomp.appc.adapter.iaas.impl.*; -import org.openecomp.appc.i18n.Msg; +import org.onap.appc.Constants; +import org.onap.appc.adapter.iaas.impl.*; +import org.onap.appc.i18n.Msg; import com.att.cdp.exceptions.ContextConnectionException; import com.att.cdp.exceptions.NotLoggedInException; import com.att.cdp.exceptions.TimeoutException; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderStackOperation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderStackOperation.java index fa59ffbae..cbf620230 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderStackOperation.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderStackOperation.java @@ -22,13 +22,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.iaas.provider.operation.impl.base; +package org.onap.appc.adapter.iaas.provider.operation.impl.base; -import org.openecomp.appc.Constants; -import org.openecomp.appc.adapter.iaas.impl.RequestContext; -import org.openecomp.appc.adapter.iaas.impl.RequestFailedException; -import org.openecomp.appc.adapter.openstack.heat.StackResource; -import org.openecomp.appc.i18n.Msg; +import org.onap.appc.Constants; +import org.onap.appc.adapter.iaas.impl.RequestContext; +import org.onap.appc.adapter.iaas.impl.RequestFailedException; +import org.onap.appc.adapter.openstack.heat.StackResource; +import org.onap.appc.i18n.Msg; import com.att.cdp.exceptions.ContextConnectionException; import com.att.cdp.exceptions.ResourceNotFoundException; import com.att.cdp.exceptions.TimeoutException; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/SnapshotResource.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/SnapshotResource.java index 04468187c..549c7b93b 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/SnapshotResource.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/SnapshotResource.java @@ -22,10 +22,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.openstack.heat; +package org.onap.appc.adapter.openstack.heat; -import org.openecomp.appc.adapter.openstack.heat.model.CreateSnapshotParams; -import org.openecomp.appc.adapter.openstack.heat.model.Snapshot; +import org.onap.appc.adapter.openstack.heat.model.CreateSnapshotParams; +import org.onap.appc.adapter.openstack.heat.model.Snapshot; import com.woorea.openstack.base.client.Entity; import com.woorea.openstack.base.client.HttpMethod; import com.woorea.openstack.base.client.OpenStackClient; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/StackResource.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/StackResource.java index a559b04a8..5add047f7 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/StackResource.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/StackResource.java @@ -22,10 +22,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.openstack.heat; +package org.onap.appc.adapter.openstack.heat; -import org.openecomp.appc.adapter.openstack.heat.model.CreateSnapshotParams; -import org.openecomp.appc.adapter.openstack.heat.model.Snapshot; +import org.onap.appc.adapter.openstack.heat.model.CreateSnapshotParams; +import org.onap.appc.adapter.openstack.heat.model.Snapshot; import com.woorea.openstack.base.client.Entity; import com.woorea.openstack.base.client.HttpMethod; import com.woorea.openstack.base.client.OpenStackClient; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/CreateSnapshotParams.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/CreateSnapshotParams.java index 4d8901cf2..642b85367 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/CreateSnapshotParams.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/CreateSnapshotParams.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.openstack.heat.model; +package org.onap.appc.adapter.openstack.heat.model; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Data.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Data.java index 3581818e0..df662013a 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Data.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Data.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.openstack.heat.model; +package org.onap.appc.adapter.openstack.heat.model; import javax.annotation.Generated; import javax.validation.Valid; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Environment.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Environment.java index 10adaedbd..b5a9ddcad 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Environment.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Environment.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.openstack.heat.model; +package org.onap.appc.adapter.openstack.heat.model; import javax.annotation.Generated; import javax.validation.Valid; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Metadata.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Metadata.java index b6402d7d1..08e44b725 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Metadata.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Metadata.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.openstack.heat.model; +package org.onap.appc.adapter.openstack.heat.model; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Parameters.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Parameters.java index 480b74450..8adc97a4f 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Parameters.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Parameters.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.openstack.heat.model; +package org.onap.appc.adapter.openstack.heat.model; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Properties.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Properties.java index 3be9461f4..0a7605268 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Properties.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Properties.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.openstack.heat.model; +package org.onap.appc.adapter.openstack.heat.model; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceData.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceData.java index 8ac70e3ea..fea775c71 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceData.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceData.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.openstack.heat.model; +package org.onap.appc.adapter.openstack.heat.model; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceRegistry.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceRegistry.java index c214c41ea..d15c1c339 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceRegistry.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceRegistry.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.openstack.heat.model; +package org.onap.appc.adapter.openstack.heat.model; import javax.annotation.Generated; import javax.validation.Valid; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources.java index 6545479c4..ffa9f0d1a 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.openstack.heat.model; +package org.onap.appc.adapter.openstack.heat.model; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources_.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources_.java index cbacd77d9..e6889b0a7 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources_.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources_.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.openstack.heat.model; +package org.onap.appc.adapter.openstack.heat.model; import javax.annotation.Generated; import javax.validation.Valid; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources__.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources__.java index b389c2d83..c34310556 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources__.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources__.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.openstack.heat.model; +package org.onap.appc.adapter.openstack.heat.model; import javax.annotation.Generated; import javax.validation.Valid; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Snapshot.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Snapshot.java index 548035635..57c7d5439 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Snapshot.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Snapshot.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.openstack.heat.model; +package org.onap.appc.adapter.openstack.heat.model; import javax.annotation.Generated; import javax.validation.Valid; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotDetails.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotDetails.java index 172072d5a..f121ddd70 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotDetails.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotDetails.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.openstack.heat.model; +package org.onap.appc.adapter.openstack.heat.model; import javax.annotation.Generated; import javax.validation.Valid; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotRestoreResponse.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotRestoreResponse.java index 5e829bad9..482a29f3b 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotRestoreResponse.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotRestoreResponse.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.openstack.heat.model; +package org.onap.appc.adapter.openstack.heat.model; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Template.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Template.java index fd762dc2a..310d711f5 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Template.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Template.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.openstack.heat.model; +package org.onap.appc.adapter.openstack.heat.model; import javax.annotation.Generated; import javax.validation.Valid; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume.java index 9173fe832..5943ba71b 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.openstack.heat.model; +package org.onap.appc.adapter.openstack.heat.model; import javax.annotation.Generated; import javax.validation.Valid; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume_.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume_.java index abad08f98..a8df4a7dc 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume_.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume_.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.openstack.heat.model; +package org.onap.appc.adapter.openstack.heat.model; import javax.annotation.Generated; import javax.validation.Valid; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/utils/Constants.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/utils/Constants.java index 9cde695d8..6b9602a62 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/utils/Constants.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/utils/Constants.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.utils; +package org.onap.appc.adapter.utils; public class Constants { diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/com/att/cdp/default.properties b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/com/att/cdp/default.properties index c91796a3d..ca971a33e 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/com/att/cdp/default.properties +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/com/att/cdp/default.properties @@ -56,13 +56,13 @@ com.att.cdp.resources=com/att/cdp/StrategyServiceMessages # # Logger names used in the application # -com.att.cdp.logger=org.openecomp.appc -com.att.cdp.security.logger=org.openecomp.appc.security -com.att.cdp.perf.logger=org.openecomp.appc.perf -com.att.cdp.gui.logger=org.openecomp.appc.gui -com.att.cdp.server.logger=org.openecomp.appc.server -com.att.cdp.coordinator.logger=org.openecomp.appc.coordinator -com.att.cdp.policy.logger=org.openecomp.appc.policy +com.att.cdp.logger=org.onap.appc +com.att.cdp.security.logger=org.onap.appc.security +com.att.cdp.perf.logger=org.onap.appc.perf +com.att.cdp.gui.logger=org.onap.appc.gui +com.att.cdp.server.logger=org.onap.appc.server +com.att.cdp.coordinator.logger=org.onap.appc.coordinator +com.att.cdp.policy.logger=org.onap.appc.policy # # This property allows to 'simulate' SSH processes within engine. diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties index 21f96d9ee..1ecb98c01 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/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,18 +70,18 @@ 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 amount of time, in seconds, that the application waits for a change of state of a stacj to a known valid #sate before giving up and failing the request. # -org.openecomp.appc.stack.state.change.timeout=100 +org.onap.appc.stack.state.change.timeout=100 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 |