You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/04/18 19:50:24 UTC
[05/17] git commit: updated refs/heads/ui-cisco-asa1000v-support to
9a876ca
Apart from the UUID, we need not log any other details for AffinityGroup in error messages.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e03176c4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e03176c4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e03176c4
Branch: refs/heads/ui-cisco-asa1000v-support
Commit: e03176c4d47d4c109f935beceb557e0c2de9a6c6
Parents: 3a9c63d
Author: Prachi Damle <pr...@cloud.com>
Authored: Wed Apr 17 18:03:34 2013 -0700
Committer: Prachi Damle <pr...@cloud.com>
Committed: Wed Apr 17 18:04:18 2013 -0700
----------------------------------------------------------------------
.../api/command/user/vm/DeployVMCmd.java | 5 ++---
.../cloudstack/affinity/AffinityGroupVO.java | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e03176c4/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
index 77ba9fe..70c0159 100755
--- a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
@@ -230,7 +230,7 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
for (String groupName : securityGroupNameList) {
Long groupId = _responseGenerator.getSecurityGroupId(groupName, getEntityOwnerId());
if (groupId == null) {
- throw new InvalidParameterValueException("Unable to find group by name " + groupName + " for account " + getEntityOwnerId());
+ throw new InvalidParameterValueException("Unable to find group by name " + groupName);
} else {
securityGroupIds.add(groupId);
}
@@ -344,8 +344,7 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
for (String groupName : affinityGroupNameList) {
Long groupId = _responseGenerator.getAffinityGroupId(groupName, getEntityOwnerId());
if (groupId == null) {
- throw new InvalidParameterValueException("Unable to find group by name " + groupName
- + " for account " + getEntityOwnerId());
+ throw new InvalidParameterValueException("Unable to find affinity group by name " + groupName);
} else {
affinityGroupIds.add(groupId);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e03176c4/server/src/org/apache/cloudstack/affinity/AffinityGroupVO.java
----------------------------------------------------------------------
diff --git a/server/src/org/apache/cloudstack/affinity/AffinityGroupVO.java b/server/src/org/apache/cloudstack/affinity/AffinityGroupVO.java
index b6c4a02..f418cef 100644
--- a/server/src/org/apache/cloudstack/affinity/AffinityGroupVO.java
+++ b/server/src/org/apache/cloudstack/affinity/AffinityGroupVO.java
@@ -107,7 +107,7 @@ public class AffinityGroupVO implements AffinityGroup {
@Override
public String toString() {
StringBuilder buf = new StringBuilder("AffinityGroup[");
- buf.append(id).append("|").append(name).append("|").append(type).append("]");
+ buf.append(uuid).append("]");
return buf.toString();
}