apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 5912: Added events and logging for securityGroup create/delete

Browse Source 
status 5912: resolved fixed
This commit is contained in:
alena 2011-03-25 15:15:16 -07:00
parent 92f01ba143
commit 1932652125
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/event/EventTypes.java
View File

@ -167,6 +167,8 @@ public class EventTypes {
// Security Groups // Security Groups
public static final String EVENT_SECURITY_GROUP_AUTHORIZE_INGRESS = "SG.AUTH.INGRESS"; public static final String EVENT_SECURITY_GROUP_AUTHORIZE_INGRESS = "SG.AUTH.INGRESS";
public static final String EVENT_SECURITY_GROUP_REVOKE_INGRESS = "SG.REVOKE.INGRESS"; public static final String EVENT_SECURITY_GROUP_REVOKE_INGRESS = "SG.REVOKE.INGRESS";
public static final String EVENT_SECURITY_GROUP_CREATE = "SG.CREATE";
public static final String EVENT_SECURITY_GROUP_DELETE = "SG.DELETE";
// Host // Host
public static final String EVENT_HOST_RECONNECT = "HOST.RECONNECT"; public static final String EVENT_HOST_RECONNECT = "HOST.RECONNECT";

13
server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
View File

@ -52,15 +52,15 @@ import com.cloud.api.commands.RevokeSecurityGroupIngressCmd;
import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.domain.DomainVO; import com.cloud.domain.DomainVO;
import com.cloud.domain.dao.DomainDao; import com.cloud.domain.dao.DomainDao;
import com.cloud.event.ActionEvent;
import com.cloud.event.EventTypes;
import com.cloud.exception.AgentUnavailableException; import com.cloud.exception.AgentUnavailableException;
import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.OperationTimedoutException; import com.cloud.exception.OperationTimedoutException;
import com.cloud.exception.PermissionDeniedException; import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceInUseException; import com.cloud.exception.ResourceInUseException;
import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.network.Network;
import com.cloud.network.NetworkManager; import com.cloud.network.NetworkManager;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.security.SecurityGroupWorkVO.Step; import com.cloud.network.security.SecurityGroupWorkVO.Step;
import com.cloud.network.security.dao.IngressRuleDao; import com.cloud.network.security.dao.IngressRuleDao;
import com.cloud.network.security.dao.SecurityGroupDao; import com.cloud.network.security.dao.SecurityGroupDao;
@ -90,7 +90,6 @@ import com.cloud.utils.fsm.StateListener;
import com.cloud.utils.net.NetUtils; import com.cloud.utils.net.NetUtils;
import com.cloud.vm.Nic; import com.cloud.vm.Nic;
import com.cloud.vm.NicProfile; import com.cloud.vm.NicProfile;
import com.cloud.vm.NicVO;
import com.cloud.vm.UserVmManager; import com.cloud.vm.UserVmManager;
import com.cloud.vm.UserVmVO; import com.cloud.vm.UserVmVO;
import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VMInstanceVO;
@ -98,7 +97,6 @@ import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachine.Event; import com.cloud.vm.VirtualMachine.Event;
import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.VirtualMachineManager; import com.cloud.vm.VirtualMachineManager;
import com.cloud.vm.dao.NicDao;
import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.VMInstanceDao; import com.cloud.vm.dao.VMInstanceDao;
@ -753,6 +751,7 @@ public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityG
} }
@Override @Override
@ActionEvent(eventType = EventTypes.EVENT_SECURITY_GROUP_CREATE, eventDescription = "creating security group")
public SecurityGroupVO createSecurityGroup(CreateSecurityGroupCmd cmd) throws PermissionDeniedException, InvalidParameterValueException { public SecurityGroupVO createSecurityGroup(CreateSecurityGroupCmd cmd) throws PermissionDeniedException, InvalidParameterValueException {
String accountName = cmd.getAccountName(); String accountName = cmd.getAccountName();
@ -826,6 +825,8 @@ public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityG
group = new SecurityGroupVO(name, description, domainId, accountId, accountName); group = new SecurityGroupVO(name, description, domainId, accountId, accountName);
group = _securityGroupDao.persist(group); group = _securityGroupDao.persist(group);
} }
s_logger.debug("Created security group " + group + " for account id=" + accountId);
return group; return group;
} finally { } finally {
if (account != null) { if (account != null) {
@ -1006,6 +1007,7 @@ public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityG
@DB @DB
@Override @Override
@ActionEvent(eventType = EventTypes.EVENT_SECURITY_GROUP_DELETE, eventDescription = "deleting security group")
public boolean deleteSecurityGroup(DeleteSecurityGroupCmd cmd) throws ResourceInUseException{ public boolean deleteSecurityGroup(DeleteSecurityGroupCmd cmd) throws ResourceInUseException{
Long id = cmd.getId(); Long id = cmd.getId();
String accountName = cmd.getAccountName(); String accountName = cmd.getAccountName();
@ -1080,6 +1082,9 @@ public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityG
} }
_securityGroupDao.expunge(groupId); _securityGroupDao.expunge(groupId);
txn.commit(); txn.commit();
s_logger.debug("Deleted security group " + group + " for account id=" + accountId);
return true; return true;
} }