Modifying log messages to display uuid
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/abff10ef Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/abff10ef Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/abff10ef Branch: refs/heads/tenant-isolation Commit: abff10efa154a7bf6dc641694a0d6e25bb1f7bf7 Parents: 9002585 Author: Dinithi <[email protected]> Authored: Mon Jun 29 13:12:09 2015 +0530 Committer: Dinithi <[email protected]> Committed: Mon Jun 29 13:12:09 2015 +0530 ---------------------------------------------------------------------- .../common/client/AutoscalerServiceClient.java | 8 ++-- .../rest/endpoint/api/StratosApiV41.java | 28 +++++++------- .../rest/endpoint/api/StratosApiV41Utils.java | 39 ++++++++++++-------- 3 files changed, 42 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/abff10ef/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 5d6bf16..dcd50ca 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 @@ -220,14 +220,14 @@ public class AutoscalerServiceClient { stub.updateDeploymentPolicy(deploymentPolicy); } - public void removeDeploymentPolicy(String deploymentPolicyID) throws RemoteException, + public void removeDeploymentPolicy(String deploymentPolicyId) throws RemoteException, AutoscalerServiceDeploymentPolicyNotExistsExceptionException, AutoscalerServiceUnremovablePolicyExceptionException { - stub.removeDeployementPolicy(deploymentPolicyID); + stub.removeDeployementPolicy(deploymentPolicyId); } - public DeploymentPolicy getDeploymentPolicy(String deploymentPolicyID) throws RemoteException { - return stub.getDeploymentPolicy(deploymentPolicyID); + public DeploymentPolicy getDeploymentPolicy(String deploymentPolicyId) throws RemoteException { + return stub.getDeploymentPolicy(deploymentPolicyId); } public DeploymentPolicy[] getDeploymentPolicies() throws RemoteException { http://git-wip-us.apache.org/repos/asf/stratos/blob/abff10ef/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 40f193f..8e04ec6 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 @@ -132,8 +132,9 @@ public class StratosApiV41 extends AbstractApi { public Response addDeploymentPolicy( DeploymentPolicyBean deploymentPolicyDefinitionBean) throws RestAPIException { - String deploymentPolicyID = deploymentPolicyDefinitionBean.getId(); + String deploymentPolicyId = deploymentPolicyDefinitionBean.getId(); deploymentPolicyDefinitionBean.setUuid(UUID.randomUUID().toString()); + String deploymentPolicyUuid = deploymentPolicyDefinitionBean.getUuid(); PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); deploymentPolicyDefinitionBean.setTenantId(carbonContext.getTenantId()); @@ -147,10 +148,10 @@ public class StratosApiV41 extends AbstractApi { return Response.status(Response.Status.CONFLICT).entity(new ResponseMessageBean( ResponseMessageBean.ERROR, "Deployment policy already exists")).build(); } - URI url = uriInfo.getAbsolutePathBuilder().path(deploymentPolicyID).build(); + URI url = uriInfo.getAbsolutePathBuilder().path(deploymentPolicyId).build(); return Response.created(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, - String.format("Deployment policy added successfully: " + "[deployment-policy-id] %s", - deploymentPolicyID))).build(); + String.format("Deployment policy added successfully: [deployment-policy-uuid] %s " + + "[deployment-policy-uuid] %s", deploymentPolicyUuid, deploymentPolicyId))).build(); } /** @@ -166,7 +167,7 @@ public class StratosApiV41 extends AbstractApi { @AuthorizationAction("/permission/admin/stratos/deploymentPolicies/view") public Response getDeploymentPolicy( @PathParam("deploymentPolicyId") String deploymentPolicyId) throws RestAPIException { - DeploymentPolicyBean deploymentPolicyBean = StratosApiV41Utils.getDeployementPolicy(deploymentPolicyId); + DeploymentPolicyBean deploymentPolicyBean = StratosApiV41Utils.getDeploymentPolicy(deploymentPolicyId); if (deploymentPolicyBean == null) { return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean( ResponseMessageBean.ERROR, "Deployment policy not found")).build(); @@ -187,7 +188,7 @@ public class StratosApiV41 extends AbstractApi { @AuthorizationAction("/permission/admin/stratos/deploymentPolicies/view") public Response getDeploymentPolicies() throws RestAPIException { - DeploymentPolicyBean[] deploymentPolicies = StratosApiV41Utils.getDeployementPolicies(); + DeploymentPolicyBean[] deploymentPolicies = StratosApiV41Utils.getDeploymentPolicies(); if (deploymentPolicies == null || deploymentPolicies.length == 0) { return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean( ResponseMessageBean.ERROR, "No deployment policies found")).build(); @@ -211,7 +212,8 @@ public class StratosApiV41 extends AbstractApi { public Response updateDeploymentPolicy( DeploymentPolicyBean deploymentPolicyDefinitionBean) throws RestAPIException { - String deploymentPolicyID = deploymentPolicyDefinitionBean.getId(); + String deploymentPolicyId = deploymentPolicyDefinitionBean.getId(); + String deploymentPolicyUuid = deploymentPolicyDefinitionBean.getUuid(); // TODO :: Deployment policy validation try { @@ -230,10 +232,10 @@ public class StratosApiV41 extends AbstractApi { return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean( ResponseMessageBean.ERROR, "Deployment policy not found")).build(); } - URI url = uriInfo.getAbsolutePathBuilder().path(deploymentPolicyID).build(); + URI url = uriInfo.getAbsolutePathBuilder().path(deploymentPolicyId).build(); return Response.ok(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, - String.format("Deployment policy updated successfully: " + "[deployment-policy-id] %s", - deploymentPolicyID))).build(); + String.format("Deployment policy updated successfully: [deployment-policy-uuid] %s " + + "[deployment-policy-id] %s", deploymentPolicyUuid, deploymentPolicyId))).build(); } /** @@ -261,7 +263,7 @@ public class StratosApiV41 extends AbstractApi { } URI url = uriInfo.getAbsolutePathBuilder().path(deploymentPolicyId).build(); return Response.ok(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, - String.format("Deployment policy removed successfully: " + "[deployment-policy-id] %s", + String.format("Deployment policy removed successfully: [deployment-policy-id] %s", deploymentPolicyId))).build(); } @@ -637,8 +639,8 @@ public class StratosApiV41 extends AbstractApi { } URI url = uriInfo.getAbsolutePathBuilder().path(networkPartitionId).build(); return Response.created(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, - String.format("Network partition added successfully: [network-partition-uuid] %s", networkPartitionId))) - .build(); + String.format("Network partition added successfully: [network-partition-uuid] %s " + + "[network-partition-uuid] %s", networkPartitionBean.getUuid(), networkPartitionId))).build(); } /** http://git-wip-us.apache.org/repos/asf/stratos/blob/abff10ef/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 9bcaafa..6596bf8 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 @@ -2841,26 +2841,27 @@ public class StratosApiV41Utils { /** * Add deployment policy * - * @param deployementPolicyDefinitionBean DeploymentPolicyBean + * @param deploymentPolicyDefinitionBean DeploymentPolicyBean */ - public static void addDeploymentPolicy(DeploymentPolicyBean deployementPolicyDefinitionBean) + public static void addDeploymentPolicy(DeploymentPolicyBean deploymentPolicyDefinitionBean) throws RestAPIException, AutoscalerServiceDeploymentPolicyAlreadyExistsExceptionException, AutoscalerServiceInvalidDeploymentPolicyExceptionException { try { if (log.isDebugEnabled()) { log.debug(String.format("Adding deployment policy: [deployment-policy-id] %s ", - deployementPolicyDefinitionBean.getId())); + deploymentPolicyDefinitionBean.getId())); } org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy deploymentPolicy = - ObjectConverter.convertDeploymentPolicyBeanToASDeploymentPolicy(deployementPolicyDefinitionBean); + ObjectConverter.convertDeploymentPolicyBeanToASDeploymentPolicy(deploymentPolicyDefinitionBean); AutoscalerServiceClient.getInstance().addDeploymentPolicy(deploymentPolicy); if (log.isDebugEnabled()) { - log.debug(String.format("Successfully added deploymentPolicy: [deployment-policy-id] %s ", - deployementPolicyDefinitionBean.getId())); + log.debug(String.format("Successfully added deploymentPolicy: [deployment-policy-uuid] %s " + + "[deployment-policy-id] %s", deploymentPolicyDefinitionBean.getUuid(), + deploymentPolicyDefinitionBean.getId())); } } catch (RemoteException e) { String msg = e.getMessage(); @@ -2879,7 +2880,7 @@ public class StratosApiV41Utils { * @param deploymentPolicyId deployment policy id * @return {@link DeploymentPolicyBean} */ - public static DeploymentPolicyBean getDeployementPolicy(String deploymentPolicyId) throws RestAPIException { + public static DeploymentPolicyBean getDeploymentPolicy(String deploymentPolicyId) throws RestAPIException { DeploymentPolicyBean deploymentPolicyBean; try { @@ -2888,10 +2889,10 @@ public class StratosApiV41Utils { DeploymentPolicy deploymentPolicy = null; PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); - List<DeploymentPolicy> deploymentPoliciesForTenant = new ArrayList<DeploymentPolicy>(); + // List<DeploymentPolicy> deploymentPoliciesForTenant = new ArrayList<DeploymentPolicy>(); for (DeploymentPolicy deploymentPolicy1 : deploymentPolicies) { if (carbonContext.getTenantId() == deploymentPolicy1.getTenantId()) { - deploymentPoliciesForTenant.add(deploymentPolicy1); + //deploymentPoliciesForTenant.add(deploymentPolicy1); if (deploymentPolicy1.getId().equals(deploymentPolicyId)) { deploymentPolicy = deploymentPolicy1; } @@ -2917,7 +2918,7 @@ public class StratosApiV41Utils { * * @return array of {@link DeploymentPolicyBean} */ - public static DeploymentPolicyBean[] getDeployementPolicies() throws RestAPIException { + public static DeploymentPolicyBean[] getDeploymentPolicies() throws RestAPIException { try { org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy[] deploymentPolicies = AutoscalerServiceClient.getInstance().getDeploymentPolicies(); @@ -2945,7 +2946,7 @@ public class StratosApiV41Utils { } /** - * Update deployement policy + * Update deployment policy * * @param deploymentPolicyDefinitionBean DeploymentPolicyBean * @throws RestAPIException @@ -2956,7 +2957,8 @@ public class StratosApiV41Utils { AutoscalerServiceDeploymentPolicyNotExistsExceptionException { try { if (log.isDebugEnabled()) { - log.debug(String.format("Updating deployment policy: [deployment-policy-id] %s ", + log.debug(String.format("Updating deployment policy: [deployment-policy-uuid] %s " + + "[deployment-policy-id] %s ", deploymentPolicyDefinitionBean.getUuid(), deploymentPolicyDefinitionBean.getId())); } @@ -2966,7 +2968,8 @@ public class StratosApiV41Utils { AutoscalerServiceClient.getInstance().updateDeploymentPolicy(deploymentPolicy); if (log.isDebugEnabled()) { - log.debug(String.format("DeploymentPolicy updated successfully : [deployment-policy-id] %s ", + log.debug(String.format("DeploymentPolicy updated successfully : [deployment-policy-uuid] %s " + + "[deployment-policy-id] %s ", deploymentPolicyDefinitionBean.getUuid(), deploymentPolicyDefinitionBean.getId())); } } catch (RemoteException e) { @@ -2990,14 +2993,18 @@ public class StratosApiV41Utils { /** * Remove deployment policy * - * @param deploymentPolicyID Deployment policy ID + * @param deploymentPolicyId Deployment policy Id * @throws RestAPIException */ - public static void removeDeploymentPolicy(String deploymentPolicyID) + public static void removeDeploymentPolicy(String deploymentPolicyId) throws RestAPIException, AutoscalerServiceDeploymentPolicyNotExistsExceptionException, AutoscalerServiceUnremovablePolicyExceptionException { + + DeploymentPolicyBean deploymentPolicyBean; try { - AutoscalerServiceClient.getInstance().removeDeploymentPolicy(deploymentPolicyID); + deploymentPolicyBean = getDeploymentPolicy(deploymentPolicyId); + AutoscalerServiceClient.getInstance().removeDeploymentPolicy(deploymentPolicyBean.getUuid()); + } catch (RemoteException e) { String msg = "Could not remove deployment policy " + e.getLocalizedMessage(); log.error(msg, e);
