From 6dccf63a3229eb48be5c2ff941a1550b7741764d Mon Sep 17 00:00:00 2001
From: Prachi Damle <prachi@cloud.com>
Date: Wed, 17 Apr 2013 17:46:06 -0700
Subject: [PATCH] set Objectname to CreateAffinityGroupResponse Object. Also
 the listAffinityGroups is missing the 'type' property

---
 server/src/com/cloud/api/ApiResponseHelper.java       |  7 ++++++-
 .../cloud/api/query/dao/AffinityGroupJoinDaoImpl.java |  1 +
 .../com/cloud/api/query/vo/AffinityGroupJoinVO.java   | 11 +++++++++++
 setup/db/db/schema-410to420.sql                       |  1 +
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 50d8de25702..819c88b8c1d 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;
     }
 
diff --git a/server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java
index a17679313d6..8743bcb2028 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);
 
diff --git a/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java b/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java
index e68996c53df..1c0dc2ccde0 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;
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index a36be0ebbf4..ce651a01a77 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,