Repository: incubator-stratos Updated Branches: refs/heads/master 38ec685f4 -> d70d558a5
hiding LB cartridges from subscriptions and seting LBcartridge true Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/1d139d0a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/1d139d0a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/1d139d0a Branch: refs/heads/master Commit: 1d139d0a15bc8e4697a3cc95aaf77e84c6f6b152 Parents: 1727409 Author: Udara Liyanage <[email protected]> Authored: Wed Mar 12 09:05:22 2014 -0400 Committer: Udara Liyanage <[email protected]> Committed: Wed Mar 12 09:05:22 2014 -0400 ---------------------------------------------------------------------- .../apache/stratos/cli/StratosApplication.java | 2 +- .../stratos/cli/beans/cartridge/Cartridge.java | 6 +- .../stratos/cli/commands/ListCommand.java | 120 ------------------- .../ListSubscribedCartridgesCommand.java | 120 +++++++++++++++++++ .../stratos/cli/commands/SubscribeCommand.java | 2 +- .../rest/endpoint/services/ServiceUtils.java | 15 ++- 6 files changed, 138 insertions(+), 127 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d139d0a/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 393bada..fc1f1b5 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 @@ -138,7 +138,7 @@ public class StratosApplication extends CommandLineApplication<StratosCommandCon command = new DeploymentPolicyDeploymentCommand(); commands.put(command.getName(), command); - command = new ListCommand(); + command = new ListSubscribedCartridgesCommand(); commands.put(command.getName(), command); command = new PartitionCommand(); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d139d0a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/cartridge/Cartridge.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/cartridge/Cartridge.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/cartridge/Cartridge.java index 5d1bde9..6331e03 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/cartridge/Cartridge.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/cartridge/Cartridge.java @@ -45,7 +45,7 @@ public class Cartridge implements Comparable<Cartridge> { private String dbHost; private String publicIp; private String lbClusterId; - private boolean isLoadBalancer; + private boolean loadBalancer; private String[] accessURLs; private PortMapping[] portMappings; @@ -238,10 +238,10 @@ public class Cartridge implements Comparable<Cartridge> { } public boolean isLoadBalancer() { - return isLoadBalancer; + return loadBalancer; } public void setLoadBalancer(boolean isLoadBalancer) { - this.isLoadBalancer = isLoadBalancer; + this.loadBalancer = isLoadBalancer; } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d139d0a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCommand.java deleted file mode 100644 index 8f1b259..0000000 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCommand.java +++ /dev/null @@ -1,120 +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 - - * 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.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.GnuParser; -import org.apache.commons.cli.Option; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; -import org.apache.stratos.cli.RestCommandLineService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.stratos.cli.Command; -import org.apache.stratos.cli.StratosCommandContext; -import org.apache.stratos.cli.exception.CommandException; -import org.apache.stratos.cli.utils.CliConstants; - -public class ListCommand implements Command<StratosCommandContext> { - - private static final Logger logger = LoggerFactory.getLogger(ListCommand.class); - - private final Options options; - - public ListCommand() { - options = constructOptions(); - } - - /** - * Construct Options. - * - * @return Options expected from command-line. - */ - private Options constructOptions() { - final Options options = new Options(); - Option fullOption = new Option(CliConstants.FULL_OPTION, CliConstants.FULL_LONG_OPTION, false, - "Display extra details"); - options.addOption(fullOption); - return options; - } - - public String getName() { - return CliConstants.LIST_ACTION; - } - - public String getDescription() { - return "List subscribed cartridges with summarized details"; - } - - 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) { - RestCommandLineService.getInstance().listSubscribedCartridges(false); - //CommandLineService.getInstance().listSubscribedCartridges(false); - return CliConstants.SUCCESSFUL_CODE; - } else if (args != null && args.length > 0) { - String[] remainingArgs = null; - boolean full = false; - final CommandLineParser parser = new GnuParser(); - CommandLine commandLine; - try { - commandLine = parser.parse(options, args); - remainingArgs = commandLine.getArgs(); - if (!(remainingArgs == null || remainingArgs.length == 0)) { - context.getStratosApplication().printUsage(getName()); - return CliConstants.BAD_ARGS_CODE; - } - - if (commandLine.hasOption(CliConstants.FULL_OPTION)) { - if (logger.isTraceEnabled()) { - logger.trace("Full option is passed"); - } - full = true; - } - if (logger.isDebugEnabled()) { - logger.debug("Listing subscribed cartridges, Full Option: {}", full); - } - RestCommandLineService.getInstance().listSubscribedCartridges(full); - //CommandLineService.getInstance().listSubscribedCartridges(full); - return CliConstants.SUCCESSFUL_CODE; - } catch (ParseException e) { - if (logger.isErrorEnabled()) { - logger.error("Error parsing arguments", e); - } - System.out.println(e.getMessage()); - return CliConstants.BAD_ARGS_CODE; - } - } else { - context.getStratosApplication().printUsage(getName()); - return CliConstants.BAD_ARGS_CODE; - } - } - - public Options getOptions() { - return options; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d139d0a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListSubscribedCartridgesCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListSubscribedCartridgesCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListSubscribedCartridgesCommand.java new file mode 100644 index 0000000..080a72c --- /dev/null +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListSubscribedCartridgesCommand.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.CommandLine; +import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.GnuParser; +import org.apache.commons.cli.Option; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.stratos.cli.RestCommandLineService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.stratos.cli.Command; +import org.apache.stratos.cli.StratosCommandContext; +import org.apache.stratos.cli.exception.CommandException; +import org.apache.stratos.cli.utils.CliConstants; + +public class ListSubscribedCartridgesCommand implements Command<StratosCommandContext> { + + private static final Logger logger = LoggerFactory.getLogger(ListSubscribedCartridgesCommand.class); + + private final Options options; + + public ListSubscribedCartridgesCommand() { + options = constructOptions(); + } + + /** + * Construct Options. + * + * @return Options expected from command-line. + */ + private Options constructOptions() { + final Options options = new Options(); + Option fullOption = new Option(CliConstants.FULL_OPTION, CliConstants.FULL_LONG_OPTION, false, + "Display extra details"); + options.addOption(fullOption); + return options; + } + + public String getName() { + return CliConstants.LIST_ACTION; + } + + public String getDescription() { + return "List subscribed cartridges with summarized details"; + } + + 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) { + RestCommandLineService.getInstance().listSubscribedCartridges(false); + //CommandLineService.getInstance().listSubscribedCartridges(false); + return CliConstants.SUCCESSFUL_CODE; + } else if (args != null && args.length > 0) { + String[] remainingArgs = null; + boolean full = false; + final CommandLineParser parser = new GnuParser(); + CommandLine commandLine; + try { + commandLine = parser.parse(options, args); + remainingArgs = commandLine.getArgs(); + if (!(remainingArgs == null || remainingArgs.length == 0)) { + context.getStratosApplication().printUsage(getName()); + return CliConstants.BAD_ARGS_CODE; + } + + if (commandLine.hasOption(CliConstants.FULL_OPTION)) { + if (logger.isTraceEnabled()) { + logger.trace("Full option is passed"); + } + full = true; + } + if (logger.isDebugEnabled()) { + logger.debug("Listing subscribed cartridges, Full Option: {}", full); + } + RestCommandLineService.getInstance().listSubscribedCartridges(full); + //CommandLineService.getInstance().listSubscribedCartridges(full); + return CliConstants.SUCCESSFUL_CODE; + } catch (ParseException e) { + if (logger.isErrorEnabled()) { + logger.error("Error parsing arguments", e); + } + System.out.println(e.getMessage()); + return CliConstants.BAD_ARGS_CODE; + } + } else { + context.getStratosApplication().printUsage(getName()); + return CliConstants.BAD_ARGS_CODE; + } + } + + public Options getOptions() { + return options; + } + +} http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d139d0a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribeCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribeCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribeCommand.java index 031abf5..4917708 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribeCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribeCommand.java @@ -35,7 +35,7 @@ import org.apache.stratos.cli.utils.CliConstants; public class SubscribeCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(ListCommand.class); + private static final Logger logger = LoggerFactory.getLogger(ListSubscribedCartridgesCommand.class); private final Options options; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d139d0a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java index 1f70896..61f8568 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java @@ -783,6 +783,10 @@ public class ServiceUtils { } cartridge.setActiveInstances(activeMemberCount); cartridge.setStatus(cartridgeStatus); + + // Ignoring the LB cartridges since they are not shown to the user. + if(cartridge.isLoadBalancer()) + continue; cartridges.add(cartridge); } } else { @@ -858,8 +862,7 @@ public class ServiceUtils { return noOfActiveInstances; } - private static Cartridge getCartridgeFromSubscription( - CartridgeSubscription subscription) throws RestAPIException { + private static Cartridge getCartridgeFromSubscription(CartridgeSubscription subscription) throws RestAPIException { if (subscription == null) { return null; @@ -901,6 +904,14 @@ public class ServiceUtils { cartridge.setStatus(subscription.getSubscriptionStatus()); cartridge.setPortMappings(subscription.getCartridgeInfo() .getPortMappings()); + + if(subscription.getCartridgeInfo().getLbConfig() != null && subscription.getCartridgeInfo().getProperties() != null) { + for(Property property: subscription.getCartridgeInfo().getProperties()) { + if(property.getName().equals("load.balancer")) { + cartridge.setLoadBalancer(true); + } + } + } return cartridge;
