You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/12/18 07:38:26 UTC
[24/50] [abbrv] stratos git commit: Updating
describe-deployment-policy cli command
Updating describe-deployment-policy cli command
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/548e2605
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/548e2605
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/548e2605
Branch: refs/heads/master
Commit: 548e2605f7da340462e324369e67cfb91d163018
Parents: a03e2bf
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 17 14:46:01 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Dec 18 12:06:58 2014 +0530
----------------------------------------------------------------------
.../org/apache/stratos/cli/RestCommandLineService.java | 12 ++++++------
.../cli/commands/DescribeDeploymentPolicyCommand.java | 8 ++++----
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/548e2605/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 0f1cc09..ea7452d 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
@@ -96,7 +96,7 @@ public class RestCommandLineService {
private static final String ENDPOINT_GET_APPLICATION = API_CONTEXT + "/applications/{appId}";
private static final String ENDPOINT_GET_AUTOSCALING_POLICY = API_CONTEXT + "/autoscalingPolicies/{id}";
- private static final String ENDPOINT_GET_DEPLOYMENT_POLICY = API_CONTEXT + "/deploymentPolicies/{id}";
+ private static final String ENDPOINT_GET_DEPLOYMENT_POLICY = API_CONTEXT + "/applications/{applicationId}/deploymentPolicy";
private static final String ENDPOINT_GET_CARTRIDGE = API_CONTEXT + "/cartridges/{cartridgeType}";
private static final String ENDPOINT_GET_CARTRIDGE_OF_TENANT = API_CONTEXT + "/subscriptions/{id}/cartridges";
private static final String ENDPOINT_GET_CLUSTER_OF_TENANT = API_CONTEXT + "/clusters/";
@@ -728,20 +728,20 @@ public class RestCommandLineService {
}
}
- public void describeDeploymentPolicy(String id) throws CommandException {
+ public void describeDeploymentPolicy(String applicationId) throws CommandException {
try {
DeploymentPolicy policy = (DeploymentPolicy) restClient.getEntity(ENDPOINT_GET_DEPLOYMENT_POLICY,
- DeploymentPolicy.class, "{id}", id, "deployment policy");
+ DeploymentPolicy.class, "{applicationId}", applicationId, "deployment policy");
if (policy == null) {
- System.out.println("Deployment policy not found: " + id);
+ System.out.println("Deployment policy not found: " + applicationId);
return;
}
- System.out.println("Deployment policy: " + id);
+ System.out.println("Deployment policy: " + applicationId);
System.out.println(getGson().toJson(policy));
} catch (Exception e) {
- String message = "Error in describing deployment policy: " + id;
+ String message = "Error in describing deployment policy: " + applicationId;
printError(message, e);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/548e2605/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeDeploymentPolicyCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeDeploymentPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeDeploymentPolicyCommand.java
index 3fe22ef..5680c4c 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeDeploymentPolicyCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeDeploymentPolicyCommand.java
@@ -42,7 +42,7 @@ public class DescribeDeploymentPolicyCommand implements Command<StratosCommandCo
@Override
public String getArgumentSyntax() {
- return "[ID]";
+ return "[application-id]";
}
@Override
@@ -56,11 +56,11 @@ public class DescribeDeploymentPolicyCommand implements Command<StratosCommandCo
logger.debug("Executing {} command...", getName());
}
if (args != null && args.length == 1) {
- String id = args[0];
+ String applicationId = args[0];
if (logger.isDebugEnabled()) {
- logger.debug("Getting Deployment policy info {}", id);
+ logger.debug("Getting deployment policy {}", applicationId);
}
- RestCommandLineService.getInstance().describeDeploymentPolicy(id);
+ RestCommandLineService.getInstance().describeDeploymentPolicy(applicationId);
return CliConstants.COMMAND_SUCCESSFULL;
} else {
context.getStratosApplication().printUsage(getName());