Fixing issues with describe cartridges in CLI
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fe382155 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fe382155 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fe382155 Branch: refs/heads/master Commit: fe38215594a76fd0f6fe4ed8291985dfca6cec2e Parents: 1ed8c35 Author: anuruddhal <[email protected]> Authored: Wed May 20 11:55:33 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Wed May 20 19:51:19 2015 +0530 ---------------------------------------------------------------------- .../apache/stratos/cli/RestCommandLineService.java | 14 ++++++-------- .../src/main/webapp/api/WEB-INF/cxf-servlet.xml | 3 ++- 2 files changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/fe382155/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 d430572..8dd1b42 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 @@ -379,7 +379,7 @@ public class RestCommandLineService { listType, "Cartridge Groups"); if ((cartridgeGroupList == null) || (cartridgeGroupList.size() == 0)) { - System.out.println("No cartridges found"); + System.out.println("No cartridge groups found"); return; } @@ -444,22 +444,20 @@ public class RestCommandLineService { if (cartridge.getIaasProvider() != null) { RowMapper<IaasProviderBean> cartridgeMapper = new RowMapper<IaasProviderBean>() { public String[] getData(IaasProviderBean row) { - String[] data = new String[4]; - data[0] = row.getProvider(); - data[1] = row.getType(); - data[2] = row.getName(); - data[3] = row.getImageId(); + String[] data = new String[2]; + data[0] = row.getType(); + data[1] = row.getImageId(); return data; } }; - IaasProviderBean[] iaasProviders = new IaasProviderBean[cartridgeList.size()]; + IaasProviderBean[] iaasProviders = new IaasProviderBean[cartridge.getIaasProvider().size()]; iaasProviders = cartridge.getIaasProvider().toArray(iaasProviders); System.out.println("-------------------------------------"); System.out.println("IaaS Providers: "); System.out.println("-------------------------------------"); - CliUtils.printTable(iaasProviders, cartridgeMapper, "Provider", "Type", "Name", "Image ID"); + CliUtils.printTable(iaasProviders, cartridgeMapper, "Type", "Image ID"); } System.out.println("-------------------------------------"); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/stratos/blob/fe382155/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml index f2972a1..f22eb1d 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml +++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml @@ -117,7 +117,7 @@ <value>property</value> <value>hostNames</value> <value>memberMap</value> - <value>portMap</value> + <value>portMapping</value> <value>partitionGroup</value> <value>partition</value> <value>member</value> @@ -147,6 +147,7 @@ <value>metadataKeys</value> <value>networkInterfaces</value> <value>iaasProvider</value> + <value>floatingNetworks</value> </list> </property> </bean>
