You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/08/12 12:13:29 UTC
[2/2] stratos git commit: Refactore with uuid
Refactore with uuid
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b5fddd3b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b5fddd3b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b5fddd3b
Branch: refs/heads/tenant-isolation
Commit: b5fddd3babd690a1c44e277336f6f87eb101c88c
Parents: a709db5
Author: Gayan Gunarathne <ga...@wso2.com>
Authored: Wed Aug 12 15:43:16 2015 +0530
Committer: Gayan Gunarathne <ga...@wso2.com>
Committed: Wed Aug 12 15:43:16 2015 +0530
----------------------------------------------------------------------
.../client/AutoscalerCloudControllerClient.java | 2 +-
.../domain/ApplicationClusterContext.java | 14 +-
.../impl/CloudControllerServiceImpl.java | 4 +-
.../main/resources/CloudControllerService.wsdl | 708 +++++++++----------
4 files changed, 364 insertions(+), 364 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/b5fddd3b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/AutoscalerCloudControllerClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/AutoscalerCloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/AutoscalerCloudControllerClient.java
index 8f6c656..65e952f 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/AutoscalerCloudControllerClient.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/AutoscalerCloudControllerClient.java
@@ -157,7 +157,7 @@ public class AutoscalerCloudControllerClient {
dto.setClusterId(applicationClusterContext.getClusterId());
dto.setAutoscalePolicyName(applicationClusterContext.getAutoscalePolicyName());
dto.setDeploymentPolicyName(applicationClusterContext.getDeploymentPolicyName());
- dto.setCartridgeType(applicationClusterContext.getCartridgeUuid());
+ dto.setCartridgeUuid(applicationClusterContext.getCartridgeUuid());
dto.setHostName(applicationClusterContext.getHostName());
dto.setTenantRange(applicationClusterContext.getTenantRange());
dto.setTextPayload(applicationClusterContext.getTextPayload());
http://git-wip-us.apache.org/repos/asf/stratos/blob/b5fddd3b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ApplicationClusterContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ApplicationClusterContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ApplicationClusterContext.java
index a6a1250..ab1459e 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ApplicationClusterContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ApplicationClusterContext.java
@@ -26,7 +26,7 @@ public class ApplicationClusterContext {
// cluster id
private String clusterId;
// cartridge type
- private String cartridgeType;
+ private String cartridgeUuid;
// payload as a String
private String textPayload;
// host name
@@ -59,12 +59,12 @@ public class ApplicationClusterContext {
this.clusterId = clusterId;
}
- public String getCartridgeType() {
- return cartridgeType;
+ public String getCartridgeUuid() {
+ return cartridgeUuid;
}
- public void setCartridgeType(String cartridgeType) {
- this.cartridgeType = cartridgeType;
+ public void setCartridgeUuid(String cartridgeUuid) {
+ this.cartridgeUuid = cartridgeUuid;
}
public String getTextPayload() {
@@ -127,12 +127,12 @@ public class ApplicationClusterContext {
ApplicationClusterContext that = (ApplicationClusterContext) other;
- return this.cartridgeType.equals(that.cartridgeType) &&
+ return this.cartridgeUuid.equals(that.cartridgeUuid) &&
this.clusterId.equals(that.clusterId);
}
public int hashCode() {
- return this.cartridgeType.hashCode() + this.clusterId.hashCode();
+ return this.cartridgeUuid.hashCode() + this.clusterId.hashCode();
}
public Properties getProperties() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/b5fddd3b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
index 6e93e53..344d777 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
@@ -1140,7 +1140,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
for (ApplicationClusterContext appClusterCtxt : appClustersContexts) {
ClusterContext clusterContext = new ClusterContext(
- appUuid, appClusterCtxt.getCartridgeType(), appClusterCtxt.getClusterId(),
+ appUuid, appClusterCtxt.getCartridgeUuid(), appClusterCtxt.getClusterId(),
appClusterCtxt.getTextPayload(), appClusterCtxt.getHostName(),
appClusterCtxt.isLbCluster(), appClusterCtxt.getProperties());
@@ -1151,7 +1151,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
CloudControllerContext.getInstance().addClusterContext(clusterContext);
// Create cluster object
- Cluster cluster = new Cluster(appClusterCtxt.getCartridgeType(), appClusterCtxt.getClusterId(),
+ Cluster cluster = new Cluster(appClusterCtxt.getCartridgeUuid(), appClusterCtxt.getClusterId(),
appClusterCtxt.getDeploymentPolicyName(), appClusterCtxt.getAutoscalePolicyName(), appUuid);
cluster.setLbCluster(false);
cluster.setTenantRange(appClusterCtxt.getTenantRange());