Repository: stratos Updated Branches: refs/heads/docker-grouping-merge 6805c113c -> 62ab6daff
reading and adding cluster properties Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a3d3558a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a3d3558a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a3d3558a Branch: refs/heads/docker-grouping-merge Commit: a3d3558a47c8457d7bea1f51d8630a404073b97f Parents: d21a321 Author: R-Rajkumar <[email protected]> Authored: Fri Nov 7 09:59:27 2014 +0530 Committer: R-Rajkumar <[email protected]> Committed: Fri Nov 7 09:59:27 2014 +0530 ---------------------------------------------------------------------- .../applications/parser/DefaultApplicationParser.java | 1 + .../applications/pojo/ApplicationClusterContext.java | 12 ++++++++++++ .../client/cloud/controller/CloudControllerClient.java | 1 + .../controller/impl/CloudControllerServiceImpl.java | 5 +++++ 4 files changed, 19 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/a3d3558a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java index 9be2fa2..0338201 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java @@ -647,6 +647,7 @@ public class DefaultApplicationParser implements ApplicationParser { clusterId, hostname, subscribableInfoCtxt.getDeploymentPolicy(), false, subscribableInfoCtxt.getDependencyAliases()); appClusterCtxt.setAutoscalePolicyName(subscribableInfoCtxt.getAutoscalingPolicy()); + appClusterCtxt.setProperties(subscribableInfoCtxt.getProperties()); this.applicationClusterContexts.add(appClusterCtxt); // add relevant information to the map http://git-wip-us.apache.org/repos/asf/stratos/blob/a3d3558a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationClusterContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationClusterContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationClusterContext.java index 39b8214..98c6655 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationClusterContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationClusterContext.java @@ -19,6 +19,8 @@ package org.apache.stratos.autoscaler.applications.pojo; +import org.apache.stratos.cloud.controller.stub.pojo.Properties; + public class ApplicationClusterContext { // cluster id @@ -37,6 +39,8 @@ public class ApplicationClusterContext { private String deploymentPolicyName; // tenant rance private String tenantRange; + // propertis + private Properties properties; public ApplicationClusterContext (String cartridgeType, String clusterId, String hostName, String textPayload, String deploymentPolicyName, boolean isLbCluster) { @@ -113,6 +117,14 @@ public class ApplicationClusterContext { public void setTenantRange(String tenantRange) { this.tenantRange = tenantRange; } + + public Properties getProperties() { + return properties; + } + + public void setProperties(Properties properties) { + this.properties = properties; + } public boolean equals(Object other) { http://git-wip-us.apache.org/repos/asf/stratos/blob/a3d3558a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java index eb3a1d9..89e0723 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java @@ -219,6 +219,7 @@ public class CloudControllerClient { dto.setTenantRange(context.getTenantRange()); dto.setTextPayload(context.getTextPayload()); dto.setLbCluster(context.isLbCluster()); + dto.setProperties(context.getProperties()); contextDTOs.add(dto); } http://git-wip-us.apache.org/repos/asf/stratos/blob/a3d3558a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java index b271ac5..0b73676 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java @@ -1935,6 +1935,11 @@ public class CloudControllerServiceImpl implements CloudControllerService { cartridge.getDeployerType().equals(StratosConstants.KUBERNETES_DEPLOYER_TYPE)) { newCluster.setKubernetesCluster(true); } + if (appClusterCtxt.getProperties() != null) { + Properties properties = CloudControllerUtil.toJavaUtilProperties(appClusterCtxt.getProperties()); + newCluster.setProperties(properties); + } + clusters.add(newCluster); } TopologyBuilder.handleApplicationClustersCreated(appId, clusters);
