You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/05/21 10:58:48 UTC
[01/15] stratos git commit: Validate whether application policy is
used before removing
Repository: stratos
Updated Branches:
refs/heads/master a4a55f08f -> ef8ed14d4
Validate whether application policy is used before removing
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e6566f3b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e6566f3b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e6566f3b
Branch: refs/heads/master
Commit: e6566f3b7562dbaa7ee442745b72ad511f64ccff
Parents: 6cbe1e3
Author: anuruddhal <an...@gmail.com>
Authored: Tue May 19 19:58:09 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Tue May 19 19:58:09 2015 +0530
----------------------------------------------------------------------
.../services/impl/AutoscalerServiceImpl.java | 25 ++++++++++++++++----
.../common/client/AutoscalerServiceClient.java | 4 ++--
.../rest/endpoint/api/StratosApiV41.java | 5 ++++
.../rest/endpoint/api/StratosApiV41Utils.java | 3 ++-
4 files changed, 29 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e6566f3b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
index 8edf8e0..8c553e1 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
@@ -808,7 +808,7 @@ public class AutoscalerServiceImpl implements AutoscalerService {
@Override
public boolean addApplicationPolicy(ApplicationPolicy applicationPolicy)
- throws RemoteException, InvalidApplicationPolicyException,ApplicationPolicyAlreadyExistsException {
+ throws RemoteException, InvalidApplicationPolicyException, ApplicationPolicyAlreadyExistsException {
// validating application policy
AutoscalerUtil.validateApplicationPolicy(applicationPolicy);
@@ -838,8 +838,23 @@ public class AutoscalerServiceImpl implements AutoscalerService {
}
@Override
- public boolean removeApplicationPolicy(String applicationPolicyId) throws InvalidPolicyException {
- PolicyManager.getInstance().removeApplicationPolicy(applicationPolicyId);
+ public boolean removeApplicationPolicy(String applicationPolicyId) throws InvalidPolicyException, UnremovablePolicyException {
+
+ if (removableApplicationPolicy(applicationPolicyId)) {
+ return PolicyManager.getInstance().removeApplicationPolicy(applicationPolicyId);
+ } else {
+ throw new UnremovablePolicyException("This application policy cannot be removed, since it is used in " +
+ "applications.");
+ }
+ }
+
+ private boolean removableApplicationPolicy(String applicationPolicyId) {
+
+ for (Application application : ApplicationHolder.getApplications().getApplications().values()) {
+ if (applicationPolicyId.equals(application.getApplicationPolicyId())) {
+ return false;
+ }
+ }
return true;
}
@@ -978,7 +993,7 @@ public class AutoscalerServiceImpl implements AutoscalerService {
// deployment policy should contain at least one network partition reference
if (null == deploymentPolicy.getNetworkPartitionRefs() || deploymentPolicy.getNetworkPartitionRefs().length == 0) {
String msg = String.format("Deployment policy does not have any network partition references: " +
- "[deployment-policy-id] %s", deploymentPolicyId);
+ "[deployment-policy-id] %s", deploymentPolicyId);
log.error(msg);
throw new InvalidDeploymentPolicyException(msg);
}
@@ -999,7 +1014,7 @@ public class AutoscalerServiceImpl implements AutoscalerService {
.getNetworkPartition(networkPartitionId);
if (networkPartition == null) {
String msg = String.format("Network partition is not found: [deployment-policy-id] %s " +
- "[network-partition-id] %s", deploymentPolicyId, networkPartitionId);
+ "[network-partition-id] %s", deploymentPolicyId, networkPartitionId);
log.error(msg);
throw new InvalidDeploymentPolicyException(msg);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e6566f3b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
index f6a97e7..26a0824 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
@@ -119,7 +119,7 @@ public class AutoscalerServiceClient {
public void addApplicationPolicy(ApplicationPolicy applicationPolicy)
throws RemoteException,
- AutoscalerServiceRemoteExceptionException, AutoscalerServiceInvalidApplicationPolicyExceptionException,AutoscalerServiceApplicationPolicyAlreadyExistsExceptionException {
+ AutoscalerServiceRemoteExceptionException, AutoscalerServiceInvalidApplicationPolicyExceptionException, AutoscalerServiceApplicationPolicyAlreadyExistsExceptionException {
stub.addApplicationPolicy(applicationPolicy);
}
@@ -138,7 +138,7 @@ public class AutoscalerServiceClient {
}
public void removeApplicationPolicy(String applicationPolicyId)
- throws RemoteException, AutoscalerServiceInvalidPolicyExceptionException {
+ throws RemoteException, AutoscalerServiceInvalidPolicyExceptionException, AutoscalerServiceUnremovablePolicyExceptionException {
stub.removeApplicationPolicy(applicationPolicyId);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e6566f3b/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 5cbf30a..d4917d4 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
@@ -920,6 +920,11 @@ public class StratosApiV41 extends AbstractApi {
return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
ResponseMessageBean.ERROR, backendErrorMessage))
.build();
+ } catch (AutoscalerServiceUnremovablePolicyExceptionException e) {
+ return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
+ ResponseMessageBean.ERROR, "This application policy cannot be removed, since it is used in an " +
+ "application"))
+ .build();
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e6566f3b/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 35d2668..9b43144 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
@@ -25,6 +25,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.autoscaler.stub.*;
import org.apache.stratos.autoscaler.stub.deployment.policy.ApplicationPolicy;
+import org.apache.stratos.autoscaler.stub.exception.UnremovablePolicyException;
import org.apache.stratos.autoscaler.stub.pojo.ApplicationContext;
import org.apache.stratos.autoscaler.stub.pojo.ServiceGroup;
import org.apache.stratos.cloud.controller.stub.*;
@@ -775,7 +776,7 @@ public class StratosApiV41Utils {
* @throws RestAPIException
*/
public static void removeApplicationPolicy(String applicationPolicyId) throws RestAPIException,
- AutoscalerServiceInvalidPolicyExceptionException {
+ AutoscalerServiceInvalidPolicyExceptionException, AutoscalerServiceUnremovablePolicyExceptionException {
if (applicationPolicyId == null) {
String msg = "Application policy bean id null";
[03/15] stratos git commit: Merge remote-tracking branch
'upstream/master'
Posted by re...@apache.org.
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7e8c3df2
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7e8c3df2
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7e8c3df2
Branch: refs/heads/master
Commit: 7e8c3df2e31a4d651946333ad97f8dfc3139c5ba
Parents: ddc24cd ec53ed6
Author: anuruddhal <an...@gmail.com>
Authored: Tue May 19 20:28:41 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Tue May 19 20:28:41 2015 +0530
----------------------------------------------------------------------
.../autoscaler/context/cluster/ClusterContext.java | 12 ++++--------
.../context/cluster/ClusterContextFactory.java | 4 ++--
2 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[13/15] stratos git commit: Removing un-supported alogrithm from UI
Posted by re...@apache.org.
Removing un-supported alogrithm from UI
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c1ceb709
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c1ceb709
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c1ceb709
Branch: refs/heads/master
Commit: c1ceb7096112bbe53452c950acfe3f6cbaaebdff
Parents: bb1dda3
Author: anuruddhal <an...@gmail.com>
Authored: Thu May 21 10:35:09 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Thu May 21 10:35:09 2015 +0530
----------------------------------------------------------------------
.../controllers/forms/schema/configure/application-policies.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c1ceb709/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json
index b5297e0..ef1029c 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json
@@ -20,7 +20,7 @@
"type": "string",
"title": "Application Policy Algorithm ",
"name": "Application Policy Algorithm",
- "enum": ["one-after-another","all-at-once","weighted-one-after-another"],
+ "enum": ["one-after-another","all-at-once"],
},
"networkPartitions": {
"id": "root/networkPartitions",
[02/15] stratos git commit: Merge branch 'apllication_policy_removal'
Posted by re...@apache.org.
Merge branch 'apllication_policy_removal'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ddc24cd9
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ddc24cd9
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ddc24cd9
Branch: refs/heads/master
Commit: ddc24cd9a3700ba8fe1e99254d8765309af1883f
Parents: 9062fc8 e6566f3
Author: anuruddhal <an...@gmail.com>
Authored: Tue May 19 20:01:05 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Tue May 19 20:01:05 2015 +0530
----------------------------------------------------------------------
.../services/impl/AutoscalerServiceImpl.java | 25 ++++++++++++++++----
.../common/client/AutoscalerServiceClient.java | 4 ++--
.../rest/endpoint/api/StratosApiV41.java | 5 ++++
.../rest/endpoint/api/StratosApiV41Utils.java | 3 ++-
4 files changed, 29 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ddc24cd9/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ddc24cd9/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ddc24cd9/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ddc24cd9/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
[12/15] stratos git commit: Merge remote-tracking branch
'upstream/master'
Posted by re...@apache.org.
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bb1dda30
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bb1dda30
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bb1dda30
Branch: refs/heads/master
Commit: bb1dda301f4c561d999a229561dfccb4aadd9eef
Parents: f6e05d4 a28acec
Author: anuruddhal <an...@gmail.com>
Authored: Thu May 21 09:42:02 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Thu May 21 09:42:02 2015 +0530
----------------------------------------------------------------------
.../services/impl/AutoscalerServiceImpl.java | 25 +-
.../stratos/autoscaler/util/AutoscalerUtil.java | 31 +-
.../stratos/cli/RestCommandLineService.java | 13 +
.../apache/stratos/cli/StratosApplication.java | 3 +
.../cli/commands/UpdateApplicationCommand.java | 125 ++++
.../controller/domain/InstanceMetadata.java | 9 +
.../iaases/kubernetes/KubernetesIaas.java | 31 +-
.../kubernetes/client/KubernetesApiClient.java | 13 +-
.../KubernetesAPIClientInterface.java | 12 +-
.../kubernetes/client/model/Container.java | 33 +-
.../client/live/AbstractLiveTest.java | 4 +-
.../live/KubernetesApiClientLiveTest.java | 8 +-
products/stratos/modules/integration/pom.xml | 12 -
.../application-policy-1.json | 6 +-
.../application-policy-2.json | 6 +-
.../application-policy-3.json | 6 +-
.../application-policy-4.json | 6 +-
.../application-policy-5.json | 6 +-
.../artifacts/application.json | 11 +-
.../wordpress-app/artifacts/application.json | 10 +-
.../artifacts/application.json | 60 +-
.../artifacts/application.json | 166 ++---
.../artifacts/application.json | 354 +++++------
.../artifacts/application.json | 36 +-
.../artifacts/application.json | 58 +-
.../artifacts/deployment-policy.json | 26 +-
.../artifacts/application-signup.json | 32 +-
.../artifacts/application.json | 42 +-
.../artifacts/domain-mappings.json | 6 +-
.../artifacts/application.json | 26 +-
.../sample-groups/artifacts/application.json | 40 +-
.../artifacts/application.json | 46 +-
.../group-scaling-v1/artifacts/application.json | 22 +-
.../artifacts/application.json | 12 +-
.../artifacts/application-signup.json | 32 +-
.../artifacts/domain-mappings.json | 6 +-
.../scripts/kubernetes/deploy.sh | 2 +-
.../scripts/kubernetes/undeploy.sh | 2 +-
.../autoscaling-policy-1.json | 22 +-
samples/cartridge-groups/db-group.json | 20 +-
samples/cartridge-groups/esb-php-group.json | 2 +-
...sted-with-esb-php-nested-with-mysql-php.json | 18 +-
samples/cartridge-groups/group1.json | 4 +-
samples/cartridge-groups/group1b.json | 2 +-
samples/cartridge-groups/group6c3.json | 2 +-
samples/cartridge-groups/group6c6.json | 2 +-
samples/cartridge-groups/group6c7.json | 8 +-
samples/cartridge-groups/n-level-nesting.json | 68 +-
samples/cartridge-groups/tomcat-group.json | 2 +-
samples/cartridges/ec2/c1.json | 1 -
samples/cartridges/ec2/c2.json | 1 -
samples/cartridges/ec2/c3.json | 1 -
samples/cartridges/ec2/c4.json | 1 -
samples/cartridges/ec2/esb.json | 1 -
samples/cartridges/ec2/php.json | 1 -
samples/cartridges/ec2/tomcat.json | 1 -
samples/cartridges/ec2/tomcat1.json | 1 -
samples/cartridges/ec2/tomcat2.json | 1 -
samples/cartridges/kubernetes/c1.json | 1 -
samples/cartridges/kubernetes/c2.json | 1 -
samples/cartridges/kubernetes/c3.json | 1 -
samples/cartridges/kubernetes/c4.json | 1 -
samples/cartridges/kubernetes/esb.json | 20 +-
samples/cartridges/kubernetes/php.json | 34 +-
samples/cartridges/kubernetes/tomcat.json | 16 +-
samples/cartridges/kubernetes/tomcat1.json | 20 +-
samples/cartridges/kubernetes/tomcat2.json | 20 +-
samples/cartridges/kubernetes/tomcat3.json | 14 +-
samples/cartridges/kubernetes/wso2-is.json | 10 +-
samples/cartridges/mock/c1.json | 1 -
samples/cartridges/mock/c2.json | 1 -
samples/cartridges/mock/c3.json | 1 -
samples/cartridges/mock/c4.json | 1 -
samples/cartridges/mock/esb.json | 7 +-
samples/cartridges/mock/mysql.json | 7 +-
samples/cartridges/mock/postgres.json | 7 +-
samples/cartridges/mock/stratos-lb.json | 6 +-
samples/cartridges/mock/tomcat.json | 5 +-
samples/cartridges/mock/tomcat2.json | 5 +-
samples/cartridges/mock/tomcat3.json | 14 +-
samples/cartridges/mock/wso2-is.json | 10 +-
samples/cartridges/openstack/tomcat.json | 39 +-
samples/cartridges/openstack/tomcat1.json | 35 +-
samples/cartridges/openstack/tomcat2.json | 35 +-
.../deployment-policy-1.json | 26 +-
.../deployment-policy-2.json | 54 +-
.../deployment-policy-3.json | 26 +-
.../deployment-policy-4.json | 94 +--
.../kubernetes/network-partition-2.json | 2 +-
.../src/main/resources/AutoscalerService.wsdl | 634 +++++++++----------
90 files changed, 1430 insertions(+), 1215 deletions(-)
----------------------------------------------------------------------
[08/15] stratos git commit: Merge remote-tracking branch
'upstream/master'
Posted by re...@apache.org.
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/947b02ed
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/947b02ed
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/947b02ed
Branch: refs/heads/master
Commit: 947b02edc7f9ec842d3cf64aa780f9c112b6d0bf
Parents: 83ae70f 0e2bbd6
Author: anuruddhal <an...@gmail.com>
Authored: Wed May 20 18:28:54 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Wed May 20 18:28:54 2015 +0530
----------------------------------------------------------------------
.../applications/parser/ApplicationParser.java | 4 +-
.../parser/DefaultApplicationParser.java | 38 +-
.../CartridgeGroupNotFoundException.java | 17 +-
.../exception/CartridgeNotFoundException.java | 37 ++
.../autoscaler/services/AutoscalerService.java | 8 +-
.../services/impl/AutoscalerServiceImpl.java | 7 +-
.../stratos/cli/RestCommandLineService.java | 24 +-
.../common/client/AutoscalerServiceClient.java | 8 +-
.../console/configure_form.jag | 34 +-
.../configure/configure_requests.jag | 32 +-
.../default/configure/application-policies.json | 17 +
.../default/configure/applicationpolicies.json | 17 -
.../default/configure/autoscaling-policies.json | 15 +
.../default/configure/autoscalingpolicies.json | 15 -
.../default/configure/cartridge-groups.json | 9 +
.../default/configure/cartridgegroups.json | 9 -
.../default/configure/deployment-policies.json | 15 +
.../default/configure/deploymentpolicies.json | 15 -
.../forms/default/configure/docker.json | 68 ---
.../default/configure/kubernetes-clusters.json | 68 +++
.../default/configure/network-partitions.json | 17 +
.../default/configure/networkpartitions.json | 17 -
.../schema/configure/application-policies.json | 86 +++
.../schema/configure/applicationpolicies.json | 86 ---
.../schema/configure/autoscaling-policies.json | 118 +++++
.../schema/configure/autoscalingpolicies.json | 118 -----
.../schema/configure/cartridge-groups.json | 46 ++
.../forms/schema/configure/cartridgegroups.json | 46 --
.../schema/configure/deployment-policies.json | 71 +++
.../schema/configure/deploymentpolicies.json | 71 ---
.../forms/schema/configure/docker.json | 411 ---------------
.../schema/configure/kubernetes-clusters.json | 411 +++++++++++++++
.../schema/configure/network-partitions.json | 94 ++++
.../schema/configure/networkpartitions.json | 94 ----
.../console/controllers/menu/menu.json | 14 +-
.../controllers/wizard/wizard_requests.jag | 4 +-
.../theme0/js/custom/applications-editor.js | 2 +-
.../js/custom/applications_group_editor.js | 2 +-
.../themes/theme0/partials/configure_form.hbs | 76 +--
.../console/themes/theme0/partials/wizard.hbs | 2 +-
.../console/wizard.jag | 8 +-
.../rest/endpoint/api/StratosApiV41.java | 39 +-
.../rest/endpoint/api/StratosApiV41Utils.java | 4 +-
.../artifacts/application.json | 2 +-
.../kubernetes-cluster-2.json | 60 +++
.../kubernetes/network-partition-1.json | 2 +-
.../src/main/resources/AutoscalerService.wsdl | 527 +++++++++++--------
47 files changed, 1545 insertions(+), 1340 deletions(-)
----------------------------------------------------------------------
[09/15] stratos git commit: Merge remote-tracking branch
'upstream/master'
Posted by re...@apache.org.
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/10d5257b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/10d5257b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/10d5257b
Branch: refs/heads/master
Commit: 10d5257bfa2de0580b492399a4cdde4af3d7630a
Parents: 947b02e 3b03ba9
Author: anuruddhal <an...@gmail.com>
Authored: Wed May 20 19:57:01 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Wed May 20 19:57:01 2015 +0530
----------------------------------------------------------------------
.../stratos/cli/RestCommandLineService.java | 14 +-
.../console/configure_form.jag | 6 +
.../default/configure/kubernetes-clusters.json | 22 +-
.../forms/schema/configure/cartridges.json | 340 ++++--------------
.../schema/configure/kubernetes-clusters.json | 347 +++++--------------
.../console/controllers/menu/menu.json | 2 +-
.../theme0/partials/applications_form.hbs | 2 +-
.../themes/theme0/partials/configure_form.hbs | 10 +-
.../src/main/webapp/api/WEB-INF/cxf-servlet.xml | 3 +-
9 files changed, 176 insertions(+), 570 deletions(-)
----------------------------------------------------------------------
[14/15] stratos git commit: Merge branch 'list-cartridge-groups' of
https://github.com/anuruddhal/stratos
Posted by re...@apache.org.
Merge branch 'list-cartridge-groups' of https://github.com/anuruddhal/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/de172535
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/de172535
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/de172535
Branch: refs/heads/master
Commit: de172535c0925b1c9c3d31a33e95dfad95e1e7b8
Parents: a4a55f0 26ef7fc
Author: reka <rt...@gmail.com>
Authored: Thu May 21 14:26:55 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu May 21 14:26:55 2015 +0530
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/15] stratos git commit: Merge remote-tracking branch
'upstream/master'
Posted by re...@apache.org.
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/94235223
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/94235223
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/94235223
Branch: refs/heads/master
Commit: 94235223544ec30f555419f509f52e7ad1e9b78a
Parents: 7e8c3df bb54544
Author: anuruddhal <an...@gmail.com>
Authored: Tue May 19 21:33:49 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Tue May 19 21:33:49 2015 +0530
----------------------------------------------------------------------
.../applications/ApplicationUtils.java | 4 +--
...ApplicationPolicyAlreadyExistsException.java | 3 +--
.../monitor/component/ApplicationMonitor.java | 2 +-
.../monitor/component/GroupMonitor.java | 14 +++++------
.../autoscaler/services/AutoscalerService.java | 2 +-
.../cloud/controller/domain/Partition.java | 2 +-
.../openstack/networking/NovaNetworkingApi.java | 2 +-
.../impl/CloudControllerServiceImpl.java | 3 +--
.../NetworkPartitionReferenceBean.java | 2 --
.../publisher/wso2/cep/ThriftClientConfig.java | 2 +-
.../balancer/conf/structure/NodeBuilder.java | 26 ++++++++++----------
.../console/themes/theme0/css/custom.css | 4 +++
.../themes/theme0/partials/login_body.hbs | 2 +-
.../util/converter/ObjectConverter.java | 14 +++++------
14 files changed, 41 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
[06/15] stratos git commit: Merge remote-tracking branch
'upstream/master'
Posted by re...@apache.org.
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/83ae70f8
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/83ae70f8
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/83ae70f8
Branch: refs/heads/master
Commit: 83ae70f869142ef70eb9503269e7ab183b97ef36
Parents: 226324e 1e7e300
Author: anuruddhal <an...@gmail.com>
Authored: Wed May 20 09:24:06 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Wed May 20 09:24:06 2015 +0530
----------------------------------------------------------------------
README.md | 49 ++++++------
.../src/main/resources/META-INF/component.xml | 2 +-
.../stratos/cli/RestCommandLineService.java | 13 +---
.../src/main/resources/META-INF/component.xml | 36 ++++-----
.../console/controllers/menu/menu.json | 26 +++----
.../manager/utils/PermissionConstants.java | 73 +++++++++++++-----
.../stratos/manager/utils/UserRoleCreator.java | 32 +++-----
.../src/main/resources/META-INF/component.xml | 50 ++++++------
.../rest/endpoint/api/StratosApiV41.java | 80 ++++++++++----------
.../rest/endpoint/api/StratosApiV41Utils.java | 14 +++-
10 files changed, 200 insertions(+), 175 deletions(-)
----------------------------------------------------------------------
[15/15] stratos git commit: Merge branch 'application_ploicy_update'
of https://github.com/anuruddhal/stratos
Posted by re...@apache.org.
Merge branch 'application_ploicy_update' of https://github.com/anuruddhal/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ef8ed14d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ef8ed14d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ef8ed14d
Branch: refs/heads/master
Commit: ef8ed14d432ff3e0294c9412ca8eb86babec3399
Parents: de17253 c1ceb70
Author: reka <rt...@gmail.com>
Authored: Thu May 21 14:27:31 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu May 21 14:27:31 2015 +0530
----------------------------------------------------------------------
.../controllers/forms/schema/configure/application-policies.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ef8ed14d/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json
----------------------------------------------------------------------
[07/15] stratos git commit: Fixing issues with describe cartridges in
CLI
Posted by re...@apache.org.
Fixing issues with describe cartridges in CLI
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/26ef7fc9
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/26ef7fc9
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/26ef7fc9
Branch: refs/heads/master
Commit: 26ef7fc92909e8fc780c683d3dfbba7b011ef8b6
Parents: 83ae70f
Author: anuruddhal <an...@gmail.com>
Authored: Wed May 20 11:55:33 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Wed May 20 11:55:33 2015 +0530
----------------------------------------------------------------------
.../apache/stratos/cli/RestCommandLineService.java | 14 ++++++--------
.../src/main/webapp/api/WEB-INF/cxf-servlet.xml | 3 ++-
2 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/26ef7fc9/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
index 01bc45d..64da292 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
@@ -379,7 +379,7 @@ public class RestCommandLineService {
listType, "Cartridge Groups");
if ((cartridgeGroupList == null) || (cartridgeGroupList.size() == 0)) {
- System.out.println("No cartridges found");
+ System.out.println("No cartridge groups found");
return;
}
@@ -444,22 +444,20 @@ public class RestCommandLineService {
if (cartridge.getIaasProvider() != null) {
RowMapper<IaasProviderBean> cartridgeMapper = new RowMapper<IaasProviderBean>() {
public String[] getData(IaasProviderBean row) {
- String[] data = new String[4];
- data[0] = row.getProvider();
- data[1] = row.getType();
- data[2] = row.getName();
- data[3] = row.getImageId();
+ String[] data = new String[2];
+ data[0] = row.getType();
+ data[1] = row.getImageId();
return data;
}
};
- IaasProviderBean[] iaasProviders = new IaasProviderBean[cartridgeList.size()];
+ IaasProviderBean[] iaasProviders = new IaasProviderBean[cartridge.getIaasProvider().size()];
iaasProviders = cartridge.getIaasProvider().toArray(iaasProviders);
System.out.println("-------------------------------------");
System.out.println("IaaS Providers: ");
System.out.println("-------------------------------------");
- CliUtils.printTable(iaasProviders, cartridgeMapper, "Provider", "Type", "Name", "Image ID");
+ CliUtils.printTable(iaasProviders, cartridgeMapper, "Type", "Image ID");
}
System.out.println("-------------------------------------");
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/26ef7fc9/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
index f2972a1..f22eb1d 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
+++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
@@ -117,7 +117,7 @@
<value>property</value>
<value>hostNames</value>
<value>memberMap</value>
- <value>portMap</value>
+ <value>portMapping</value>
<value>partitionGroup</value>
<value>partition</value>
<value>member</value>
@@ -147,6 +147,7 @@
<value>metadataKeys</value>
<value>networkInterfaces</value>
<value>iaasProvider</value>
+ <value>floatingNetworks</value>
</list>
</property>
</bean>
[10/15] stratos git commit: Merge remote-tracking branch
'upstream/master'
Posted by re...@apache.org.
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9a12c8bb
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9a12c8bb
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9a12c8bb
Branch: refs/heads/master
Commit: 9a12c8bb0c84235cf308c726c866949e00ed7ae3
Parents: 10d5257 7ee7ecf
Author: anuruddhal <an...@gmail.com>
Authored: Wed May 20 20:56:53 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Wed May 20 20:56:53 2015 +0530
----------------------------------------------------------------------
.../src/main/resources/META-INF/component.xml | 51 ++--
.../src/main/resources/META-INF/component.xml | 73 +++--
.../console/controllers/menu/menu.json | 156 +++++++++-
.../manager/utils/PermissionConstants.java | 82 ++---
.../stratos/manager/utils/UserRoleCreator.java | 2 +-
.../src/main/resources/META-INF/component.xml | 111 ++-----
.../rest/endpoint/api/AuthenticationApi.java | 2 -
.../rest/endpoint/api/StratosApiV41.java | 306 +++++++++----------
.../distribution/src/main/conf/autoscaler.xml | 5 +
tools/stratos-installer/conf/setup.conf | 3 +
tools/stratos-installer/mock_iaas.sh | 62 ++++
tools/stratos-installer/setup.sh | 2 +
.../templates/cloud-controller.xml | 7 +
13 files changed, 496 insertions(+), 366 deletions(-)
----------------------------------------------------------------------
[11/15] stratos git commit: Merge remote-tracking branch
'upstream/master'
Posted by re...@apache.org.
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f6e05d4c
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f6e05d4c
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f6e05d4c
Branch: refs/heads/master
Commit: f6e05d4c75adf35bf51c02a8d9e4c4865c52aed1
Parents: 9a12c8b 5dc54d5
Author: anuruddhal <an...@gmail.com>
Authored: Wed May 20 23:15:23 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Wed May 20 23:15:23 2015 +0530
----------------------------------------------------------------------
.../stratos/rest/endpoint/api/StratosApiV41.java | 19 +++++++++++++++----
.../rest/endpoint/api/StratosApiV41Utils.java | 11 +++--------
2 files changed, 18 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
[05/15] stratos git commit: Fixing list cartridges issue in CLI
Posted by re...@apache.org.
Fixing list cartridges issue in CLI
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/226324e4
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/226324e4
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/226324e4
Branch: refs/heads/master
Commit: 226324e45382ed2cd7bc9a595971c8e2f3861d55
Parents: 9423522
Author: anuruddhal <an...@gmail.com>
Authored: Tue May 19 23:34:17 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Tue May 19 23:34:17 2015 +0530
----------------------------------------------------------------------
.../src/main/webapp/api/WEB-INF/cxf-servlet.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/226324e4/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
index 39faa64..f2972a1 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
+++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
@@ -145,6 +145,8 @@
<value>publicIPs</value>
<value>ports</value>
<value>metadataKeys</value>
+ <value>networkInterfaces</value>
+ <value>iaasProvider</value>
</list>
</property>
</bean>