Skip to content

Commit b5abc08

Browse files
author
Jessica Wang
committed
CLOUDSTACK-3016: remove zonetype parameter from listRouters API, listInternalLbVms API.
1 parent f2e6aba commit b5abc08

3 files changed

Lines changed: 6 additions & 25 deletions

File tree

‎api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,7 @@ public class ListInternalLBVMsCmd extends BaseListProjectAndAccountResourcesCmd
7575

7676
@Parameter(name=ApiConstants.FOR_VPC, type=CommandType.BOOLEAN, description="if true is passed for this parameter, list only VPC Internal LB VMs")
7777
private Boolean forVpc;
78-
79-
@Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network type of the zone that the virtual machine belongs to")
80-
private String zoneType;
81-
78+
8279

8380
/////////////////////////////////////////////////////
8481
/////////////////// Accessors ///////////////////////
@@ -123,10 +120,7 @@ public Boolean getForVpc() {
123120
public String getRole() {
124121
return Role.INTERNAL_LB_VM.toString();
125122
}
126-
127-
public String getZoneType() {
128-
return zoneType;
129-
}
123+
130124

131125
/////////////////////////////////////////////////////
132126
/////////////// API Implementation///////////////////

‎api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ public class ListRoutersCmd extends BaseListProjectAndAccountResourcesCmd {
6565
description="the Zone ID of the router")
6666
private Long zoneId;
6767

68-
@Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network type of the zone that the virtual machine belongs to")
69-
private String zoneType;
70-
7168
@Parameter(name=ApiConstants.NETWORK_ID, type=CommandType.UUID, entityType=NetworkResponse.class,
7269
description="list by network id")
7370
private Long networkId;
@@ -107,10 +104,6 @@ public Long getZoneId() {
107104
return zoneId;
108105
}
109106

110-
public String getZoneType() {
111-
return zoneType;
112-
}
113-
114107
public Long getNetworkId() {
115108
return networkId;
116109
}

‎server/src/com/cloud/api/query/QueryManagerImpl.java‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@ private Pair<List<SecurityGroupJoinVO>, Integer> listSecurityGroupRulesByVM(long
981981
public ListResponse<DomainRouterResponse> searchForRouters(ListRoutersCmd cmd) {
982982
Pair<List<DomainRouterJoinVO>, Integer> result = searchForRoutersInternal(cmd, cmd.getId(), cmd.getRouterName(),
983983
cmd.getState(), cmd.getZoneId(), cmd.getPodId(), cmd.getHostId(), cmd.getKeyword(), cmd.getNetworkId(),
984-
cmd.getVpcId(), cmd.getForVpc(), cmd.getRole(), cmd.getZoneType());
984+
cmd.getVpcId(), cmd.getForVpc(), cmd.getRole());
985985
ListResponse<DomainRouterResponse> response = new ListResponse<DomainRouterResponse>();
986986

987987
List<DomainRouterResponse> routerResponses = ViewResponseHelper.createDomainRouterResponse(result.first().toArray(new DomainRouterJoinVO[result.first().size()]));
@@ -994,17 +994,17 @@ public ListResponse<DomainRouterResponse> searchForRouters(ListRoutersCmd cmd) {
994994
public ListResponse<DomainRouterResponse> searchForInternalLbVms(ListInternalLBVMsCmd cmd) {
995995
Pair<List<DomainRouterJoinVO>, Integer> result = searchForRoutersInternal(cmd, cmd.getId(), cmd.getRouterName(),
996996
cmd.getState(), cmd.getZoneId(), cmd.getPodId(), cmd.getHostId(), cmd.getKeyword(), cmd.getNetworkId(),
997-
cmd.getVpcId(), cmd.getForVpc(), cmd.getRole(), cmd.getZoneType());
997+
cmd.getVpcId(), cmd.getForVpc(), cmd.getRole());
998998
ListResponse<DomainRouterResponse> response = new ListResponse<DomainRouterResponse>();
999999

10001000
List<DomainRouterResponse> routerResponses = ViewResponseHelper.createDomainRouterResponse(result.first().toArray(new DomainRouterJoinVO[result.first().size()]));
10011001
response.setResponses(routerResponses, result.second());
10021002
return response;
10031003
}
1004-
1004+
10051005

10061006
private Pair<List<DomainRouterJoinVO>, Integer> searchForRoutersInternal(BaseListProjectAndAccountResourcesCmd cmd, Long id,
1007-
String name, String state, Long zoneId, Long podId, Long hostId, String keyword, Long networkId, Long vpcId, Boolean forVpc, String role, String zoneType) {
1007+
String name, String state, Long zoneId, Long podId, Long hostId, String keyword, Long networkId, Long vpcId, Boolean forVpc, String role) {
10081008

10091009

10101010
Account caller = UserContext.current().getCaller();
@@ -1032,7 +1032,6 @@ private Pair<List<DomainRouterJoinVO>, Integer> searchForRoutersInternal(BaseLis
10321032
sb.and("accountId", sb.entity().getAccountId(), SearchCriteria.Op.IN);
10331033
sb.and("state", sb.entity().getState(), SearchCriteria.Op.EQ);
10341034
sb.and("dataCenterId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ);
1035-
sb.and("dataCenterType", sb.entity().getDataCenterType(), SearchCriteria.Op.EQ);
10361035
sb.and("podId", sb.entity().getPodId(), SearchCriteria.Op.EQ);
10371036
sb.and("hostId", sb.entity().getHostId(), SearchCriteria.Op.EQ);
10381037
sb.and("vpcId", sb.entity().getVpcId(), SearchCriteria.Op.EQ);
@@ -1082,11 +1081,6 @@ private Pair<List<DomainRouterJoinVO>, Integer> searchForRoutersInternal(BaseLis
10821081
sc.setParameters("podId", podId);
10831082
}
10841083

1085-
if (zoneType != null) {
1086-
sc.setParameters("dataCenterType", zoneType);
1087-
}
1088-
1089-
10901084
if (hostId != null) {
10911085
sc.setParameters("hostId", hostId);
10921086
}

0 commit comments

Comments
 (0)