Repository: stratos Updated Branches: refs/heads/master bbf34f7f2 -> 9ea2e1d0d
Added isPublic and description fields to cli beans. Updated cli output accordingly Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/79507d46 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/79507d46 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/79507d46 Branch: refs/heads/master Commit: 79507d46dadaef8824d908f6559bdc5007792398 Parents: f010309 Author: Shiro <[email protected]> Authored: Fri Sep 26 16:57:01 2014 +0530 Committer: Shiro <[email protected]> Committed: Fri Sep 26 16:57:01 2014 +0530 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 46 ++++++++++++-------- .../beans/autoscaler/partition/Partition.java | 20 +++++++++ .../policy/autoscale/AutoscalePolicy.java | 13 +++++- .../policy/deployment/DeploymentPolicy.java | 22 +++++++++- .../stratos/cli/beans/cartridge/Cartridge.java | 9 ++++ .../beans/cartridge/ServiceDefinitionBean.java | 9 ++++ 6 files changed, 97 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/79507d46/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 cb83ba8..847fefa 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 @@ -349,12 +349,13 @@ public class RestCommandLineService { RowMapper<Cartridge> cartridgeMapper = new RowMapper<Cartridge>() { public String[] getData(Cartridge cartridge) { - String[] data = new String[5]; + String[] data = new String[6]; data[0] = cartridge.getCartridgeType(); data[1] = cartridge.getDisplayName(); data[2] = cartridge.getDescription(); data[3] = cartridge.getVersion(); data[4] = String.valueOf(cartridge.isMultiTenant()); + data[5] = cartridge.getIsPublic() ? "Public" : "Private";; return data; } @@ -390,7 +391,7 @@ public class RestCommandLineService { cartridges1 = singleTeneCartridgetList.getCartridge().toArray(cartridges1 ); System.out.println("Available Single-Tenant Cartridges:"); - CommandLineUtils.printTable(cartridges1, cartridgeMapper, "Type", "Name", "Description", "Version", "Multitenanted"); + CommandLineUtils.printTable(cartridges1, cartridgeMapper, "Type", "Name", "Description", "Version", "Multitenanted", "Accessibility"); System.out.println(); } } catch (Exception e) { @@ -491,18 +492,19 @@ public class RestCommandLineService { RowMapper<Cartridge> cartridgeMapper = new RowMapper<Cartridge>() { public String[] getData(Cartridge cartridge) { - String[] data = full ? new String[10] : new String[8]; + String[] data = full ? new String[11] : new String[9]; data[0] = cartridge.getCartridgeType(); data[1] = cartridge.getDisplayName(); - data[2] = cartridge.getVersion(); - data[3] = cartridge.isMultiTenant() ? "Multi-Tenant" : "Single-Tenant"; - data[4] = cartridge.getCartridgeAlias(); - data[5] = cartridge.getStatus(); - data[6] = cartridge.isMultiTenant() ? "N/A" : String.valueOf(cartridge.getActiveInstances()); - data[7] = cartridge.getHostName(); + data[2] = cartridge.getIsPublic() ? "Public" : "Private";; + data[3] = cartridge.getVersion(); + data[4] = cartridge.isMultiTenant() ? "Multi-Tenant" : "Single-Tenant"; + data[5] = cartridge.getCartridgeAlias(); + data[6] = cartridge.getStatus(); + data[7] = cartridge.isMultiTenant() ? "N/A" : String.valueOf(cartridge.getActiveInstances()); + data[8] = cartridge.getHostName(); if (full) { - data[8] = getAccessURLs(cartridge); - data[9] = cartridge.getRepoURL() != null ? cartridge.getRepoURL() : ""; + data[9] = getAccessURLs(cartridge); + data[10] = cartridge.getRepoURL() != null ? cartridge.getRepoURL() : ""; } return data; @@ -512,6 +514,7 @@ public class RestCommandLineService { List<String> headers = new ArrayList<String>(); headers.add("Type"); headers.add("Name"); + headers.add("Accessibility"); headers.add("Version"); headers.add("Tenancy Model"); headers.add("Alias"); @@ -574,6 +577,7 @@ public class RestCommandLineService { System.out.println("\tType : " + cartridge.getCartridgeType()); System.out.println("\tName : " + cartridge.getDisplayName()); System.out.println("\tVersion : " + cartridge.getVersion()); + System.out.println("\tPublic : " + cartridge.getIsPublic()); String tenancy = cartridge.isMultiTenant() ? "Multi-Tenant" : "Single-Tenant"; System.out.println("\tTenancy Model : " + tenancy); System.out.println("\tAlias : " + cartridge.getCartridgeAlias()); @@ -1536,12 +1540,13 @@ public class RestCommandLineService { RowMapper<ServiceDefinitionBean> deployServiceMapper = new RowMapper<ServiceDefinitionBean>() { public String[] getData(ServiceDefinitionBean definition) { - String[] data = new String[5]; + String[] data = new String[6]; data[0] = definition.getCartridgeType(); data[1] = definition.getDeploymentPolicyName(); data[2] = definition.getAutoscalingPolicyName(); data[3] = definition.getClusterDomain(); data[4] = definition.getTenantRange(); + data[5] = definition.getIsPublic() ? "Public" : "Private";; return data; } }; @@ -1559,7 +1564,7 @@ public class RestCommandLineService { System.out.println("Available Deploy Services :"); CommandLineUtils.printTable(definitionArry, deployServiceMapper, "Cartridge Type", "Deployment Policy Name", - "Autoscaling Policy Name", "Cluster Domain", "Tenant Range"); + "Autoscaling Policy Name", "Cluster Domain", "Tenant Range", "Accessibility"); System.out.println(); } catch (Exception e) { @@ -1631,9 +1636,10 @@ public class RestCommandLineService { RowMapper<Partition> partitionMapper = new RowMapper<Partition>() { public String[] getData(Partition partition) { - String[] data = new String[2]; + String[] data = new String[3]; data[0] = partition.getId(); data[1] = partition.getProvider(); + data[2] = partition.getIsPublic() ? "Public" : "Private"; return data; } }; @@ -1652,7 +1658,7 @@ public class RestCommandLineService { } System.out.println("Available Partitions:" ); - CommandLineUtils.printTable(partitions, partitionMapper, "ID", "Provider"); + CommandLineUtils.printTable(partitions, partitionMapper, "ID", "Provider", "Accessibilty"); System.out.println(); } catch (Exception e) { @@ -1698,8 +1704,9 @@ public class RestCommandLineService { RowMapper<AutoscalePolicy> partitionMapper = new RowMapper<AutoscalePolicy>() { public String[] getData(AutoscalePolicy policy) { - String[] data = new String[1]; + String[] data = new String[2]; data[0] = policy.getId(); + data[1] = policy.getIsPublic() ? "Public" : "Private"; return data; } }; @@ -1718,7 +1725,7 @@ public class RestCommandLineService { } System.out.println("Available Auto-scaling Policies:"); - CommandLineUtils.printTable(policyArry, partitionMapper, "ID"); + CommandLineUtils.printTable(policyArry, partitionMapper, "ID", "Accessibility"); } catch (Exception e) { handleException("Exception in listing autoscale policies", e); @@ -1762,8 +1769,9 @@ public class RestCommandLineService { RowMapper<DeploymentPolicy> partitionMapper = new RowMapper<DeploymentPolicy>() { public String[] getData(DeploymentPolicy policy) { - String[] data = new String[1]; + String[] data = new String[2]; data[0] = policy.getId(); + data[1] = policy.getIsPublic() ? "Public" : "Private"; return data; } }; @@ -1782,7 +1790,7 @@ public class RestCommandLineService { } System.out.println("Available Deployment Policies:"); - CommandLineUtils.printTable(policyArry, partitionMapper, "ID"); + CommandLineUtils.printTable(policyArry, partitionMapper, "ID", "Accessibility"); System.out.println(); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/stratos/blob/79507d46/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/autoscaler/partition/Partition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/autoscaler/partition/Partition.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/autoscaler/partition/Partition.java index aeda738..e04f073 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/autoscaler/partition/Partition.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/autoscaler/partition/Partition.java @@ -23,6 +23,10 @@ import java.util.List; public class Partition { private String id; + + private String description; + + private boolean isPublic; private int partitionMin; @@ -71,6 +75,22 @@ public class Partition { public void setProperty(List<PropertyBean> property) { this.property = property; } + + public boolean getIsPublic() { + return isPublic; + } + + public void setIsPublic(boolean isPublic) { + this.isPublic = isPublic; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/79507d46/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/autoscaler/policy/autoscale/AutoscalePolicy.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/autoscaler/policy/autoscale/AutoscalePolicy.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/autoscaler/policy/autoscale/AutoscalePolicy.java index 3f0bc9a..919d3b6 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/autoscaler/policy/autoscale/AutoscalePolicy.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/autoscaler/policy/autoscale/AutoscalePolicy.java @@ -25,10 +25,11 @@ public class AutoscalePolicy { private String displayName; private String description; + + private boolean isPublic; private LoadThresholds loadThresholds; - - + public String getId() { return id; } @@ -60,4 +61,12 @@ public class AutoscalePolicy { public void setLoadThresholds(LoadThresholds loadThresholds) { this.loadThresholds = loadThresholds; } + + public boolean getIsPublic() { + return isPublic; + } + + public void setIsPublic(boolean isPublic) { + this.isPublic = isPublic; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/79507d46/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/autoscaler/policy/deployment/DeploymentPolicy.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/autoscaler/policy/deployment/DeploymentPolicy.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/autoscaler/policy/deployment/DeploymentPolicy.java index 1899d89..cc40f47 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/autoscaler/policy/deployment/DeploymentPolicy.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/autoscaler/policy/deployment/DeploymentPolicy.java @@ -25,12 +25,16 @@ import java.util.List; public class DeploymentPolicy { private String id; + + private String description; + + private boolean isPublic; //partition groups private List<PartitionGroup> partitionGroup; //partitions - private List<Partition> partition; + private List<Partition> partition; public String getId() { return id; @@ -55,4 +59,20 @@ public class DeploymentPolicy { public void setPartition(List<Partition> partition) { this.partition = partition; } + + public boolean getIsPublic() { + return isPublic; + } + + public void setIsPublic(boolean isPublic) { + this.isPublic = isPublic; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/79507d46/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 a148a2d..ddbea1b 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 @@ -27,6 +27,7 @@ public class Cartridge implements Comparable<Cartridge> { private String displayName; private String description; + private boolean isPublic; private String cartridgeAlias; private String cartridgeType; private int activeInstances; @@ -246,6 +247,14 @@ public class Cartridge implements Comparable<Cartridge> { this.loadBalancer = isLoadBalancer; } + public boolean getIsPublic() { + return isPublic; + } + + public void setIsPublic(boolean isPublic) { + this.isPublic = isPublic; + } + public String getServiceGroup() { return serviceGroup; } http://git-wip-us.apache.org/repos/asf/stratos/blob/79507d46/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/cartridge/ServiceDefinitionBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/cartridge/ServiceDefinitionBean.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/cartridge/ServiceDefinitionBean.java index 52048d2..656f411 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/cartridge/ServiceDefinitionBean.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/cartridge/ServiceDefinitionBean.java @@ -21,6 +21,7 @@ package org.apache.stratos.cli.beans.cartridge; public class ServiceDefinitionBean { private String serviceName; + private boolean isPublic; private String cartridgeType; private String deploymentPolicyName; private String autoscalingPolicyName; @@ -83,4 +84,12 @@ public class ServiceDefinitionBean { public void setTenantRange(String tenantRange) { this.tenantRange = tenantRange; } + + public boolean getIsPublic() { + return isPublic; + } + + public void setIsPublic(boolean isPublic) { + this.isPublic = isPublic; + } }
