Skip to content

Commit

Permalink
Fix NMS-7563: problem with cdp on hp procurve
Browse files Browse the repository at this point in the history 
Added test for the provided use case.
Still need one test to be fixed about cdp
links not detected on Hp Procurve switch
  • Loading branch information
@rssntn67
rssntn67 committed Mar 21, 2015
1 parent 8165fea commit 1a9ce61
Show file tree
Hide file tree
Showing 44 changed files with 925 additions and 377 deletions.
4 changes: 2 additions & 2 deletions opennms-services/src/test/java/org/opennms/netmgt/enlinkd/EnLinkdSnmpTest.java
View file
Expand Up @@ -89,7 +89,7 @@
import org.opennms.netmgt.model.OspfElement;
import org.opennms.netmgt.model.OspfElement.Status;
import org.opennms.netmgt.model.OspfElement.TruthValue;
import org.opennms.netmgt.nb.TestNetworkBuilder;
import org.opennms.netmgt.nb.NmsNetworkBuilder;
import org.opennms.netmgt.snmp.SnmpAgentConfig;
import org.opennms.netmgt.snmp.SnmpUtils;
import org.opennms.netmgt.snmp.SnmpWalker;
Expand All @@ -104,7 +104,7 @@
"classpath:/META-INF/opennms/applicationContext-proxy-snmp.xml"
})
@JUnitConfigurationEnvironment
public class EnLinkdSnmpTest extends TestNetworkBuilder implements InitializingBean {
public class EnLinkdSnmpTest extends NmsNetworkBuilder implements InitializingBean {

private final static Logger LOG = LoggerFactory.getLogger(EnLinkdSnmpTest.class);

Expand Down
18 changes: 9 additions & 9 deletions opennms-services/src/test/java/org/opennms/netmgt/enlinkd/EnLinkdTest.java
View file
Expand Up @@ -27,15 +27,15 @@
*******************************************************************************/

package org.opennms.netmgt.enlinkd;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SWITCH1_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SWITCH1_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SWITCH1_SYSOID;
import static org.opennms.netmgt.nb.TestNetworkBuilder.DELHI_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.DELHI_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.DELHI_SYSOID;
import static org.opennms.netmgt.nb.TestNetworkBuilder.MUMBAI_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.MUMBAI_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.MUMBAI_SYSOID;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SWITCH1_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SWITCH1_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SWITCH1_SYSOID;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.DELHI_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.DELHI_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.DELHI_SYSOID;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.MUMBAI_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.MUMBAI_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.MUMBAI_SYSOID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNotNull;
Expand Down
4 changes: 4 additions & 0 deletions opennms-services/src/test/java/org/opennms/netmgt/enlinkd/EnLinkdTestBuilder.java
View file
Expand Up @@ -39,6 +39,7 @@
import org.opennms.core.test.db.annotations.JUnitTemporaryDatabase;
import org.opennms.netmgt.config.EnhancedLinkdConfig;

import org.opennms.netmgt.dao.api.CdpLinkDao;
import org.opennms.netmgt.dao.api.NodeDao;
import org.opennms.netmgt.dao.api.BridgeBridgeLinkDao;
import org.opennms.netmgt.dao.api.BridgeMacLinkDao;
Expand Down Expand Up @@ -74,6 +75,9 @@ public abstract class EnLinkdTestBuilder extends EnLinkdTestHelper implements In
@Autowired
protected NodeDao m_nodeDao;

@Autowired
protected CdpLinkDao m_cdpLinkDao;

@Autowired
protected LldpLinkDao m_lldpLinkDao;

Expand Down
33 changes: 32 additions & 1 deletion opennms-services/src/test/java/org/opennms/netmgt/enlinkd/EnLinkdTestHelper.java
View file
Expand Up @@ -34,6 +34,9 @@
import org.opennms.core.utils.LldpUtils.LldpChassisIdSubType;
import org.opennms.core.utils.LldpUtils.LldpPortIdSubType;
import org.opennms.netmgt.model.BridgeMacLink;
import org.opennms.netmgt.model.CdpElement;
import org.opennms.netmgt.model.CdpLink;
import org.opennms.netmgt.model.CdpLink.CiscoNetworkProtocolType;
import org.opennms.netmgt.model.LldpElement;
import org.opennms.netmgt.model.LldpLink;
import org.opennms.netmgt.model.OspfElement;
Expand All @@ -57,7 +60,34 @@ protected static void printLldpElements(List<LldpElement> lldpelements) {
for (LldpElement element: lldpelements)
printLldpElement(element);
}
protected static void printLldpElement(final LldpElement lldpElement) {
protected static void printCdpElement(final CdpElement cdpElement) {
System.err.println("----------cdp element --------");
System.err.println("Nodeid: " + cdpElement.getNode().getId());
System.err.println("Cdp Global Device Id: " + cdpElement.getCdpGlobalDeviceId());
System.err.println("Cdp Global Run: " + TruthValue.getTypeString(cdpElement.getCdpGlobalRun().getValue()));
}

protected static void printCdpLink(CdpLink link) {
System.err.println("----------cdp link --------");
System.err.println("Create time: " + link.getCdpLinkCreateTime());
System.err.println("Last Poll time: " + link.getCdpLinkLastPollTime());
System.err.println("----------Source Node--------");
System.err.println("Nodeid: " + link.getNode().getId());
System.err.println("----------Source Port--------");
System.err.println("cdp ifindex: " + link.getCdpCacheIfIndex());
System.err.println("cdp interface name: " + link.getCdpInterfaceName());
System.err.println("----------Rem Node--------");
System.err.println("cdpcacheaddresstype: " + CiscoNetworkProtocolType.getTypeString(link.getCdpCacheAddressType().getValue()));
System.err.println("cdpcacheaddress: " + link.getCdpCacheAddress());
System.err.println("cdpcacheversion: " + link.getCdpCacheVersion());
System.err.println("cdpcachedeviceid: " + link.getCdpCacheDeviceId());
System.err.println("cdpcachedeviceplatform: " + link.getCdpCacheDevicePlatform());
System.err.println("----------Remote Port--------");
System.err.println("cdpcachedeviceport: " + link.getCdpCacheDevicePort());
System.err.println("");
}

protected static void printLldpElement(final LldpElement lldpElement) {
System.err.println("----------lldp element --------");
System.err.println("Nodeid: " + lldpElement.getNode().getId());
System.err.println("lldp chassis type/id: " + LldpChassisIdSubType.getTypeString(lldpElement.getLldpChassisIdSubType().getValue())+"/"+lldpElement.getLldpChassisId());
Expand All @@ -72,6 +102,7 @@ protected static void printLldpLink(LldpLink link) {
System.err.println("Nodeid: " + link.getNode().getId());
System.err.println("----------Source Port--------");
System.err.println("lldp port num: " + link.getLldpLocalPortNum());
System.err.println("lldp port ifindex: " + link.getLldpPortIfindex());
System.err.println("lldp port type/id: " + LldpPortIdSubType.getTypeString(link.getLldpPortIdSubType().getValue())+"/" + link.getLldpPortId());
System.err.println("lldp port descr: " + link.getLldpPortDescr());
System.err.println("----------Rem Node--------");
Expand Down
18 changes: 9 additions & 9 deletions opennms-services/src/test/java/org/opennms/netmgt/enlinkd/Nms0001EnTest.java
View file
Expand Up @@ -31,15 +31,15 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.opennms.netmgt.nb.TestNetworkBuilder.FROH_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.FROH_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.FROH_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.TestNetworkBuilder.OEDIPUS_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.OEDIPUS_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.OEDIPUS_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SIEGFRIE_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SIEGFRIE_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SIEGFRIE_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.FROH_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.FROH_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.FROH_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.OEDIPUS_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.OEDIPUS_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.OEDIPUS_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SIEGFRIE_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SIEGFRIE_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SIEGFRIE_SNMP_RESOURCE;

import org.junit.Test;
import org.opennms.core.test.snmp.annotations.JUnitSnmpAgent;
Expand Down
42 changes: 21 additions & 21 deletions opennms-services/src/test/java/org/opennms/netmgt/enlinkd/Nms0002EnTest.java
View file
Expand Up @@ -28,27 +28,27 @@

package org.opennms.netmgt.enlinkd;

import static org.opennms.netmgt.nb.TestNetworkBuilder.RDeEssnBrue_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.RDeEssnBrue_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.RDeEssnBrue_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.TestNetworkBuilder.Rluck001_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.Rluck001_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.Rluck001_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SDeEssnBrue081_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SDeEssnBrue081_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SDeEssnBrue081_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SDeEssnBrue121_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SDeEssnBrue121_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SDeEssnBrue121_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SDeEssnBrue142_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SDeEssnBrue142_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SDeEssnBrue142_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SDeEssnBrue165_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SDeEssnBrue165_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SDeEssnBrue165_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.TestNetworkBuilder.Sluck001_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.Sluck001_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.Sluck001_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.RDeEssnBrue_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.RDeEssnBrue_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.RDeEssnBrue_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.Rluck001_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.Rluck001_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.Rluck001_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SDeEssnBrue081_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SDeEssnBrue081_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SDeEssnBrue081_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SDeEssnBrue121_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SDeEssnBrue121_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SDeEssnBrue121_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SDeEssnBrue142_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SDeEssnBrue142_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SDeEssnBrue142_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SDeEssnBrue165_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SDeEssnBrue165_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SDeEssnBrue165_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.Sluck001_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.Sluck001_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.Sluck001_SNMP_RESOURCE;

import java.util.List;

Expand Down
12 changes: 6 additions & 6 deletions opennms-services/src/test/java/org/opennms/netmgt/enlinkd/Nms0123EnTest.java
View file
Expand Up @@ -28,13 +28,13 @@

package org.opennms.netmgt.enlinkd;

import static org.opennms.netmgt.nb.TestNetworkBuilder.ITPN0111_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.ITPN0111_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.ITPN0111_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.ITPN0111_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.ITPN0111_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.ITPN0111_SNMP_RESOURCE;

import static org.opennms.netmgt.nb.TestNetworkBuilder.ITPN0112_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.ITPN0112_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.ITPN0112_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.ITPN0112_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.ITPN0112_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.ITPN0112_SNMP_RESOURCE;

import java.util.List;

Expand Down
54 changes: 27 additions & 27 deletions opennms-services/src/test/java/org/opennms/netmgt/enlinkd/Nms10205bEnTest.java
View file
Expand Up @@ -27,33 +27,33 @@
*******************************************************************************/

package org.opennms.netmgt.enlinkd;
import static org.opennms.netmgt.nb.TestNetworkBuilder.BAGMANE_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.BAGMANE_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.BAGMANE_SNMP_RESOURCE_B;
import static org.opennms.netmgt.nb.TestNetworkBuilder.BANGALORE_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.BANGALORE_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.BANGALORE_SNMP_RESOURCE_B;
import static org.opennms.netmgt.nb.TestNetworkBuilder.DELHI_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.DELHI_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.DELHI_SNMP_RESOURCE_B;
import static org.opennms.netmgt.nb.TestNetworkBuilder.J6350_42_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.J6350_42_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.J6350_42_SNMP_RESOURCE_B;
import static org.opennms.netmgt.nb.TestNetworkBuilder.MUMBAI_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.MUMBAI_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.MUMBAI_SNMP_RESOURCE_B;
import static org.opennms.netmgt.nb.TestNetworkBuilder.MYSORE_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.MYSORE_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.MYSORE_SNMP_RESOURCE_B;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SPACE_EX_SW1_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SPACE_EX_SW1_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SPACE_EX_SW1_SNMP_RESOURCE_B;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SPACE_EX_SW2_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SPACE_EX_SW2_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SPACE_EX_SW2_SNMP_RESOURCE_B;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SRX_100_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SRX_100_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SRX_100_SNMP_RESOURCE_B;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.BAGMANE_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.BAGMANE_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.BAGMANE_SNMP_RESOURCE_B;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.BANGALORE_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.BANGALORE_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.BANGALORE_SNMP_RESOURCE_B;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.DELHI_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.DELHI_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.DELHI_SNMP_RESOURCE_B;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.J6350_42_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.J6350_42_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.J6350_42_SNMP_RESOURCE_B;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.MUMBAI_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.MUMBAI_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.MUMBAI_SNMP_RESOURCE_B;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.MYSORE_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.MYSORE_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.MYSORE_SNMP_RESOURCE_B;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SPACE_EX_SW1_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SPACE_EX_SW1_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SPACE_EX_SW1_SNMP_RESOURCE_B;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SPACE_EX_SW2_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SPACE_EX_SW2_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SPACE_EX_SW2_SNMP_RESOURCE_B;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SRX_100_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SRX_100_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SRX_100_SNMP_RESOURCE_B;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

Expand Down
18 changes: 9 additions & 9 deletions opennms-services/src/test/java/org/opennms/netmgt/enlinkd/Nms17216EnTest.java
View file
Expand Up @@ -41,15 +41,15 @@
import static org.opennms.netmgt.nb.TestNetworkBuilder.ROUTER4_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.ROUTER4_SNMP_RESOURCE;
*/
import static org.opennms.netmgt.nb.TestNetworkBuilder.SWITCH1_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SWITCH1_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SWITCH1_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SWITCH2_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SWITCH2_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SWITCH2_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SWITCH3_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SWITCH3_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.SWITCH3_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SWITCH1_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SWITCH1_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SWITCH1_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SWITCH2_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SWITCH2_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SWITCH2_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SWITCH3_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SWITCH3_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.SWITCH3_SNMP_RESOURCE;

/*
import static org.opennms.netmgt.nb.TestNetworkBuilder.SWITCH4_IP;
Expand Down
12 changes: 6 additions & 6 deletions opennms-services/src/test/java/org/opennms/netmgt/enlinkd/Nms4930EnTest.java
View file
Expand Up @@ -41,12 +41,12 @@
import org.opennms.netmgt.model.BridgeMacLink;
import org.opennms.netmgt.model.OnmsNode;
import org.opennms.netmgt.nb.Nms4930NetworkBuilder;
import static org.opennms.netmgt.nb.TestNetworkBuilder.DLINK1_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.DLINK1_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.DLINK1_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.TestNetworkBuilder.DLINK2_IP;
import static org.opennms.netmgt.nb.TestNetworkBuilder.DLINK2_NAME;
import static org.opennms.netmgt.nb.TestNetworkBuilder.DLINK2_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.DLINK1_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.DLINK1_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.DLINK1_SNMP_RESOURCE;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.DLINK2_IP;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.DLINK2_NAME;
import static org.opennms.netmgt.nb.NmsNetworkBuilder.DLINK2_SNMP_RESOURCE;

public class Nms4930EnTest extends EnLinkdTestBuilder {

Expand Down

0 comments on commit 1a9ce61

Please sign in to comment.