From 03f48872d602c64bd74c40a2cd93f17acc746236 Mon Sep 17 00:00:00 2001 From: Boris Schrijver Date: Tue, 11 Aug 2015 19:01:38 +0200 Subject: [PATCH] CLOUDSTACK-8133 Added Virtualmachine count and ID's to listSecurityGroups response. See issue CLOUDSTACK-8133 for more information. Added null check by comment of Koushik Das. Added brackets by comment of Wido den Hollander. Removed a call to findById() by comment of Koushik Das. Signed-off-by: Wido den Hollander --- .../apache/cloudstack/api/ApiConstants.java | 1 + .../api/response/SecurityGroupResponse.java | 24 +++++++++++++++-- .../query/dao/SecurityGroupJoinDaoImpl.java | 27 +++++++++++++++---- 3 files changed, 45 insertions(+), 7 deletions(-) diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java b/api/src/org/apache/cloudstack/api/ApiConstants.java index 0e7ff88d68b..e86e2d4a995 100644 --- a/api/src/org/apache/cloudstack/api/ApiConstants.java +++ b/api/src/org/apache/cloudstack/api/ApiConstants.java @@ -271,6 +271,7 @@ public class ApiConstants { public static final String VIRTUAL_MACHINE_ID = "virtualmachineid"; public static final String VIRTUAL_MACHINE_IDS = "virtualmachineids"; public static final String VIRTUAL_MACHINE_ID_IP = "vmidipmap"; + public static final String VIRTUAL_MACHINE_COUNT = "virtualmachinecount"; public static final String USAGE_ID = "usageid"; public static final String VLAN = "vlan"; diff --git a/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java b/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java index 0be2ee137be..c96421b0a40 100644 --- a/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java @@ -19,14 +19,13 @@ package org.apache.cloudstack.api.response; import java.util.LinkedHashSet; import java.util.Set; -import com.google.gson.annotations.SerializedName; - import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.security.SecurityGroup; import com.cloud.serializer.Param; +import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") @EntityReference(value = SecurityGroup.class) @@ -76,7 +75,16 @@ public class SecurityGroupResponse extends BaseResponse implements ControlledVie @Param(description = "the list of resource tags associated with the rule", responseObject = ResourceTagResponse.class) private Set tags; + @SerializedName(ApiConstants.VIRTUAL_MACHINE_COUNT) + @Param(description = "the number of virtualmachines associated with this securitygroup", since = "4.6.0") + private Integer virtualMachineCount; + + @SerializedName(ApiConstants.VIRTUAL_MACHINE_IDS) + @Param(description = "the list of virtualmachine ids associated with this securitygroup", since = "4.6.0") + private Set virtualMachineIds; + public SecurityGroupResponse() { + this.virtualMachineIds = new LinkedHashSet(); this.ingressRules = new LinkedHashSet(); this.egressRules = new LinkedHashSet(); this.tags = new LinkedHashSet(); @@ -176,4 +184,16 @@ public class SecurityGroupResponse extends BaseResponse implements ControlledVie public void addTag(ResourceTagResponse tag) { this.tags.add(tag); } + + public void setVirtualMachineCount(Integer virtualMachineCount) { + this.virtualMachineCount = virtualMachineCount; + } + + public void setVirtualMachineIds(Set virtualMachineIds) { + this.virtualMachineIds = virtualMachineIds; + } + + public void addVirtualMachineId(String virtualMachineId) { + this.virtualMachineIds.add(virtualMachineId); + } } diff --git a/server/src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java index bb4df1dd556..1c544276e2d 100644 --- a/server/src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java @@ -24,25 +24,28 @@ import java.util.Set; import javax.ejb.Local; import javax.inject.Inject; -import com.cloud.server.ResourceTag; import org.apache.cloudstack.api.response.ResourceTagResponse; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - import org.apache.cloudstack.api.response.SecurityGroupResponse; import org.apache.cloudstack.api.response.SecurityGroupRuleResponse; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.api.ApiDBUtils; import com.cloud.api.ApiResponseHelper; import com.cloud.api.query.vo.ResourceTagJoinVO; import com.cloud.api.query.vo.SecurityGroupJoinVO; import com.cloud.network.security.SecurityGroup; +import com.cloud.network.security.SecurityGroupVMMapVO; import com.cloud.network.security.SecurityRule.SecurityRuleType; +import com.cloud.network.security.dao.SecurityGroupVMMapDao; +import com.cloud.server.ResourceTag; import com.cloud.user.Account; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +import com.cloud.vm.UserVmVO; +import com.cloud.vm.dao.UserVmDao; @Component @Local(value = {SecurityGroupJoinDao.class}) @@ -51,9 +54,12 @@ public class SecurityGroupJoinDaoImpl extends GenericDaoBase sgSearch; @@ -125,6 +131,17 @@ public class SecurityGroupJoinDaoImpl extends GenericDaoBase securityGroupVmMap = _securityGroupVMMapDao.listBySecurityGroup(vsg.getId()); + s_logger.debug("newSecurityGroupResponse() -> virtualmachine count: " + securityGroupVmMap.size()); + sgResponse.setVirtualMachineCount(securityGroupVmMap.size()); + + for(SecurityGroupVMMapVO securityGroupVMMapVO : securityGroupVmMap) { + final UserVmVO userVmVO = _userVmDao.findById(securityGroupVMMapVO.getInstanceId()); + if (userVmVO != null) { + sgResponse.addVirtualMachineId(userVmVO.getUuid()); + } + } + // update tag information Long tag_id = vsg.getTagId(); if (tag_id != null && tag_id.longValue() > 0) {