CLI commands and REST API methods changed
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/87ae08dd Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/87ae08dd Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/87ae08dd Branch: refs/heads/master Commit: 87ae08ddf9b34c9027000dc6373e4730b9d30952 Parents: 999842d Author: Dinithi <[email protected]> Authored: Tue May 12 20:29:30 2015 +0530 Committer: Dinithi <[email protected]> Committed: Tue May 12 20:29:30 2015 +0530 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 8 +- .../apache/stratos/cli/StratosApplication.java | 3 - .../ListPartialSearchTenantsCommand.java | 119 ------------------- .../stratos/cli/commands/ListTenants.java | 11 +- .../commands/UpdateKubernetesHostCommand.java | 29 +---- .../rest/endpoint/api/StratosApiV41.java | 2 +- .../rest/endpoint/api/StratosApiV41Utils.java | 13 +- 7 files changed, 22 insertions(+), 163 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/87ae08dd/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 0e02b18..2871a01 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 @@ -126,7 +126,7 @@ public class RestCommandLineService { private static final String ENDPOINT_GET_APPLICATION_RUNTIME = API_CONTEXT + "/applications/{applicationId}/runtime"; private static final String ENDPOINT_UPDATE_KUBERNETES_MASTER = API_CONTEXT + "/kubernetesClusters/{kubernetesClusterId}/master"; - private static final String ENDPOINT_UPDATE_KUBERNETES_HOST = API_CONTEXT + "/kubernetesClusters/{kubernetesClusterId}/minion/{minionId}"; + private static final String ENDPOINT_UPDATE_KUBERNETES_HOST = API_CONTEXT + "/kubernetesClusters/host"; private static final String ENDPOINT_SYNCHRONIZE_ARTIFACTS = API_CONTEXT + "/repo/synchronize/{subscriptionAlias}"; private static final String ENDPOINT_ACTIVATE_TENANT = API_CONTEXT + "/tenants/activate/{tenantDomain}"; @@ -1416,12 +1416,10 @@ public class RestCommandLineService { * Update Kubernetes Host * * @param entityBody Kubernetes host definition - * @param clusterId cluster id - * @param hostId host id * @throws CommandException */ - public void updateKubernetesHost(String entityBody, String clusterId, String hostId) throws CommandException { - restClient.updateEntity((ENDPOINT_UPDATE_KUBERNETES_HOST.replace("{kubernetesClusterId}", clusterId)).replace("{minionId}", hostId), entityBody, "kubernetes host"); + public void updateKubernetesHost(String entityBody) throws CommandException { + restClient.updateEntity(ENDPOINT_UPDATE_KUBERNETES_HOST, entityBody, "kubernetes host"); } /** http://git-wip-us.apache.org/repos/asf/stratos/blob/87ae08dd/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java ---------------------------------------------------------------------- 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 8874e15..54a5d8b 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 @@ -225,9 +225,6 @@ public class StratosApplication extends CommandLineApplication<StratosCommandCon command = new DescribeTenantCommand(); commands.put(command.getName(), command); - command = new ListPartialSearchTenantsCommand(); - commands.put(command.getName(), command); - command = new DescribeApplicationSignupCommand(); commands.put(command.getName(), command); http://git-wip-us.apache.org/repos/asf/stratos/blob/87ae08dd/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListPartialSearchTenantsCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListPartialSearchTenantsCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListPartialSearchTenantsCommand.java deleted file mode 100644 index d4da11e..0000000 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListPartialSearchTenantsCommand.java +++ /dev/null @@ -1,119 +0,0 @@ -/** - * 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 - * <p/> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p/> - * 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 static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; - -/** - * List cartridges by partial domain search - */ -public class ListPartialSearchTenantsCommand implements Command<StratosCommandContext> { - - private static final Logger log = LoggerFactory.getLogger(ListPartialSearchTenantsCommand.class); - - private final Options options; - - public ListPartialSearchTenantsCommand() { - options = constructOptions(); - } - - private Options constructOptions() { - final Options options = new Options(); - - Option partialDomainOption = new Option(CliConstants.TENANT_PARTIAL_SEARCH_OPTION, CliConstants.TENANT_PARTIAL_SEARCH_LONG_OPTION, true, - "partialDomain"); - partialDomainOption.setArgName("partialDomain"); - options.addOption(partialDomainOption); - - return options; - } - - public String getName() { - return "list-tenants-by-partial-domain"; - } - - public String getDescription() { - return "List cartridges by partial domain search"; - } - - public String getArgumentSyntax() { - return null; - } - - public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { - if (log.isDebugEnabled()) { - log.debug("Executing {} command...", getName()); - } - - if (args != null && args.length > 0) { - String partialDomain = null; - - final CommandLineParser parser = new GnuParser(); - CommandLine commandLine; - - try { - commandLine = parser.parse(options, args); - //merge newly discovered options with previously discovered ones. - Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions()); - - if (log.isDebugEnabled()) { - log.debug("List cartridges by partial domain search"); - } - - if (opts.hasOption(CliConstants.TENANT_PARTIAL_SEARCH_OPTION)) { - if (log.isTraceEnabled()) { - log.trace("Partial domain option is passed"); - } - partialDomain = opts.getOption(CliConstants.TENANT_PARTIAL_SEARCH_OPTION).getValue(); - } - - if (partialDomain == null) { - context.getStratosApplication().printUsage(getName()); - return CliConstants.COMMAND_FAILED; - } - - RestCommandLineService.getInstance().listTenantsByPartialDomain(partialDomain); - return CliConstants.COMMAND_SUCCESSFULL; - - } catch (ParseException e) { - log.error("Error parsing arguments", e); - System.out.println(e.getMessage()); - return CliConstants.COMMAND_FAILED; - } - - } else { - context.getStratosApplication().printUsage(getName()); - return CliConstants.COMMAND_FAILED; - } - } - - public Options getOptions() { - return options; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/87ae08dd/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListTenants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListTenants.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListTenants.java index 8ec0d8e..dc87f41 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListTenants.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListTenants.java @@ -47,16 +47,23 @@ public class ListTenants implements Command<StratosCommandContext> { } public String getArgumentSyntax() { - return null; + return "[partial-domain]"; } public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { if (log.isDebugEnabled()) { log.debug("Executing {} command...", getName()); } - if (args == null || args.length == 0) { + + if(args == null || args.length == 0) { RestCommandLineService.getInstance().listTenants(); return CliConstants.COMMAND_SUCCESSFULL; + + } else if(args[0] != null) { + + String partialDomainName = args[0]; + RestCommandLineService.getInstance().listTenantsByPartialDomain(partialDomainName); + return CliConstants.COMMAND_SUCCESSFULL; } else { context.getStratosApplication().printUsage(getName()); return CliConstants.COMMAND_FAILED; http://git-wip-us.apache.org/repos/asf/stratos/blob/87ae08dd/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateKubernetesHostCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateKubernetesHostCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateKubernetesHostCommand.java index 7367f12..107476c 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateKubernetesHostCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateKubernetesHostCommand.java @@ -43,15 +43,6 @@ public class UpdateKubernetesHostCommand implements Command<StratosCommandContex public UpdateKubernetesHostCommand() { options = new Options(); - Option clusterIdOption = new Option(CliConstants.CLUSTER_ID_OPTION, CliConstants.CLUSTER_ID_LONG_OPTION, true, - "Kubernetes cluster id"); - clusterIdOption.setArgName("cluster id"); - options.addOption(clusterIdOption); - - Option hostIdOption = new Option(CliConstants.HOST_ID_OPTION, CliConstants.HOST_ID_LONG_OPTION, true, - "Kubernetes host id"); - hostIdOption.setArgName("host id"); - options.addOption(hostIdOption); Option resourcePathOption = new Option(CliConstants.RESOURCE_PATH, CliConstants.RESOURCE_PATH_LONG_OPTION, true, "Kubernetes host resource path"); @@ -96,23 +87,7 @@ public class UpdateKubernetesHostCommand implements Command<StratosCommandContex //merge newly discovered options with previously discovered ones. Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions()); - if ((opts.hasOption(CliConstants.RESOURCE_PATH)) && (opts.hasOption(CliConstants.HOST_ID_OPTION)) - && (opts.hasOption(CliConstants.CLUSTER_ID_OPTION))) { - - // get cluster id arg value - String clusterId = opts.getOption(CliConstants.CLUSTER_ID_OPTION).getValue(); - if (clusterId == null) { - context.getStratosApplication().printUsage(getName()); - return CliConstants.COMMAND_FAILED; - } - - // get host id arg value - String hostId = opts.getOption(CliConstants.HOST_ID_OPTION).getValue(); - if (hostId == null) { - context.getStratosApplication().printUsage(getName()); - return CliConstants.COMMAND_FAILED; - } - + if (opts.hasOption(CliConstants.RESOURCE_PATH)) { // get resource path arg value String resourcePath = opts.getOption(CliConstants.RESOURCE_PATH).getValue(); if (resourcePath == null) { @@ -121,7 +96,7 @@ public class UpdateKubernetesHostCommand implements Command<StratosCommandContex } String resourceFileContent = CliUtils.readResource(resourcePath); - RestCommandLineService.getInstance().updateKubernetesHost(resourceFileContent, clusterId, hostId); + RestCommandLineService.getInstance().updateKubernetesHost(resourceFileContent); return CliConstants.COMMAND_SUCCESSFULL; } else { context.getStratosApplication().printUsage(getName()); http://git-wip-us.apache.org/repos/asf/stratos/blob/87ae08dd/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 c7491d1..26b685e 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 @@ -1786,7 +1786,7 @@ public class StratosApiV41 extends AbstractApi { } @PUT - @Path("/kubernetes/update/host") + @Path("/kubernetesClusters/host") @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/updateKubernetesHost") http://git-wip-us.apache.org/repos/asf/stratos/blob/87ae08dd/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 a4eee4c..ff2c08c 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 @@ -2139,7 +2139,8 @@ public class StratosApiV41Utils { * @return update status * @throws RestAPIException */ - public static boolean updateKubernetesHost(KubernetesHostBean kubernetesHostBean) throws RestAPIException { + public static boolean updateKubernetesHost(KubernetesHostBean kubernetesHostBean) throws + RestAPIException { CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient(); if (cloudControllerServiceClient != null) { org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesHost kubernetesHost = @@ -2356,19 +2357,19 @@ public class StratosApiV41Utils { * Add Application Domain Mappings * * @param applicationId application Id - * @param domainMapppingsBean ApplicationDomainMappingsBean + * @param domainMappingsBean ApplicationDomainMappingsBean * @throws RestAPIException */ public static void addApplicationDomainMappings( - String applicationId, ApplicationDomainMappingsBean domainMapppingsBean) throws RestAPIException, + String applicationId, ApplicationDomainMappingsBean domainMappingsBean) throws RestAPIException, StratosManagerServiceDomainMappingExceptionException { try { int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - if (domainMapppingsBean.getDomainMappings() != null) { + if (domainMappingsBean.getDomainMappings() != null) { StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance(); - for (DomainMappingBean domainMappingBean : domainMapppingsBean.getDomainMappings()) { + for (DomainMappingBean domainMappingBean : domainMappingsBean.getDomainMappings()) { ClusterDataHolder clusterDataHolder = findClusterDataHolder( applicationId, domainMappingBean.getCartridgeAlias()); @@ -2396,7 +2397,7 @@ public class StratosApiV41Utils { } /** - * Finnd Cluster Data Holder + * Find Cluster Data Holder * * @param applicationId applicationId * @param cartridgeAlias cartridge Alias
