Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 723D9DE36 for ; Fri, 27 Jul 2012 21:01:36 +0000 (UTC) Received: (qmail 11987 invoked by uid 500); 27 Jul 2012 21:01:33 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 11905 invoked by uid 500); 27 Jul 2012 21:01:33 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 11442 invoked by uid 99); 27 Jul 2012 21:01:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Jul 2012 21:01:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 74896198C7; Fri, 27 Jul 2012 21:01:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alena1108@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [27/50] [abbrv] git commit: Added missing action events for enable/disable static nat Message-Id: <20120727210132.74896198C7@tyr.zones.apache.org> Date: Fri, 27 Jul 2012 21:01:32 +0000 (UTC) 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 Authored: Thu Jul 26 15:28:50 2012 -0700 Committer: Alena Prokharchyk 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();