diff --git a/api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java b/api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java index d9a5377d89c..78e0c57d39f 100644 --- a/api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java +++ b/api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java @@ -137,7 +137,8 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements Por @Override public String getEventDescription() { - return ("Creating an ipforwarding 1:1 NAT rule for "+ipAddressId+" with virtual machine:"+ getVirtualMachineId()); + IpAddress ip = _networkService.getIp(ipAddressId); + return ("Applying an ipforwarding 1:1 NAT rule for Ip: "+ip.getAddress()+" with virtual machine:"+ getVirtualMachineId()); } @Override diff --git a/api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java b/api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java index c7f6fbd73ef..a2762162c9a 100644 --- a/api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java +++ b/api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java @@ -214,7 +214,8 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements @Override public String getEventDescription() { - return ("Creating an port forwarding rule for "+ipAddressId+" with virtual machine:"+virtualMachineId); + IpAddress ip = _networkService.getIp(ipAddressId); + return ("Applying port forwarding rule for Ip: "+ip.getAddress()+" with virtual machine:"+virtualMachineId); } @Override diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index e086305900c..e4d2a5ce6e2 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -65,6 +65,7 @@ import com.cloud.deploy.DeployDestination; import com.cloud.deploy.DeploymentPlan; import com.cloud.domain.Domain; import com.cloud.domain.dao.DomainDao; +import com.cloud.event.ActionEvent; import com.cloud.event.EventTypes; import com.cloud.event.UsageEventVO; import com.cloud.event.dao.EventDao; @@ -484,8 +485,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag return _networksDao.listBy(owner.getId(), zoneId, GuestIpType.Virtual); } - @Override - @DB + @Override @DB @ActionEvent (eventType=EventTypes.EVENT_NET_IP_ASSIGN, eventDescription="allocating Ip", create=true) public IpAddress allocateIP(AssociateIPAddrCmd cmd) throws ResourceAllocationException, InsufficientAddressCapacityException, ConcurrentOperationException { String accountName = cmd.getAccountName(); long domainId = cmd.getDomainId(); @@ -558,7 +558,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag return ip; } - @Override + @Override @DB @ActionEvent (eventType=EventTypes.EVENT_NET_IP_ASSIGN, eventDescription="associating Ip", async=true) public IpAddress associateIP(AssociateIPAddrCmd cmd) throws ResourceAllocationException, ResourceUnavailableException, InsufficientAddressCapacityException, ConcurrentOperationException { Account caller = UserContext.current().getCaller(); Account owner = null; @@ -1196,8 +1196,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag return profiles; } - @Override - @DB + @Override @DB @ActionEvent (eventType=EventTypes.EVENT_NET_IP_RELEASE, eventDescription="disassociating Ip") public boolean disassociateIpAddress(DisassociateIPAddrCmd cmd) throws PermissionDeniedException, IllegalArgumentException { Long userId = UserContext.current().getCallerUserId(); diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java index f545ee2a13e..e1959badf32 100644 --- a/server/src/com/cloud/network/rules/RulesManagerImpl.java +++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java @@ -28,6 +28,7 @@ import org.apache.log4j.Logger; import com.cloud.agent.api.to.PortForwardingRuleTO; import com.cloud.api.commands.ListPortForwardingRulesCmd; +import com.cloud.event.ActionEvent; import com.cloud.event.EventTypes; import com.cloud.event.UsageEventVO; import com.cloud.event.dao.EventDao; @@ -170,7 +171,7 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager { } - @Override @DB + @Override @DB @ActionEvent (eventType=EventTypes.EVENT_NET_RULE_ADD, eventDescription="creating forwarding rule", create=true) public PortForwardingRule createPortForwardingRule(PortForwardingRule rule, Long vmId, boolean isNat) throws NetworkRuleConflictException { UserContext ctx = UserContext.current(); Account caller = ctx.getCaller(); @@ -347,7 +348,7 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager { txn.commit(); } - @Override + @Override @ActionEvent (eventType=EventTypes.EVENT_NET_RULE_DELETE, eventDescription="revoking forwarding rule", async=true) public boolean revokePortForwardingRule(long ruleId, boolean apply) { UserContext ctx = UserContext.current(); Account caller = ctx.getCaller(); @@ -511,7 +512,7 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager { return _forwardingDao.searchNatRules(ipId, id, vmId, start, size); } - @Override + @Override @ActionEvent (eventType=EventTypes.EVENT_NET_RULE_ADD, eventDescription="applying forwarding rule", async=true) public boolean applyPortForwardingRules(long ipId, Account caller) throws ResourceUnavailableException { return applyPortForwardingRules(ipId, false, caller); }