Skip to content

Commit

Permalink
Moved enlinkd snmp classes to their own package
Browse files Browse the repository at this point in the history
  • Loading branch information
@rssntn67
rssntn67 committed May 24, 2014
1 parent 7986975 commit f640b5c
Show file tree
Hide file tree
Showing 26 changed files with 67 additions and 40 deletions.
6 changes: 6 additions & 0 deletions opennms-services/src/main/java/org/opennms/netmgt/enlinkd/BridgeLinkdNodeDiscovery.java
View file
Expand Up @@ -38,6 +38,12 @@
import java.util.Map;
import java.util.Map.Entry;

import org.opennms.netmgt.enlinkd.snmp.CiscoVtpTracker;
import org.opennms.netmgt.enlinkd.snmp.CiscoVtpVlanTableTracker;
import org.opennms.netmgt.enlinkd.snmp.Dot1dBaseTracker;
import org.opennms.netmgt.enlinkd.snmp.Dot1dStpPortTableTracker;
import org.opennms.netmgt.enlinkd.snmp.Dot1dTpFdbTableTracker;
import org.opennms.netmgt.enlinkd.snmp.Dot1qTpFdbTableTracker;
import org.opennms.netmgt.model.BridgeElement;
import org.opennms.netmgt.model.BridgeElement.BridgeDot1dBaseType;
import org.opennms.netmgt.model.BridgeMacLink;
Expand Down
1 change: 1 addition & 0 deletions ...nms-services/src/main/java/org/opennms/netmgt/enlinkd/IpNetToMediaLinkdNodeDiscovery.java
View file
Expand Up @@ -35,6 +35,7 @@



import org.opennms.netmgt.enlinkd.snmp.IpNetToMediaTableTracker;
import org.opennms.netmgt.model.IpNetToMedia;
import org.opennms.netmgt.model.IpNetToMedia.IpNetToMediaType;
import org.opennms.netmgt.model.topology.LinkableSnmpNode;
Expand Down
3 changes: 3 additions & 0 deletions opennms-services/src/main/java/org/opennms/netmgt/enlinkd/IsisLinkdNodeDiscovery.java
View file
Expand Up @@ -34,6 +34,9 @@
import java.util.Date;
import java.util.List;

import org.opennms.netmgt.enlinkd.snmp.IsisCircTableTracker;
import org.opennms.netmgt.enlinkd.snmp.IsisISAdjTableTracker;
import org.opennms.netmgt.enlinkd.snmp.IsisSysObjectGroupTracker;
import org.opennms.netmgt.model.IsIsLink;
import org.opennms.netmgt.model.topology.LinkableSnmpNode;
import org.opennms.netmgt.snmp.SnmpUtils;
Expand Down
3 changes: 3 additions & 0 deletions opennms-services/src/main/java/org/opennms/netmgt/enlinkd/LldpLinkdNodeDiscovery.java
View file
Expand Up @@ -32,6 +32,9 @@

import java.util.Date;

import org.opennms.netmgt.enlinkd.snmp.LldpLocPortGetter;
import org.opennms.netmgt.enlinkd.snmp.LldpLocalGroupTracker;
import org.opennms.netmgt.enlinkd.snmp.LldpRemTableTracker;
import org.opennms.netmgt.model.topology.LinkableSnmpNode;
import org.opennms.netmgt.snmp.SnmpUtils;
import org.opennms.netmgt.snmp.SnmpWalker;
Expand Down
4 changes: 4 additions & 0 deletions opennms-services/src/main/java/org/opennms/netmgt/enlinkd/OspfLinkdNodeDiscovery.java
View file
Expand Up @@ -38,6 +38,10 @@

import org.opennms.core.utils.InetAddressUtils;

import org.opennms.netmgt.enlinkd.snmp.OspfGeneralGroupTracker;
import org.opennms.netmgt.enlinkd.snmp.OspfIfTableTracker;
import org.opennms.netmgt.enlinkd.snmp.OspfIpAddrTableGetter;
import org.opennms.netmgt.enlinkd.snmp.OspfNbrTableTracker;
import org.opennms.netmgt.model.OspfElement.Status;
import org.opennms.netmgt.model.OspfLink;
import org.opennms.netmgt.model.topology.LinkableSnmpNode;
Expand Down
2 changes: 1 addition & 1 deletion ...ennms/netmgt/enlinkd/CiscoVtpTracker.java → .../netmgt/enlinkd/snmp/CiscoVtpTracker.java
View file
Expand Up @@ -26,7 +26,7 @@
* http://www.opennms.com/
*******************************************************************************/

package org.opennms.netmgt.enlinkd;
package org.opennms.netmgt.enlinkd.snmp;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
6 changes: 3 additions & 3 deletions ...mgt/enlinkd/CiscoVtpVlanTableTracker.java → ...nlinkd/snmp/CiscoVtpVlanTableTracker.java
View file
Expand Up @@ -26,7 +26,7 @@
* http://www.opennms.com/
*******************************************************************************/

package org.opennms.netmgt.enlinkd;
package org.opennms.netmgt.enlinkd.snmp;

import org.opennms.netmgt.model.OnmsVlan.VlanStatus;
import org.opennms.netmgt.model.OnmsVlan.VlanType;
Expand Down Expand Up @@ -84,7 +84,7 @@ public class CiscoVtpVlanTableTracker extends TableTracker {
CISCO_VTP_VLAN_NAME
};

class CiscoVtpVlanRow extends SnmpRowResult {
public class CiscoVtpVlanRow extends SnmpRowResult {

public CiscoVtpVlanRow(int columnCount, SnmpInstId instance) {
super(columnCount, instance);
Expand Down Expand Up @@ -140,7 +140,7 @@ public void rowCompleted(final SnmpRowResult row) {
/**
* <p>processCiscoVtpVlanRow</p>
*
* @param row a {@link org.opennms.netmgt.enlinkd.CiscoVtpVlanTableTracker.CiscoVtpVlanRow} object.
* @param row a {@link org.opennms.netmgt.enlinkd.snmp.CiscoVtpVlanTableTracker.CiscoVtpVlanRow} object.
*/
public void processCiscoVtpVlanRow(final CiscoVtpVlanRow row) {
}
Expand Down
2 changes: 1 addition & 1 deletion ...t/enlinkd/Dot1dBasePortIfIndexGetter.java → ...inkd/snmp/Dot1dBasePortIfIndexGetter.java
View file
@@ -1,4 +1,4 @@
package org.opennms.netmgt.enlinkd;
package org.opennms.netmgt.enlinkd.snmp;

import org.opennms.netmgt.snmp.SnmpAgentConfig;
import org.opennms.netmgt.snmp.SnmpObjId;
Expand Down
2 changes: 1 addition & 1 deletion ...gt/enlinkd/Dot1dBasePortTableTracker.java → ...linkd/snmp/Dot1dBasePortTableTracker.java
View file
Expand Up @@ -26,7 +26,7 @@
* http://www.opennms.com/
*******************************************************************************/

package org.opennms.netmgt.enlinkd;
package org.opennms.netmgt.enlinkd.snmp;

import org.opennms.netmgt.snmp.RowCallback;
import org.opennms.netmgt.snmp.SnmpInstId;
Expand Down
2 changes: 1 addition & 1 deletion ...nnms/netmgt/enlinkd/Dot1dBaseTracker.java → ...netmgt/enlinkd/snmp/Dot1dBaseTracker.java
View file
Expand Up @@ -26,7 +26,7 @@
* http://www.opennms.com/
*******************************************************************************/

package org.opennms.netmgt.enlinkd;
package org.opennms.netmgt.enlinkd.snmp;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
6 changes: 3 additions & 3 deletions ...mgt/enlinkd/Dot1dStpPortTableTracker.java → ...nlinkd/snmp/Dot1dStpPortTableTracker.java
View file
Expand Up @@ -26,7 +26,7 @@
* http://www.opennms.com/
*******************************************************************************/

package org.opennms.netmgt.enlinkd;
package org.opennms.netmgt.enlinkd.snmp;

import org.opennms.netmgt.model.BridgeStpLink;
import org.opennms.netmgt.model.BridgeStpLink.BridgeDot1dStpPortEnable;
Expand Down Expand Up @@ -151,7 +151,7 @@ public class Dot1dStpPortTableTracker extends TableTracker {
DOT1D_STP_PORT_DESIGNATED_PORT
};

class Dot1dStpPortRow extends SnmpRowResult {
public class Dot1dStpPortRow extends SnmpRowResult {

public Dot1dStpPortRow(int columnCount, SnmpInstId instance) {
super(columnCount, instance);
Expand Down Expand Up @@ -270,7 +270,7 @@ public void rowCompleted(final SnmpRowResult row) {
/**
* <p>processDot1dStpPortRow</p>
*
* @param row a {@link org.opennms.netmgt.enlinkd.Dot1dStpPortTableTracker.Dot1dStpPortRow} object.
* @param row a {@link org.opennms.netmgt.enlinkd.snmp.Dot1dStpPortTableTracker.Dot1dStpPortRow} object.
*/
public void processDot1dStpPortRow(final Dot1dStpPortRow row) {
}
Expand Down
6 changes: 3 additions & 3 deletions ...etmgt/enlinkd/Dot1dTpFdbTableTracker.java → .../enlinkd/snmp/Dot1dTpFdbTableTracker.java
View file
Expand Up @@ -26,7 +26,7 @@
* http://www.opennms.com/
*******************************************************************************/

package org.opennms.netmgt.enlinkd;
package org.opennms.netmgt.enlinkd.snmp;

import org.opennms.netmgt.model.BridgeMacLink;
import org.opennms.netmgt.model.BridgeMacLink.BridgeDot1qTpFdbStatus;
Expand Down Expand Up @@ -123,7 +123,7 @@ public class Dot1dTpFdbTableTracker extends TableTracker {
DOT1D_TP_FDB_STATUS
};

class Dot1dTpFdbRow extends SnmpRowResult {
public class Dot1dTpFdbRow extends SnmpRowResult {
public Dot1dTpFdbRow(int columnCount, SnmpInstId instance) {
super(columnCount, instance);
}
Expand Down Expand Up @@ -200,7 +200,7 @@ public void rowCompleted(final SnmpRowResult row) {
/**
* <p>processIpNetToMediaRow</p>
*
* @param row a {@link org.opennms.netmgt.enlinkd.Dot1dTpFdbTableTracker.Dot1dTpFdbRow} object.
* @param row a {@link org.opennms.netmgt.enlinkd.snmp.Dot1dTpFdbTableTracker.Dot1dTpFdbRow} object.
*/
public void processDot1dTpFdbRow(final Dot1dTpFdbRow row) {
}
Expand Down
6 changes: 3 additions & 3 deletions ...etmgt/enlinkd/Dot1qTpFdbTableTracker.java → .../enlinkd/snmp/Dot1qTpFdbTableTracker.java
View file
Expand Up @@ -26,7 +26,7 @@
* http://www.opennms.com/
*******************************************************************************/

package org.opennms.netmgt.enlinkd;
package org.opennms.netmgt.enlinkd.snmp;

import org.opennms.netmgt.model.BridgeMacLink;
import org.opennms.netmgt.model.BridgeMacLink.BridgeDot1qTpFdbStatus;
Expand Down Expand Up @@ -123,7 +123,7 @@ public class Dot1qTpFdbTableTracker extends TableTracker {
};


class Dot1qTpFdbRow extends SnmpRowResult {
public class Dot1qTpFdbRow extends SnmpRowResult {

public Dot1qTpFdbRow(int columnCount, SnmpInstId instance) {
super(columnCount, instance);
Expand Down Expand Up @@ -202,7 +202,7 @@ public void rowCompleted(final SnmpRowResult row) {
/**
* <p>processIpNetToMediaRow</p>
*
* @param row a {@link org.opennms.netmgt.enlinkd.Dot1qTpFdbTableTracker.Dot1qTpFdbRow} object.
* @param row a {@link org.opennms.netmgt.enlinkd.snmp.Dot1qTpFdbTableTracker.Dot1qTpFdbRow} object.
*/
public void processDot1qTpFdbRow(final Dot1qTpFdbRow row) {
}
Expand Down
6 changes: 3 additions & 3 deletions ...mgt/enlinkd/IpNetToMediaTableTracker.java → ...nlinkd/snmp/IpNetToMediaTableTracker.java
View file
Expand Up @@ -26,7 +26,7 @@
* http://www.opennms.com/
*******************************************************************************/

package org.opennms.netmgt.enlinkd;
package org.opennms.netmgt.enlinkd.snmp;

import static org.opennms.core.utils.InetAddressUtils.normalizeMacAddress;

Expand Down Expand Up @@ -120,7 +120,7 @@ public class IpNetToMediaTableTracker extends TableTracker
IPNETTOMEDIA_TABLE_TYPE
};

class IpNetToMediaRow extends SnmpRowResult {
public class IpNetToMediaRow extends SnmpRowResult {

public IpNetToMediaRow(int columnCount, SnmpInstId instance) {
super(columnCount, instance);
Expand Down Expand Up @@ -219,7 +219,7 @@ public void rowCompleted(final SnmpRowResult row) {
/**
* <p>processIpNetToMediaRow</p>
*
* @param row a {@link org.opennms.netmgt.enlinkd.IpNetToMediaTableTracker.IpNetToMediaRow} object.
* @param row a {@link org.opennms.netmgt.enlinkd.snmp.IpNetToMediaTableTracker.IpNetToMediaRow} object.
*/
public void processIpNetToMediaRow(final IpNetToMediaRow row) {
}
Expand Down
6 changes: 3 additions & 3 deletions .../netmgt/enlinkd/IsisCircTableTracker.java → ...gt/enlinkd/snmp/IsisCircTableTracker.java
View file
Expand Up @@ -26,7 +26,7 @@
* http://www.opennms.com/
*******************************************************************************/

package org.opennms.netmgt.enlinkd;
package org.opennms.netmgt.enlinkd.snmp;

import org.opennms.netmgt.model.IsIsLink;
import org.opennms.netmgt.model.IsIsElement.IsisAdminState;
Expand Down Expand Up @@ -73,7 +73,7 @@ public class IsisCircTableTracker extends TableTracker {

};

class IsIsCircRow extends SnmpRowResult {
public class IsIsCircRow extends SnmpRowResult {

public IsIsCircRow(int columnCount, SnmpInstId instance) {
super(columnCount, instance);
Expand Down Expand Up @@ -129,7 +129,7 @@ public void rowCompleted(final SnmpRowResult row) {
/**
* <p>processIsisAdjRow</p>
*
* @param row a {@link org.opennms.netmgt.enlinkd.IsisCircTableTracker.IsIsCircRow} object.
* @param row a {@link org.opennms.netmgt.enlinkd.snmp.IsisCircTableTracker.IsIsCircRow} object.
*/
public void processIsisCircRow(final IsIsCircRow row) {
}
Expand Down
6 changes: 3 additions & 3 deletions ...netmgt/enlinkd/IsisISAdjTableTracker.java → ...t/enlinkd/snmp/IsisISAdjTableTracker.java
View file
Expand Up @@ -26,7 +26,7 @@
* http://www.opennms.com/
*******************************************************************************/

package org.opennms.netmgt.enlinkd;
package org.opennms.netmgt.enlinkd.snmp;

import org.opennms.netmgt.model.IsIsLink;
import org.opennms.netmgt.model.IsIsLink.IsisISAdjNeighSysType;
Expand Down Expand Up @@ -127,7 +127,7 @@ public class IsisISAdjTableTracker extends TableTracker {

};

class IsIsAdjRow extends SnmpRowResult {
public class IsIsAdjRow extends SnmpRowResult {
public IsIsAdjRow(int columnCount, SnmpInstId instance) {
super(columnCount, instance);
LOG.debug( "column count = {}, instance = {}", columnCount, instance);
Expand Down Expand Up @@ -206,7 +206,7 @@ public void rowCompleted(final SnmpRowResult row) {
/**
* <p>processIsisAdjRow</p>
*
* @param row a {@link org.opennms.netmgt.enlinkd.IsisISAdjTableTracker.IsIsAdjRow} object.
* @param row a {@link org.opennms.netmgt.enlinkd.snmp.IsisISAdjTableTracker.IsIsAdjRow} object.
*/
public void processIsisAdjRow(final IsIsAdjRow row) {
}
Expand Down
2 changes: 1 addition & 1 deletion ...gt/enlinkd/IsisSysObjectGroupTracker.java → ...linkd/snmp/IsisSysObjectGroupTracker.java
View file
Expand Up @@ -26,7 +26,7 @@
* http://www.opennms.com/
*******************************************************************************/

package org.opennms.netmgt.enlinkd;
package org.opennms.netmgt.enlinkd.snmp;

import org.opennms.netmgt.model.IsIsElement;
import org.opennms.netmgt.model.IsIsElement.IsisAdminState;
Expand Down
2 changes: 1 addition & 1 deletion ...rg/opennms/netmgt/enlinkd/LldpHelper.java → ...ennms/netmgt/enlinkd/snmp/LldpHelper.java
View file
@@ -1,4 +1,4 @@
package org.opennms.netmgt.enlinkd;
package org.opennms.netmgt.enlinkd.snmp;

import org.opennms.core.utils.InetAddressUtils;
import org.opennms.netmgt.model.LldpElement.LldpChassisIdSubType;
Expand Down
2 changes: 1 addition & 1 deletion ...nms/netmgt/enlinkd/LldpLocPortGetter.java → ...etmgt/enlinkd/snmp/LldpLocPortGetter.java
View file
@@ -1,4 +1,4 @@
package org.opennms.netmgt.enlinkd;
package org.opennms.netmgt.enlinkd.snmp;

import org.opennms.netmgt.model.LldpLink;
import org.opennms.netmgt.model.LldpLink.LldpPortIdSubType;
Expand Down
2 changes: 1 addition & 1 deletion ...netmgt/enlinkd/LldpLocalGroupTracker.java → ...t/enlinkd/snmp/LldpLocalGroupTracker.java
View file
Expand Up @@ -26,7 +26,7 @@
* http://www.opennms.com/
*******************************************************************************/

package org.opennms.netmgt.enlinkd;
package org.opennms.netmgt.enlinkd.snmp;

import org.opennms.netmgt.model.LldpElement;
import org.opennms.netmgt.model.LldpElement.LldpChassisIdSubType;
Expand Down
6 changes: 3 additions & 3 deletions ...s/netmgt/enlinkd/LldpRemTableTracker.java → ...mgt/enlinkd/snmp/LldpRemTableTracker.java
View file
Expand Up @@ -26,7 +26,7 @@
* http://www.opennms.com/
*******************************************************************************/

package org.opennms.netmgt.enlinkd;
package org.opennms.netmgt.enlinkd.snmp;


import org.opennms.netmgt.model.LldpLink;
Expand Down Expand Up @@ -95,7 +95,7 @@ public class LldpRemTableTracker extends TableTracker {
};


class LldpRemRow extends SnmpRowResult {
public class LldpRemRow extends SnmpRowResult {

public LldpRemRow(int columnCount, SnmpInstId instance) {
super(columnCount, instance);
Expand Down Expand Up @@ -190,7 +190,7 @@ public void rowCompleted(final SnmpRowResult row) {
/**
* <p>processLldpRemRow</p>
*
* @param row a {@link org.opennms.netmgt.enlinkd.LldpRemTableTracker.LldpRemRow} object.
* @param row a {@link org.opennms.netmgt.enlinkd.snmp.LldpRemTableTracker.LldpRemRow} object.
*/
public void processLldpRemRow(final LldpRemRow row) {
}
Expand Down
2 changes: 1 addition & 1 deletion ...tmgt/enlinkd/OspfGeneralGroupTracker.java → ...enlinkd/snmp/OspfGeneralGroupTracker.java
View file
Expand Up @@ -26,7 +26,7 @@
* http://www.opennms.com/
*******************************************************************************/

package org.opennms.netmgt.enlinkd;
package org.opennms.netmgt.enlinkd.snmp;

import java.net.InetAddress;

Expand Down
6 changes: 3 additions & 3 deletions ...ms/netmgt/enlinkd/OspfIfTableTracker.java → ...tmgt/enlinkd/snmp/OspfIfTableTracker.java
View file
Expand Up @@ -26,7 +26,7 @@
* http://www.opennms.com/
*******************************************************************************/

package org.opennms.netmgt.enlinkd;
package org.opennms.netmgt.enlinkd.snmp;

import static org.opennms.core.utils.InetAddressUtils.str;

Expand Down Expand Up @@ -68,7 +68,7 @@ public class OspfIfTableTracker extends TableTracker {

};

class OspfIfRow extends SnmpRowResult {
public class OspfIfRow extends SnmpRowResult {

public OspfIfRow(int columnCount, SnmpInstId instance) {
super(columnCount, instance);
Expand Down Expand Up @@ -135,7 +135,7 @@ public void rowCompleted(final SnmpRowResult row) {
/**
* <p>processOspfIfRow</p>
*
* @param row a {@link org.opennms.netmgt.enlinkd.OspfIfTableTracker.OspfIfRow} object.
* @param row a {@link org.opennms.netmgt.enlinkd.snmp.OspfIfTableTracker.OspfIfRow} object.
*/
public void processOspfIfRow(final OspfIfRow row) {
}
Expand Down
2 changes: 1 addition & 1 deletion ...netmgt/enlinkd/OspfIpAddrTableGetter.java → ...t/enlinkd/snmp/OspfIpAddrTableGetter.java
View file
@@ -1,4 +1,4 @@
package org.opennms.netmgt.enlinkd;
package org.opennms.netmgt.enlinkd.snmp;

import java.net.InetAddress;

Expand Down
6 changes: 3 additions & 3 deletions ...s/netmgt/enlinkd/OspfNbrTableTracker.java → ...mgt/enlinkd/snmp/OspfNbrTableTracker.java
View file
Expand Up @@ -26,7 +26,7 @@
* http://www.opennms.com/
*******************************************************************************/

package org.opennms.netmgt.enlinkd;
package org.opennms.netmgt.enlinkd.snmp;

import java.net.InetAddress;

Expand Down Expand Up @@ -82,7 +82,7 @@ public class OspfNbrTableTracker extends TableTracker {
OSPF_NBR_ROUTERID
};

class OspfNbrRow extends SnmpRowResult {
public class OspfNbrRow extends SnmpRowResult {

public OspfNbrRow(int columnCount, SnmpInstId instance) {
super(columnCount, instance);
Expand Down Expand Up @@ -137,7 +137,7 @@ public void rowCompleted(final SnmpRowResult row) {
/**
* <p>processOspfIfRow</p>
*
* @param row a {@link org.opennms.netmgt.enlinkd.OspfNbrTableTracker.OspfNbrRow} object.
* @param row a {@link org.opennms.netmgt.enlinkd.snmp.OspfNbrTableTracker.OspfNbrRow} object.
*/
public void processOspfNbrRow(final OspfNbrRow row) {
}
Expand Down

0 comments on commit f640b5c

Please sign in to comment.