From 9b5288e97429dd46377e348c40a23d9a64114b54 Mon Sep 17 00:00:00 2001 From: Dinithi Date: Mon, 16 Feb 2015 15:09:15 +0530 Subject: [PATCH 1/4] CLI commands added for adding and updating deployment policies. --- .../stratos/cli/RestCommandLineService.java | 16 ++ .../stratos/cli/StratosApplication.java | 6 + .../commands/AddDeploymentPolicyCommand.java | 137 ++++++++++++++++++ .../UpdateDeploymentPolicyCommand.java | 120 +++++++++++++++ 4 files changed, 279 insertions(+) create mode 100644 components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDeploymentPolicyCommand.java create mode 100644 components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateDeploymentPolicyCommand.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 53967dc2f9..7923f39873 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 @@ -1332,4 +1332,20 @@ public String[] getData(NetworkPartitionBean partition) { public void updateNetworkPartition(String networkPartitionDefinition) throws CommandException { restClient.updateEntity(ENDPOINT_DEPLOY_NETWORK_PARTITION, networkPartitionDefinition, "network-partition"); } + + /** + * Deploy deployment policy + * @throws CommandException + */ + public void addDeploymentPolicy(String deploymentPolicy) throws CommandException { + restClient.deployEntity(ENDPOINT_DEPLOY_DEPLOYMENT_POLICY, deploymentPolicy, "deployment policy"); + } + + /** + * Update deployment policy + * @throws CommandException + */ + public void updateDeploymentPolicy(String deploymentPolicy) throws CommandException { + restClient.updateEntity(ENDPOINT_UPDATE_DEPLOYMENT_POLICY, deploymentPolicy, "deployment policy"); + } } \ No newline at end of file diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java index af99c1df38..41dd715048 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java @@ -222,6 +222,12 @@ private void createCommands() { command = new AddApplicationSignupCommand(); commands.put(command.getName(), command); + command = new AddDeploymentPolicyCommand(); + commands.put(command.getName(), command); + + command = new UpdateDeploymentPolicyCommand(); + commands.put(command.getName(), command); + if (logger.isDebugEnabled()) { logger.debug("Created {} commands for the application. {}", commands.size(), commands.keySet()); } diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDeploymentPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDeploymentPolicyCommand.java new file mode 100644 index 0000000000..c5a5b92dda --- /dev/null +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDeploymentPolicyCommand.java @@ -0,0 +1,137 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + + * http://www.apache.org/licenses/LICENSE-2.0 + + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.stratos.cli.commands; + +import org.apache.commons.cli.*; +import org.apache.stratos.cli.Command; +import org.apache.stratos.cli.RestCommandLineService; +import org.apache.stratos.cli.StratosCommandContext; +import org.apache.stratos.cli.exception.CommandException; +import org.apache.stratos.cli.utils.CliConstants; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; + +public class AddDeploymentPolicyCommand implements Command { + private static final Logger logger = LoggerFactory.getLogger(AddDeploymentPolicyCommand.class); + + private final Options options; + + public AddDeploymentPolicyCommand(){ + options = constructOptions(); + } + + private Options constructOptions() { + final Options options = new Options(); + + Option resourcePath = new Option(CliConstants.RESOURCE_PATH, CliConstants.RESOURCE_PATH_LONG_OPTION, true, + "Deployment policy resource path"); + resourcePath.setArgName("resource path"); + options.addOption(resourcePath); + + return options; + } + + public String getName() { + return "add-deployment-policy"; + } + + public String getDescription() { + return "Add deployment policy deployment"; + } + + public String getArgumentSyntax() { + return null; + } + + public int execute(StratosCommandContext context, String[] args) throws CommandException { + if (logger.isDebugEnabled()) { + logger.debug("Executing {} command...", getName()); + } + + if (args != null && args.length > 0) { + String resourcePath = null; + String deploymentPolicyDeployment = null; + + final CommandLineParser parser = new GnuParser(); + CommandLine commandLine; + + try { + commandLine = parser.parse(options, args); + + if (logger.isDebugEnabled()) { + logger.debug("Deployment policy deployment"); + } + + if (commandLine.hasOption(CliConstants.RESOURCE_PATH)) { + if (logger.isTraceEnabled()) { + logger.trace("Resource path option is passed"); + } + resourcePath = commandLine.getOptionValue(CliConstants.RESOURCE_PATH); + deploymentPolicyDeployment = readResource(resourcePath); + } + + if (resourcePath == null) { + System.out.println("usage: " + getName() + " [-p ]"); + return CliConstants.COMMAND_FAILED; + } + + RestCommandLineService.getInstance().addDeploymentPolicy(deploymentPolicyDeployment); + return CliConstants.COMMAND_SUCCESSFULL; + + } catch (ParseException e) { + if (logger.isErrorEnabled()) { + logger.error("Error parsing arguments", e); + } + System.out.println(e.getMessage()); + return CliConstants.COMMAND_FAILED; + } catch (IOException e) { + System.out.println("Invalid resource path"); + return CliConstants.COMMAND_FAILED; + } + } else { + context.getStratosApplication().printUsage(getName()); + return CliConstants.COMMAND_FAILED; + } + } + + private String readResource(String fileName) throws IOException { + BufferedReader br = new BufferedReader(new FileReader(fileName)); + try { + StringBuilder sb = new StringBuilder(); + String line = br.readLine(); + + while (line != null) { + sb.append(line); + sb.append("\n"); + line = br.readLine(); + } + return sb.toString(); + } finally { + br.close(); + } + } + + public Options getOptions() { + return options; + } +} diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateDeploymentPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateDeploymentPolicyCommand.java new file mode 100644 index 0000000000..27c9a5bfe8 --- /dev/null +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateDeploymentPolicyCommand.java @@ -0,0 +1,120 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + + * http://www.apache.org/licenses/LICENSE-2.0 + + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.stratos.cli.commands; + +import org.apache.commons.cli.*; +import org.apache.stratos.cli.Command; +import org.apache.stratos.cli.RestCommandLineService; +import org.apache.stratos.cli.StratosCommandContext; +import org.apache.stratos.cli.exception.CommandException; +import org.apache.stratos.cli.utils.CliConstants; +import org.apache.stratos.cli.utils.CliUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; + +public class UpdateDeploymentPolicyCommand implements Command { + private static final Logger logger = LoggerFactory.getLogger(UpdateDeploymentPolicyCommand.class); + + private final Options options; + + public UpdateDeploymentPolicyCommand(){ + options = constructOptions(); + } + + public Options getOptions() { + return options; + } + + private Options constructOptions() { + final Options options = new Options(); + + Option resourcePath = new Option(CliConstants.RESOURCE_PATH, CliConstants.RESOURCE_PATH_LONG_OPTION, true, + "Deployment policy resource path"); + resourcePath.setArgName("resource path"); + options.addOption(resourcePath); + + return options; + } + + public String getName() { + return "update-deployment-policy"; + } + + public String getDescription() { + return "Update deployment policy"; + } + + public String getArgumentSyntax() { + return null; + } + + public int execute(StratosCommandContext context, String[] args) throws CommandException { + if (logger.isDebugEnabled()) { + logger.debug("Executing {} command...", getName()); + } + + if (args != null && args.length > 0) { + String resourcePath = null; + String deploymentPolicyDeployment = null; + + final CommandLineParser parser = new GnuParser(); + CommandLine commandLine; + + try { + commandLine = parser.parse(options, args); + + if (logger.isDebugEnabled()) { + logger.debug("Updating deployment policy"); + } + + if (commandLine.hasOption(CliConstants.RESOURCE_PATH)) { + if (logger.isTraceEnabled()) { + logger.trace("Resource path option is passed"); + } + resourcePath = commandLine.getOptionValue(CliConstants.RESOURCE_PATH); + deploymentPolicyDeployment = CliUtils.readResource(resourcePath); + } + + if (resourcePath == null) { + System.out.println("usage: " + getName() + " [-p ]"); + return CliConstants.COMMAND_FAILED; + } + + RestCommandLineService.getInstance().updateDeploymentPolicy(deploymentPolicyDeployment); + return CliConstants.COMMAND_SUCCESSFULL; + + } catch (ParseException e) { + if (logger.isErrorEnabled()) { + logger.error("Error parsing arguments", e); + } + System.out.println(e.getMessage()); + return CliConstants.COMMAND_FAILED; + } catch (IOException ignore) { + System.out.println("Invalid resource path"); + return CliConstants.COMMAND_FAILED; + } + } else { + context.getStratosApplication().printUsage(getName()); + return CliConstants.COMMAND_FAILED; + } + } +} From 828c49dc99c5ee883a60c019c759f096da254579 Mon Sep 17 00:00:00 2001 From: Dinithi Date: Mon, 16 Feb 2015 15:41:46 +0530 Subject: [PATCH 2/4] removeDeploymentPolicy API method updated --- .../org/apache/stratos/rest/endpoint/api/StratosApiV41.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 37c3f6a4c0..057b390a11 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 @@ -219,11 +219,11 @@ public Response updateDeploymentPolicy(DeploymentPolicyBean deploymentPolicyDefi * @throws RestAPIException the rest api exception */ @DELETE - @Path("/deploymentPolicies") + @Path("/deploymentPolicies/{depolymentPolicyID}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/admin/manage/addCartridge") - public Response removeDeploymentPolicy(String deploymentPolicyID) + @AuthorizationAction("/permission/admin/manage/removeDeploymentPolicy") + public Response removeDeploymentPolicy(@PathParam("depolymentPolicyID") String deploymentPolicyID) throws RestAPIException { StratosApiV41Utils.removeDeploymentPolicy(deploymentPolicyID); From 3b462f393e05edd0453fa61ff5a778b7a1517321 Mon Sep 17 00:00:00 2001 From: Dinithi Date: Mon, 16 Feb 2015 17:12:01 +0530 Subject: [PATCH 3/4] CLI command added to remove Deployment Policy. --- .../org/apache/stratos/cli/RestClient.java | 2 +- .../stratos/cli/RestCommandLineService.java | 11 ++- .../stratos/cli/StratosApplication.java | 3 + .../RemoveDeploymentPolicyCommand.java | 71 +++++++++++++++++++ 4 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDeploymentPolicyCommand.java diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java index d1b9fb9074..eeb0302c1e 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java @@ -202,7 +202,7 @@ public void deleteEntity(String serviceEndpoint, String identifier, String entit int responseCode = executeDelete(serviceEndpoint, identifier); if (responseCode == 404) { System.out.println(String.format("%s not found", StringUtils.capitalize(entityName))); - } else if (responseCode == 200) { + } else if (responseCode >= 200 && responseCode < 300) { System.out.println(String.format("Successfully deleted %s", entityName)); } } catch (Exception e) { 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 7923f39873..3256e85a03 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 @@ -91,8 +91,8 @@ public class RestCommandLineService { private static final String ENDPOINT_REMOVE_APPLICATION = API_CONTEXT + "/applications/{appId}"; private static final String ENDPOINT_REMOVE_NETWORK_PARTITION = API_CONTEXT + "/networkPartitions/{id}"; - private static final String ENDPOINT_REMOVE_AUTOSCALINGPOLICY = API_CONTEXT + "/autoscalingPolicies/{policyId}"; + private static final String ENDPOINT_REMOVE_DEPLOYMENT_POLICY = API_CONTEXT + "/deploymentPolicies/{policyId}"; private static final String ENDPOINT_LIST_AUTOSCALING_POLICIES = API_CONTEXT + "/autoscalingPolicies"; private static final String ENDPOINT_LIST_DEPLOYMENT_POLICIES = API_CONTEXT + "/deploymentPolicies"; @@ -1348,4 +1348,13 @@ public void addDeploymentPolicy(String deploymentPolicy) throws CommandException public void updateDeploymentPolicy(String deploymentPolicy) throws CommandException { restClient.updateEntity(ENDPOINT_UPDATE_DEPLOYMENT_POLICY, deploymentPolicy, "deployment policy"); } + + /** + * Delete deployment policy + * @throws CommandException + */ + public void deleteDeploymentPolicy(String policyId) { + restClient.deleteEntity(ENDPOINT_REMOVE_DEPLOYMENT_POLICY.replace("{policyId}", policyId), policyId, + "deployment policy"); + } } \ No newline at end of file diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java index 41dd715048..9589490879 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java @@ -228,6 +228,9 @@ private void createCommands() { command = new UpdateDeploymentPolicyCommand(); commands.put(command.getName(), command); + command = new RemoveDeploymentPolicyCommand(); + commands.put(command.getName(), command); + if (logger.isDebugEnabled()) { logger.debug("Created {} commands for the application. {}", commands.size(), commands.keySet()); } diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDeploymentPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDeploymentPolicyCommand.java new file mode 100644 index 0000000000..31d79054fa --- /dev/null +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDeploymentPolicyCommand.java @@ -0,0 +1,71 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + + * http://www.apache.org/licenses/LICENSE-2.0 + + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.stratos.cli.commands; + +import org.apache.commons.cli.Options; +import org.apache.stratos.cli.Command; +import org.apache.stratos.cli.RestCommandLineService; +import org.apache.stratos.cli.StratosCommandContext; +import org.apache.stratos.cli.exception.CommandException; +import org.apache.stratos.cli.utils.CliConstants; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class RemoveDeploymentPolicyCommand implements Command { + private static final Logger logger = LoggerFactory.getLogger(RemoveDeploymentPolicyCommand.class); + + @Override + public String getName() { + return "remove-deployment-policy"; + } + + @Override + public String getDescription() { + return "Remove Deployment policy"; + } + + @Override + public String getArgumentSyntax() { + return "[Deployment-policy Id]"; + } + + @Override + public Options getOptions() { + return null; + } + + @Override + public int execute(StratosCommandContext context, String[] args) throws CommandException { + if (logger.isDebugEnabled()) { + logger.debug("Executing {} command...", getName()); + } + if (args != null && args.length == 1) { + String id = args[0]; + if (logger.isDebugEnabled()) { + logger.debug("Getting Deployment-policy Id {}", id); + } + RestCommandLineService.getInstance().deleteDeploymentPolicy(id); + return CliConstants.COMMAND_SUCCESSFULL; + } else { + context.getStratosApplication().printUsage(getName()); + return CliConstants.COMMAND_FAILED; + } + } +} From 5a393e29aadd20a4f5fe20585675728d5163c8f7 Mon Sep 17 00:00:00 2001 From: Dinithi Date: Mon, 16 Feb 2015 18:39:05 +0530 Subject: [PATCH 4/4] removed unnecessary CLI constants --- .../stratos/cli/RestCommandLineService.java | 4 +- .../cli/commands/ActivateTenantCommand.java | 2 +- .../commands/AddApplicationSignupCommand.java | 2 +- .../cli/commands/DeactivateTenantCommand.java | 2 +- .../commands/DeleteApplicationCommand.java | 2 +- .../DeleteApplicationSignupCommand.java | 2 +- .../cli/commands/DeleteTenantCommand.java | 2 +- .../cli/commands/DeleteUserCommand.java | 2 +- .../commands/DescribeApplicationCommand.java | 2 +- .../DescribeApplicationSignupCommand.java | 2 +- .../DescribeAutoScalingPolicyCommand.java | 2 +- .../commands/DescribeCartridgeCommand.java | 2 +- .../DescribeDeploymentPolicyCommand.java | 2 +- .../cli/commands/ListApplicationsCommand.java | 2 +- .../commands/ListAutoscalePolicyCommand.java | 2 +- .../cli/commands/ListCartridgesCommand.java | 2 +- .../stratos/cli/commands/ListTenants.java | 2 +- .../stratos/cli/commands/ListUsers.java | 2 +- .../RemoveNetworkPartitionCommand.java | 2 +- .../commands/UndeployApplicationCommand.java | 2 +- .../stratos/cli/utils/CliConstants.java | 214 ------------------ 21 files changed, 21 insertions(+), 235 deletions(-) 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 3256e85a03..39f3110f15 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 @@ -535,8 +535,8 @@ public void deleteUser(String userName) throws CommandException { GsonBuilder gsonBuilder = new GsonBuilder(); Gson gson = gsonBuilder.create(); - if (responseCode.equals(CliConstants.RESPONSE_NO_CONTENT)) { - System.out.println("You have succesfully deleted " + userName + " user"); + if (responseCode.equals(CliConstants.RESPONSE_NO_CONTENT) || responseCode.equals(CliConstants.RESPONSE_OK)) { + System.out.println("You have successfully deleted " + userName + " user"); return; } else { String resultString = CliUtils.getHttpResponseString(response); diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ActivateTenantCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ActivateTenantCommand.java index 2e6bde4ec9..b9923ab517 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ActivateTenantCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ActivateTenantCommand.java @@ -32,7 +32,7 @@ public class ActivateTenantCommand implements Command { @Override public String getName() { - return CliConstants.ACTIVATE_TENANT; + return "activate-tenant"; } @Override diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddApplicationSignupCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddApplicationSignupCommand.java index 212fd6f9ef..84aa8671e1 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddApplicationSignupCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddApplicationSignupCommand.java @@ -49,7 +49,7 @@ public AddApplicationSignupCommand() { @Override public String getName() { - return CliConstants.ADD_APPLICATION_SIGNUP; + return "add-application"; } @Override diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeactivateTenantCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeactivateTenantCommand.java index ee9e15a250..ce4cf51b23 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeactivateTenantCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeactivateTenantCommand.java @@ -32,7 +32,7 @@ public class DeactivateTenantCommand implements Command { @Override public String getName() { - return CliConstants.DEACTIVATE_TENANT; + return "deactivate-tenant"; } @Override diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationCommand.java index a21ac1c13d..0557b0c2e7 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationCommand.java @@ -32,7 +32,7 @@ public class DeleteApplicationCommand implements Command @Override public String getName() { - return CliConstants.DELETE_APPLICATION; + return "remove-application"; } @Override diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationSignupCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationSignupCommand.java index 9417d07a45..dfced5b584 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationSignupCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationSignupCommand.java @@ -32,7 +32,7 @@ public class DeleteApplicationSignupCommand implements Command { @Override public String getName() { - return CliConstants.DELETE_TENANT; + return "remove-tenant"; } @Override diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteUserCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteUserCommand.java index c53f6b26de..f884665caa 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteUserCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteUserCommand.java @@ -32,7 +32,7 @@ public class DeleteUserCommand implements Command { @Override public String getName() { - return CliConstants.DELETE_USER; + return "remove-user"; } @Override diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationCommand.java index 5fc2be85e8..dbac1e811b 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationCommand.java @@ -36,7 +36,7 @@ public DescribeApplicationCommand() { } public String getName() { - return CliConstants.DESCRIBE_APPLICATION; + return "describe-application"; } public String getDescription() { diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationSignupCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationSignupCommand.java index 37857ad032..a9e4c3650e 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationSignupCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationSignupCommand.java @@ -36,7 +36,7 @@ public DescribeApplicationSignupCommand() { } public String getName() { - return CliConstants.DESCRIBE_APPLICATION_SIGNUP; + return "describe-application-signup"; } public String getDescription() { diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeAutoScalingPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeAutoScalingPolicyCommand.java index a7e6945f6e..a056141db4 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeAutoScalingPolicyCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeAutoScalingPolicyCommand.java @@ -32,7 +32,7 @@ public class DescribeAutoScalingPolicyCommand implements Command @Override public String getName() { - return CliConstants.DESCRIBE_CARTRIDGE; + return "describe-cartridge"; } @Override 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 5680c4c743..017bd0cbe5 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 @@ -32,7 +32,7 @@ public class DescribeDeploymentPolicyCommand implements Command