You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2012/07/03 01:40:17 UTC
[4/13] git commit: CS-6840: List all objects without require parameter
CS-6840: List all objects without require parameter
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d9688f74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d9688f74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d9688f74
Branch: refs/heads/vpc
Commit: d9688f74ba432cf53745e08090e6bdeab3793c7c
Parents: 3995dc9
Author: Sheng Yang <sh...@citrix.com>
Authored: Thu Jun 28 15:22:32 2012 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Mon Jul 2 16:29:10 2012 -0700
----------------------------------------------------------------------
.../cloud/api/commands/ListVpnConnectionsCmd.java | 2 +-
.../api/commands/ListVpnCustomerGatewaysCmd.java | 2 +-
.../com/cloud/api/commands/ListVpnGatewaysCmd.java | 2 +-
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 6 ++++++
4 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d9688f74/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java b/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
index cc9331b..0b5e69d 100644
--- a/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
+++ b/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
@@ -37,7 +37,7 @@ public class ListVpnConnectionsCmd extends BaseListProjectAndAccountResourcesCmd
/////////////////////////////////////////////////////
@IdentityMapper(entityTableName="s2s_vpn_connection")
- @Parameter(name=ApiConstants.ID, type=CommandType.LONG, required=true, description="id of the vpn connection")
+ @Parameter(name=ApiConstants.ID, type=CommandType.LONG, description="id of the vpn connection")
private Long id;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d9688f74/api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java b/api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
index 3351834..9f5a143 100644
--- a/api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
+++ b/api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
@@ -37,7 +37,7 @@ public class ListVpnCustomerGatewaysCmd extends BaseListProjectAndAccountResourc
/////////////////////////////////////////////////////
@IdentityMapper(entityTableName="s2s_customer_gateway")
- @Parameter(name=ApiConstants.ID, type=CommandType.LONG, required=true, description="id of the customer gateway")
+ @Parameter(name=ApiConstants.ID, type=CommandType.LONG, description="id of the customer gateway")
private Long id;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d9688f74/api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java b/api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
index b72b1bb..46d5d7d 100644
--- a/api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
+++ b/api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
@@ -37,7 +37,7 @@ public class ListVpnGatewaysCmd extends BaseListProjectAndAccountResourcesCmd {
/////////////////////////////////////////////////////
@IdentityMapper(entityTableName="s2s_vpn_gateway")
- @Parameter(name=ApiConstants.ID, type=CommandType.LONG, required=true, description="id of the vpn gateway")
+ @Parameter(name=ApiConstants.ID, type=CommandType.LONG, description="id of the vpn gateway")
private Long id;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d9688f74/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
index bc634ef..eca1d80 100644
--- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
@@ -306,6 +306,8 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnService, Manager {
List<Site2SiteCustomerGateway> results = new ArrayList<Site2SiteCustomerGateway>();
if (id != null) {
results.add(_customerGatewayDao.findById(cmd.getId()));
+ } else {
+ results.addAll(_customerGatewayDao.listAll());
}
return results;
}
@@ -316,6 +318,8 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnService, Manager {
List<Site2SiteVpnGateway> results = new ArrayList<Site2SiteVpnGateway>();
if (id != null) {
results.add(_vpnGatewayDao.findById(cmd.getId()));
+ } else {
+ results.addAll(_vpnGatewayDao.listAll());
}
return results;
}
@@ -326,6 +330,8 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnService, Manager {
List<Site2SiteVpnConnection> results = new ArrayList<Site2SiteVpnConnection>();
if (id != null) {
results.add(_vpnConnectionDao.findById(cmd.getId()));
+ } else {
+ results.addAll(_vpnConnectionDao.listAll());
}
return results;
}