incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [27/50] [abbrv] git commit: Added missing action events for enable/disable static nat
Date Fri, 27 Jul 2012 21:01:32 GMT
Added missing action events for enable/disable static nat


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7d406bf3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7d406bf3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7d406bf3

Branch: refs/heads/vpc
Commit: 7d406bf3d19cd88721a85e564c685a7d25c66322
Parents: bf2e3d6
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Thu Jul 26 15:28:50 2012 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Thu Jul 26 15:28:50 2012 -0700

----------------------------------------------------------------------
 .../com/cloud/network/rules/RulesManagerImpl.java  |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7d406bf3/server/src/com/cloud/network/rules/RulesManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java
index 666e269..b45443e 100755
--- a/server/src/com/cloud/network/rules/RulesManagerImpl.java
+++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java
@@ -331,9 +331,11 @@ public class RulesManagerImpl implements RulesManager, RulesService,
Manager {
     }
 
     @Override
+    @ActionEvent(eventType = EventTypes.EVENT_ENABLE_STATIC_NAT, eventDescription = "enabling
static nat")
     public boolean enableStaticNat(long ipId, long vmId, boolean isSystemVm) throws NetworkRuleConflictException,
ResourceUnavailableException {
         UserContext ctx = UserContext.current();
         Account caller = ctx.getCaller();
+        UserContext.current().setEventDetails("Ip Id: " + ipId);
 
         IPAddressVO ipAddress = _ipAddressDao.findById(ipId);
         if (ipAddress == null) {
@@ -1052,6 +1054,7 @@ public class RulesManagerImpl implements RulesManager, RulesService,
Manager {
     }
 
     @Override
+    @ActionEvent(eventType = EventTypes.EVENT_DISABLE_STATIC_NAT, eventDescription = "disabling
static nat", async=true)
     public boolean disableStaticNat(long ipId) throws ResourceUnavailableException, NetworkRuleConflictException,
InsufficientAddressCapacityException {
         UserContext ctx = UserContext.current();
         Account caller = ctx.getCaller();


Mime
View raw message