You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/05/26 13:30:45 UTC
[1/3] stratos git commit: Fixed removing network patitions in use
Repository: stratos
Updated Branches:
refs/heads/master eabb22447 -> 3426d775f
Fixed removing network patitions in use
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/27f01783
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/27f01783
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/27f01783
Branch: refs/heads/master
Commit: 27f01783f29317c8ee421bcb95c883f85f21dd78
Parents: eabb224
Author: Pubudu Gunatilaka <pu...@gmail.com>
Authored: Tue May 26 15:37:46 2015 +0530
Committer: Pubudu Gunatilaka <pu...@gmail.com>
Committed: Tue May 26 15:37:46 2015 +0530
----------------------------------------------------------------------
.../rest/endpoint/api/StratosApiV41Utils.java | 23 +++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/27f01783/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 dbcf072..7e17d21 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
@@ -2616,9 +2616,30 @@ public class StratosApiV41Utils {
public static void removeNetworkPartition(String networkPartitionId) throws RestAPIException,
CloudControllerServiceNetworkPartitionNotExistsExceptionException {
try {
+ ApplicationContext[] applicationContexts = AutoscalerServiceClient.getInstance().getApplications();
+ if (applicationContexts != null) {
+ for (ApplicationContext applicationContext : applicationContexts) {
+ if (applicationContext != null) {
+ String[] networkPartitions = AutoscalerServiceClient.getInstance().getApplicationNetworkPartitions(applicationContext.getApplicationId());
+ if (networkPartitions != null) {
+ for (int i = 0; i < networkPartitions.length; i++) {
+ if (networkPartitions[i].equals(networkPartitionId)) {
+ String message = String.format("Cannot remove the network partition %s, since it is used in application %s", networkPartitionId, applicationContext.getApplicationId());
+ log.error(message);
+ throw new RestAPIException(message);
+ }
+ }
+ }
+ }
+ }
+ }
CloudControllerServiceClient serviceClient = CloudControllerServiceClient.getInstance();
serviceClient.removeNetworkPartition(networkPartitionId);
- } catch (RemoteException e) {
+ } catch (AutoscalerServiceAutoScalerExceptionException e) {
+ String message = e.getMessage();
+ log.error(message);
+ throw new RestAPIException(message, e);
+ } catch (RemoteException e) {
String message = e.getMessage();
log.error(message);
throw new RestAPIException(message, e);
[3/3] stratos git commit: minor formating issues fixed
Posted by la...@apache.org.
minor formating issues fixed
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/3426d775
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/3426d775
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/3426d775
Branch: refs/heads/master
Commit: 3426d775f87900e4e8da7834106d45067a8efbd2
Parents: 1977624
Author: Pubudu Gunatilaka <pu...@gmail.com>
Authored: Tue May 26 15:44:17 2015 +0530
Committer: Pubudu Gunatilaka <pu...@gmail.com>
Committed: Tue May 26 15:44:17 2015 +0530
----------------------------------------------------------------------
.../apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/3426d775/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 c177501..99f57a7 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
@@ -2620,11 +2620,14 @@ public class StratosApiV41Utils {
if (applicationContexts != null) {
for (ApplicationContext applicationContext : applicationContexts) {
if (applicationContext != null) {
- String[] networkPartitions = AutoscalerServiceClient.getInstance().getApplicationNetworkPartitions(applicationContext.getApplicationId());
+ String[] networkPartitions = AutoscalerServiceClient.getInstance().
+ getApplicationNetworkPartitions(applicationContext.getApplicationId());
if (networkPartitions != null) {
for (int i = 0; i < networkPartitions.length; i++) {
if (networkPartitions[i].equals(networkPartitionId)) {
- String message = String.format("Cannot remove the network partition %s, since it is used in application %s", networkPartitionId, applicationContext.getApplicationId());
+ String message = String.format("Cannot remove the network partition %s, since" +
+ " it is used in application %s", networkPartitionId,
+ applicationContext.getApplicationId());
log.error(message);
throw new RestAPIException(message);
}
[2/3] stratos git commit: formating changes fixed
Posted by la...@apache.org.
formating changes fixed
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/19776241
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/19776241
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/19776241
Branch: refs/heads/master
Commit: 19776241f1d8f64e7a5589f6882e9018aeae0880
Parents: 27f0178
Author: Pubudu Gunatilaka <pu...@gmail.com>
Authored: Tue May 26 15:42:00 2015 +0530
Committer: Pubudu Gunatilaka <pu...@gmail.com>
Committed: Tue May 26 15:42:00 2015 +0530
----------------------------------------------------------------------
.../rest/endpoint/api/StratosApiV41Utils.java | 26 ++++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/19776241/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 7e17d21..c177501 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
@@ -2618,20 +2618,20 @@ public class StratosApiV41Utils {
try {
ApplicationContext[] applicationContexts = AutoscalerServiceClient.getInstance().getApplications();
if (applicationContexts != null) {
- for (ApplicationContext applicationContext : applicationContexts) {
- if (applicationContext != null) {
- String[] networkPartitions = AutoscalerServiceClient.getInstance().getApplicationNetworkPartitions(applicationContext.getApplicationId());
- if (networkPartitions != null) {
- for (int i = 0; i < networkPartitions.length; i++) {
- if (networkPartitions[i].equals(networkPartitionId)) {
+ for (ApplicationContext applicationContext : applicationContexts) {
+ if (applicationContext != null) {
+ String[] networkPartitions = AutoscalerServiceClient.getInstance().getApplicationNetworkPartitions(applicationContext.getApplicationId());
+ if (networkPartitions != null) {
+ for (int i = 0; i < networkPartitions.length; i++) {
+ if (networkPartitions[i].equals(networkPartitionId)) {
String message = String.format("Cannot remove the network partition %s, since it is used in application %s", networkPartitionId, applicationContext.getApplicationId());
log.error(message);
- throw new RestAPIException(message);
- }
- }
- }
- }
- }
+ throw new RestAPIException(message);
+ }
+ }
+ }
+ }
+ }
}
CloudControllerServiceClient serviceClient = CloudControllerServiceClient.getInstance();
serviceClient.removeNetworkPartition(networkPartitionId);
@@ -2639,7 +2639,7 @@ public class StratosApiV41Utils {
String message = e.getMessage();
log.error(message);
throw new RestAPIException(message, e);
- } catch (RemoteException e) {
+ } catch (RemoteException e) {
String message = e.getMessage();
log.error(message);
throw new RestAPIException(message, e);