Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D0054F262 for ; Sat, 6 Apr 2013 00:01:56 +0000 (UTC) Received: (qmail 12032 invoked by uid 500); 6 Apr 2013 00:01:56 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 12012 invoked by uid 500); 6 Apr 2013 00:01:56 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 11997 invoked by uid 99); 6 Apr 2013 00:01:56 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Apr 2013 00:01:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 439E71EEFD; Sat, 6 Apr 2013 00:01:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: prachidamle@apache.org To: commits@cloudstack.apache.org Message-Id: <189c21671eea40af8d2ceea9b97ece0c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/affinity_groups to ec152bd Date: Sat, 6 Apr 2013 00:01:56 +0000 (UTC) Updated Branches: refs/heads/affinity_groups ca1a7948f -> ec152bd5e Fixes to de-couple the AffinityGroupResponse from UserVmResponse, since ApiDiscoveryService breaks, if we nest two response objects into each other. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ec152bd5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ec152bd5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ec152bd5 Branch: refs/heads/affinity_groups Commit: ec152bd5ea68b68185179448ec63ae0d7e1992c3 Parents: ca1a794 Author: Prachi Damle Authored: Fri Apr 5 17:01:06 2013 -0700 Committer: Prachi Damle Committed: Fri Apr 5 17:01:06 2013 -0700 ---------------------------------------------------------------------- .../cloudstack/affinity/AffinityGroupResponse.java | 18 +++++++----- .../api/query/dao/AffinityGroupJoinDaoImpl.java | 21 +++------------ setup/db/db/schema-410to420.sql | 3 +- 3 files changed, 16 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec152bd5/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 1ae7c59..afd33da 100644 --- a/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java +++ b/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java @@ -16,8 +16,10 @@ // under the License. package org.apache.cloudstack.affinity; +import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedHashSet; +import java.util.List; import java.util.Set; import org.apache.cloudstack.api.ApiConstants; @@ -57,12 +59,12 @@ public class AffinityGroupResponse extends BaseResponse implements ControlledVie @Param(description = "the type of the affinity group") private String type; - @SerializedName("virtualmachine") - @Param(description = "virtual machines associated with this affinity group ", responseObject = UserVmResponse.class) - private Set vmList; + @SerializedName("virtualmachineIds") + @Param(description = "virtual machine Ids associated with this affinity group ") + private List vmIdList; public AffinityGroupResponse() { - this.vmList = new LinkedHashSet(); + this.vmIdList = new ArrayList(); } @Override @@ -142,12 +144,12 @@ public class AffinityGroupResponse extends BaseResponse implements ControlledVie } - public void setVMList(Set vmList) { - this.vmList = vmList; + public void setVMIdList(List vmIdList) { + this.vmIdList = vmIdList; } - public void addVM(UserVmResponse vm) { - this.vmList.add(vm); + public void addVMId(String vmId) { + this.vmIdList.add(vmId); } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec152bd5/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 98c6440..a176793 100644 --- a/server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java @@ -25,13 +25,10 @@ import javax.inject.Inject; import org.apache.cloudstack.affinity.AffinityGroup; import org.apache.cloudstack.affinity.AffinityGroupResponse; -import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.api.ApiResponseHelper; import com.cloud.api.query.vo.AffinityGroupJoinVO; import com.cloud.configuration.dao.ConfigurationDao; -import com.cloud.user.Account; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @@ -72,13 +69,9 @@ public class AffinityGroupJoinDaoImpl extends GenericDaoBase 0) { - UserVmResponse resp = new UserVmResponse(); - resp.setObjectName("virtualmachine"); - resp.setId(vag.getVmUuid()); - resp.setName(vag.getVmName()); - resp.setDisplayName(vag.getVmDisplayName()); - resp.setState(vag.getVmState().toString()); - agResponse.addVM(resp); + List vmIdList = new ArrayList(); + vmIdList.add(vag.getVmUuid()); + agResponse.setVMIdList(vmIdList); } agResponse.setObjectName("affinitygroup"); @@ -90,13 +83,7 @@ public class AffinityGroupJoinDaoImpl extends GenericDaoBase 0) { - UserVmResponse resp = new UserVmResponse(); - resp.setObjectName("virtualmachine"); - resp.setId(vag.getVmUuid()); - resp.setName(vag.getVmName()); - resp.setDisplayName(vag.getVmDisplayName()); - resp.setState(vag.getVmState().toString()); - vagData.addVM(resp); + vagData.addVMId(vag.getVmUuid()); } return vagData; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec152bd5/setup/db/db/schema-410to420.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql index e79bc11..494ca1b 100644 --- a/setup/db/db/schema-410to420.sql +++ b/setup/db/db/schema-410to420.sql @@ -153,7 +153,8 @@ CREATE TABLE `cloud`.`affinity_group_vm_map` ( `affinity_group_id` bigint unsigned NOT NULL, `instance_id` bigint unsigned NOT NULL, PRIMARY KEY (`id`), - CONSTRAINT `fk_agvm__group_id` FOREIGN KEY(`affinity_group_id`) REFERENCES `affinity_group`(`id`) + CONSTRAINT `fk_agvm__group_id` FOREIGN KEY(`affinity_group_id`) REFERENCES `affinity_group`(`id`) ON DELETE CASCADE, + CONSTRAINT `fk_affinity_group_vm_map___instance_id` FOREIGN KEY(`instance_id`) REFERENCES `user_vm` (`id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8;