Repository: stratos Updated Branches: refs/heads/tenant-isolation ea45f6cf7 -> ca0333bb2
Fix issues in updating a network partition and a deployment policy Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b751ddd2 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b751ddd2 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b751ddd2 Branch: refs/heads/tenant-isolation Commit: b751ddd2b9c332a4df4c4c1b5db00612b9dc6bb9 Parents: ea182b4 Author: Dinithi <[email protected]> Authored: Mon Jul 20 10:07:57 2015 +0530 Committer: Dinithi <[email protected]> Committed: Mon Jul 20 10:07:57 2015 +0530 ---------------------------------------------------------------------- .../services/impl/CloudControllerServiceImpl.java | 2 +- .../apache/stratos/rest/endpoint/api/StratosApiV41.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/b751ddd2/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 d4c7b13..0aee888 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 @@ -1644,7 +1644,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { String networkPartitionId = networkPartition.getId(); String networkPartitionUuid = networkPartition.getUuid(); - if (cloudControllerContext.getNetworkPartition(networkPartitionId) == null) { + if (cloudControllerContext.getNetworkPartition(networkPartitionUuid) == null) { String message = String.format("Network partition not found: [network-partition-uuid] %s " + "[network-partition-id] %s", networkPartitionUuid, networkPartitionId); log.error(message); http://git-wip-us.apache.org/repos/asf/stratos/blob/b751ddd2/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 6aa89ea..7cce069 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 @@ -741,7 +741,8 @@ public class StratosApiV41 extends AbstractApi { ResponseMessageBean.ERROR, "Network partition not found")).build(); } return Response.ok().entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, - String.format("Network Partition updated successfully: [network-partition] %s", + String.format("Network Partition updated successfully: [network-partition-uuid] %s " + + "[network-partition-id] %s", networkPartition.getUuid(), networkPartition.getId()))).build(); } @@ -757,17 +758,16 @@ public class StratosApiV41 extends AbstractApi { @AuthorizationAction("/permission/admin/stratos/networkPartitions/manage") public Response removeNetworkPartition( @PathParam("networkPartitionId") String networkPartitionId) throws RestAPIException { - + PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); try { - PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); StratosApiV41Utils.removeNetworkPartition(networkPartitionId, carbonContext.getTenantId()); } catch (CloudControllerServiceNetworkPartitionNotExistsExceptionException e) { return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean( ResponseMessageBean.ERROR, "Network partition is not found")).build(); } return Response.ok().entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, - String.format("Network partition deleted successfully: [network-partition] %s", - networkPartitionId))).build(); + String.format("Network partition deleted successfully: [network-partition-id] %s " + + "[tenant-domain] %s", networkPartitionId, carbonContext.getTenantDomain()))).build(); } // API methods for applications
