You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/12/19 13:42:07 UTC
[4/8] stratos git commit: Merge the changes
Merge the changes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bb3a32fb
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bb3a32fb
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bb3a32fb
Branch: refs/heads/master
Commit: bb3a32fbd8eb334a9f9deaecc791e145258391e3
Parents: fbce8c7
Author: gayan <ga...@puppet.gayan.org>
Authored: Fri Dec 19 18:07:14 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Dec 19 18:11:49 2014 +0530
----------------------------------------------------------------------
.../rest/endpoint/api/StratosApiV41Utils.java | 24 ++++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bb3a32fb/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index 3dacdac..e0e9a60 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -95,7 +95,7 @@ public class StratosApiV41Utils {
private static ServiceDeploymentManager serviceDeploymentManager = new ServiceDeploymentManager();
// Util methods for cartridges
- public static void createCartridgeDefinition(CartridgeDefinitionBean cartridgeDefinitionBean, ConfigurationContext ctxt,
+ public static void addCartridge(CartridgeDefinitionBean cartridgeDefinitionBean, ConfigurationContext ctxt,
String userName, String tenantDomain) throws RestAPIException {
log.info(String.format("Starting to deploy a cartridge: [type] %s " , cartridgeDefinitionBean.getType()));
@@ -112,10 +112,10 @@ public class StratosApiV41Utils {
} catch (ADCException e) {
throw new RestAPIException(e);
}
- log.info(String.format("Successfully deployed cartridge: [type] %s " , cartridgeDefinitionBean.getType()));
+ log.info(String.format("Successfully deployed cartridge: [cartridge-type] %s " , cartridgeDefinitionBean.getType()));
}
- public static void deleteCartridgeDefinition(String cartridgeType) throws RestAPIException {
+ public static void removeCartridge(String cartridgeType) throws RestAPIException {
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
if (cloudControllerServiceClient != null) {
@@ -181,7 +181,7 @@ public class StratosApiV41Utils {
String cartridgeType) throws RestAPIException {
try {
- cloudControllerServiceClient.unDeployCartridgeDefinition(cartridgeType);
+ cloudControllerServiceClient.removeCartridge(cartridgeType);
} catch (RemoteException e) {
log.error(e.getMessage(), e);
@@ -541,7 +541,7 @@ public class StratosApiV41Utils {
// Util methods for Autoscaling policies
- public static void createAutoscalingPolicy(AutoscalePolicy autoscalePolicyBean) throws RestAPIException {
+ public static void addAutoscalingPolicy(AutoscalePolicy autoscalePolicyBean) throws RestAPIException {
log.info(String.format("Deploying autoscaling policy: [id] %s", autoscalePolicyBean.getId()));
@@ -869,7 +869,7 @@ public class StratosApiV41Utils {
// Util methods for service groups
- public static void createServiceGroupDefinition(ServiceGroupDefinition serviceGroupDefinition) throws RestAPIException {
+ public static void addServiceGroup(ServiceGroupDefinition serviceGroupDefinition) throws RestAPIException {
try {
serviceGropingManager.deployServiceGroupDefinition(serviceGroupDefinition);
@@ -909,7 +909,7 @@ public class StratosApiV41Utils {
}
}
- public static void deleteServiceGroupDefinition(String serviceGroupDefinitionName) throws RestAPIException {
+ public static void removeServiceGroup(String serviceGroupDefinitionName) throws RestAPIException {
try {
serviceGropingManager.undeployServiceGroupDefinition(serviceGroupDefinitionName);
@@ -1039,7 +1039,7 @@ public class StratosApiV41Utils {
}
}
- public static void deleteApplication(String applicationId) throws RestAPIException {
+ public static void removeApplication(String applicationId) throws RestAPIException {
try {
AutoscalerServiceClient.getServiceClient().deleteApplication(applicationId);
@@ -1259,7 +1259,7 @@ public class StratosApiV41Utils {
// Util methods for Kubernetes clusters
- public static boolean deployKubernetesGroup(KubernetesGroup kubernetesGroupBean) throws RestAPIException {
+ public static boolean addKubernetesGroup(KubernetesGroup kubernetesGroupBean) throws RestAPIException {
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
if (cloudControllerServiceClient != null) {
@@ -1280,7 +1280,7 @@ public class StratosApiV41Utils {
return false;
}
- public static boolean deployKubernetesHost(String kubernetesGroupId, KubernetesHost kubernetesHostBean)
+ public static boolean addKubernetesHost(String kubernetesGroupId, KubernetesHost kubernetesHostBean)
throws RestAPIException {
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
@@ -1369,7 +1369,7 @@ public class StratosApiV41Utils {
return null;
}
- public static boolean undeployKubernetesGroup(String kubernetesGroupId) throws RestAPIException {
+ public static boolean removeKubernetesGroup(String kubernetesGroupId) throws RestAPIException {
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
if (cloudControllerServiceClient != null) {
@@ -1388,7 +1388,7 @@ public class StratosApiV41Utils {
return false;
}
- public static boolean undeployKubernetesHost(String kubernetesHostId) throws RestAPIException {
+ public static boolean removeKubernetesHost(String kubernetesHostId) throws RestAPIException {
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
if (cloudControllerServiceClient != null) {