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/02/13 10:39:40 UTC

stratos git commit: Addin REST API to add the deployment policy

Repository: stratos
Updated Branches:
  refs/heads/4.1.0-beta-deployment-policy-fix 544877c35 -> f3c36aa35


Addin REST API to add the deployment policy


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f3c36aa3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f3c36aa3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f3c36aa3

Branch: refs/heads/4.1.0-beta-deployment-policy-fix
Commit: f3c36aa35c5404381ee678d48389771d3e22219a
Parents: 544877c
Author: Gayan Gunarathne <ga...@wso2.com>
Authored: Fri Feb 13 15:09:06 2015 +0530
Committer: Gayan Gunarathne <ga...@wso2.com>
Committed: Fri Feb 13 15:09:06 2015 +0530

----------------------------------------------------------------------
 .../policy/deployment/DeploymentPolicyBean.java |  20 +++++++++----------
 .../activemq-data/testBroker/KahaDB/db-1.log    | Bin 33030144 -> 33030144 bytes
 .../activemq-data/testBroker/KahaDB/db.data     | Bin 49152 -> 49152 bytes
 .../activemq-data/testBroker/KahaDB/db.redo     | Bin 49240 -> 49240 bytes
 .../rest/endpoint/api/StratosApiV41.java        |   2 +-
 .../rest/endpoint/api/StratosApiV41Utils.java   |   2 +-
 .../stratos/rest/endpoint/mock/MockContext.java |  10 +++++-----
 .../util/converter/ObjectConverter.java         |  16 +++++++--------
 .../artifacts/deployment-policy.json            |  14 ++++++-------
 9 files changed, 32 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/f3c36aa3/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/DeploymentPolicyBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/DeploymentPolicyBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/DeploymentPolicyBean.java
index f0a1a90..a0c73da 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/DeploymentPolicyBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/DeploymentPolicyBean.java
@@ -19,25 +19,17 @@
 
 package org.apache.stratos.common.beans.policy.deployment;
 
-
 import org.apache.stratos.common.beans.partition.NetworkPartitionRefBean;
 
 import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
 
 @XmlRootElement
 public class DeploymentPolicyBean {
 
     private String id;
 
-	private NetworkPartitionRefBean[] networkPartition;
-
-	public NetworkPartitionRefBean[] getNetworkPartitionBeans() {
-		return networkPartition;
-	}
-
-	public void setNetworkPartitionRefBean(NetworkPartitionRefBean[] networkPartition) {
-		this.networkPartition = networkPartition;
-	}
+	private List<NetworkPartitionRefBean> networkPartition;
 
 	public String getId() {
 		return id;
@@ -46,4 +38,12 @@ public class DeploymentPolicyBean {
 	public void setId(String id) {
 		this.id = id;
 	}
+
+	public List<NetworkPartitionRefBean> getNetworkPartition() {
+		return networkPartition;
+	}
+
+	public void setNetworkPartition(List<NetworkPartitionRefBean> networkPartition) {
+		this.networkPartition = networkPartition;
+	}
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/f3c36aa3/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db-1.log
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db-1.log b/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db-1.log
index 4a92e8d..6260b0f 100644
Binary files a/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db-1.log and b/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db-1.log differ

http://git-wip-us.apache.org/repos/asf/stratos/blob/f3c36aa3/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db.data
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db.data b/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db.data
index 12144a3..ea62ef7 100644
Binary files a/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db.data and b/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db.data differ

http://git-wip-us.apache.org/repos/asf/stratos/blob/f3c36aa3/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db.redo
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db.redo b/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db.redo
index b8607f3..36cc3c5 100644
Binary files a/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db.redo and b/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db.redo differ

http://git-wip-us.apache.org/repos/asf/stratos/blob/f3c36aa3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
index bc517eb..45acb36 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
@@ -160,7 +160,7 @@ public class StratosApiV41 extends AbstractApi {
 	/**
 	 * Creates the Deployement Policy Definition.
 	 *
-	 * @param deployementPolicyDefinitionBean the cartridge definition bean
+	 * @param deploymentPolicyDefinitionBean the cartridge definition bean
 	 * @return the response
 	 * @throws RestAPIException the rest api exception
 	 */

http://git-wip-us.apache.org/repos/asf/stratos/blob/f3c36aa3/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 9fccdef..e0e72ec 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
@@ -1058,7 +1058,7 @@ public class StratosApiV41Utils {
 			log.error(message);
 			throw new RestAPIException(message);
 		}
-		if(deploymentPolicy.getNetworkPartitionBeans().length==0){
+		if(deploymentPolicy.getNetworkPartition().size()==0){
 			String message="No network partitions specify with the policy";
 			log.error(message);
 			throw new RestAPIException(message);

http://git-wip-us.apache.org/repos/asf/stratos/blob/f3c36aa3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
index 77882f6..99de9db 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
@@ -547,7 +547,7 @@ public class MockContext {
     			if(!(deploymentPolicyMap.get(PUBLIC_DEFINITION)).containsKey(deploymentPolicyId)){
         			throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId);
         		}
-        		return (deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId).getNetworkPartitionBeans()[0].getPartitions().toArray(new PartitionBean[0]);
+        		return (deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId).getNetworkPartition().get(0).getPartitions().toArray(new PartitionBean[0]);
     		}
     	}
         	
@@ -556,7 +556,7 @@ public class MockContext {
         }
         //FIXME to parse thr all the NW partitions
     	return (deploymentPolicyMap.get(tenantId)).
-                get(deploymentPolicyId).getNetworkPartitionBeans()[0].getPartitions().toArray(new PartitionBean[0]);
+                get(deploymentPolicyId).getNetworkPartition().get(0).getPartitions().toArray(new PartitionBean[0]);
     }
 
     public NetworkPartitionRefBean[] getPartitionGroups(String deploymentPolicyId)  throws RestAPIException{
@@ -569,14 +569,14 @@ public class MockContext {
     			if(!(deploymentPolicyMap.get(PUBLIC_DEFINITION)).containsKey(deploymentPolicyId)){
         			throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId);
         		}
-        		return (deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId).getNetworkPartitionBeans();
+        		return (NetworkPartitionRefBean[])(deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId).getNetworkPartition().toArray();
     		}
     	}
         	
     	if(!(deploymentPolicyMap.get(tenantId)).containsKey(deploymentPolicyId)){
     		throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId);
         }
-    	return (deploymentPolicyMap.get(tenantId)).get(deploymentPolicyId).getNetworkPartitionBeans();
+    	return (NetworkPartitionRefBean[])(deploymentPolicyMap.get(tenantId)).get(deploymentPolicyId).getNetworkPartition().toArray();
     }
 
     public AutoscalePolicyBean[] getAutoscalePolicies()  throws RestAPIException{
@@ -710,7 +710,7 @@ public class MockContext {
     	}
         	  	
         PartitionBean[] partitions = null;
-         for(NetworkPartitionRefBean networkPartition : deploymentPolicy.getNetworkPartitionBeans()){
+         for(NetworkPartitionRefBean networkPartition : deploymentPolicy.getNetworkPartition()){
              if(networkPartition.getId().equals(partitionGroupId)){
                  partitions =  networkPartition.getPartitions().toArray(new PartitionBean[0]);
              }

http://git-wip-us.apache.org/repos/asf/stratos/blob/f3c36aa3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index 42e4896..c488477 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -362,9 +362,9 @@ public class ObjectConverter {
 
 		deploymentPolicy.setDeploymentPolicyID(deploymentPolicyBean.getId());
 
-		if (deploymentPolicyBean.getNetworkPartitionBeans() != null) {
+		if (deploymentPolicyBean.getNetworkPartition()!= null) {
 			deploymentPolicy.setNetworkPartitionsRef(convertNetworkPartitionRefToStubNetworkPartitionRef(
-					deploymentPolicyBean.getNetworkPartitionBeans()));
+					deploymentPolicyBean.getNetworkPartition()));
 		}
 
 		return deploymentPolicy;
@@ -561,15 +561,15 @@ public class ObjectConverter {
     }
 
 	public static NetworkPartitionRef[] convertNetworkPartitionRefToStubNetworkPartitionRef(
-			NetworkPartitionRefBean[] networkPartitionBean) {
+			List<NetworkPartitionRefBean> networkPartitionBean) {
 
 		org.apache.stratos.cloud.controller.stub.domain.NetworkPartitionRef[] networkPartition =
-				new NetworkPartitionRef[networkPartitionBean.length];
-		for (int i = 0; i < networkPartitionBean.length; i++) {
+				new NetworkPartitionRef[networkPartitionBean.size()];
+		for (int i=0;i<networkPartitionBean.size();i++) {
 			networkPartition[i] = new NetworkPartitionRef();
-			networkPartition[i].setId(networkPartitionBean[i].getId());
-			networkPartition[i].setPartitionAlgo(networkPartitionBean[i].getPartitionAlgo());
-			networkPartition[i].setPartitions(convertToCCPartitionRefPojos(networkPartitionBean[i].getPartitions()));
+			networkPartition[i].setId(networkPartitionBean.get(i).getId());
+			networkPartition[i].setPartitionAlgo(networkPartitionBean.get(i).getPartitionAlgo());
+			networkPartition[i].setPartitions(convertToCCPartitionRefPojos(networkPartitionBean.get(i).getPartitions()));
 		}
 
 		return networkPartition;

http://git-wip-us.apache.org/repos/asf/stratos/blob/f3c36aa3/samples/applications/single-cartridge/artifacts/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/deployment-policy.json b/samples/applications/single-cartridge/artifacts/deployment-policy.json
index 6667383..d858aed 100644
--- a/samples/applications/single-cartridge/artifacts/deployment-policy.json
+++ b/samples/applications/single-cartridge/artifacts/deployment-policy.json
@@ -1,13 +1,13 @@
 {
-   "id": "deployment-policy-1",
-   "networkPartition":[
+   "id": "deployment-policy-2",
+   "networkPartition": [
       {
-         "id":"network-partition-1",
-         "partitionAlgo":"one-after-another",
-         "partitions":[
+         "id": "network-partition-1",
+         "partitionAlgo": "one-after-another",
+         "partitions": [
             {
-               "id":"partition-1",
-               "max":5
+               "id": "partition-1",
+               "max": 5
             }
          ]
       }