From a20ed3a43de2de6df10e2348330371fba7a535a0 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessicawang@apache.org>
Date: Fri, 26 Apr 2013 11:37:32 -0700
Subject: [PATCH] CLOUDSTACK-2120: mixed zone management - API: change
 listZones API to to take in zonetype instead of networktype (to be consistent
 with other listXXXXXXXs API).

---
 .../cloudstack/api/command/user/zone/ListZonesByCmd.java | 9 +++++----
 server/src/com/cloud/api/query/QueryManagerImpl.java     | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

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 d0dc736f1a6..ed31037407f 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() {
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java
index 2c003d31679..50018e53efb 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();