diff options
Diffstat (limited to 'appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle')
19 files changed, 147 insertions, 147 deletions
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml index 743a90ecc..8f2674d10 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml @@ -27,7 +27,7 @@ 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-chef-adapter</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> @@ -78,7 +78,7 @@ <version>1.55</version> </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-common</artifactId> <version>${project.version}</version> </dependency> @@ -224,8 +224,8 @@ <configuration> <instructions> <Bundle-SymbolicName>appc-chef-adapter</Bundle-SymbolicName> - <Bundle-Activator>org.openecomp.appc.adapter.chef.ChefActivator</Bundle-Activator> - <Export-Package>org.openecomp.appc.adapter.chef</Export-Package> + <Bundle-Activator>org.onap.appc.adapter.chef.ChefActivator</Bundle-Activator> + <Export-Package>org.onap.appc.adapter.chef</Export-Package> <Import-Package> org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.* </Import-Package> diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefActivator.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefActivator.java index c6f4c6589..6c798b4b2 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefActivator.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefActivator.java @@ -22,13 +22,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.chef; +package org.onap.appc.adapter.chef; -import org.openecomp.appc.Constants; -import org.openecomp.appc.adapter.chef.impl.ChefAdapterImpl; -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.chef.impl.ChefAdapterImpl; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.i18n.Msg; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import org.osgi.framework.BundleActivator; diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefAdapter.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefAdapter.java index 4793ee708..d11db1c14 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefAdapter.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefAdapter.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.chef; +package org.onap.appc.adapter.chef; import java.util.Map; -import org.openecomp.appc.exceptions.APPCException; +import org.onap.appc.exceptions.APPCException; import com.att.cdp.zones.model.Server; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; @@ -47,24 +47,24 @@ public interface ChefAdapter 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"; /** * This method is used to restart an existing virtual machine given the fully qualified URL of the machine. @@ -73,11 +73,11 @@ public interface ChefAdapter 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> @@ -103,11 +103,11 @@ public interface ChefAdapter 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> @@ -133,11 +133,11 @@ public interface ChefAdapter 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> @@ -163,11 +163,11 @@ public interface ChefAdapter 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> diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/ApiMethod.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/ApiMethod.java index de4f31a04..38c4dd354 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/ApiMethod.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/ApiMethod.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.chef.chefapi; +package org.onap.appc.adapter.chef.chefapi; import java.text.SimpleDateFormat; import java.util.Date; @@ -33,7 +33,7 @@ import org.apache.http.Header; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.util.EntityUtils; -import org.openecomp.appc.adapter.chef.chefclient.Utils; +import org.onap.appc.adapter.chef.chefclient.Utils; import org.apache.http.HttpEntity; import org.apache.http.impl.client.HttpClients; diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Delete.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Delete.java index 85206af36..5fa8a3fae 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Delete.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Delete.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.chef.chefapi; +package org.onap.appc.adapter.chef.chefapi; import org.apache.http.client.methods.HttpDelete; diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Get.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Get.java index 948bff6af..da37236a7 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Get.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Get.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.chef.chefapi; +package org.onap.appc.adapter.chef.chefapi; import org.apache.http.client.methods.HttpGet; diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Post.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Post.java index 5e00b09a4..3234eeefa 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Post.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Post.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.chef.chefapi; +package org.onap.appc.adapter.chef.chefapi; import org.apache.http.client.methods.*; import org.apache.http.entity.StringEntity; diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Put.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Put.java index fa57c1117..c96fc64d1 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Put.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Put.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.chef.chefapi; +package org.onap.appc.adapter.chef.chefapi; import org.apache.http.client.methods.*; import org.apache.http.entity.StringEntity; diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/ChefApiClient.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/ChefApiClient.java index 7aa63193b..d7080fc12 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/ChefApiClient.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/ChefApiClient.java @@ -22,9 +22,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.chef.chefclient; +package org.onap.appc.adapter.chef.chefclient; import org.apache.http.client.methods.*; -import org.openecomp.appc.adapter.chef.chefapi.*; +import org.onap.appc.adapter.chef.chefapi.*; public class ChefApiClient { private String endpoint; diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/Utils.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/Utils.java index 393069dfd..71182c497 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/Utils.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/Utils.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.chef.chefclient; +package org.onap.appc.adapter.chef.chefclient; import java.io.BufferedReader; import java.io.FileReader; diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/ChefAdapterImpl.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/ChefAdapterImpl.java index ab853dcc4..824a6af95 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/ChefAdapterImpl.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/ChefAdapterImpl.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.chef.impl; +package org.onap.appc.adapter.chef.impl; import java.io.File; import java.util.Map; @@ -34,12 +34,12 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; import org.json.JSONObject; -import org.openecomp.appc.Constants; -import org.openecomp.appc.adapter.chef.ChefAdapter; -import org.openecomp.appc.adapter.chef.chefapi.ApiMethod; -import org.openecomp.appc.adapter.chef.chefclient.ChefApiClient; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; +import org.onap.appc.Constants; +import org.onap.appc.adapter.chef.ChefAdapter; +import org.onap.appc.adapter.chef.chefapi.ApiMethod; +import org.onap.appc.adapter.chef.chefclient.ChefApiClient; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import com.att.eelf.configuration.EELFLogger; @@ -69,7 +69,7 @@ public class ChefAdapterImpl implements ChefAdapter { private final EELFLogger logger = EELFManager.getInstance().getLogger(ChefAdapterImpl.class); private final String CANNOT_FIND_PRIVATE_KEY_STR = "Cannot find the private key in the APPC file system, please load the private key to "; - private final String CHEF_ACTION_STR = "org.openecomp.appc.instance.chefAction"; + private final String CHEF_ACTION_STR = "org.onap.appc.instance.chefAction"; private final String ORGANIZATIONS_STR = "/organizations/"; /** * A reference to the adapter configuration object. @@ -106,7 +106,7 @@ public class ChefAdapterImpl implements ChefAdapter { * Returns the symbolic name of the adapter * * @return The adapter name - * @see org.openecomp.appc.adapter.chef.ChefAdapter#getAdapterName() + * @see org.onap.appc.adapter.chef.ChefAdapter#getAdapterName() */ @Override public String getAdapterName() { @@ -119,12 +119,12 @@ public class ChefAdapterImpl implements ChefAdapter { @Override public void nodeObejctBuilder(Map<String, String> params, SvcLogicContext ctx) { logger.info("nodeObejctBuilder"); - String name = params.get("org.openecomp.appc.instance.nodeobject.name"); - String normal = params.get("org.openecomp.appc.instance.nodeobject.normal"); - String overrides = params.get("org.openecomp.appc.instance.nodeobject.overrides"); - String defaults = params.get("org.openecomp.appc.instance.nodeobject.defaults"); - String runList = params.get("org.openecomp.appc.instance.nodeobject.run_list"); - String chefEnvironment = params.get("org.openecomp.appc.instance.nodeobject.chef_environment"); + String name = params.get("org.onap.appc.instance.nodeobject.name"); + String normal = params.get("org.onap.appc.instance.nodeobject.normal"); + String overrides = params.get("org.onap.appc.instance.nodeobject.overrides"); + String defaults = params.get("org.onap.appc.instance.nodeobject.defaults"); + String runList = params.get("org.onap.appc.instance.nodeobject.run_list"); + String chefEnvironment = params.get("org.onap.appc.instance.nodeobject.chef_environment"); String nodeObject = "{\"json_class\":\"Chef::Node\",\"default\":{" + defaults + "},\"chef_type\":\"node\",\"run_list\":[" + runList + "],\"override\":{" + overrides + "},\"normal\": {" + normal + "},\"automatic\":{},\"name\":\"" + name + "\",\"chef_environment\":\"" @@ -134,19 +134,19 @@ public class ChefAdapterImpl implements ChefAdapter { RequestContext rc = new RequestContext(ctx); rc.isAlive(); SvcLogicContext svcLogic = rc.getSvcLogicContext(); - svcLogic.setAttribute("org.openecomp.appc.chef.nodeObject", nodeObject); + svcLogic.setAttribute("org.onap.appc.chef.nodeObject", nodeObject); } /** * send get request to chef server */ public void chefInfo(Map<String, String> params) { - clientName = params.get("org.openecomp.appc.instance.username"); - serverAddress = params.get("org.openecomp.appc.instance.serverAddress"); - organizations = params.get("org.openecomp.appc.instance.organizations"); + clientName = params.get("org.onap.appc.instance.username"); + serverAddress = params.get("org.onap.appc.instance.serverAddress"); + organizations = params.get("org.onap.appc.instance.organizations"); chefserver = "https://" + serverAddress + ORGANIZATIONS_STR + organizations; - if (params.containsKey("org.openecomp.appc.instance.pemPath")) { - clientPrivatekey = params.get("org.openecomp.appc.instance.pemPath"); + if (params.containsKey("org.onap.appc.instance.pemPath")) { + clientPrivatekey = params.get("org.onap.appc.instance.pemPath"); } else { clientPrivatekey = "/opt/app/bvc/chef/" + serverAddress + "/" + organizations + "/" + clientName + ".pem"; } @@ -159,9 +159,9 @@ public class ChefAdapterImpl implements ChefAdapter { @Override public void retrieveData(Map<String, String> params, SvcLogicContext ctx) { - String allConfigData = params.get("org.openecomp.appc.instance.allConfig"); - String key = params.get("org.openecomp.appc.instance.key"); - String dgContext = params.get("org.openecomp.appc.instance.dgContext"); + String allConfigData = params.get("org.onap.appc.instance.allConfig"); + String key = params.get("org.onap.appc.instance.key"); + String dgContext = params.get("org.onap.appc.instance.dgContext"); JSONObject josnConfig = new JSONObject(allConfigData); String contextData; @@ -184,9 +184,9 @@ public class ChefAdapterImpl implements ChefAdapter { @Override public void combineStrings(Map<String, String> params, SvcLogicContext ctx) { - String string1 = params.get("org.openecomp.appc.instance.String1"); - String string2 = params.get("org.openecomp.appc.instance.String2"); - String dgContext = params.get("org.openecomp.appc.instance.dgContext"); + String string1 = params.get("org.onap.appc.instance.String1"); + String string2 = params.get("org.onap.appc.instance.String2"); + String dgContext = params.get("org.onap.appc.instance.dgContext"); String contextData = string1 + string2; RequestContext rc = new RequestContext(ctx); rc.isAlive(); @@ -226,7 +226,7 @@ public class ChefAdapterImpl implements ChefAdapter { public void chefPut(Map<String, String> params, SvcLogicContext ctx) { chefInfo(params); String chefAction = params.get(CHEF_ACTION_STR); - String chefNodeStr = params.get("org.openecomp.appc.instance.chefRequestBody"); + String chefNodeStr = params.get("org.onap.appc.instance.chefRequestBody"); RequestContext rc = new RequestContext(ctx); rc.isAlive(); int code; @@ -254,7 +254,7 @@ public class ChefAdapterImpl implements ChefAdapter { chefInfo(params); logger.info("chef Post method"); logger.info(clientName + " " + clientPrivatekey + " " + chefserver + " " + organizations); - String chefNodeStr = params.get("org.openecomp.appc.instance.chefRequestBody"); + String chefNodeStr = params.get("org.onap.appc.instance.chefRequestBody"); String chefAction = params.get(CHEF_ACTION_STR); RequestContext rc = new RequestContext(ctx); @@ -311,7 +311,7 @@ public class ChefAdapterImpl implements ChefAdapter { @Override public void trigger(Map<String, String> params, SvcLogicContext ctx) { logger.info("Run trigger method"); - String tVmIp = params.get("org.openecomp.appc.instance.ip"); + String tVmIp = params.get("org.onap.appc.instance.ip"); RequestContext rc = new RequestContext(ctx); rc.isAlive(); @@ -332,9 +332,9 @@ public class ChefAdapterImpl implements ChefAdapter { @Override public void checkPushJob(Map<String, String> params, SvcLogicContext ctx) { chefInfo(params); - String jobID = params.get("org.openecomp.appc.instance.jobid"); - int retryTimes = Integer.parseInt(params.get("org.openecomp.appc.instance.retryTimes")); - int retryInterval = Integer.parseInt(params.get("org.openecomp.appc.instance.retryInterval")); + String jobID = params.get("org.onap.appc.instance.jobid"); + int retryTimes = Integer.parseInt(params.get("org.onap.appc.instance.retryTimes")); + int retryInterval = Integer.parseInt(params.get("org.onap.appc.instance.retryInterval")); String chefAction = "/pushy/jobs/" + jobID; RequestContext rc = new RequestContext(ctx); @@ -362,15 +362,15 @@ public class ChefAdapterImpl implements ChefAdapter { } if ("complete".equals(status)) { - svcLogic.setAttribute("org.openecomp.appc.chefServerResult.code", "200"); - svcLogic.setAttribute("org.openecomp.appc.chefServerResult.message", message); + svcLogic.setAttribute("org.onap.appc.chefServerResult.code", "200"); + svcLogic.setAttribute("org.onap.appc.chefServerResult.message", message); } else { if ("running".equals(status)) { - svcLogic.setAttribute("org.openecomp.appc.chefServerResult.code", "202"); - svcLogic.setAttribute("org.openecomp.appc.chefServerResult.message", "chef client runtime out"); + svcLogic.setAttribute("org.onap.appc.chefServerResult.code", "202"); + svcLogic.setAttribute("org.onap.appc.chefServerResult.message", "chef client runtime out"); } else { - svcLogic.setAttribute("org.openecomp.appc.chefServerResult.code", "500"); - svcLogic.setAttribute("org.openecomp.appc.chefServerResult.message", message); + svcLogic.setAttribute("org.onap.appc.chefServerResult.code", "500"); + svcLogic.setAttribute("org.onap.appc.chefServerResult.message", message); } } } @@ -378,7 +378,7 @@ public class ChefAdapterImpl implements ChefAdapter { @Override public void pushJob(Map<String, String> params, SvcLogicContext ctx) { chefInfo(params); - String pushRequest = params.get("org.openecomp.appc.instance.pushRequest"); + String pushRequest = params.get("org.onap.appc.instance.pushRequest"); String chefAction = "/pushy/jobs"; RequestContext rc = new RequestContext(ctx); rc.isAlive(); @@ -393,7 +393,7 @@ public class ChefAdapterImpl implements ChefAdapter { int startIndex = message.indexOf("jobs") + 6; int endIndex = message.length() - 2; String jobID = message.substring(startIndex, endIndex); - svcLogic.setAttribute("org.openecomp.appc.jobID", jobID); + svcLogic.setAttribute("org.onap.appc.jobID", jobID); logger.info(jobID); } chefServerResult(rc, Integer.toString(code), message); @@ -413,8 +413,8 @@ public class ChefAdapterImpl implements ChefAdapter { logger.info("Couldn't covert " + code + " to an Integer, defaulting status to 500", e); status = "500"; } - svcLogic.setAttribute("org.openecomp.appc.chefAgent.code", status); - svcLogic.setAttribute("org.openecomp.appc.chefAgent.message", msg); + svcLogic.setAttribute("org.onap.appc.chefAgent.code", status); + svcLogic.setAttribute("org.onap.appc.chefAgent.message", msg); } /** @@ -424,21 +424,21 @@ public class ChefAdapterImpl implements ChefAdapter { */ private void doSuccess(RequestContext rc) { SvcLogicContext svcLogic = rc.getSvcLogicContext(); - svcLogic.setAttribute("org.openecomp.appc.chefAgent.code", "200"); + svcLogic.setAttribute("org.onap.appc.chefAgent.code", "200"); } private void chefServerResult(RequestContext rc, String code, String message) { SvcLogicContext svcLogic = rc.getSvcLogicContext(); svcLogic.setStatus(OUTCOME_SUCCESS); - svcLogic.setAttribute("org.openecomp.appc.chefServerResult.code", code); - svcLogic.setAttribute("org.openecomp.appc.chefServerResult.message", message); + svcLogic.setAttribute("org.onap.appc.chefServerResult.code", code); + svcLogic.setAttribute("org.onap.appc.chefServerResult.message", message); } private void chefClientResult(RequestContext rc, String code, String message) { SvcLogicContext svcLogic = rc.getSvcLogicContext(); svcLogic.setStatus(OUTCOME_SUCCESS); - svcLogic.setAttribute("org.openecomp.appc.chefClientResult.code", code); - svcLogic.setAttribute("org.openecomp.appc.chefClientResult.message", message); + svcLogic.setAttribute("org.onap.appc.chefClientResult.code", code); + svcLogic.setAttribute("org.onap.appc.chefClientResult.message", message); } /** diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/RequestContext.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/RequestContext.java index a3ecf857c..3c0e00a6a 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/RequestContext.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/RequestContext.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.chef.impl; +package org.onap.appc.adapter.chef.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-chef-adapter/appc-chef-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties index 6b3ca8d5a..c00220dd6 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties +++ b/appc-adapters/appc-chef-adapter/appc-chef-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,12 +70,12 @@ provider.trusted.hosts=* # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc). # If the server does not change state to a valid state within the alloted time, the operation # fails. -org.openecomp.appc.server.state.change.timeout=300 +org.onap.appc.server.state.change.timeout=300 # # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider # to refresh the status of a resource we are waiting on. # -org.openecomp.appc.openstack.poll.interval=20 +org.onap.appc.openstack.poll.interval=20 # # The connection information to connect to the provider we are using. These properties # are "structured" properties, in that the name is a compound name, where the nodes diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/chefclient/TestChefApiClient.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/chefclient/TestChefApiClient.java index 3dc9ff20d..5ea152a8d 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/chefclient/TestChefApiClient.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/chefclient/TestChefApiClient.java @@ -1,4 +1,4 @@ -package org.openecomp.appc.adapter.chef.chefclient; +package org.onap.appc.adapter.chef.chefclient; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -14,11 +14,11 @@ import java.util.regex.Pattern; import org.junit.Before; import org.junit.Test; -import org.openecomp.appc.adapter.chef.chefapi.ApiMethod; -import org.openecomp.appc.adapter.chef.chefapi.Delete; -import org.openecomp.appc.adapter.chef.chefapi.Get; -import org.openecomp.appc.adapter.chef.chefapi.Post; -import org.openecomp.appc.adapter.chef.chefapi.Put; +import org.onap.appc.adapter.chef.chefapi.ApiMethod; +import org.onap.appc.adapter.chef.chefapi.Delete; +import org.onap.appc.adapter.chef.chefapi.Get; +import org.onap.appc.adapter.chef.chefapi.Post; +import org.onap.appc.adapter.chef.chefapi.Put; public class TestChefApiClient { @@ -41,16 +41,16 @@ public class TestChefApiClient { fail("Could not initialize properties"); } client = new ChefApiClient( - props.getProperty("org.openecomp.appc.adapter.chef.chefclient.userId"), + props.getProperty("org.onap.appc.adapter.chef.chefclient.userId"), System.getProperty("user.dir") + - props.getProperty("org.openecomp.appc.adapter.chef.chefclient.pemPath"), - props.getProperty("org.openecomp.appc.adapter.chef.chefclient.endPoint"), - props.getProperty("org.openecomp.appc.adapter.chef.chefclient.organizations")); + props.getProperty("org.onap.appc.adapter.chef.chefclient.pemPath"), + props.getProperty("org.onap.appc.adapter.chef.chefclient.endPoint"), + props.getProperty("org.onap.appc.adapter.chef.chefclient.organizations")); } @Test public void testGet(){ - Get get = client.get(props.getProperty("org.openecomp.appc.adapter.chef.chefclient.path")); + Get get = client.get(props.getProperty("org.onap.appc.adapter.chef.chefclient.path")); ApiMethod method = get.createRequest(); String[] response = method.test.split("\n"); @@ -59,7 +59,7 @@ public class TestChefApiClient { @Test public void testPut(){ - Put put = client.put(props.getProperty("org.openecomp.appc.adapter.chef.chefclient.path")); + Put put = client.put(props.getProperty("org.onap.appc.adapter.chef.chefclient.path")); ApiMethod method = put.createRequest(); String[] response = method.test.split("\n"); @@ -68,7 +68,7 @@ public class TestChefApiClient { @Test public void testPost() { - Post post = client.post(props.getProperty("org.openecomp.appc.adapter.chef.chefclient.path")); + Post post = client.post(props.getProperty("org.onap.appc.adapter.chef.chefclient.path")); ApiMethod method = post.createRequest(); String[] response = method.test.split("\n"); @@ -77,7 +77,7 @@ public class TestChefApiClient { @Test public void testDelete(){ - Delete delete = client.delete(props.getProperty("org.openecomp.appc.adapter.chef.chefclient.path")); + Delete delete = client.delete(props.getProperty("org.onap.appc.adapter.chef.chefclient.path")); ApiMethod method = delete.createRequest(); String[] response = method.test.split("\n"); diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/impl/TestChefAdapterImpl.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/impl/TestChefAdapterImpl.java index bb63d342c..687ba8338 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/impl/TestChefAdapterImpl.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/impl/TestChefAdapterImpl.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.chef.impl; +package org.onap.appc.adapter.chef.impl; import static org.junit.Assert.assertEquals; @@ -33,7 +33,7 @@ import java.util.Map; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.openecomp.appc.exceptions.APPCException; +import org.onap.appc.exceptions.APPCException; import com.att.cdp.exceptions.ZoneException; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; @@ -49,7 +49,7 @@ public class TestChefAdapterImpl { public void setup() { adapter = new ChefAdapterImpl(Boolean.TRUE); params = new HashMap<>(); - params.put("org.openecomp.appc.instance.pemPath", + params.put("org.onap.appc.instance.pemPath", "/src/test/resources/testclient.pem"); } @@ -63,7 +63,7 @@ public class TestChefAdapterImpl { @Test public void testChefGetFail() throws IOException, IllegalStateException, IllegalArgumentException, ZoneException, APPCException { - params.put("org.openecomp.appc.instance.chefAction", "/nodes"); + params.put("org.onap.appc.instance.chefAction", "/nodes"); givenParams(params, "chefGet"); thenResponseShouldFail(); @@ -72,10 +72,10 @@ public class TestChefAdapterImpl { @Test public void testChefPutFail() throws IOException, IllegalStateException, IllegalArgumentException, ZoneException, APPCException { - params.put("org.openecomp.appc.instance.chefAction", "/nodes/testnode"); - params.put("org.openecomp.appc.instance.runList", "recipe[commandtest]"); - params.put("org.openecomp.appc.instance.attributes", ""); - params.put("org.openecomp.appc.instance.chefRequestBody", "Test Body"); + params.put("org.onap.appc.instance.chefAction", "/nodes/testnode"); + params.put("org.onap.appc.instance.runList", "recipe[commandtest]"); + params.put("org.onap.appc.instance.attributes", ""); + params.put("org.onap.appc.instance.chefRequestBody", "Test Body"); givenParams(params, "chefPut"); thenResponseShouldFail(); @@ -84,7 +84,7 @@ public class TestChefAdapterImpl { @Test public void testTriggerFail() throws IOException, IllegalStateException, IllegalArgumentException, ZoneException, APPCException { - params.put("org.openecomp.appc.instance.ip", ""); + params.put("org.onap.appc.instance.ip", ""); givenParams(params, "trigger"); thenResponseShouldFail(); @@ -94,15 +94,15 @@ public class TestChefAdapterImpl { svcContext = new SvcLogicContext(); if (method == "chefGet"){ adapter.chefGet(adapterParams, svcContext); - getAttribute = "org.openecomp.appc.chefServerResult.code"; + getAttribute = "org.onap.appc.chefServerResult.code"; } if (method == "chefPut"){ adapter.chefPut(adapterParams, svcContext); - getAttribute = "org.openecomp.appc.chefServerResult.code"; + getAttribute = "org.onap.appc.chefServerResult.code"; } if (method == "trigger"){ adapter.trigger(adapterParams, svcContext); - getAttribute = "org.openecomp.appc.chefAgent.code"; + getAttribute = "org.onap.appc.chefAgent.code"; } } diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java index 62470cc01..13b5fdfb3 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java @@ -23,7 +23,7 @@ */ -package org.openecomp.appc.test; +package org.onap.appc.test; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.openecomp.appc.test.InterceptLogger; +import org.onap.appc.test.InterceptLogger; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java index 8a06b31be..b101ecee4 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java @@ -23,7 +23,7 @@ */ -package org.openecomp.appc.test; +package org.onap.appc.test; import java.text.MessageFormat; import java.util.ArrayList; diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties index c781956d7..bb888132a 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties @@ -29,38 +29,38 @@ # # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded # to supply configuration options -org.openecomp.appc.bootstrap.file=appc.properties -org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. +org.onap.appc.bootstrap.file=appc.properties +org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. appc.application.name=APPC # # Define the message resource bundle name to be loaded -org.openecomp.appc.resources=org/openecomp/appc/i18n/MessageResources +org.onap.appc.resources=org/onap/appc/i18n/MessageResources # # The name of the adapter. -org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter +org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter # # Set up the logging environment # -org.openecomp.appc.logging.file=org/openecomp/appc/logback.xml -org.openecomp.appc.logging.path=${user.home};etc;../etc -org.openecomp.appc.logger=org.openecomp.appc -org.openecomp.appc.security.logger=org.openecomp.appc.security +org.onap.appc.logging.file=org/onap/appc/logback.xml +org.onap.appc.logging.path=${user.home};etc;../etc +org.onap.appc.logger=org.onap.appc +org.onap.appc.security.logger=org.onap.appc.security # # The minimum and maximum provider/tenant context pool sizes. Min=1 means that as soon # as the provider/tenant is referenced a Context is opened and added to the pool. Max=0 # means that the upper bound on the pool is unbounded. -org.openecomp.appc.provider.min.pool=1 -org.openecomp.appc.provider.max.pool=0 +org.onap.appc.provider.min.pool=1 +org.onap.appc.provider.max.pool=0 # # The following properties are used to configure the retry logic for connection to the # IaaS provider(s). The retry delay property is the amount of time, in seconds, the # application waits between retry attempts. The retry limit is the number of retries # that are allowed before the request is failed. -org.openecomp.appc.provider.retry.delay = 30 -org.openecomp.appc.provider.retry.limit = 10 +org.onap.appc.provider.retry.delay = 30 +org.onap.appc.provider.retry.limit = 10 # # The trusted hosts list for SSL access when a certificate is not provided. @@ -70,12 +70,12 @@ provider.trusted.hosts=* # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc). # If the server does not change state to a valid state within the alloted time, the operation # fails. -org.openecomp.appc.server.state.change.timeout=300 +org.onap.appc.server.state.change.timeout=300 # # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider # to refresh the status of a resource we are waiting on. # -org.openecomp.appc.openstack.poll.interval=20 +org.onap.appc.openstack.poll.interval=20 # # The connection information to connect to the provider we are using. These properties # are "structured" properties, in that the name is a compound name, where the nodes diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/test.properties b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/test.properties index 4805e4316..2623f283a 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/test.properties +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/test.properties @@ -1,5 +1,5 @@ -org.openecomp.appc.adapter.chef.chefclient.userId=test -org.openecomp.appc.adapter.chef.chefclient.pemPath=/src/test/resources/testclient.pem -org.openecomp.appc.adapter.chef.chefclient.endPoint=http://test.com -org.openecomp.appc.adapter.chef.chefclient.organizations=onap -org.openecomp.appc.adapter.chef.chefclient.path=/test/path +org.onap.appc.adapter.chef.chefclient.userId=test +org.onap.appc.adapter.chef.chefclient.pemPath=/src/test/resources/testclient.pem +org.onap.appc.adapter.chef.chefclient.endPoint=http://test.com +org.onap.appc.adapter.chef.chefclient.organizations=onap +org.onap.appc.adapter.chef.chefclient.path=/test/path |