-
-
BaseImporter class.
- * - * @author ranger - * @version $Id: $ - */ -public class BaseImporter implements ImportOperationFactory { - - private static final Logger LOG = LoggerFactory.getLogger(BaseImporter.class); - - - protected TransactionTemplate m_transTemplate; - protected DistPollerDao m_distPollerDao; - private NodeDao m_nodeDao; - private IpInterfaceDao m_ipInterfaceDao; - private ServiceTypeDao m_serviceTypeDao; - private MonitoredServiceDao m_monitoredServiceDao; - private AssetRecordDao m_assetRecordDao; - private CategoryDao m_categoryDao; - private final ThreadLocalsetTransactionTemplate
- * - * @param transTemplate a {@link org.springframework.transaction.support.TransactionTemplate} object. - */ - public void setTransactionTemplate(TransactionTemplate transTemplate) { - m_transTemplate = transTemplate; - } - - /** - *getDistPollerDao
- * - * @return a {@link org.opennms.netmgt.dao.api.DistPollerDao} object. - */ - public DistPollerDao getDistPollerDao() { - return m_distPollerDao; - } - - /** - *setDistPollerDao
- * - * @param distPollerDao a {@link org.opennms.netmgt.dao.api.DistPollerDao} object. - */ - public void setDistPollerDao(DistPollerDao distPollerDao) { - m_distPollerDao = distPollerDao; - } - - /** - *getNodeDao
- * - * @return a {@link org.opennms.netmgt.dao.api.NodeDao} object. - */ - public NodeDao getNodeDao() { - return m_nodeDao; - } - - /** - *setNodeDao
- * - * @param nodeDao a {@link org.opennms.netmgt.dao.api.NodeDao} object. - */ - public void setNodeDao(NodeDao nodeDao) { - m_nodeDao = nodeDao; - } - - /** - *getIpInterfaceDao
- * - * @return a {@link org.opennms.netmgt.dao.api.IpInterfaceDao} object. - */ - public IpInterfaceDao getIpInterfaceDao() { - return m_ipInterfaceDao; - } - - /** - *setIpInterfaceDao
- * - * @param ipInterfaceDao a {@link org.opennms.netmgt.dao.api.IpInterfaceDao} object. - */ - public void setIpInterfaceDao(IpInterfaceDao ipInterfaceDao) { - m_ipInterfaceDao = ipInterfaceDao; - } - - /** - *getMonitoredServiceDao
- * - * @return a {@link org.opennms.netmgt.dao.api.MonitoredServiceDao} object. - */ - public MonitoredServiceDao getMonitoredServiceDao() { - return m_monitoredServiceDao; - } - - /** - *setMonitoredServiceDao
- * - * @param monitoredServiceDao a {@link org.opennms.netmgt.dao.api.MonitoredServiceDao} object. - */ - public void setMonitoredServiceDao(MonitoredServiceDao monitoredServiceDao) { - m_monitoredServiceDao = monitoredServiceDao; - } - - /** - *getServiceTypeDao
- * - * @return a {@link org.opennms.netmgt.dao.api.ServiceTypeDao} object. - */ - public ServiceTypeDao getServiceTypeDao() { - return m_serviceTypeDao; - } - - /** - *setServiceTypeDao
- * - * @param serviceTypeDao a {@link org.opennms.netmgt.dao.api.ServiceTypeDao} object. - */ - public void setServiceTypeDao(ServiceTypeDao serviceTypeDao) { - m_serviceTypeDao = serviceTypeDao; - } - - /** - *getAssetRecordDao
- * - * @return a {@link org.opennms.netmgt.dao.api.AssetRecordDao} object. - */ - public AssetRecordDao getAssetRecordDao() { - return m_assetRecordDao; - } - - /** - *setAssetRecordDao
- * - * @param assetRecordDao a {@link org.opennms.netmgt.dao.api.AssetRecordDao} object. - */ - public void setAssetRecordDao(AssetRecordDao assetRecordDao) { - m_assetRecordDao = assetRecordDao; - } - - /** - *getTransTemplate
- * - * @return a {@link org.springframework.transaction.support.TransactionTemplate} object. - */ - public TransactionTemplate getTransTemplate() { - return m_transTemplate; - } - - /** - *setTransTemplate
- * - * @param transTemplate a {@link org.springframework.transaction.support.TransactionTemplate} object. - */ - public void setTransTemplate(TransactionTemplate transTemplate) { - m_transTemplate = transTemplate; - } - - /** {@inheritDoc} */ - @Override - public InsertOperation createInsertOperation(String foreignSource, String foreignId, String nodeLabel, String building, String city) { - InsertOperation insertOperation = new InsertOperation(foreignSource, foreignId, nodeLabel, building, city); - insertOperation.setNodeDao(m_nodeDao); - insertOperation.setDistPollerDao(m_distPollerDao); - insertOperation.setServiceTypeDao(m_serviceTypeDao); - insertOperation.setCategoryDao(m_categoryDao); - insertOperation.setTypeCache(m_typeCache); - insertOperation.setCategoryCache(m_categoryCache); - return insertOperation; - - } - - /** {@inheritDoc} */ - @Override - public UpdateOperation createUpdateOperation(Integer nodeId, String foreignSource, String foreignId, String nodeLabel, String building, String city) { - UpdateOperation updateOperation = new UpdateOperation(nodeId, foreignSource, foreignId, nodeLabel, building, city); - updateOperation.setNodeDao(m_nodeDao); - updateOperation.setDistPollerDao(m_distPollerDao); - updateOperation.setServiceTypeDao(m_serviceTypeDao); - updateOperation.setCategoryDao(m_categoryDao); - updateOperation.setTypeCache(m_typeCache); - updateOperation.setCategoryCache(m_categoryCache); - return updateOperation; - } - - /** {@inheritDoc} */ - @Override - public DeleteOperation createDeleteOperation(Integer nodeId, String foreignSource, String foreignId) { - return new DeleteOperation(nodeId, foreignSource, foreignId, m_nodeDao); - } - - /** - *importModelFromResource
- * - * @param resource a {@link org.springframework.core.io.Resource} object. - * @throws java.io.IOException if any. - * @throws org.opennms.netmgt.importer.ModelImportException if any. - */ - protected void importModelFromResource(Resource resource) throws IOException, ModelImportException { - importModelFromResource(resource, new DefaultImportStatistics(), null); - } - - /** - *importModelFromResource
- * - * @param resource a {@link org.springframework.core.io.Resource} object. - * @param stats a {@link org.opennms.netmgt.importer.operations.ImportStatistics} object. - * @param event a {@link org.opennms.netmgt.xml.event.Event} object. - * @throws java.io.IOException if any. - * @throws org.opennms.netmgt.importer.ModelImportException if any. - */ - protected void importModelFromResource(Resource resource, ImportStatistics stats, Event event) throws IOException, ModelImportException { - - stats.beginImporting(); - stats.beginLoadingResource(resource); - - SpecFile specFile = new SpecFile(); - specFile.loadResource(resource); - - stats.finishLoadingResource(resource); - - - if (event != null && getEventForeignSource(event) != null) { - specFile.setForeignSource(getEventForeignSource(event)); - } - - stats.beginAuditNodes(); - createDistPollerIfNecessary(); - - MapcreateImportOperationsManager
- * - * @param foreignIdsToNodes a {@link java.util.Map} object. - * @param stats a {@link org.opennms.netmgt.importer.operations.ImportStatistics} object. - * @return a {@link org.opennms.netmgt.importer.operations.ImportOperationsManager} object. - */ - protected ImportOperationsManager createImportOperationsManager(MapgetCategoryDao
- * - * @return a {@link org.opennms.netmgt.dao.api.CategoryDao} object. - */ - public CategoryDao getCategoryDao() { - return m_categoryDao; - } - - /** - *setCategoryDao
- * - * @param categoryDao a {@link org.opennms.netmgt.dao.api.CategoryDao} object. - */ - public void setCategoryDao(CategoryDao categoryDao) { - m_categoryDao = categoryDao; - } - - /** - *getScanThreads
- * - * @return a int. - */ - public int getScanThreads() { - return m_scanThreads; - } - - /** - *setScanThreads
- * - * @param poolSize a int. - */ - public void setScanThreads(int poolSize) { - m_scanThreads = poolSize; - } - - /** - *getWriteThreads
- * - * @return a int. - */ - public int getWriteThreads() { - return m_writeThreads; - } - - /** - *setWriteThreads
- * - * @param writeThreads a int. - */ - public void setWriteThreads(int writeThreads) { - m_writeThreads = writeThreads; - } - -} diff --git a/opennms-import/src/main/java/org/opennms/netmgt/importer/ImportAccountant.java b/opennms-import/src/main/java/org/opennms/netmgt/importer/ImportAccountant.java deleted file mode 100644 index 154f9413667e..000000000000 --- a/opennms-import/src/main/java/org/opennms/netmgt/importer/ImportAccountant.java +++ /dev/null @@ -1,94 +0,0 @@ -/******************************************************************************* - * This file is part of OpenNMS(R). - * - * Copyright (C) 2006-2012 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc. - * - * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. - * - * OpenNMS(R) is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * OpenNMS(R) is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with OpenNMS(R). If not, see: - * http://www.gnu.org/licenses/ - * - * For more information contact: - * OpenNMS(R) LicensingImportAccountant class.
- * - * @author ranger - * @version $Id: $ - */ -public class ImportAccountant extends AbstractImportVisitor { - private final ImportOperationsManager m_opsMgr; - private SaveOrUpdateOperation m_currentOp; - - /** - *Constructor for ImportAccountant.
- * - * @param opsMgr a {@link org.opennms.netmgt.importer.operations.ImportOperationsManager} object. - */ - public ImportAccountant(ImportOperationsManager opsMgr) { - m_opsMgr = opsMgr; - } - - /** {@inheritDoc} */ - @Override - public void visitNode(Node node) { - m_currentOp = m_opsMgr.foundNode(node.getForeignId(), node.getNodeLabel(), node.getBuilding(), node.getCity()); - } - /** {@inheritDoc} */ - @Override - public void completeNode(Node node) { - m_currentOp = null; - } - - /** {@inheritDoc} */ - @Override - public void visitInterface(Interface iface) { - m_currentOp.foundInterface(iface.getIpAddr(), iface.getDescr(), iface.getSnmpPrimary(), iface.getManaged(), iface.getStatus()); - - } - - /** {@inheritDoc} */ - @Override - public void visitMonitoredService(MonitoredService svc) { - m_currentOp.foundMonitoredService(svc.getServiceName()); - } - - /** {@inheritDoc} */ - @Override - public void visitCategory(Category category) { - m_currentOp.foundCategory(category.getName()); - } - - /** {@inheritDoc} */ - @Override - public void visitAsset(Asset asset) { - m_currentOp.foundAsset(asset.getName(), asset.getValue()); - } -} diff --git a/opennms-import/src/main/java/org/opennms/netmgt/importer/ImporterService.java b/opennms-import/src/main/java/org/opennms/netmgt/importer/ImporterService.java deleted file mode 100644 index 11fa891a4fdd..000000000000 --- a/opennms-import/src/main/java/org/opennms/netmgt/importer/ImporterService.java +++ /dev/null @@ -1,485 +0,0 @@ -/******************************************************************************* - * This file is part of OpenNMS(R). - * - * Copyright (C) 2006-2012 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc. - * - * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. - * - * OpenNMS(R) is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * OpenNMS(R) is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with OpenNMS(R). If not, see: - * http://www.gnu.org/licenses/ - * - * For more information contact: - * OpenNMS(R) LicensingImporterService class.
- * - * @author ranger - * @version $Id: $ - */ -public class ImporterService extends BaseImporter implements SpringServiceDaemon, DisposableBean, EventListener { - - private static final Logger LOG = LoggerFactory.getLogger(ImporterService.class); - - /** ConstantNAME="ModelImporter" */
- public static final String NAME = "model-importer";
-
- private volatile Resource m_importResource;
- private volatile EventIpcManager m_eventManager;
- private volatile ImporterStats m_stats;
-
-
- /**
- * doImport
- */ - public void doImport() { - doImport(null); - } - - /** - * Begins importing from resource specified in model-importer.properties file or - * in event parameter: url. Import Resources are managed with a "key" called - * "foreignSource" specified in the XML retreived by the resource and can be overridden - * as a parameter of an event. - * @param event - */ - private void doImport(Event event) { - Resource resource = null; - try { - m_stats = new ImporterStats(); - resource = ((event != null && getEventUrl(event) != null) ? new UrlResource(getEventUrl(event)) : m_importResource); - sendImportStarted(resource); - importModelFromResource(resource, m_stats, event); - LOG.info("Finished Importing: {}", m_stats); - sendImportSuccessful(m_stats, resource); - } catch (IOException e) { - String msg = "IOException importing "+resource; - LOG.error(msg, e); - sendImportFailed(msg+": "+e.getMessage(), resource); - } catch (ModelImportException e) { - String msg = "Error parsing import data from "+resource; - LOG.error(msg, e); - sendImportFailed(msg+": "+e.getMessage(), resource); - } - } - - private String getEventUrl(Event event) { - return EventUtils.getParm(event, EventConstants.PARM_URL); - } - - /** - *getStats
- * - * @return a {@link java.lang.String} object. - */ - public String getStats() { return (m_stats == null ? "No Stats Availabile" : m_stats.toString()); } - - private void sendImportSuccessful(ImporterStats stats, Resource resource) { - EventBuilder builder = new EventBuilder(EventConstants.IMPORT_SUCCESSFUL_UEI, NAME); - builder.addParam(EventConstants.PARM_IMPORT_RESOURCE, resource.toString()); - builder.addParam(EventConstants.PARM_IMPORT_STATS, stats.toString()); - m_eventManager.sendNow(builder.getEvent()); - } - - private void sendImportFailed(String msg, Resource resource) { - EventBuilder builder = new EventBuilder(EventConstants.IMPORT_FAILED_UEI, NAME); - builder.addParam(EventConstants.PARM_IMPORT_RESOURCE, resource.toString()); - builder.addParam(EventConstants.PARM_FAILURE_MESSAGE, msg); - m_eventManager.sendNow(builder.getEvent()); - } - - private void sendImportStarted(Resource resource) { - EventBuilder builder = new EventBuilder(EventConstants.IMPORT_STARTED_UEI, NAME); - builder.addParam(EventConstants.PARM_IMPORT_RESOURCE, resource.toString()); - m_eventManager.sendNow(builder.getEvent()); - } - - /** - *setImportResource
- * - * @param resource a {@link org.springframework.core.io.Resource} object. - */ - public void setImportResource(Resource resource) { - m_importResource = resource; - } - - /** - *getEventManager
- * - * @return a {@link org.opennms.netmgt.model.events.EventIpcManager} object. - */ - public EventIpcManager getEventManager() { - return m_eventManager; - } - - /** - *setEventManager
- * - * @param eventManager a {@link org.opennms.netmgt.model.events.EventIpcManager} object. - */ - public void setEventManager(EventIpcManager eventManager) { - m_eventManager = eventManager; - } - - /** {@inheritDoc} */ - @Override - protected ImportOperationsManager createImportOperationsManager(MapafterPropertiesSet
- * - * @throws java.lang.Exception if any. - */ - @Override - public void afterPropertiesSet() throws Exception { - m_eventManager.addEventListener(this, EventConstants.RELOAD_IMPORT_UEI); - } - - /** - *destroy
- * - * @throws java.lang.Exception if any. - */ - @Override - public void destroy() throws Exception { - m_eventManager.removeEventListener(this, EventConstants.RELOAD_IMPORT_UEI); - - } - - /** - *getName
- * - * @return a {@link java.lang.String} object. - */ - @Override - public String getName() { - return NAME; - } - - /** {@inheritDoc} */ - @Override - public void onEvent(Event e) { - - Map mdc = Logging.getCopyOfContextMap(); - try { - Logging.putPrefix(NAME); - - if (!EventConstants.RELOAD_IMPORT_UEI.equals(e.getUei())) { - return; - } - doImport(e); - } finally { - Logging.setContextMap(mdc); - } - } - - public class ImporterStats implements ImportStatistics { - - private Duration m_importDuration = new Duration("Importing"); - private Duration m_auditDuration = new Duration("Auditing"); - private Duration m_loadingDuration = new Duration("Loading"); - private Duration m_processingDuration = new Duration("Processing"); - private Duration m_preprocessingDuration = new Duration("Scanning"); - private Duration m_relateDuration = new Duration("Relating"); - private WorkEffort m_preprocessingEffort = new WorkEffort("Scan Effort"); - private WorkEffort m_processingEffort = new WorkEffort("Write Effort"); - private WorkEffort m_eventEffort = new WorkEffort("Event Sending Effort"); - private int m_deleteCount; - private int m_insertCount; - private int m_updateCount; - private int m_eventCount; - - @Override - public void beginProcessingOps() { - m_processingDuration.start(); - } - - @Override - public void finishProcessingOps() { - m_processingDuration.end(); - } - - @Override - public void beginPreprocessingOps() { - m_preprocessingDuration.start(); - } - - @Override - public void finishPreprocessingOps() { - m_preprocessingDuration.end(); - } - - @Override - public void beginPreprocessing(ImportOperation oper) { - if (oper instanceof AbstractSaveOrUpdateOperation) { - m_preprocessingEffort.begin(); - } - } - - @Override - public void finishPreprocessing(ImportOperation oper) { - if (oper instanceof AbstractSaveOrUpdateOperation) { - m_preprocessingEffort.end(); - } - } - - @Override - public void beginPersisting(ImportOperation oper) { - m_processingEffort.begin(); - - } - - @Override - public void finishPersisting(ImportOperation oper) { - m_processingEffort.end(); - } - - @Override - public void beginSendingEvents(ImportOperation oper, Liststart
- * - * @throws java.lang.Exception if any. - */ - @Override - public void start() throws Exception { - // nothing to do -- we're event-driven - } -} diff --git a/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/AbstractSaveOrUpdateOperation.java b/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/AbstractSaveOrUpdateOperation.java deleted file mode 100644 index 3f32228a9a7b..000000000000 --- a/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/AbstractSaveOrUpdateOperation.java +++ /dev/null @@ -1,522 +0,0 @@ -/******************************************************************************* - * This file is part of OpenNMS(R). - * - * Copyright (C) 2006-2012 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc. - * - * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. - * - * OpenNMS(R) is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * OpenNMS(R) is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with OpenNMS(R). If not, see: - * http://www.gnu.org/licenses/ - * - * For more information contact: - * OpenNMS(R) LicensingAbstract AbstractSaveOrUpdateOperation class.
- * - * @author ranger - * @version $Id: $ - */ -public abstract class AbstractSaveOrUpdateOperation extends AbstractImportOperation implements SaveOrUpdateOperation { - - private static final Logger LOG = LoggerFactory.getLogger(AbstractSaveOrUpdateOperation.class); - - - private final OnmsNode m_node; - private NodeDao m_nodeDao; - private DistPollerDao m_distPollerDao; - private OnmsIpInterface m_currentInterface; - private ServiceTypeDao m_svcTypeDao; - private CategoryDao m_categoryDao; - private ThreadLocalConstructor for AbstractSaveOrUpdateOperation.
- * - * @param foreignSource a {@link java.lang.String} object. - * @param foreignId a {@link java.lang.String} object. - * @param nodeLabel a {@link java.lang.String} object. - * @param building a {@link java.lang.String} object. - * @param city a {@link java.lang.String} object. - */ - public AbstractSaveOrUpdateOperation(final String foreignSource, final String foreignId, final String nodeLabel, final String building, final String city) { - this(null, foreignSource, foreignId, nodeLabel, building, city); - } - - /** - *Constructor for AbstractSaveOrUpdateOperation.
- * - * @param nodeId a {@link java.lang.Integer} object. - * @param foreignSource a {@link java.lang.String} object. - * @param foreignId a {@link java.lang.String} object. - * @param nodeLabel a {@link java.lang.String} object. - * @param building a {@link java.lang.String} object. - * @param city a {@link java.lang.String} object. - */ - public AbstractSaveOrUpdateOperation(final Integer nodeId, final String foreignSource, final String foreignId, final String nodeLabel, final String building, final String city) { - m_node = new OnmsNode(); - m_node.setId(nodeId); - m_node.setLabel(nodeLabel); - m_node.setLabelSource(NodeLabelSource.USER); - m_node.setType(NodeType.ACTIVE); - m_node.setForeignSource(foreignSource); - m_node.setForeignId(foreignId); - m_node.getAssetRecord().setBuilding(building); - m_node.getAssetRecord().getGeolocation().setCity(city); - } - - /** {@inheritDoc} */ - @Override - public void foundInterface(final String ipAddr, final Object descr, final InterfaceSnmpPrimaryType snmpPrimary, final boolean managed, final int status) { - - if ("".equals(ipAddr)) { - LOG.error("Found interface on node {} with an empty ipaddr! Ignoring!", m_node.getLabel()); - // create a bogus OnmsIpInterface and set it to current to services we run across get ignored as well - m_currentInterface = new OnmsIpInterface(); - return; - } - - final InetAddress addr = addr(ipAddr); - - m_currentInterface = new OnmsIpInterface(addr, m_node); - m_currentInterface.setIsManaged(status == 3 ? "U" : "M"); - m_currentInterface.setIsSnmpPrimary(PrimaryType.get(snmpPrimary.toString())); - - if (InterfaceSnmpPrimaryType.P.equals(snmpPrimary)) { - if (addr == null) { - LOG.error("Unable to resolve address of snmpPrimary interface for node {}", m_node.getLabel()); - } - m_collector = new IfSnmpCollector(addr); - } - - //FIXME: verify this doesn't conflict with constructor. The constructor already adds this - //interface to the node. - m_node.addIpInterface(m_currentInterface); - } - - /** - *gatherAdditionalData
- */ - @Override - public void gatherAdditionalData() { - updateSnmpData(); - } - - /** - *persist
- * - * @return a {@link java.util.List} object. - */ - @Override - public ListdoPersist
- * - * @return a {@link java.util.List} object. - */ - protected abstract ListupdateSnmpData
- */ - protected void updateSnmpData() { - if (m_collector != null) { - m_collector.run(); - } - - updateSnmpDataForNode(); - - updateSnmpDataForSnmpInterfaces(); - - for (final OnmsIpInterface ipIf : m_node.getIpInterfaces()) { - resolveIpHostname(ipIf); - updateSnmpDataForInterface(ipIf); - } - } - - private void updateSnmpDataForSnmpInterfaces() { - if (m_collector != null && m_collector.hasIfTable()) { - - for(final IfTableEntry entry : m_collector.getIfTable()) { - final Integer ifIndex = entry.getIfIndex(); - if (ifIndex == null) { - continue; - } - - LOG.debug("Updating SNMP Interface with ifIndex {}", ifIndex); - - // first look to see if an snmpIf was created already - OnmsSnmpInterface snmpIf = m_node.getSnmpInterfaceWithIfIndex(ifIndex); - - if (snmpIf == null) { - // if not then create one - snmpIf = new OnmsSnmpInterface(m_node, ifIndex); - } - - snmpIf.setIfAlias(m_collector.getIfAlias(ifIndex)); - snmpIf.setIfName(m_collector.getIfName(ifIndex)); - snmpIf.setIfType(getIfType(ifIndex)); - snmpIf.setNetMask(getNetMask(ifIndex)); - snmpIf.setIfAdminStatus(getAdminStatus(ifIndex)); - snmpIf.setIfDescr(m_collector.getIfDescr(ifIndex)); - snmpIf.setIfSpeed(m_collector.getInterfaceSpeed(ifIndex)); - snmpIf.setPhysAddr(m_collector.getPhysAddr(ifIndex)); - - } - } - } - - private void updateSnmpDataForNode() { - if (m_collector != null && m_collector.hasSystemGroup()) { - m_node.setSysContact(m_collector.getSystemGroup().getSysContact()); - m_node.setSysDescription(m_collector.getSystemGroup().getSysDescr()); - m_node.setSysLocation(m_collector.getSystemGroup().getSysLocation()); - m_node.setSysObjectId(m_collector.getSystemGroup().getSysObjectID()); - } - } - - /** - *isSnmpDataForNodeUpToDate
- * - * @return a boolean. - */ - protected boolean isSnmpDataForNodeUpToDate() { - return m_collector != null && m_collector.hasSystemGroup(); - } - - /** - *isSnmpDataForInterfacesUpToDate
- * - * @return a boolean. - */ - protected boolean isSnmpDataForInterfacesUpToDate() { - return m_collector != null && m_collector.hasIfTable() && m_collector.hasIpAddrTable(); - } - - private void updateSnmpDataForInterface(final OnmsIpInterface ipIf) { - if (m_collector == null || !m_collector.hasIpAddrTable() || !m_collector.hasIfTable()) { - return; - } - - final InetAddress inetAddr = ipIf.getIpAddress(); - final String ipAddr = str(inetAddr); - - LOG.debug("Creating SNMP info for interface {}", ipAddr); - - final int ifIndex = m_collector.getIfIndex(inetAddr); - if (ifIndex == -1) { - return; - } - - // first look to see if an snmpIf was created already - OnmsSnmpInterface snmpIf = m_node.getSnmpInterfaceWithIfIndex(ifIndex); - - if (snmpIf == null) { - // if not then create one - snmpIf = new OnmsSnmpInterface(m_node, ifIndex); - snmpIf.setIfAlias(m_collector.getIfAlias(ifIndex)); - snmpIf.setIfName(m_collector.getIfName(ifIndex)); - snmpIf.setIfType(getIfType(ifIndex)); - snmpIf.setNetMask(getNetMask(ifIndex)); - snmpIf.setIfAdminStatus(getAdminStatus(ifIndex)); - snmpIf.setIfDescr(m_collector.getIfDescr(ifIndex)); - snmpIf.setIfSpeed(m_collector.getInterfaceSpeed(ifIndex)); - snmpIf.setPhysAddr(m_collector.getPhysAddr(ifIndex)); - } - - snmpIf.setCollectionEnabled(true); - - ipIf.setSnmpInterface(snmpIf); - - //FIXME: Improve OpenNMS to provide these values - // ifOperStatus - - } - - private Integer getAdminStatus(final int ifIndex) { - final int adminStatus = m_collector.getAdminStatus(ifIndex); - return (adminStatus == -1 ? null : Integer.valueOf(adminStatus)); - } - - private Integer getIfType(final int ifIndex) { - final int ifType = m_collector.getIfType(ifIndex); - return (ifType == -1 ? null : Integer.valueOf(ifType)); - } - - private InetAddress getNetMask(final int ifIndex) { - final InetAddress[] ifAddressAndMask = m_collector.getIfAddressAndMask(ifIndex); - if (ifAddressAndMask != null && ifAddressAndMask.length > 1 && ifAddressAndMask[1] != null) { - return ifAddressAndMask[1]; - } - return null; - } - - private void resolveIpHostname(final OnmsIpInterface ipIf) { - final String ipAddress = str(ipIf.getIpAddress()); - ipIf.setIpHostName(ipAddress); - } - - /** {@inheritDoc} */ - @Override - public void foundMonitoredService(final String serviceName) { - final OnmsServiceType svcType = getServiceType(serviceName); - final OnmsMonitoredService service = new OnmsMonitoredService(m_currentInterface, svcType); - service.setStatus("A"); - m_currentInterface.getMonitoredServices().add(service); - - } - - /** {@inheritDoc} */ - @Override - public void foundCategory(final String name) { - m_node.getCategories().add(getCategory(name)); - } - - /** {@inheritDoc} */ - @Override - public void foundAsset(final String name, final String value) { - final BeanWrapper w = PropertyAccessorFactory.forBeanPropertyAccess(m_node.getAssetRecord()); - try { - w.setPropertyValue(name, value); - } catch (final BeansException e) { - LOG.warn("Could not set property on asset: {}", name, e); - } - } - - private OnmsServiceType getServiceType(final String serviceName) { - preloadExistingTypes(); - OnmsServiceType type = getTypes().get(serviceName); - if (type == null) { - type = m_svcTypeDao.findByName(serviceName); - - if (type == null) { - type = new OnmsServiceType(serviceName); - m_svcTypeDao.save(type); - } - - getTypes().put(serviceName, type); - } - return type; - } - - private void preloadExistingTypes() { - if (getTypes() == null) { - setTypes(new HashMapgetNode
- * - * @return a {@link org.opennms.netmgt.model.OnmsNode} object. - */ - protected OnmsNode getNode() { - return m_node; - } - - /** - *getNodeDao
- * - * @return a {@link org.opennms.netmgt.dao.api.NodeDao} object. - */ - protected NodeDao getNodeDao() { - return m_nodeDao; - } - - /** - *getDistPollerDao
- * - * @return a {@link org.opennms.netmgt.dao.api.DistPollerDao} object. - */ - protected DistPollerDao getDistPollerDao() { - return m_distPollerDao; - } - - private OnmsCategory getCategory(final String name) { - preloadExistingCategories(); - - OnmsCategory category = getCategories().get(name); - if (category == null) { - category = m_categoryDao.findByName(name); - if (category == null) { - category = new OnmsCategory(name); - m_categoryDao.save(category); - } - getCategories().put(category.getName(), category); - } - return category; - - } - - /** - *getIpAddrToInterfaceMap
- * - * @param imported a {@link org.opennms.netmgt.model.OnmsNode} object. - * @return a {@link java.util.Map} object. - */ - protected MapgetCategoryDao
- * - * @return a {@link org.opennms.netmgt.dao.api.CategoryDao} object. - */ - public CategoryDao getCategoryDao() { - return m_categoryDao; - } - - /** - *setCategoryDao
- * - * @param categoryDao a {@link org.opennms.netmgt.dao.api.CategoryDao} object. - */ - public void setCategoryDao(final CategoryDao categoryDao) { - m_categoryDao = categoryDao; - } - - /** - *setServiceTypeDao
- * - * @param svcTypeDao a {@link org.opennms.netmgt.dao.api.ServiceTypeDao} object. - */ - public void setServiceTypeDao(final ServiceTypeDao svcTypeDao) { - m_svcTypeDao = svcTypeDao; - } - - /** - *setNodeDao
- * - * @param nodeDao a {@link org.opennms.netmgt.dao.api.NodeDao} object. - */ - public void setNodeDao(final NodeDao nodeDao) { - m_nodeDao = nodeDao; - } - - /** - *setDistPollerDao
- * - * @param distPollerDao a {@link org.opennms.netmgt.dao.api.DistPollerDao} object. - */ - public void setDistPollerDao(final DistPollerDao distPollerDao) { - m_distPollerDao = distPollerDao; - } - - /** - *setTypeCache
- * - * @param typeCache a {@link java.lang.ThreadLocal} object. - */ - public void setTypeCache(final ThreadLocalsetCategoryCache
- * - * @param categoryCache a {@link java.lang.ThreadLocal} object. - */ - public void setCategoryCache(final ThreadLocalnullSafeEquals
- * - * @param o1 a {@link java.lang.Object} object. - * @param o2 a {@link java.lang.Object} object. - * @return a boolean. - */ - public boolean nullSafeEquals(final Object o1, final Object o2) { - return (o1 == null ? o2 == null : o1.equals(o2)); - } - -} diff --git a/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/AddEventVisitor.java b/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/AddEventVisitor.java deleted file mode 100644 index 3b492c058e76..000000000000 --- a/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/AddEventVisitor.java +++ /dev/null @@ -1,71 +0,0 @@ -/******************************************************************************* - * This file is part of OpenNMS(R). - * - * Copyright (C) 2006-2012 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc. - * - * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. - * - * OpenNMS(R) is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * OpenNMS(R) is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with OpenNMS(R). If not, see: - * http://www.gnu.org/licenses/ - * - * For more information contact: - * OpenNMS(R) LicensingAddEventVisitor class.
- * - * @author ranger - * @version $Id: $ - */ -package org.opennms.netmgt.importer.operations; - -import java.util.List; - -import org.opennms.netmgt.capsd.EventUtils; -import org.opennms.netmgt.model.AbstractEntityVisitor; -import org.opennms.netmgt.model.OnmsIpInterface; -import org.opennms.netmgt.model.OnmsMonitoredService; -import org.opennms.netmgt.model.OnmsNode; -import org.opennms.netmgt.xml.event.Event; -public final class AddEventVisitor extends AbstractEntityVisitor { - private final ListDefaultImportStatistics class.
- * - * @author ranger - * @version $Id: $ - */ -package org.opennms.netmgt.importer.operations; - -import java.util.List; - -import org.opennms.netmgt.xml.event.Event; -import org.springframework.core.io.Resource; -public class DefaultImportStatistics implements ImportStatistics { - /** - *beginProcessingOps
- */ - @Override - public void beginProcessingOps() { - } - - /** - *finishProcessingOps
- */ - @Override - public void finishProcessingOps() { - } - - /** - *beginPreprocessingOps
- */ - @Override - public void beginPreprocessingOps() { - } - - /** - *finishPreprocessingOps
- */ - @Override - public void finishPreprocessingOps() { - } - - /** {@inheritDoc} */ - @Override - public void beginPreprocessing(ImportOperation oper) { - } - - /** {@inheritDoc} */ - @Override - public void finishPreprocessing(ImportOperation oper) { - } - - /** {@inheritDoc} */ - @Override - public void beginPersisting(ImportOperation oper) { - } - - /** {@inheritDoc} */ - @Override - public void finishPersisting(ImportOperation oper) { - } - - /** {@inheritDoc} */ - @Override - public void beginSendingEvents(ImportOperation oper, ListbeginImporting
- */ - @Override - public void beginImporting() { - } - - /** - *finishImporting
- */ - @Override - public void finishImporting() { - } - - /** - *beginAuditNodes
- */ - @Override - public void beginAuditNodes() { - } - - /** - *finishAuditNodes
- */ - @Override - public void finishAuditNodes() { - } - - /** {@inheritDoc} */ - @Override - public void setDeleteCount(int deleteCount) { - } - - /** {@inheritDoc} */ - @Override - public void setInsertCount(int insertCount) { - } - - /** {@inheritDoc} */ - @Override - public void setUpdateCount(int updateCount) { - } - - /** - *beginRelateNodes
- */ - @Override - public void beginRelateNodes() { - // TODO Auto-generated method stub - - } - - /** - *finishRelateNodes
- */ - @Override - public void finishRelateNodes() { - // TODO Auto-generated method stub - - } - -} diff --git a/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/DeleteEventVisitor.java b/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/DeleteEventVisitor.java deleted file mode 100644 index 35cec426125c..000000000000 --- a/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/DeleteEventVisitor.java +++ /dev/null @@ -1,70 +0,0 @@ -/******************************************************************************* - * This file is part of OpenNMS(R). - * - * Copyright (C) 2006-2012 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc. - * - * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. - * - * OpenNMS(R) is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * OpenNMS(R) is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with OpenNMS(R). If not, see: - * http://www.gnu.org/licenses/ - * - * For more information contact: - * OpenNMS(R) LicensingDeleteEventVisitor class.
- * - * @author ranger - * @version $Id: $ - */ -package org.opennms.netmgt.importer.operations; - -import java.util.List; - -import org.opennms.core.utils.InetAddressUtils; -import org.opennms.netmgt.capsd.EventUtils; -import org.opennms.netmgt.model.AbstractEntityVisitor; -import org.opennms.netmgt.model.OnmsIpInterface; -import org.opennms.netmgt.model.OnmsMonitoredService; -import org.opennms.netmgt.model.OnmsNode; -import org.opennms.netmgt.xml.event.Event; -public final class DeleteEventVisitor extends AbstractEntityVisitor { - private final ListDeleteOperation class.
- * - * @author ranger - * @version $Id: $ - */ -public class DeleteOperation extends AbstractImportOperation { - - Integer m_nodeId; - NodeDao m_nodeDao; - - /** - *Constructor for DeleteOperation.
- * - * @param nodeId a {@link java.lang.Integer} object. - * @param foreignSource a {@link java.lang.String} object. - * @param foreignId a {@link java.lang.String} object. - * @param nodeDao a {@link org.opennms.netmgt.dao.api.NodeDao} object. - */ - public DeleteOperation(Integer nodeId, String foreignSource, String foreignId, NodeDao nodeDao) { - m_nodeId = nodeId; - m_nodeDao = nodeDao; - } - - /** - *persist
- * - * @return a {@link java.util.List} object. - */ - @Override - public ListtoString
- * - * @return a {@link java.lang.String} object. - */ - @Override - public String toString() { - return "DELETE: Node "+m_nodeId; - } - - /** - *gatherAdditionalData
- */ - @Override - public void gatherAdditionalData() { - // no additional data to gather - } -} diff --git a/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/ImportOperationFactory.java b/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/ImportOperationFactory.java deleted file mode 100644 index b354ab896c36..000000000000 --- a/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/ImportOperationFactory.java +++ /dev/null @@ -1,76 +0,0 @@ -/******************************************************************************* - * This file is part of OpenNMS(R). - * - * Copyright (C) 2006-2012 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc. - * - * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. - * - * OpenNMS(R) is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * OpenNMS(R) is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with OpenNMS(R). If not, see: - * http://www.gnu.org/licenses/ - * - * For more information contact: - * OpenNMS(R) LicensingImportOperationFactory interface.
- * - * @author ranger - * @version $Id: $ - */ -public interface ImportOperationFactory { - - /** - *createInsertOperation
- * - * @param foreignSource a {@link java.lang.String} object. - * @param foreignId a {@link java.lang.String} object. - * @param nodeLabel a {@link java.lang.String} object. - * @param building a {@link java.lang.String} object. - * @param city a {@link java.lang.String} object. - * @return a {@link org.opennms.netmgt.importer.operations.InsertOperation} object. - */ - public abstract InsertOperation createInsertOperation(String foreignSource, String foreignId, String nodeLabel, String building, String city); - - /** - *createUpdateOperation
- * - * @param nodeId a {@link java.lang.Integer} object. - * @param foreignSource a {@link java.lang.String} object. - * @param foreignId a {@link java.lang.String} object. - * @param nodeLabel a {@link java.lang.String} object. - * @param building a {@link java.lang.String} object. - * @param city a {@link java.lang.String} object. - * @return a {@link org.opennms.netmgt.importer.operations.UpdateOperation} object. - */ - public abstract UpdateOperation createUpdateOperation(Integer nodeId, String foreignSource, String foreignId, String nodeLabel, String building, String city); - - /** - *createDeleteOperation
- * - * @param nodeId a {@link java.lang.Integer} object. - * @param foreignSource a {@link java.lang.String} object. - * @param foreignId a {@link java.lang.String} object. - * @return a {@link org.opennms.netmgt.importer.operations.DeleteOperation} object. - */ - public abstract DeleteOperation createDeleteOperation(Integer nodeId, String foreignSource, String foreignId); - -} diff --git a/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/ImportOperationsManager.java b/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/ImportOperationsManager.java deleted file mode 100644 index 237326bf545c..000000000000 --- a/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/ImportOperationsManager.java +++ /dev/null @@ -1,438 +0,0 @@ -/******************************************************************************* - * This file is part of OpenNMS(R). - * - * Copyright (C) 2006-2012 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc. - * - * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. - * - * OpenNMS(R) is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * OpenNMS(R) is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with OpenNMS(R). If not, see: - * http://www.gnu.org/licenses/ - * - * For more information contact: - * OpenNMS(R) LicensingConstructor for ImportOperationsManager.
- * - * @param foreignIdToNodeMap a {@link java.util.Map} object. - * @param operationFactory a {@link org.opennms.netmgt.importer.operations.ImportOperationFactory} object. - */ - public ImportOperationsManager(MapfoundNode
- * - * @param foreignId a {@link java.lang.String} object. - * @param nodeLabel a {@link java.lang.String} object. - * @param building a {@link java.lang.String} object. - * @param city a {@link java.lang.String} object. - * @return a {@link org.opennms.netmgt.importer.operations.SaveOrUpdateOperation} object. - */ - public SaveOrUpdateOperation foundNode(String foreignId, String nodeLabel, String building, String city) { - - if (nodeExists(foreignId)) { - return updateNode(foreignId, nodeLabel, building, city); - } else { - return insertNode(foreignId, nodeLabel, building, city); - } - } - - private boolean nodeExists(String foreignId) { - return m_foreignIdToNodeMap.containsKey(foreignId); - } - - private SaveOrUpdateOperation insertNode(String foreignId, String nodeLabel, String building, String city) { - InsertOperation insertOperation = m_operationFactory.createInsertOperation(getForeignSource(), foreignId, nodeLabel, building, city); - m_inserts.add(insertOperation); - return insertOperation; - } - - private SaveOrUpdateOperation updateNode(String foreignId, String nodeLabel, String building, String city) { - Integer nodeId = processForeignId(foreignId); - UpdateOperation updateOperation = m_operationFactory.createUpdateOperation(nodeId, getForeignSource(), foreignId, nodeLabel, building, city); - m_updates.add(updateOperation); - return updateOperation; - } - - /** - * Return NodeId and remove it from the Map so we know which nodes have been operated on thereby - * tracking nodes to be deleted. - * @param foreignId - * @return a nodeId - */ - private Integer processForeignId(String foreignId) { - return m_foreignIdToNodeMap.remove(foreignId); - } - - /** - *getOperationCount
- * - * @return a int. - */ - public int getOperationCount() { - return m_inserts.size() + m_updates.size() + m_foreignIdToNodeMap.size(); - } - - /** - *getInsertCount
- * - * @return a int. - */ - public int getInsertCount() { - return m_inserts.size(); - } - - /** - *getUpdateCount
- * - * @return a int. - */ - public int getUpdateCount() { - return m_updates.size(); - } - - /** - *getDeleteCount
- * - * @return a int. - */ - public int getDeleteCount() { - return m_foreignIdToNodeMap.size(); - } - - class DeleteIterator implements IteratorshutdownAndWaitForCompletion
- * - * @param executorService a {@link java.util.concurrent.ExecutorService} object. - * @param msg a {@link java.lang.String} object. - */ - public void shutdownAndWaitForCompletion(ExecutorService executorService, String msg) { - executorService.shutdown(); - try { - while (!executorService.awaitTermination(10, TimeUnit.SECONDS)) { - // loop util the await returns false - } - } catch (InterruptedException e) { - LOG.error(msg, e); - } - } - - /** - *persistOperations
- * - * @param template a {@link org.springframework.transaction.support.TransactionTemplate} object. - * @param dao a {@link org.opennms.netmgt.dao.api.OnmsDao} object. - */ - public void persistOperations(TransactionTemplate template, OnmsDao dao) { - m_stats.beginProcessingOps(); - m_stats.setDeleteCount(getDeleteCount()); - m_stats.setInsertCount(getInsertCount()); - m_stats.setUpdateCount(getUpdateCount()); - ExecutorService pool = Executors.newFixedThreadPool(m_writeThreads, new LogPreservingThreadFactory(getClass().getSimpleName() + ".persistOperations", m_writeThreads, false)); - - preprocessOperations(template, dao, new OperationIterator(), pool); - - shutdownAndWaitForCompletion(pool, "persister interrupted!"); - - m_stats.finishProcessingOps(); - - } - - private void preprocessOperations(final TransactionTemplate template, final OnmsDao dao, OperationIterator iterator, final ExecutorService dbPool) { - - m_stats.beginPreprocessingOps(); - - ExecutorService pool = Executors.newFixedThreadPool(m_scanThreads, new LogPreservingThreadFactory(getClass().getSimpleName() + ".preprocessOperations", m_scanThreads, false)); - for (IteratorpreprocessOperation
- * - * @param oper a {@link org.opennms.netmgt.importer.operations.ImportOperation} object. - * @param template a {@link org.springframework.transaction.support.TransactionTemplate} object. - * @param dao a {@link org.opennms.netmgt.dao.api.OnmsDao} object. - * @param dbPool a {@link java.util.concurrent.ExecutorService} object. - */ - protected void preprocessOperation(final ImportOperation oper, final TransactionTemplate template, final OnmsDao dao, final ExecutorService dbPool) { - m_stats.beginPreprocessing(oper); - LOG.info("Preprocess: {}", oper); - oper.gatherAdditionalData(); - Runnable r = new Runnable() { - @Override - public void run() { - persistOperation(oper, template, dao); - } - }; - - dbPool.execute(r); - - m_stats.finishPreprocessing(oper); - } - - /** - *persistOperation
- * - * @param oper a {@link org.opennms.netmgt.importer.operations.ImportOperation} object. - * @param template a {@link org.springframework.transaction.support.TransactionTemplate} object. - * @param dao a {@link org.opennms.netmgt.dao.api.OnmsDao} object. - */ - protected void persistOperation(final ImportOperation oper, TransactionTemplate template, final OnmsDao dao) { - m_stats.beginPersisting(oper); - LOG.info("Persist: {}", oper); - - ListsetScanThreads
- * - * @param scanThreads a int. - */ - public void setScanThreads(int scanThreads) { - m_scanThreads = scanThreads; - } - - /** - *setWriteThreads
- * - * @param writeThreads a int. - */ - public void setWriteThreads(int writeThreads) { - m_writeThreads = writeThreads; - } - - - - /** - *getEventMgr
- * - * @return a {@link org.opennms.netmgt.model.events.EventIpcManager} object. - */ - public EventIpcManager getEventMgr() { - return m_eventMgr; - } - - - - /** - *setEventMgr
- * - * @param eventMgr a {@link org.opennms.netmgt.model.events.EventIpcManager} object. - */ - public void setEventMgr(EventIpcManager eventMgr) { - m_eventMgr = eventMgr; - } - - /** - *getStats
- * - * @return a {@link org.opennms.netmgt.importer.operations.ImportStatistics} object. - */ - public ImportStatistics getStats() { - return m_stats; - } - - /** - *setStats
- * - * @param stats a {@link org.opennms.netmgt.importer.operations.ImportStatistics} object. - */ - public void setStats(ImportStatistics stats) { - m_stats = stats; - } - - /** - *setForeignSource
- * - * @param foreignSource a {@link java.lang.String} object. - */ - public void setForeignSource(String foreignSource) { - m_foreignSource = foreignSource; - } - - /** - *getForeignSource
- * - * @return a {@link java.lang.String} object. - */ - public String getForeignSource() { - return m_foreignSource; - } -} diff --git a/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/ImportStatistics.java b/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/ImportStatistics.java deleted file mode 100644 index 1ad46e43f7a3..000000000000 --- a/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/ImportStatistics.java +++ /dev/null @@ -1,173 +0,0 @@ -/******************************************************************************* - * This file is part of OpenNMS(R). - * - * Copyright (C) 2006-2012 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc. - * - * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. - * - * OpenNMS(R) is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * OpenNMS(R) is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with OpenNMS(R). If not, see: - * http://www.gnu.org/licenses/ - * - * For more information contact: - * OpenNMS(R) LicensingImportStatistics interface.
- * - * @author ranger - * @version $Id: $ - */ -public interface ImportStatistics { - - /** - *beginProcessingOps
- */ - void beginProcessingOps(); - - /** - *finishProcessingOps
- */ - void finishProcessingOps(); - - /** - *beginPreprocessingOps
- */ - void beginPreprocessingOps(); - - /** - *finishPreprocessingOps
- */ - void finishPreprocessingOps(); - - /** - *beginPreprocessing
- * - * @param oper a {@link org.opennms.netmgt.importer.operations.ImportOperation} object. - */ - void beginPreprocessing(ImportOperation oper); - - /** - *finishPreprocessing
- * - * @param oper a {@link org.opennms.netmgt.importer.operations.ImportOperation} object. - */ - void finishPreprocessing(ImportOperation oper); - - /** - *beginPersisting
- * - * @param oper a {@link org.opennms.netmgt.importer.operations.ImportOperation} object. - */ - void beginPersisting(ImportOperation oper); - - /** - *finishPersisting
- * - * @param oper a {@link org.opennms.netmgt.importer.operations.ImportOperation} object. - */ - void finishPersisting(ImportOperation oper); - - /** - *beginSendingEvents
- * - * @param oper a {@link org.opennms.netmgt.importer.operations.ImportOperation} object. - * @param events a {@link java.util.List} object. - */ - void beginSendingEvents(ImportOperation oper, ListfinishSendingEvents
- * - * @param oper a {@link org.opennms.netmgt.importer.operations.ImportOperation} object. - * @param events a {@link java.util.List} object. - */ - void finishSendingEvents(ImportOperation oper, ListbeginLoadingResource
- * - * @param resource a {@link org.springframework.core.io.Resource} object. - */ - void beginLoadingResource(Resource resource); - - /** - *finishLoadingResource
- * - * @param resource a {@link org.springframework.core.io.Resource} object. - */ - void finishLoadingResource(Resource resource); - - /** - *beginImporting
- */ - void beginImporting(); - - /** - *finishImporting
- */ - void finishImporting(); - - /** - *beginAuditNodes
- */ - void beginAuditNodes(); - - /** - *finishAuditNodes
- */ - void finishAuditNodes(); - - /** - *setDeleteCount
- * - * @param deleteCount a int. - */ - void setDeleteCount(int deleteCount); - - /** - *setInsertCount
- * - * @param insertCount a int. - */ - void setInsertCount(int insertCount); - - /** - *setUpdateCount
- * - * @param updateCount a int. - */ - void setUpdateCount(int updateCount); - - /** - *beginRelateNodes
- */ - void beginRelateNodes(); - - /** - *finishRelateNodes
- */ - void finishRelateNodes(); - -} diff --git a/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/InsertOperation.java b/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/InsertOperation.java deleted file mode 100644 index 464f96678da5..000000000000 --- a/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/InsertOperation.java +++ /dev/null @@ -1,89 +0,0 @@ -/******************************************************************************* - * This file is part of OpenNMS(R). - * - * Copyright (C) 2006-2012 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc. - * - * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. - * - * OpenNMS(R) is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * OpenNMS(R) is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with OpenNMS(R). If not, see: - * http://www.gnu.org/licenses/ - * - * For more information contact: - * OpenNMS(R) LicensingInsertOperation class.
- * - * @author ranger - * @version $Id: $ - */ -public class InsertOperation extends AbstractSaveOrUpdateOperation { - - /** - *Constructor for InsertOperation.
- * - * @param foreignSource a {@link java.lang.String} object. - * @param foreignId a {@link java.lang.String} object. - * @param nodeLabel a {@link java.lang.String} object. - * @param building a {@link java.lang.String} object. - * @param city a {@link java.lang.String} object. - */ - public InsertOperation(String foreignSource, String foreignId, String nodeLabel, String building, String city) { - super(foreignSource, foreignId, nodeLabel, building, city); - } - - /** - *doPersist
- * - * @return a {@link java.util.List} object. - */ - @Override - public ListtoString
- * - * @return a {@link java.lang.String} object. - */ - @Override - public String toString() { - return "INSERT: Node: "+getNode().getLabel(); - } - -} diff --git a/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/UpdateOperation.java b/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/UpdateOperation.java deleted file mode 100644 index c5bc44c9e587..000000000000 --- a/opennms-import/src/main/java/org/opennms/netmgt/importer/operations/UpdateOperation.java +++ /dev/null @@ -1,428 +0,0 @@ -/******************************************************************************* - * This file is part of OpenNMS(R). - * - * Copyright (C) 2006-2012 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc. - * - * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. - * - * OpenNMS(R) is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * OpenNMS(R) is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with OpenNMS(R). If not, see: - * http://www.gnu.org/licenses/ - * - * For more information contact: - * OpenNMS(R) LicensingUpdateOperation class.
- * - * @author ranger - * @version $Id: $ - */ -public class UpdateOperation extends AbstractSaveOrUpdateOperation { - - private static final Logger LOG = LoggerFactory.getLogger(UpdateOperation.class); - - - public class ServiceUpdater { - - private OnmsIpInterface m_iface; - MapConstructor for UpdateOperation.
- * - * @param nodeId a {@link java.lang.Integer} object. - * @param foreignSource a {@link java.lang.String} object. - * @param foreignId a {@link java.lang.String} object. - * @param nodeLabel a {@link java.lang.String} object. - * @param building a {@link java.lang.String} object. - * @param city a {@link java.lang.String} object. - */ - public UpdateOperation(Integer nodeId, String foreignSource, String foreignId, String nodeLabel, String building, String city) { - super(nodeId, foreignSource, foreignId, nodeLabel, building, city); - } - - /** - *doPersist
- * - * @return a {@link java.util.List} object. - */ - @Override - public ListtoString
- * - * @return a {@link java.lang.String} object. - */ - @Override - public String toString() { - return "UPDATE: Node: "+getNode().getId()+": "+getNode().getLabel(); - } -} diff --git a/opennms-import/src/main/java/org/opennms/netmgt/importer/specification/AbstractImportVisitor.java b/opennms-import/src/main/java/org/opennms/netmgt/importer/specification/AbstractImportVisitor.java deleted file mode 100644 index a2122eab2cb7..000000000000 --- a/opennms-import/src/main/java/org/opennms/netmgt/importer/specification/AbstractImportVisitor.java +++ /dev/null @@ -1,105 +0,0 @@ -/******************************************************************************* - * This file is part of OpenNMS(R). - * - * Copyright (C) 2006-2012 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc. - * - * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. - * - * OpenNMS(R) is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * OpenNMS(R) is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with OpenNMS(R). If not, see: - * http://www.gnu.org/licenses/ - * - * For more information contact: - * OpenNMS(R) LicensingAbstractImportVisitor class.
- * - * @author ranger - * @version $Id: $ - */ -public class AbstractImportVisitor implements ImportVisitor { - - /** {@inheritDoc} */ - @Override - public void visitModelImport(ModelImport mi) { - } - - /** {@inheritDoc} */ - @Override - public void completeModelImport(ModelImport modelImport) { - } - - /** {@inheritDoc} */ - @Override - public void visitNode(Node node) { - } - - /** {@inheritDoc} */ - @Override - public void completeNode(Node node) { - } - - /** {@inheritDoc} */ - @Override - public void visitInterface(Interface iface) { - } - - /** {@inheritDoc} */ - @Override - public void completeInterface(Interface iface) { - } - - /** {@inheritDoc} */ - @Override - public void visitMonitoredService(MonitoredService svc) { - } - - /** {@inheritDoc} */ - @Override - public void completeMonitoredService(MonitoredService svc) { - } - - /** {@inheritDoc} */ - @Override - public void visitCategory(Category category) { - } - - /** {@inheritDoc} */ - @Override - public void completeCategory(Category category) { - } - - /** {@inheritDoc} */ - @Override - public void visitAsset(Asset asset) { - } - - /** {@inheritDoc} */ - @Override - public void completeAsset(Asset asset) { - } -} diff --git a/opennms-import/src/main/java/org/opennms/netmgt/importer/specification/ImportVisitor.java b/opennms-import/src/main/java/org/opennms/netmgt/importer/specification/ImportVisitor.java deleted file mode 100644 index 187fd140ac3b..000000000000 --- a/opennms-import/src/main/java/org/opennms/netmgt/importer/specification/ImportVisitor.java +++ /dev/null @@ -1,119 +0,0 @@ -/******************************************************************************* - * This file is part of OpenNMS(R). - * - * Copyright (C) 2006-2012 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc. - * - * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. - * - * OpenNMS(R) is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * OpenNMS(R) is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with OpenNMS(R). If not, see: - * http://www.gnu.org/licenses/ - * - * For more information contact: - * OpenNMS(R) LicensingImportVisitor interface.
- * - * @author ranger - * @version $Id: $ - */ -public interface ImportVisitor { - - /** - *visitModelImport
- * - * @param mi a {@link org.opennms.netmgt.importer.config.ModelImport} object. - */ - public void visitModelImport(ModelImport mi); - /** - *completeModelImport
- * - * @param modelImport a {@link org.opennms.netmgt.importer.config.ModelImport} object. - */ - public void completeModelImport(ModelImport modelImport); - /** - *visitNode
- * - * @param node a {@link org.opennms.netmgt.importer.config.Node} object. - */ - public void visitNode(Node node); - /** - *completeNode
- * - * @param node a {@link org.opennms.netmgt.importer.config.Node} object. - */ - public void completeNode(Node node); - /** - *visitInterface
- * - * @param iface a {@link org.opennms.netmgt.importer.config.Interface} object. - */ - public void visitInterface(Interface iface); - /** - *completeInterface
- * - * @param iface a {@link org.opennms.netmgt.importer.config.Interface} object. - */ - public void completeInterface(Interface iface); - /** - *visitMonitoredService
- * - * @param svc a {@link org.opennms.netmgt.importer.config.MonitoredService} object. - */ - public void visitMonitoredService(MonitoredService svc); - /** - *completeMonitoredService
- * - * @param svc a {@link org.opennms.netmgt.importer.config.MonitoredService} object. - */ - public void completeMonitoredService(MonitoredService svc); - /** - *visitCategory
- * - * @param category a {@link org.opennms.netmgt.importer.config.Category} object. - */ - public void visitCategory(Category category); - /** - *completeCategory
- * - * @param category a {@link org.opennms.netmgt.importer.config.Category} object. - */ - public void completeCategory(Category category); - /** - *visitAsset
- * - * @param asset a {@link org.opennms.netmgt.importer.config.Asset} object. - */ - public void visitAsset(Asset asset); - /** - *completeAsset
- * - * @param asset a {@link org.opennms.netmgt.importer.config.Asset} object. - */ - public void completeAsset(Asset asset); - -} diff --git a/opennms-import/src/main/java/org/opennms/netmgt/importer/specification/SpecFile.java b/opennms-import/src/main/java/org/opennms/netmgt/importer/specification/SpecFile.java deleted file mode 100644 index b87dec04f914..000000000000 --- a/opennms-import/src/main/java/org/opennms/netmgt/importer/specification/SpecFile.java +++ /dev/null @@ -1,164 +0,0 @@ -/******************************************************************************* - * This file is part of OpenNMS(R). - * - * Copyright (C) 2006-2012 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc. - * - * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. - * - * OpenNMS(R) is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * OpenNMS(R) is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with OpenNMS(R). If not, see: - * http://www.gnu.org/licenses/ - * - * For more information contact: - * OpenNMS(R) LicensingSpecFile class.
- * - * @author ranger - * @version $Id: $ - */ -public class SpecFile { - - private ModelImport m_mi; - - /** - *loadResource
- * - * @param resource a {@link org.springframework.core.io.Resource} object. - * @throws org.opennms.netmgt.importer.ModelImportException if any. - * @throws java.io.IOException if any. - */ - public void loadResource(Resource resource) throws ModelImportException, IOException { - try { - m_mi = CastorUtils.unmarshal(ModelImport.class, resource); - } catch (MarshalException e) { - throw new ModelImportException("Exception while marshalling import: "+e, e); - } catch (ValidationException e) { - throw new ModelImportException("Exception while validating import "+e); - } - } - - /** - *visitImport
- * - * @param visitor a {@link org.opennms.netmgt.importer.specification.ImportVisitor} object. - */ - public void visitImport(ImportVisitor visitor) { - doVisitImport(visitor); - } - - private void doVisitImport(ImportVisitor visitor) { - visitor.visitModelImport(m_mi); - for (Node node : m_mi.getNodeCollection()) { - visitNode(visitor, node); - } - visitor.completeModelImport(m_mi); - } - - private void visitNode(final ImportVisitor visitor, final Node node) { - doVisitNode(visitor, node); - } - - private void doVisitNode(ImportVisitor visitor, Node node) { - visitor.visitNode(node); - for (Category category : node.getCategoryCollection()) { - visitCategory(visitor, category); - } - for (Interface iface : node.getInterfaceCollection()) { - visitInterface(visitor, iface); - } - for (Asset asset : node.getAssetCollection()) { - visitAsset(visitor, asset); - } - visitor.completeNode(node); - } - - private void visitAsset(ImportVisitor visitor, Asset asset) { - doVisitAsset(visitor, asset); - } - - private void doVisitAsset(ImportVisitor visitor, Asset asset) { - visitor.visitAsset(asset); - visitor.completeAsset(asset); - } - - private void visitCategory(ImportVisitor visitor, Category category) { - doVisitCategory(visitor, category); - } - - private void doVisitCategory(ImportVisitor visitor, Category category) { - visitor.visitCategory(category); - visitor.completeCategory(category); - } - - private void visitInterface(ImportVisitor visitor, Interface iface) { - doVisitInterface(visitor, iface); - } - - private void doVisitInterface(ImportVisitor visitor, Interface iface) { - visitor.visitInterface(iface); - for (MonitoredService svc : iface.getMonitoredServiceCollection()) { - visitMonitoredService(visitor, svc); - } - visitor.completeInterface(iface); - } - - private void visitMonitoredService(ImportVisitor visitor, MonitoredService svc) { - doVisitMonitoredService(visitor, svc); - } - - private void doVisitMonitoredService(ImportVisitor visitor, MonitoredService svc) { - visitor.visitMonitoredService(svc); - visitor.completeMonitoredService(svc); - } - - /** - *getForeignSource
- * - * @return a {@link java.lang.String} object. - */ - public String getForeignSource() { - return m_mi.getForeignSource(); - } - - /** - *setForeignSource
- * - * @param foreignSource a {@link java.lang.String} object. - */ - public void setForeignSource(String foreignSource) { - m_mi.setForeignSource(foreignSource); - } - -} diff --git a/opennms-import/src/main/resources/META-INF/opennms/applicationContext-importer.xml b/opennms-import/src/main/resources/META-INF/opennms/applicationContext-importer.xml deleted file mode 100644 index dc276638b6b2..000000000000 --- a/opennms-import/src/main/resources/META-INF/opennms/applicationContext-importer.xml +++ /dev/null @@ -1,74 +0,0 @@ - --
-
The XML may contain spaces that must be removed.
+ * + * @param name the new name + */ + public void setName(String name) { + this.name = name == null ? null : name.trim(); + } + + /** + * Gets the minimum heartbeat. + * + * @return the minimum heartbeat + */ + @XmlElement(name="minimal_heartbeat") + public Integer getMinHeartbeat() { + return minHeartbeat; + } + + /** + * Sets the minimum heartbeat. + * + * @param minHeartbeat the new minimum heartbeat + */ + public void setMinHeartbeat(Integer minHeartbeat) { + this.minHeartbeat = minHeartbeat; + } + + /** + * Gets the minimum value. + * + * @return the minimum value + */ + @XmlElement + public Double getMin() { + return min; + } + + /** + * Sets the minimum value. + * + * @param min the new minimum value + */ + public void setMin(Double min) { + this.min = min; + } + + /** + * Gets the maximum value. + * + * @return the maximum value + */ + @XmlElement + public Double getMax() { + return max; + } + + /** + * Sets the maximum value. + * + * @param max the new maximum value + */ + public void setMax(Double max) { + this.max = max; + } + + /** + * Gets the last data source value. + * + * @return the last data source time stamp + */ + @XmlElement(name="last_ds") + @XmlJavaTypeAdapter(DoubleAdapter.class) + public Double getLastDs() { + return lastDs; + } + + /** + * Sets the last data source value. + * + * @param lastDs the new last data source value + */ + public void setLastDs(Double lastDs) { + this.lastDs = lastDs; + } + + /** + * Gets the value. + * + * @return the value + */ + @XmlElement + public Double getValue() { + return value; + } + + /** + * Sets the value. + * + * @param value the new value + */ + public void setValue(Double value) { + this.value = value; + } + + /** + * Gets the unknown seconds. + * + * @return the unknown seconds + */ + @XmlElement(name="unknown_sec") + public Integer getUnknownSec() { + return unknownSec; + } + + /** + * Sets the unknown seconds. + * + * @param unknownSec the new unknown seconds + */ + public void setUnknownSec(Integer unknownSec) { + this.unknownSec = unknownSec; + } + + /** + * Format equals. + * + * @param ds the DS object + * @return true, if successful + */ + public boolean formatEquals(AbstractDS ds) { + if (this.name != null) { + if (ds.name == null) return false; + else if (!(this.name.equals(ds.name))) + return false; + } + else if (ds.name != null) + return false; + + if (this.minHeartbeat != null) { + if (ds.minHeartbeat == null) return false; + else if (!(this.minHeartbeat.equals(ds.minHeartbeat))) + return false; + } + else if (ds.minHeartbeat != null) + return false; + + if (this.min != null) { + if (ds.min == null) return false; + else if (!(this.min.equals(ds.min))) + return false; + } + else if (ds.min != null) + return false; + + if (this.max != null) { + if (ds.max == null) return false; + else if (!(this.max.equals(ds.max))) + return false; + } + else if (ds.max != null) + return false; + + return true; + } +} diff --git a/opennms-rrd/opennms-rrd-model/src/main/java/org/opennms/netmgt/rrd/model/AbstractRRA.java b/opennms-rrd/opennms-rrd-model/src/main/java/org/opennms/netmgt/rrd/model/AbstractRRA.java new file mode 100644 index 000000000000..97d30872d0eb --- /dev/null +++ b/opennms-rrd/opennms-rrd-model/src/main/java/org/opennms/netmgt/rrd/model/AbstractRRA.java @@ -0,0 +1,123 @@ +/******************************************************************************* + * This file is part of OpenNMS(R). + * + * Copyright (C) 2006-2012 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc. + * + * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. + * + * OpenNMS(R) is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. + * + * OpenNMS(R) is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with OpenNMS(R). If not, see: + * http://www.gnu.org/licenses/ + * + * For more information contact: + * OpenNMS(R) LicensingMerge the content of rrdSrc into this RRD.
+ *The format must be equal in order to perform the merge operation.
+ * + * @param rrdSrc the RRD source + * @throws IllegalArgumentException the illegal argument exception + */ + public void merge(AbstractRRD rrdSrc) throws IllegalArgumentException { + if (!formatEquals(rrdSrc)) { + throw new IllegalArgumentException("Invalid RRD format"); + } + int rraNum = 0; + for (AbstractRRA rra : rrdSrc.getRras()) { + for (Row row : rra.getRows()) { + if (!row.isNan()) { + Long ts = rrdSrc.findTimestampByRow(rra, row); + Row localRow = findRowByTimestamp(getRras().get(rraNum), ts); + if (localRow != null) { + localRow.setValues(row.getValues()); + } + } + } + rraNum++; + } + } + + /** + * Merge. + * + * @param rrdList the RRD list + * @throws IllegalArgumentException the illegal argument exception + */ + public void merge(List rrdList) throws IllegalArgumentException { + if (rrdList.size() != getDataSources().size()) { + throw new IllegalArgumentException("Cannot merge RRDs because the amount of RRDs doesn't match the amount of data sources."); + } + for (AbstractRRD arrd : rrdList) { + if (!getVersion().equals(getVersion())) { + throw new IllegalArgumentException("Cannot merge RRDs because one of them have a different file version."); + } + if (!hasEqualsRras(arrd)) { + throw new IllegalArgumentException("Cannot merge RRDs because one of them as different RRA configuration."); + } + if (arrd.getDataSources().size() > 1) { + throw new IllegalArgumentException("Cannot merge RRDs because one of them has more than one DS."); + } + } + Collections.sort(rrdList, new ComparatorIf the RRD contain several data sources, it will return one RRD per DS. + * Otherwise, it will throw an exception.
+ * + * @return the RRD list + * @throws IllegalArgumentException the illegal argument exception + */ + public ListThe null representation of some integer values inside the XML version of an RRD is expressed as 'U'
+ * + * @author Alejandro GalueThe null representation of some integer values inside the XML version of an RRD is expressed as 'U'
+ * + * @author Alejandro GalueThe start time expressed in seconds since 1970-01-01 UTC.
+ * + * @return the start + */ + public Long getStart() { + return start; + } + + /** + * Sets the start. + * + * @param start the new start + */ + public void setStart(Long start) { + this.start = start; + } + + /** + * Gets the end. + *The end time expressed in seconds since 1970-01-01 UTC
+ * + * @return the end + */ + public Long getEnd() { + return end; + } + + /** + * Sets the end. + * + * @param end the new end + */ + public void setEnd(Long end) { + this.end = end; + } + + /** + * Gets the step. + *The step (interval) time expressed in seconds
+ * + * @return the step + */ + public Integer getStep() { + return step; + } + + /** + * Sets the step. + * + * @param step the new step + */ + public void setStep(Integer step) { + this.step = step; + } + + /** + * Gets the rows. + * + * @return the rows + */ + public Integer getRows() { + return rows; + } + + /** + * Sets the rows. + * + * @param rows the new rows + */ + public void setRows(Integer rows) { + this.rows = rows; + } + + /** + * Gets the columns. + * + * @return the columns + */ + public Integer getColumns() { + return columns; + } + + /** + * Sets the columns. + * + * @param columns the new columns + */ + public void setColumns(Integer columns) { + this.columns = columns; + } + + /** + * Gets the legend entries. + * + * @return the legend entries + */ + public ListExpressed in seconds since 1970-01-01 UTC
+ * + * @return the time stamp + */ + public Long getTimestamp() { + return timestamp; + } + + /** + * Sets the time stamp. + * + * @param timestamp the new time stamp + */ + public void setTimestamp(Long timestamp) { + this.timestamp = timestamp; + } + +} diff --git a/opennms-import/src/main/java/org/opennms/netmgt/importer/ModelImportException.java b/opennms-rrd/opennms-rrd-model/src/main/java/org/opennms/netmgt/rrd/model/v1/CFType.java similarity index 65% rename from opennms-import/src/main/java/org/opennms/netmgt/importer/ModelImportException.java rename to opennms-rrd/opennms-rrd-model/src/main/java/org/opennms/netmgt/rrd/model/v1/CFType.java index c09e8a8788f0..3e145376bc90 100644 --- a/opennms-import/src/main/java/org/opennms/netmgt/importer/ModelImportException.java +++ b/opennms-rrd/opennms-rrd-model/src/main/java/org/opennms/netmgt/rrd/model/v1/CFType.java @@ -25,35 +25,41 @@ * http://www.opennms.org/ * http://www.opennms.com/ *******************************************************************************/ +package org.opennms.netmgt.rrd.model.v1; -package org.opennms.netmgt.importer; /** - *ModelImportException class.
- * - * @author ranger - * @version $Id: $ + * The Enumeration CFType (Consolidation Function Type). */ -public class ModelImportException extends Exception { +public enum CFType { + + /** RRA:AVERAGE:xff:steps:rows. */ + AVERAGE, + + /** RRA:MIN:xff:steps:rows. */ + MIN, - private static final long serialVersionUID = 6520991163434052156L; + /** RRA:MAX:xff:steps:rows. */ + MAX, + + /** RRA:LAST:xff:steps:rows. */ + LAST; /** - *Constructor for ModelImportException.
+ * Gets the CF Value. * - * @param msg a {@link java.lang.String} object. + * @return the string representation of the consolidation function */ - public ModelImportException(String msg) { - super(msg); + public String value() { + return name(); } - + /** - *Constructor for ModelImportException.
+ * From value. * - * @param msg a {@link java.lang.String} object. - * @param t a {@link java.lang.Throwable} object. + * @param v the string name of the CF + * @return the consolidation function type */ - public ModelImportException(String msg, Throwable t) { - super(msg, t); + public static CFType fromValue(String v) { + return v == null ? null : valueOf(v.trim()); } - } diff --git a/opennms-rrd/opennms-rrd-model/src/main/java/org/opennms/netmgt/rrd/model/v1/DS.java b/opennms-rrd/opennms-rrd-model/src/main/java/org/opennms/netmgt/rrd/model/v1/DS.java new file mode 100644 index 000000000000..fb3c54b59b4e --- /dev/null +++ b/opennms-rrd/opennms-rrd-model/src/main/java/org/opennms/netmgt/rrd/model/v1/DS.java @@ -0,0 +1,99 @@ +/******************************************************************************* + * This file is part of OpenNMS(R). + * + * Copyright (C) 2006-2012 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc. + * + * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. + * + * OpenNMS(R) is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. + * + * OpenNMS(R) is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with OpenNMS(R). If not, see: + * http://www.gnu.org/licenses/ + * + * For more information contact: + * OpenNMS(R) Licensing-
+ *
- ds.decl: name, type, minimal_heartbeat, min, max, last_ds, value, unknown_sec + *
ImporterService class.
- * - * @author ranger - * @version $Id: $ + * The Class DSAdapter. + *The XML representation sometimes contain spaces when defining the data source.
+ * + * @author Alejandro GaluegetStats
- * - * @return a {@link java.lang.String} object. + /* (non-Javadoc) + * @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) */ @Override - public String getStats() { - return getDaemon().getStats(); + public DSType unmarshal(String value) throws Exception { + return value == null ? null : DSType.fromValue(value.trim()); } + } diff --git a/opennms-rrd/opennms-rrd-model/src/main/java/org/opennms/netmgt/rrd/model/v1/DSType.java b/opennms-rrd/opennms-rrd-model/src/main/java/org/opennms/netmgt/rrd/model/v1/DSType.java new file mode 100644 index 000000000000..2cc38e9056f6 --- /dev/null +++ b/opennms-rrd/opennms-rrd-model/src/main/java/org/opennms/netmgt/rrd/model/v1/DSType.java @@ -0,0 +1,72 @@ +/******************************************************************************* + * This file is part of OpenNMS(R). + * + * Copyright (C) 2006-2012 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc. + * + * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. + * + * OpenNMS(R) is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. + * + * OpenNMS(R) is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with OpenNMS(R). If not, see: + * http://www.gnu.org/licenses/ + * + * For more information contact: + * OpenNMS(R) LicensingWarning: This representation doesn't support Aberrant Behavior Detection with Holt-Winters Forecasting
+ * + * @author Alejandro GalueXFF The xfiles factor defines what part of a consolidation interval may be made up from *UNKNOWN* data while the consolidated + * value is still regarded as known. It is given as the ratio of allowed *UNKNOWN* PDPs to the number of PDPs in the interval. + * Thus, it ranges from 0 to 1 (exclusive).
+ * + * @return the XFF + */ + @XmlElement(name="xff") + public Double getXff() { + return xff; + } + + /** + * Sets the XFF. + * + * @param xff the new XFF + */ + public void setXff(Double xff) { + this.xff = xff; + } + + /** + * Format equals. + * + * @param rra the RRA object + * @return true, if successful + */ + public boolean formatEquals(RRA rra) { + if (this.consolidationFunction != null) { + if (rra.consolidationFunction == null) return false; + else if (!(this.consolidationFunction.equals(rra.consolidationFunction))) + return false; + } + else if (rra.consolidationFunction != null) + return false; + + if (this.xff != null) { + if (rra.xff == null) return false; + else if (!(this.xff.equals(rra.xff))) + return false; + } + else if (rra.xff != null) + return false; + + return super.formatEquals(rra); + } + + /* (non-Javadoc) + * @see org.opennms.netmgt.rrd.model.AbstractRRA#createSingleRRA(int) + */ + @Override + protected AbstractRRA createSingleRRA(int dsIndex) throws IllegalArgumentException { + RRA clone = new RRA(); + clone.setConsolidationFunction(getConsolidationFunction()); + clone.setPdpPerRow(getPdpPerRow()); + clone.getDataSources().add(getDataSources().get(dsIndex)); + clone.setXff(getXff()); + return clone; + } + +} diff --git a/opennms-rrd/opennms-rrd-model/src/main/java/org/opennms/netmgt/rrd/model/v1/RRADS.java b/opennms-rrd/opennms-rrd-model/src/main/java/org/opennms/netmgt/rrd/model/v1/RRADS.java new file mode 100644 index 000000000000..da41a2dda172 --- /dev/null +++ b/opennms-rrd/opennms-rrd-model/src/main/java/org/opennms/netmgt/rrd/model/v1/RRADS.java @@ -0,0 +1,88 @@ +/******************************************************************************* + * This file is part of OpenNMS(R). + * + * Copyright (C) 2006-2012 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc. + * + * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. + * + * OpenNMS(R) is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. + * + * OpenNMS(R) is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with OpenNMS(R). If not, see: + * http://www.gnu.org/licenses/ + * + * For more information contact: + * OpenNMS(R) Licensing-
+ *
- ds.decl.normal: minimal_heartbeat, min, max + *
- ds.decl.cdef: cdef + *
- ds.decl: name, type, (ds.decl.normal | ds.decl.cdef), last_ds, value, unknown_sec + *
The XML may contain spaces that must be removed.
+ * + * @param cdef the new CDEF + */ + public void setCdef(String cdef) { + this.cdef = cdef == null ? null : cdef.trim(); + } + + /** + * Format equals. + * + * @param ds the DS object + * @return true, if successful + */ + public boolean formatEquals(DS ds) { + if (this.type != null) { + if (ds.type == null) return false; + else if (!(this.type.equals(ds.type))) + return false; + } + else if (ds.type != null) + return false; + + if (this.cdef != null) { + if (ds.cdef == null) return false; + else if (!(this.cdef.equals(ds.cdef))) + return false; + } + else if (ds.cdef != null) + return false; + + return super.formatEquals(ds); + } +} diff --git a/opennms-rrd/opennms-rrd-model/src/main/java/org/opennms/netmgt/rrd/model/v3/DSAdapter.java b/opennms-rrd/opennms-rrd-model/src/main/java/org/opennms/netmgt/rrd/model/v3/DSAdapter.java new file mode 100644 index 000000000000..d0ea9803c923 --- /dev/null +++ b/opennms-rrd/opennms-rrd-model/src/main/java/org/opennms/netmgt/rrd/model/v3/DSAdapter.java @@ -0,0 +1,56 @@ +/******************************************************************************* + * This file is part of OpenNMS(R). + * + * Copyright (C) 2006-2012 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc. + * + * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. + * + * OpenNMS(R) is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. + * + * OpenNMS(R) is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with OpenNMS(R). If not, see: + * http://www.gnu.org/licenses/ + * + * For more information contact: + * OpenNMS(R) LicensingThe XML representation sometimes contain spaces when defining the data source.
+ * + * @author Alejandro Galue-
+ *
- param.hwpredict: hw_alpha, hw_beta, dependent_rra_idx + *
- param.seasonal: seasonal_gamma, seasonal_smooth_idx, smoothing_window?, dependent_rra_idx + *
- param.failures: delta_pos, delta_neg, window_len, failure_threshold + *
- param.devpredict: dependent_rra_idx + *
- param.avg_min_max: xff + *
XFF The xfiles factor defines what part of a consolidation interval may be made up from *UNKNOWN* data while the consolidated + * value is still regarded as known. It is given as the ratio of allowed *UNKNOWN* PDPs to the number of PDPs in the interval. + * Thus, it ranges from 0 to 1 (exclusive).
+ * + * @return the XFF + */ + public Double getXff() { + return xff; + } + + /** + * Sets the XFF. + * + * @param xff the new XFF + */ + public void setXff(Double xff) { + this.xff = xff; + } + +} diff --git a/opennms-rrd/opennms-rrd-model/src/main/java/org/opennms/netmgt/rrd/model/v3/RRA.java b/opennms-rrd/opennms-rrd-model/src/main/java/org/opennms/netmgt/rrd/model/v3/RRA.java new file mode 100644 index 000000000000..c76df8442161 --- /dev/null +++ b/opennms-rrd/opennms-rrd-model/src/main/java/org/opennms/netmgt/rrd/model/v3/RRA.java @@ -0,0 +1,158 @@ +/******************************************************************************* + * This file is part of OpenNMS(R). + * + * Copyright (C) 2006-2012 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc. + * + * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. + * + * OpenNMS(R) is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. + * + * OpenNMS(R) is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with OpenNMS(R). If not, see: + * http://www.gnu.org/licenses/ + * + * For more information contact: + * OpenNMS(R) Licensing-
+ *
- ds.cdp.hwpredict: intercept, last_intercept, slope, last_slope, nan_count, last_nan_count + *
- ds.cdp.seasonal: seasonal, last_seasonal, init_flag + *
- ds.cdp.failures: history + *
- ds.cdp.avg_min_max: value, unknown_datapoints + *
- ds.cdp: primary_value, secondary_value, (ds.cdp.hwpredict | ds.cdp.seasonal | ds.cdp.failures | ds.cdp.avg_min_max)? + *
Both test XML contains data from different range of times, and the value is always increasing.
+ * + * @throws Exception the exception + */ + @Test + public void testRrdMerge() throws Exception { + RRDv3 tempA = JaxbUtils.unmarshal(RRDv3.class, new File("src/test/resources/rrd-tempA.xml")); + RRDv3 tempB = JaxbUtils.unmarshal(RRDv3.class, new File("src/test/resources/rrd-tempB.xml")); + + // Retrieve a list of the time stamps of the rows with data from tempA.rrd + // Verify the max value + Double value = Double.NEGATIVE_INFINITY; + ListMain class.
- * - * @author ranger - * @version $Id: $ + * The Class RRD Export Test. + * + * @author Alejandro Galuemain
+ * Parses the Xport. * - * @param args an array of {@link java.lang.String} objects. + * @throws Exception the exception */ - public static void main(String[] args) { - try { - ApplicationContext appContext = new ClassPathXmlApplicationContext("/META-INF/modelImport-appContext.xml"); - ModelImporter importer = (ModelImporter)appContext.getBean("modelImporter"); - Resource resource = new FileSystemResource(args[0]); - importer.importModelFromResource(resource); - } catch (ModelImportException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } + @Test + public void parseXport() throws Exception { + RrdXport xport = JaxbUtils.unmarshal(RrdXport.class, new File("src/test/resources/rrd-xport.xml")); + Assert.assertNotNull(xport); + Assert.assertEquals(new Integer(300), xport.getMeta().getStep()); + Assert.assertEquals(new Long(1206312900), xport.getMeta().getStart()); + Assert.assertEquals(new Long(1206316500), xport.getMeta().getEnd()); + Assert.assertEquals("load average 5min", xport.getMeta().getLegends().get(0)); + Assert.assertEquals(new Long(1206312900), xport.getRows().get(0).getTimestamp()); + Assert.assertEquals(new Double(19.86), xport.getRows().get(0).getValues().get(0)); } - } diff --git a/opennms-rrd/opennms-rrd-model/src/test/resources/jrb-dump.xml b/opennms-rrd/opennms-rrd-model/src/test/resources/jrb-dump.xml new file mode 100644 index 000000000000..577db792d3f6 --- /dev/null +++ b/opennms-rrd/opennms-rrd-model/src/test/resources/jrb-dump.xml @@ -0,0 +1,233 @@ +getResourceId
+ *Inspired by DefaultKscReportService
+ * + * @return a {@link java.lang.String} object. + */ + public String getResourceId() { + String resourceType = getResourceTypeName(); + String resourceLabel = getInstanceLabel(); + if ("node".equals(resourceType)) { + resourceType = "nodeSnmp"; + resourceLabel = ""; + } + if ("if".equals(resourceType)) { + resourceType = "interfaceSnmp"; + } + String parentResourceTypeName = "node"; + String parentResourceName = Integer.toString(getNodeId()); + // I can't find a better way to deal with this when storeByForeignSource is enabled + if (m_resource != null && m_resource.getParent() != null && m_resource.getParent().startsWith(DefaultResourceDao.FOREIGN_SOURCE_DIRECTORY)) { + String[] parts = m_resource.getParent().split(File.separator); + if (parts.length == 3) { + parentResourceTypeName = "nodeSource"; + parentResourceName = parts[1] + ":" + parts[2]; + } + } + return OnmsResource.createResourceId(parentResourceTypeName, parentResourceName, resourceType, resourceLabel); + } + /** *getIfLabel
* @@ -434,10 +465,10 @@ public String getFieldValue(String ds) { value = ResourceTypeUtils.getStringProperty(resourceDirectory, ds); } } catch (Throwable e) { - LOG.info("getLabelValue: Can't get value for attribute {} for resource {}.", ds, m_resource, e); + LOG.info("getFieldValue: Can't get value for attribute {} for resource {}.", ds, m_resource, e); } if (value == null) { - LOG.debug("getLabelValue: The field {} is not a string property. Trying to parse it as numeric metric.", ds); + LOG.debug("getFieldValue: The field {} is not a string property. Trying to parse it as numeric metric.", ds); Double d = getAttributeValue(ds); if (d != null) value = d.toString(); diff --git a/opennms-services/src/test/java/org/opennms/netmgt/threshd/CollectionResourceWrapperTest.java b/opennms-services/src/test/java/org/opennms/netmgt/threshd/CollectionResourceWrapperTest.java index 9f044d4417a9..ba1775cfaf73 100644 --- a/opennms-services/src/test/java/org/opennms/netmgt/threshd/CollectionResourceWrapperTest.java +++ b/opennms-services/src/test/java/org/opennms/netmgt/threshd/CollectionResourceWrapperTest.java @@ -67,6 +67,7 @@ import org.opennms.netmgt.config.datacollection.PersistenceSelectorStrategy; import org.opennms.netmgt.config.datacollection.ResourceType; import org.opennms.netmgt.config.datacollection.StorageStrategy; +import org.opennms.netmgt.dao.support.DefaultResourceDao; import org.opennms.netmgt.mock.MockDataCollectionConfig; import org.opennms.netmgt.mock.MockNetwork; import org.opennms.netmgt.model.OnmsNode; @@ -361,20 +362,25 @@ public void testInterfaceResource() throws Exception { db.update("update snmpinterface set snmpifindex=?, snmpifname=?, snmpifdescr=? where id=?", ifIndex, ifName, ifName, 1); DataSourceFactory.setInstance(db); Vault.setDataSource(db); - + + // Create Mock Collection Agent + CollectionAgent agent = createCollectionAgent(); + // Create SnmpIfData OnmsNode node = new OnmsNode(); - node.setId(1); + node.setId(agent.getNodeId()); node.setLabel("testNode"); + node.setForeignSource(agent.getForeignSource()); + node.setForeignId(agent.getForeignId()); OnmsSnmpInterface snmpIface = new OnmsSnmpInterface(node, ifIndex); snmpIface.setIfDescr(ifName); snmpIface.setIfName(ifName); snmpIface.setIfAlias(ifName); snmpIface.setIfSpeed(10000000l); + snmpIface.setPhysAddr("001122334455"); SnmpIfData ifData = new SnmpIfData(snmpIface); // Creating IfResourceType - CollectionAgent agent = createCollectionAgent(); MockDataCollectionConfig dataCollectionConfig = new MockDataCollectionConfig(); OnmsSnmpCollection collection = new OnmsSnmpCollection(agent, new ServiceParameters(new HashMapgetNodeDao
+ * + * @return a {@link org.opennms.netmgt.dao.NodeDao} object. + */ + public NodeDao getNodeDao() { + return m_nodeDao; + } + + /** + *setNodeDao
+ * + * @param nodeDao a {@link org.opennms.netmgt.dao.NodeDao} object. + */ + public void setNodeDao(NodeDao nodeDao) { + this.m_nodeDao = nodeDao; + } + } diff --git a/opennms-webapp/src/main/java/org/opennms/web/controller/NavBarController.java b/opennms-webapp/src/main/java/org/opennms/web/controller/NavBarController.java index 7f589ae6c161..913603b1545c 100644 --- a/opennms-webapp/src/main/java/org/opennms/web/controller/NavBarController.java +++ b/opennms-webapp/src/main/java/org/opennms/web/controller/NavBarController.java @@ -103,6 +103,9 @@ public String getHeaderHtml(HttpServletRequest request) { } private String createHeaderHtml(HttpServletRequest request) { + /** + * Added javascript snippet to hide the header if not displayed in a toplevel window (iFrame). + */ return "" +
"
" +
"
" +
"" +
- "";
+ "";
}
private String getNoticeStatus() {
diff --git a/opennms-webapp/src/main/java/org/opennms/web/element/ElementUtil.java b/opennms-webapp/src/main/java/org/opennms/web/element/ElementUtil.java
index 486424d76a84..be6136a7d6e4 100644
--- a/opennms-webapp/src/main/java/org/opennms/web/element/ElementUtil.java
+++ b/opennms-webapp/src/main/java/org/opennms/web/element/ElementUtil.java
@@ -591,30 +591,29 @@ public static OnmsNode getNodeByParams(HttpServletRequest request, ServletContex
* ![OpenNMS Web Console Home](\"../images/logo.png\"){kind=logo}
" +
@@ -118,7 +121,7 @@ private String createHeaderHtml(HttpServletRequest request) {
"
" +
"getNodeByParams
* * @param request a {@link javax.servlet.http.HttpServletRequest} object. - * @param nodeIdParam a {@link java.lang.String} object. + * @param nodeLookupParam a {@link java.lang.String} object. * @return a {@link OnmsNode} object. * @throws javax.servlet.ServletException if any. * @throws java.sql.SQLException if any. */ public static OnmsNode getNodeByParams(HttpServletRequest request, - String nodeIdParam, ServletContext servletContext) throws ServletException, SQLException { - if (request.getParameter(nodeIdParam) == null) { - throw new MissingParameterException(nodeIdParam, new String[] { "node" }); + String nodeLookupParam, ServletContext servletContext) throws ServletException, SQLException { + if (request.getParameter(nodeLookupParam) == null) { + throw new MissingParameterException(nodeLookupParam, new String[] { "node" }); } - String nodeIdString = request.getParameter(nodeIdParam); - - int nodeId; - - try { - nodeId = Integer.parseInt(nodeIdString); - } catch (NumberFormatException e) { - throw new ElementIdNotFoundException("Wrong data type for \"" - + nodeIdParam + "\", should be integer", nodeIdString, - "node", "element/node.jsp", "node", "element/nodeList.htm"); + String nodeLookupString = request.getParameter(nodeLookupParam); + if (!nodeLookupString.contains(":")) { + try { + Integer.parseInt(nodeLookupString); + } catch (NumberFormatException e) { + throw new ElementIdNotFoundException("Wrong data type for \"" + + nodeLookupString + "\", should be integer", nodeLookupString, + "node", "element/node.jsp", "node", "element/nodeList.htm"); + } } - OnmsNode node = NetworkElementFactory.getInstance(servletContext).getNode(nodeId); + OnmsNode node = NetworkElementFactory.getInstance(servletContext).getNode(nodeLookupString); if (node == null) { throw new ElementNotFoundException("No such node in database", "node", "element/node.jsp", "node", "element/nodeList.htm"); diff --git a/opennms-webapp/src/main/java/org/opennms/web/element/NetworkElementFactory.java b/opennms-webapp/src/main/java/org/opennms/web/element/NetworkElementFactory.java index 20e9fe6b5831..a94aef8890d4 100644 --- a/opennms-webapp/src/main/java/org/opennms/web/element/NetworkElementFactory.java +++ b/opennms-webapp/src/main/java/org/opennms/web/element/NetworkElementFactory.java @@ -210,17 +210,15 @@ public String getIpPrimaryAddress(int nodeId) { */ @Override public OnmsNode getNode(int nodeId) { - OnmsCriteria criteria = new OnmsCriteria(OnmsNode.class); - criteria.add(Restrictions.eq("id",nodeId)); - - ListfindNodeChildResources
+ * + * @param node a {@link org.opennms.netmgt.model.OnmsNode} object. + * @return a {@link java.util.List} object. + */ + public ListfindNodeChildResources
* diff --git a/opennms-webapp/src/main/java/org/opennms/web/svclayer/support/DefaultResourceService.java b/opennms-webapp/src/main/java/org/opennms/web/svclayer/support/DefaultResourceService.java index 015d65c2695a..366dae81fb0b 100644 --- a/opennms-webapp/src/main/java/org/opennms/web/svclayer/support/DefaultResourceService.java +++ b/opennms-webapp/src/main/java/org/opennms/web/svclayer/support/DefaultResourceService.java @@ -38,6 +38,7 @@ import org.opennms.netmgt.EventConstants; import org.opennms.netmgt.dao.api.GraphDao; import org.opennms.netmgt.dao.api.ResourceDao; +import org.opennms.netmgt.model.OnmsNode; import org.opennms.netmgt.model.OnmsResource; import org.opennms.netmgt.model.PrefabGraph; import org.opennms.netmgt.model.RrdGraphAttribute; @@ -174,6 +175,20 @@ public List
Favorites: