cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to b5abc08
Date Tue, 18 Jun 2013 17:41:47 GMT
Updated Branches:
  refs/heads/master f2e6ababa -> b5abc0862


CLOUDSTACK-3016: remove zonetype parameter from listRouters API, listInternalLbVms API.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b5abc086
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b5abc086
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b5abc086

Branch: refs/heads/master
Commit: b5abc0862b8877f8aee0df2b33cd0d55ea9f9649
Parents: f2e6aba
Author: Jessica Wang <jessicawang@apache.org>
Authored: Tue Jun 18 10:40:14 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Tue Jun 18 10:41:37 2013 -0700

----------------------------------------------------------------------
 .../admin/internallb/ListInternalLBVMsCmd.java        | 10 ++--------
 .../api/command/admin/router/ListRoutersCmd.java      |  7 -------
 server/src/com/cloud/api/query/QueryManagerImpl.java  | 14 ++++----------
 3 files changed, 6 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b5abc086/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
index e314b32..68370e8 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
@@ -75,10 +75,7 @@ public class ListInternalLBVMsCmd extends BaseListProjectAndAccountResourcesCmd
 
     @Parameter(name=ApiConstants.FOR_VPC, type=CommandType.BOOLEAN, description="if true
is passed for this parameter, list only VPC Internal LB VMs")
     private Boolean forVpc;
-    
-    @Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network
type of the zone that the virtual machine belongs to")
-    private String zoneType;
-    
+     
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
@@ -123,10 +120,7 @@ public class ListInternalLBVMsCmd extends BaseListProjectAndAccountResourcesCmd
     public String getRole() {
         return Role.INTERNAL_LB_VM.toString();
     }
-    
-    public String getZoneType() {
-        return zoneType;
-    }
+  
 
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b5abc086/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
index 78c3554..a74eb89 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
@@ -65,9 +65,6 @@ public class ListRoutersCmd extends BaseListProjectAndAccountResourcesCmd
{
             description="the Zone ID of the router")
     private Long zoneId;
 
-    @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.NETWORK_ID, type=CommandType.UUID, entityType=NetworkResponse.class,
             description="list by network id")
     private Long networkId;
@@ -107,10 +104,6 @@ public class ListRoutersCmd extends BaseListProjectAndAccountResourcesCmd
{
         return zoneId;
     }
 
-    public String getZoneType() {
-        return zoneType;
-    }
-    
     public Long getNetworkId() {
         return networkId;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b5abc086/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 f70f5ae..10ab8f1 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -981,7 +981,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService
{
     public ListResponse<DomainRouterResponse> searchForRouters(ListRoutersCmd cmd)
{
         Pair<List<DomainRouterJoinVO>, Integer> result = searchForRoutersInternal(cmd,
cmd.getId(), cmd.getRouterName(),
                 cmd.getState(), cmd.getZoneId(), cmd.getPodId(), cmd.getHostId(), cmd.getKeyword(),
cmd.getNetworkId(),
-                cmd.getVpcId(), cmd.getForVpc(), cmd.getRole(), cmd.getZoneType());
+                cmd.getVpcId(), cmd.getForVpc(), cmd.getRole());
         ListResponse<DomainRouterResponse> response = new ListResponse<DomainRouterResponse>();
 
         List<DomainRouterResponse> routerResponses = ViewResponseHelper.createDomainRouterResponse(result.first().toArray(new
DomainRouterJoinVO[result.first().size()]));
@@ -994,17 +994,17 @@ public class QueryManagerImpl extends ManagerBase implements QueryService
{
     public ListResponse<DomainRouterResponse> searchForInternalLbVms(ListInternalLBVMsCmd
cmd) {
         Pair<List<DomainRouterJoinVO>, Integer> result = searchForRoutersInternal(cmd,
cmd.getId(), cmd.getRouterName(),
                 cmd.getState(), cmd.getZoneId(), cmd.getPodId(), cmd.getHostId(), cmd.getKeyword(),
cmd.getNetworkId(),
-                cmd.getVpcId(), cmd.getForVpc(), cmd.getRole(), cmd.getZoneType());
+                cmd.getVpcId(), cmd.getForVpc(), cmd.getRole());
         ListResponse<DomainRouterResponse> response = new ListResponse<DomainRouterResponse>();
 
         List<DomainRouterResponse> routerResponses = ViewResponseHelper.createDomainRouterResponse(result.first().toArray(new
DomainRouterJoinVO[result.first().size()]));
         response.setResponses(routerResponses, result.second());
         return response;
     }
-
+    
 
     private Pair<List<DomainRouterJoinVO>, Integer> searchForRoutersInternal(BaseListProjectAndAccountResourcesCmd
cmd, Long id,
-            String name, String state, Long zoneId, Long podId, Long hostId, String keyword,
Long networkId, Long vpcId, Boolean forVpc, String role, String zoneType) {
+            String name, String state, Long zoneId, Long podId, Long hostId, String keyword,
Long networkId, Long vpcId, Boolean forVpc, String role) {
        
 
         Account caller = UserContext.current().getCaller();
@@ -1032,7 +1032,6 @@ public class QueryManagerImpl extends ManagerBase implements QueryService
{
         sb.and("accountId", sb.entity().getAccountId(), SearchCriteria.Op.IN);
         sb.and("state", sb.entity().getState(), SearchCriteria.Op.EQ);
         sb.and("dataCenterId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ);
-        sb.and("dataCenterType", sb.entity().getDataCenterType(), SearchCriteria.Op.EQ);
         sb.and("podId", sb.entity().getPodId(), SearchCriteria.Op.EQ);
         sb.and("hostId", sb.entity().getHostId(), SearchCriteria.Op.EQ);
         sb.and("vpcId", sb.entity().getVpcId(), SearchCriteria.Op.EQ);
@@ -1082,11 +1081,6 @@ public class QueryManagerImpl extends ManagerBase implements QueryService
{
             sc.setParameters("podId", podId);
         }
 
-        if (zoneType != null) {
-            sc.setParameters("dataCenterType", zoneType);
-        }
-        
-
         if (hostId != null) {
             sc.setParameters("hostId", hostId);
         }


Mime
View raw message