[prev in list] [next in list] [prev in thread] [next in thread]
List: opennms-cvs
Subject: [opennms-cvs] SF.net SVN: opennms:[13165] opennms/trunk
From: brozow () users ! sourceforge ! net
Date: 2009-04-29 17:09:26
Message-ID: E1LzDHi-00022W-J5 () c3vjzd1 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 13165
http://opennms.svn.sourceforge.net/opennms/?rev=13165&view=rev
Author: brozow
Date: 2009-04-29 17:09:26 +0000 (Wed, 29 Apr 2009)
Log Message:
-----------
add user to nodeAdded event
Modified Paths:
--------------
opennms/trunk/opennms-model/src/main/java/org/opennms/netmgt/model/events/AddEventVisitor.java
opennms/trunk/opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/DefaultNodeProvisionService.java
opennms/trunk/opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/NodeProvisionService.java
opennms/trunk/opennms-webapp/src/main/java/org/opennms/web/controller/node/NodeProvisioningController.java
Modified: opennms/trunk/opennms-model/src/main/java/org/opennms/netmgt/model/events/AddEventVisitor.java
===================================================================
--- opennms/trunk/opennms-model/src/main/java/org/opennms/netmgt/model/events/AddEventVisitor.java 2009-04-29 \
16:57:46 UTC (rev 13164)
+++ opennms/trunk/opennms-model/src/main/java/org/opennms/netmgt/model/events/AddEventVisitor.java 2009-04-29 \
17:09:26 UTC (rev 13165) @@ -45,7 +45,7 @@
import org.opennms.netmgt.model.OnmsNode;
import org.opennms.netmgt.xml.event.Event;
-public final class AddEventVisitor extends AbstractEntityVisitor {
+public class AddEventVisitor extends AbstractEntityVisitor {
private static final String m_eventSource = "Provisiond";
private final EventForwarder m_eventForwarder;
@@ -68,15 +68,15 @@
m_eventForwarder.sendNow(createNodeGainedServiceEvent(monSvc));
}
- private Event createNodeAddedEvent(OnmsNode node) {
+ protected Event createNodeAddedEvent(OnmsNode node) {
return EventUtils.createNodeAddedEvent(m_eventSource, node.getId(), \
node.getLabel(), node.getLabelSource()); }
- private Event createNodeGainedInterfaceEvent(OnmsIpInterface iface) {
+ protected Event createNodeGainedInterfaceEvent(OnmsIpInterface iface) {
return EventUtils.createNodeGainedInterfaceEvent(m_eventSource, \
iface.getNode().getId(), iface.getInetAddress()); }
- private Event createNodeGainedServiceEvent(OnmsMonitoredService monSvc) {
+ protected Event createNodeGainedServiceEvent(OnmsMonitoredService monSvc) {
OnmsIpInterface iface = monSvc.getIpInterface();
OnmsNode node = iface.getNode();
return EventUtils.createNodeGainedServiceEvent(m_eventSource, monSvc.getNodeId(), \
iface.getInetAddress(), monSvc.getServiceType().getName(), node.getLabel(), \
node.getLabelSource(), node.getSysName(), node.getSysDescription());
Modified: opennms/trunk/opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/DefaultNodeProvisionService.java
===================================================================
--- opennms/trunk/opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/DefaultNodeProvisionService.java 2009-04-29 \
16:57:46 UTC (rev 13164)
+++ opennms/trunk/opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/DefaultNodeProvisionService.java 2009-04-29 \
17:09:26 UTC (rev 13165) @@ -65,7 +65,7 @@
}
@Transactional
- public boolean provisionNode(String foreignSource, String foreignId, String \
nodeLabel, String ipAddress, + public boolean provisionNode(final String user, \
String foreignSource, String foreignId, String nodeLabel, String \
ipAddress,
String[] categories, String snmpCommunity, String snmpVersion,
String deviceUsername, String devicePassword, String enablePassword,
String accessMethod, String autoEnable) throws NodeProvisionException {
@@ -175,7 +175,20 @@
Assert.notNull(savedNode, "Failed to save node to database");
log().debug("sending events for new node ID " + savedNode.getId());
- savedNode.visit(new AddEventVisitor(m_eventForwarder));
+ savedNode.visit(new AddEventVisitor(m_eventForwarder) {
+
+ /* (non-Javadoc)
+ * @see \
org.opennms.netmgt.model.events.AddEventVisitor#createNodeAddedEvent(org.opennms.netmgt.model.OnmsNode)
+ */
+ @Override
+ protected Event createNodeAddedEvent(OnmsNode node) {
+ Event e = super.createNodeAddedEvent(node);
+ return new EventBuilder(e).addParam(EventConstants.PARM_USER, \
user).getEvent(); + }
+
+
+
+ });
return true;
}
Modified: opennms/trunk/opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/NodeProvisionService.java
===================================================================
--- opennms/trunk/opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/NodeProvisionService.java 2009-04-29 \
16:57:46 UTC (rev 13164)
+++ opennms/trunk/opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/NodeProvisionService.java 2009-04-29 \
17:09:26 UTC (rev 13165) @@ -43,7 +43,7 @@
public ModelAndView getModelAndView(HttpServletRequest request) ;
- public boolean provisionNode(String foreignSource, String foreignId, String \
nodeLabel, String ipAddress, + public boolean provisionNode(String user, String \
foreignSource, String foreignId, String nodeLabel, String ipAddress, String[] \
categories, String snmpCommunity, String snmpVersion,
String deviceUsername, String devicePassword, String enablePassword,
Modified: opennms/trunk/opennms-webapp/src/main/java/org/opennms/web/controller/node/NodeProvisioningController.java
===================================================================
--- opennms/trunk/opennms-webapp/src/main/java/org/opennms/web/controller/node/NodeProvisioningController.java 2009-04-29 \
16:57:46 UTC (rev 13164)
+++ opennms/trunk/opennms-webapp/src/main/java/org/opennms/web/controller/node/NodeProvisioningController.java 2009-04-29 \
17:09:26 UTC (rev 13165) @@ -40,6 +40,7 @@
import org.opennms.netmgt.provision.persist.NodeProvisionService;
import org.opennms.web.MissingParameterException;
import org.springframework.beans.factory.InitializingBean;
+import org.springframework.security.context.SecurityContextHolder;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.web.servlet.ModelAndView;
@@ -66,6 +67,8 @@
*/
@Transactional
protected ModelAndView handleRequestInternal(HttpServletRequest request, \
HttpServletResponse response) throws Exception { +
+ String user = \
SecurityContextHolder.getContext().getAuthentication().getName();
String action = request.getParameter("actionCode");
String redirectParms = request.getParameter("redirectParms");
@@ -87,6 +90,7 @@
String foreignSource = request.getParameter("foreignSource");
if (m_nodeProvisionService.provisionNode(
+ user,
foreignSource,
String.valueOf(System.currentTimeMillis()),
request.getParameter("nodeLabel"),
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
------------------------------------------------------------------------------
Register Now & Save for Velocity, the Web Performance & Operations
Conference from O'Reilly Media. Velocity features a full day of
expert-led, hands-on workshops and two days of sessions from industry
leaders in dedicated Performance & Operations tracks. Use code vel09scf
and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
_______________________________________________
Please read the OpenNMS Mailing List FAQ:
http://www.opennms.org/wiki/index.php?page=MailingListFaq
opennms-cvs mailing list
To *unsubscribe* or change your subscription options, see the bottom of this page:
https://lists.sourceforge.net/lists/listinfo/opennms-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic