You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/02/25 19:54:54 UTC
[19/50] [abbrv] stratos git commit: adding getDeploymentPolicies api
in CC
adding getDeploymentPolicies api in CC
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/437cfd55
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/437cfd55
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/437cfd55
Branch: refs/heads/master-deployment-policy-fix-merge
Commit: 437cfd55ac17115debca1df3b7f0a3897e5b9432
Parents: 506e0a4
Author: R-Rajkumar <rr...@gmail.com>
Authored: Wed Feb 18 22:46:52 2015 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Wed Feb 25 22:52:47 2015 +0530
----------------------------------------------------------------------
.../controller/context/CloudControllerContext.java | 4 ++++
.../controller/services/CloudControllerService.java | 6 ++++++
.../services/impl/CloudControllerServiceImpl.java | 15 ++++++++++++---
3 files changed, 22 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/437cfd55/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
index efc731f..54efdcc 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
@@ -276,6 +276,10 @@ public class CloudControllerContext implements Serializable {
public DeploymentPolicy getDeploymentPolicy(String deploymentPolicyID) {
return deploymentPolicyIDToDeployPolicyMap.get(deploymentPolicyID);
}
+
+ public Collection<DeploymentPolicy> getDeploymentPolicies() {
+ return deploymentPolicyIDToDeployPolicyMap.values();
+ }
public void removeDeploymentPolicy(String deploymentPolicyID) {
if (deploymentPolicyIDToDeployPolicyMap.containsKey(deploymentPolicyID)) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/437cfd55/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
index 9a17e71..d870ac7 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
@@ -376,6 +376,12 @@ public interface CloudControllerService {
* @return
*/
public DeploymentPolicy getDeploymentPolicy(String deploymentPolicyID) throws DeploymentPolicyNotExistsException;
+
+ /**
+ * Get deployment policies
+ * @return array of {@link DeploymentPolicy}
+ */
+ public DeploymentPolicy[] getDeploymentPolicies();
/**
* Add network partition
http://git-wip-us.apache.org/repos/asf/stratos/blob/437cfd55/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 faa961d..96456a6 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
@@ -36,13 +36,10 @@ import org.apache.stratos.cloud.controller.messaging.publisher.StatisticsDataPub
import org.apache.stratos.cloud.controller.messaging.publisher.TopologyEventPublisher;
import org.apache.stratos.cloud.controller.messaging.topology.TopologyBuilder;
import org.apache.stratos.cloud.controller.messaging.topology.TopologyManager;
-import org.apache.stratos.cloud.controller.registry.RegistryManager;
import org.apache.stratos.cloud.controller.services.CloudControllerService;
import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
import org.apache.stratos.common.Property;
-import org.apache.stratos.common.threading.StratosThreadPool;
-import org.apache.stratos.common.client.CloudControllerServiceClient;
import org.apache.stratos.messaging.domain.topology.*;
import org.apache.stratos.messaging.event.topology.MemberReadyToShutdownEvent;
@@ -1462,6 +1459,18 @@ public class CloudControllerServiceImpl implements CloudControllerService {
CloudControllerContext.getInstance().getDeploymentPolicy(deploymentPolicyID);
return deploymentPolicy;
}
+
+ @Override
+ public DeploymentPolicy[] getDeploymentPolicies() {
+ try {
+ Collection<DeploymentPolicy> deploymentPolicies = cloudControllerContext.getDeploymentPolicies();
+ return deploymentPolicies.toArray(new DeploymentPolicy[deploymentPolicies.size()]);
+ } catch (Exception e) {
+ String message = "Could not get deployment policies";
+ log.error(message);
+ throw new CloudControllerException(message, e);
+ }
+ }
@Override
public boolean updateKubernetesHost(KubernetesHost kubernetesHost) throws