etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-4296: fix parameter setting error in listVirtualMachines command 

(cherry picked from commit 72f013f780)
This commit is contained in:
Wei Zhou 2013-08-13 21:38:27 +02:00
parent 5c35bd1b3e
commit da7f924cc5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
View File

@ -66,7 +66,7 @@ public class ListVMsCmd extends BaseListTaggedResourcesCmd {
private Long id;
@Parameter(name=ApiConstants.NAME, type=CommandType.STRING, description="name of the virtual machine")
private String instanceName;
private String name;
@Parameter(name=ApiConstants.POD_ID, type=CommandType.UUID, entityType=PodResponse.class,
description="the pod ID")
@ -130,8 +130,8 @@ public class ListVMsCmd extends BaseListTaggedResourcesCmd {
return id;
}
public String getInstanceName() {
return instanceName;
public String getName() {
return name;
}
public Long getPodId() {

6
server/src/com/cloud/api/query/QueryManagerImpl.java
View File

@ -710,7 +710,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
// cmd.getPageSizeVal()); //version without default sorting
c.addCriteria(Criteria.KEYWORD, cmd.getKeyword());
c.addCriteria(Criteria.ID, cmd.getId());
c.addCriteria(Criteria.NAME, cmd.getInstanceName());
c.addCriteria(Criteria.NAME, cmd.getName());
c.addCriteria(Criteria.STATE, cmd.getState());
c.addCriteria(Criteria.DATACENTERID, cmd.getZoneId());
c.addCriteria(Criteria.GROUPID, cmd.getGroupId());
@ -782,7 +782,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
sb.and("displayName", sb.entity().getDisplayName(), SearchCriteria.Op.LIKE);
sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
sb.and("name", sb.entity().getHostName(), SearchCriteria.Op.LIKE);
sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);
sb.and("stateEQ", sb.entity().getState(), SearchCriteria.Op.EQ);
sb.and("stateNEQ", sb.entity().getState(), SearchCriteria.Op.NEQ);
sb.and("stateNIN", sb.entity().getState(), SearchCriteria.Op.NIN);
@ -840,7 +840,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
if (keyword != null) {
SearchCriteria<UserVmJoinVO> ssc = _userVmJoinDao.createSearchCriteria();
ssc.addOr("displayName", SearchCriteria.Op.LIKE, "%" + keyword + "%");
ssc.addOr("hostName", SearchCriteria.Op.LIKE, "%" + keyword + "%");
ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%");
ssc.addOr("instanceName", SearchCriteria.Op.LIKE, "%" + keyword + "%");
ssc.addOr("state", SearchCriteria.Op.EQ, keyword);

2
server/src/com/cloud/api/query/vo/UserVmJoinVO.java
View File

@ -1653,7 +1653,7 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
@Override
public String toString() {
if (toString == null) {
toString = new StringBuilder("VM[").append(id).append("|").append(hostName).append("]").toString();
toString = new StringBuilder("VM[").append(id).append("|").append(name).append("]").toString();
}
return toString;
}