You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/04/29 15:14:15 UTC
[37/50] [abbrv] git commit: updated refs/heads/marvin_refactor to
7c439fe
CLOUDSTACK-2120: mixed zone management - API: change listZones API to to take in zonetype instead of networktype (to be consistent with other listXXXXXXXs API).
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a20ed3a4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a20ed3a4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a20ed3a4
Branch: refs/heads/marvin_refactor
Commit: a20ed3a43de2de6df10e2348330371fba7a535a0
Parents: 3e2eb59
Author: Jessica Wang <je...@apache.org>
Authored: Fri Apr 26 11:37:32 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Fri Apr 26 11:37:32 2013 -0700
----------------------------------------------------------------------
.../api/command/user/zone/ListZonesByCmd.java | 9 +++++----
.../src/com/cloud/api/query/QueryManagerImpl.java | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a20ed3a4/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java b/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
index d0dc736..ed31037 100644
--- a/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
@@ -23,6 +23,7 @@ import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.BaseCmd.CommandType;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
@@ -56,8 +57,8 @@ public class ListZonesByCmd extends BaseListCmd {
@Parameter(name=ApiConstants.NAME, type=CommandType.STRING, description="the name of the zone")
private String name;
- @Parameter(name=ApiConstants.NETWORK_TYPE, type=CommandType.STRING, description="the network type of the zone")
- private String networkType;
+ @Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network type of the zone that the virtual machine belongs to")
+ private String zoneType;
@Parameter(name=ApiConstants.SHOW_CAPACITIES, type=CommandType.BOOLEAN, description="flag to display the capacity of the zones")
private Boolean showCapacities;
@@ -82,8 +83,8 @@ public class ListZonesByCmd extends BaseListCmd {
return name;
}
- public String getNetworkType(){
- return networkType;
+ public String getZoneType() {
+ return zoneType;
}
public Boolean getShowCapacities() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a20ed3a4/server/src/com/cloud/api/query/QueryManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java
index 2c003d3..50018e5 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -2219,7 +2219,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
Long id = cmd.getId();
String keyword = cmd.getKeyword();
String name = cmd.getName();
- String networkType = cmd.getNetworkType();
+ String networkType = cmd.getZoneType();
Filter searchFilter = new Filter(DataCenterJoinVO.class, null, false, cmd.getStartIndex(), cmd.getPageSizeVal());
SearchCriteria<DataCenterJoinVO> sc = _dcJoinDao.createSearchCriteria();