You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/08/19 19:33:05 UTC
[1/2] git commit: updated refs/heads/4.1 to 50c7a48
Updated Branches:
refs/heads/4.1 8001e270b -> 50c7a4825
CLOUDSTACK-4296: fix parameter setting error in listVirtualMachines command
(cherry picked from commit 72f013f7809db70755f0ff59f8c888d95d5179b5)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/52aaa331
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/52aaa331
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/52aaa331
Branch: refs/heads/4.1
Commit: 52aaa3311eff3c75ac680f6cd87eacbb86cf85ed
Parents: 8001e27
Author: Wei Zhou <w....@leaseweb.com>
Authored: Tue Aug 13 21:38:27 2013 +0200
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Mon Aug 19 19:23:28 2013 +0200
----------------------------------------------------------------------
.../org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java | 6 +++---
server/src/com/cloud/api/query/QueryManagerImpl.java | 6 +++---
server/src/com/cloud/api/query/vo/UserVmJoinVO.java | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52aaa331/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
index 30f03b8..c85622b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
@@ -65,7 +65,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")
@@ -126,8 +126,8 @@ public class ListVMsCmd extends BaseListTaggedResourcesCmd {
return id;
}
- public String getInstanceName() {
- return instanceName;
+ public String getName() {
+ return name;
}
public Long getPodId() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52aaa331/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 e05bc54..76c6d49 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -618,7 +618,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
//Criteria c = new Criteria(null, Boolean.FALSE, cmd.getStartIndex(), 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());
@@ -685,7 +685,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);
@@ -738,7 +738,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);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52aaa331/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
index b3f4343..51679ae 100644
--- a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
@@ -1628,7 +1628,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;
}
[2/2] git commit: updated refs/heads/4.1 to 50c7a48
Posted by we...@apache.org.
CLOUDSTACK-4296: fix a similar issue
(cherry picked from commit e2f47871d17351dae7555a48e0cd4d3dbe2ab2e2)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/50c7a482
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/50c7a482
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/50c7a482
Branch: refs/heads/4.1
Commit: 50c7a48254468a564d07a40371fec23b11a76c14
Parents: 52aaa33
Author: Wei Zhou <w....@leaseweb.com>
Authored: Tue Aug 13 21:55:55 2013 +0200
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Mon Aug 19 19:23:35 2013 +0200
----------------------------------------------------------------------
server/src/com/cloud/api/query/QueryManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50c7a482/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 76c6d49..9a78b2e 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -1008,11 +1008,11 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
if (keyword != null) {
SearchCriteria<DomainRouterJoinVO> ssc = _routerJoinDao.createSearchCriteria();
- 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.LIKE, "%" + keyword + "%");
- sc.addAnd("hostName", SearchCriteria.Op.SC, ssc);
+ sc.addAnd("instanceName", SearchCriteria.Op.SC, ssc);
}
if (name != null) {