You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2013/04/18 03:05:23 UTC
[1/3] git commit: updated refs/heads/master to e03176c
Updated Branches:
refs/heads/master 7182a939a -> e03176c4d
set Objectname to CreateAffinityGroupResponse Object. Also the listAffinityGroups is missing the 'type' property
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6dccf63a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6dccf63a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6dccf63a
Branch: refs/heads/master
Commit: 6dccf63a3229eb48be5c2ff941a1550b7741764d
Parents: 7182a93
Author: Prachi Damle <pr...@cloud.com>
Authored: Wed Apr 17 17:46:06 2013 -0700
Committer: Prachi Damle <pr...@cloud.com>
Committed: Wed Apr 17 18:04:13 2013 -0700
----------------------------------------------------------------------
server/src/com/cloud/api/ApiResponseHelper.java | 7 ++++++-
.../api/query/dao/AffinityGroupJoinDaoImpl.java | 1 +
.../cloud/api/query/vo/AffinityGroupJoinVO.java | 11 +++++++++++
setup/db/db/schema-410to420.sql | 1 +
4 files changed, 19 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6dccf63a/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 50d8de2..819c88b 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -3664,8 +3664,13 @@ public class ApiResponseHelper implements ResponseGenerator {
response.setName(group.getName());
response.setType(group.getType());
response.setDescription(group.getDescription());
- // response.setDomainId(account.)
+ Domain domain = ApiDBUtils.findDomainById(account.getDomainId());
+ if (domain != null) {
+ response.setDomainId(domain.getUuid());
+ response.setDomainName(domain.getName());
+ }
+ response.setObjectName("affinitygroup");
return response;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6dccf63a/server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java
index a176793..8743bcb 100644
--- a/server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java
@@ -63,6 +63,7 @@ public class AffinityGroupJoinDaoImpl extends GenericDaoBase<AffinityGroupJoinVO
agResponse.setId(vag.getUuid());
agResponse.setName(vag.getName());
agResponse.setDescription(vag.getDescription());
+ agResponse.setType(vag.getType());
ApiResponseHelper.populateOwner(agResponse, vag);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6dccf63a/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java b/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java
index e68996c..1c0dc2c 100644
--- a/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java
@@ -36,6 +36,9 @@ public class AffinityGroupJoinVO extends BaseViewVO implements ControlledViewEnt
@Column(name="name")
private String name;
+ @Column(name = "type")
+ private String type;
+
@Column(name = "description")
private String description;
@@ -114,6 +117,14 @@ public class AffinityGroupJoinVO extends BaseViewVO implements ControlledViewEnt
this.name = name;
}
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
@Override
public long getAccountId() {
return accountId;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6dccf63a/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index a36be0e..ce651a0 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -512,6 +512,7 @@ CREATE VIEW `cloud`.`affinity_group_view` AS
select
affinity_group.id id,
affinity_group.name name,
+ affinity_group.type type,
affinity_group.description description,
affinity_group.uuid uuid,
account.id account_id,
[3/3] git commit: updated refs/heads/master to e03176c
Posted by pr...@apache.org.
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/master
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();
}
[2/3] git commit: updated refs/heads/master to e03176c
Posted by pr...@apache.org.
CLOUDSTACK-2069: Anti-Affinity - listVirtualmachines - affinitygroup entity does not include other Vms that are part of this affinity group.
Removed the virtualmachineIds:[] sent in the API response.
The listVirtualMachines Resopnse need not list details beyond the id, name,description etc.
If the user wants to get the list of VMs in the group, listAffinityGroups APi can be used.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3a9c63d8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3a9c63d8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3a9c63d8
Branch: refs/heads/master
Commit: 3a9c63d8c919deaaea12d40f83272af3162e84d6
Parents: 6dccf63
Author: Prachi Damle <pr...@cloud.com>
Authored: Wed Apr 17 17:48:52 2013 -0700
Committer: Prachi Damle <pr...@cloud.com>
Committed: Wed Apr 17 18:04:15 2013 -0700
----------------------------------------------------------------------
.../cloudstack/affinity/AffinityGroupResponse.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a9c63d8/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java b/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java
index afd33da..b6d4ff6 100644
--- a/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java
+++ b/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java
@@ -64,7 +64,6 @@ public class AffinityGroupResponse extends BaseResponse implements ControlledVie
private List<String> vmIdList;
public AffinityGroupResponse() {
- this.vmIdList = new ArrayList<String>();
}
@Override
@@ -149,6 +148,10 @@ public class AffinityGroupResponse extends BaseResponse implements ControlledVie
}
public void addVMId(String vmId) {
+ if (this.vmIdList == null) {
+ this.vmIdList = new ArrayList<String>();
+ }
+
this.vmIdList.add(vmId);
}