You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2014/02/13 10:44:27 UTC
git commit: Fixed list-subscribed-cartridge command error in CLI
Updated Branches:
refs/heads/master 5069b4fac -> 704661adb
Fixed list-subscribed-cartridge command error in CLI
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/704661ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/704661ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/704661ad
Branch: refs/heads/master
Commit: 704661adb5761c75aa388d16f495278c5425486c
Parents: 5069b4f
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Thu Feb 13 15:13:56 2014 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Thu Feb 13 15:13:56 2014 +0530
----------------------------------------------------------------------
.../apache/stratos/cli/RestCommandLineService.java | 14 +++++++-------
.../apache/stratos/cli/beans/cartridge/Cartridge.java | 9 +++++++++
2 files changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/704661ad/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 393289a..ee9e152 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
@@ -350,7 +350,7 @@ public class RestCommandLineService {
// Filter out LB cartridges
List<Cartridge> allCartridges = cartridgeList.getCartridge();
for (Cartridge cartridge : allCartridges) {
- if(!cartridge.getProvider().equals("lb")){
+ if( ! cartridge.isLoadBalancer()) {
applicationCartridgeList.getCartridge().add(cartridge);
}
}
@@ -369,7 +369,7 @@ public class RestCommandLineService {
RowMapper<Cartridge> cartridgeMapper = new RowMapper<Cartridge>() {
public String[] getData(Cartridge cartridge) {
- String[] data = full ? new String[11] : new String[9];
+ String[] data = full ? new String[10] : new String[8];
data[0] = cartridge.getCartridgeType();
data[1] = cartridge.getDisplayName();
data[2] = cartridge.getVersion();
@@ -377,11 +377,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();
- data[8] = cartridge.getHostName();
+ data[7] = cartridge.getHostName();
if (full) {
- data[9] = getAccessURLs(cartridge);
- data[10] = cartridge.getRepoURL() != null ? cartridge.getRepoURL() : "";
+ data[8] = getAccessURLs(cartridge);
+ data[9] = cartridge.getRepoURL() != null ? cartridge.getRepoURL() : "";
}
return data;
@@ -396,7 +395,7 @@ public class RestCommandLineService {
headers.add("Alias");
headers.add("Status");
headers.add("Running Instances");
- headers.add("LB Cluster ID");
+ //headers.add("LB Cluster ID");
headers.add("Host Name");
if (full) {
headers.add("Access URL(s)");
@@ -406,6 +405,7 @@ public class RestCommandLineService {
System.out.println("Subscribed Cartridges:");
CommandLineUtils.printTable(cartridges, cartridgeMapper, headers.toArray(new String[headers.size()]));
System.out.println();
+
} catch (Exception e) {
handleException("Exception in listing subscribe cartridges", e);
} finally {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/704661ad/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 2c155c1..5d1bde9 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,6 +45,7 @@ public class Cartridge implements Comparable<Cartridge> {
private String dbHost;
private String publicIp;
private String lbClusterId;
+ private boolean isLoadBalancer;
private String[] accessURLs;
private PortMapping[] portMappings;
@@ -235,4 +236,12 @@ public class Cartridge implements Comparable<Cartridge> {
public void setLbClusterId(String lbClusterId) {
this.lbClusterId = lbClusterId;
}
+
+ public boolean isLoadBalancer() {
+ return isLoadBalancer;
+ }
+
+ public void setLoadBalancer(boolean isLoadBalancer) {
+ this.isLoadBalancer = isLoadBalancer;
+ }
}