Updated Branches: refs/heads/master 0f6abf70b -> 8eedd4648
Show LB Cluster ID in list-subscribe-cartridge command Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8eedd464 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8eedd464 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8eedd464 Branch: refs/heads/master Commit: 8eedd4648051f730ac94250aea2a04939dbb5749 Parents: 0f6abf7 Author: Manula Thantriwatte <[email protected]> Authored: Tue Feb 11 14:50:57 2014 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Tue Feb 11 14:50:57 2014 +0530 ---------------------------------------------------------------------- .../java/org/apache/stratos/cli/RestCommandLineService.java | 8 +++++--- .../org/apache/stratos/cli/beans/cartridge/Cartridge.java | 9 +++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8eedd464/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 b02ea69..dfd1f0a 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 @@ -368,7 +368,7 @@ public class RestCommandLineService { RowMapper<Cartridge> cartridgeMapper = new RowMapper<Cartridge>() { public String[] getData(Cartridge cartridge) { - String[] data = full ? new String[9] : new String[7]; + String[] data = full ? new String[10] : new String[8]; data[0] = cartridge.getCartridgeType(); data[1] = cartridge.getDisplayName(); data[2] = cartridge.getVersion(); @@ -376,9 +376,10 @@ public class RestCommandLineService { data[4] = cartridge.getCartridgeAlias(); data[5] = cartridge.getStatus(); data[6] = cartridge.isMultiTenant() ? "N/A" : String.valueOf(cartridge.getActiveInstances()); + data[7] = cartridge.getLbClusterId(); if (full) { - data[7] = getAccessURLs(cartridge); - data[8] = cartridge.getRepoURL() != null ? cartridge.getRepoURL() : ""; + data[8] = getAccessURLs(cartridge); + data[9] = cartridge.getRepoURL() != null ? cartridge.getRepoURL() : ""; } return data; @@ -393,6 +394,7 @@ public class RestCommandLineService { headers.add("Alias"); headers.add("Status"); headers.add("Running Instances"); + headers.add("LB Cluster ID"); if (full) { headers.add("Access URL(s)"); headers.add("Repo URL"); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8eedd464/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 d5d9825..2c155c1 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 @@ -44,6 +44,7 @@ public class Cartridge implements Comparable<Cartridge> { private String mappedDomain; private String dbHost; private String publicIp; + private String lbClusterId; private String[] accessURLs; private PortMapping[] portMappings; @@ -226,4 +227,12 @@ public class Cartridge implements Comparable<Cartridge> { } return compare; } + + public String getLbClusterId() { + return lbClusterId; + } + + public void setLbClusterId(String lbClusterId) { + this.lbClusterId = lbClusterId; + } }
