From 541fb21faf9bdd90c4ab8a32731b397a66678d31 Mon Sep 17 00:00:00 2001 From: Antonio Date: Thu, 5 Mar 2015 11:35:05 +0100 Subject: [PATCH] Fix NMS-7184: lldp decode exception Resolved dependency problem from lldp enum moved --- .../EnhancedLinkdMockDataPopulator.java | 54 ++++++++++--------- .../internal/LldpLinkStatusProviderTest.java | 18 ++++--- .../netmgt/dao/api/LldpElementDao.java | 2 +- .../hibernate/LldpElementDaoHibernate.java | 2 +- .../org/opennms/netmgt/dao/NodeDaoTest.java | 2 +- .../netmgt/enlinkd/EnLinkdSnmpTest.java | 4 +- .../netmgt/enlinkd/EnLinkdTestHelper.java | 4 +- .../web/enlinkd/EnLinkdElementFactory.java | 4 +- 8 files changed, 47 insertions(+), 43 deletions(-) diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/src/test/java/org/opennms/features/topology/plugins/topo/linkd/internal/EnhancedLinkdMockDataPopulator.java b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/src/test/java/org/opennms/features/topology/plugins/topo/linkd/internal/EnhancedLinkdMockDataPopulator.java index 0f5240e98e53..331164ba66e4 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/src/test/java/org/opennms/features/topology/plugins/topo/linkd/internal/EnhancedLinkdMockDataPopulator.java +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/src/test/java/org/opennms/features/topology/plugins/topo/linkd/internal/EnhancedLinkdMockDataPopulator.java @@ -31,6 +31,8 @@ import org.easymock.EasyMock; import org.junit.Assert; import org.opennms.core.utils.InetAddressUtils; +import org.opennms.core.utils.LldpUtils.LldpChassisIdSubType; +import org.opennms.core.utils.LldpUtils.LldpPortIdSubType; import org.opennms.features.topology.api.GraphContainer; import org.opennms.features.topology.api.OperationContext; import org.opennms.features.topology.api.topo.*; @@ -126,7 +128,7 @@ public void populateDatabase() { .addIpInterface("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd%5").setIsManaged("M").setIsSnmpPrimary("N"); builder.addService(icmp); final OnmsNode node1 = builder.getCurrentNode(); - node1.setLldpElement(new LldpElement(node1, "node1ChassisId", "node1SysName", LldpElement.LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL)); + node1.setLldpElement(new LldpElement(node1, "node1ChassisId", "node1SysName", LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL)); setNode1(node1); builder.addNode("node2").setForeignSource("imported:").setForeignId("2").setType(OnmsNode.NodeType.ACTIVE); @@ -141,7 +143,7 @@ public void populateDatabase() { builder.addService(icmp); builder.addAtInterface(node1, "192.168.2.1", "AA:BB:CC:DD:EE:FF").setIfIndex(1).setLastPollTime(new Date()).setStatus('A'); OnmsNode node2 = builder.getCurrentNode(); - node2.setLldpElement(new LldpElement(node2, "node2ChassisId", "node2SysName", LldpElement.LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL)); + node2.setLldpElement(new LldpElement(node2, "node2ChassisId", "node2SysName", LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL)); setNode2(node2); builder.addNode("node3").setForeignSource("imported:").setForeignId("3").setType(OnmsNode.NodeType.ACTIVE); @@ -154,7 +156,7 @@ public void populateDatabase() { builder.addInterface("192.168.3.3").setIsManaged("M").setIsSnmpPrimary("N"); builder.addService(icmp); OnmsNode node3 = builder.getCurrentNode(); - node3.setLldpElement(new LldpElement(node3, "node3ChassisId", "node3SysName", LldpElement.LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL)); + node3.setLldpElement(new LldpElement(node3, "node3ChassisId", "node3SysName", LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL)); setNode3(node3); builder.addNode("node4").setForeignSource("imported:").setForeignId("4").setType(OnmsNode.NodeType.ACTIVE); @@ -167,7 +169,7 @@ public void populateDatabase() { builder.addInterface("192.168.4.3").setIsManaged("M").setIsSnmpPrimary("N"); builder.addService(icmp); OnmsNode node4 = builder.getCurrentNode(); - node4.setLldpElement(new LldpElement(node4, "node4ChassisId", "node4SysName", LldpElement.LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL)); + node4.setLldpElement(new LldpElement(node4, "node4ChassisId", "node4SysName", LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL)); setNode4(node4); //This node purposely doesn't have a foreignId style assetNumber @@ -181,7 +183,7 @@ public void populateDatabase() { builder.addInterface("10.1.1.3").setIsManaged("M").setIsSnmpPrimary("N"); builder.addService(icmp); OnmsNode node5 = builder.getCurrentNode(); - node5.setLldpElement(new LldpElement(node5, "node5ChassisId", "node5SysName", LldpElement.LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL)); + node5.setLldpElement(new LldpElement(node5, "node5ChassisId", "node5SysName", LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL)); setNode5(node5); //This node purposely doesn't have a assetNumber and is used by a test to check the category @@ -195,7 +197,7 @@ public void populateDatabase() { builder.addInterface("10.1.2.3").setIsManaged("M").setIsSnmpPrimary("N"); builder.addService(icmp); OnmsNode node6 = builder.getCurrentNode(); - node6.setLldpElement(new LldpElement(node6, "node6ChassisId", "node6SysName", LldpElement.LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL)); + node6.setLldpElement(new LldpElement(node6, "node6ChassisId", "node6SysName", LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL)); setNode6(node6); builder.addNode("alternate-node3").setType(OnmsNode.NodeType.ACTIVE).getAssetRecord().setDisplayCategory("category1"); @@ -208,7 +210,7 @@ public void populateDatabase() { builder.addInterface("10.1.3.3").setIsManaged("M").setIsSnmpPrimary("N"); builder.addService(icmp); OnmsNode node7 = builder.getCurrentNode(); - node7.setLldpElement(new LldpElement(node7, "node7ChassisId", "node7SysName", LldpElement.LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL)); + node7.setLldpElement(new LldpElement(node7, "node7ChassisId", "node7SysName", LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL)); setNode7(node7); builder.addNode("alternate-node4").setType(OnmsNode.NodeType.ACTIVE).getAssetRecord().setDisplayCategory("category1"); @@ -221,7 +223,7 @@ public void populateDatabase() { builder.addInterface("10.1.4.3").setIsManaged("M").setIsSnmpPrimary("N"); builder.addService(icmp); OnmsNode node8 = builder.getCurrentNode(); - node8.setLldpElement(new LldpElement(node8, "node8ChassisId", "mode8SysName", LldpElement.LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL)); + node8.setLldpElement(new LldpElement(node8, "node8ChassisId", "mode8SysName", LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL)); setNode8(node8); List nodes = new ArrayList(); @@ -249,29 +251,29 @@ public void populateDatabase() { String portDescr, String remChassisId, String remSysname, LldpElement.LldpChassisIdSubType remChassisIdSubType, String remPortId, String remPortDescr*/ - final LldpLink dli12 = createLldpLink(getNode1(), "node1PortId", "node1PortDescr", 12, 10, LldpLink.LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode2().getLldpElement(), "node2PortDescr", "node2PortId"); - final LldpLink dli21 = createLldpLink(getNode2(), "node2PortId", "node2PortDescr", 22, 20, LldpLink.LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode1().getLldpElement(), "node1PortDescr", "node1PortId"); + final LldpLink dli12 = createLldpLink(getNode1(), "node1PortId", "node1PortDescr", 12, 10, LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode2().getLldpElement(), "node2PortDescr", "node2PortId"); + final LldpLink dli21 = createLldpLink(getNode2(), "node2PortId", "node2PortDescr", 22, 20, LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode1().getLldpElement(), "node1PortDescr", "node1PortId"); - final LldpLink dli23 = createLldpLink(getNode2(), "node2PortId", "node2PortDescr", 22, 20, LldpLink.LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode3().getLldpElement(), "node3PortDescr", "node3PortId"); - final LldpLink dli32 = createLldpLink(getNode3(), "node3PortId", "node3PortDescr", 33, 30, LldpLink.LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode2().getLldpElement(), "node2PortDescr", "node2PortId"); + final LldpLink dli23 = createLldpLink(getNode2(), "node2PortId", "node2PortDescr", 22, 20, LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode3().getLldpElement(), "node3PortDescr", "node3PortId"); + final LldpLink dli32 = createLldpLink(getNode3(), "node3PortId", "node3PortDescr", 33, 30, LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode2().getLldpElement(), "node2PortDescr", "node2PortId"); - final LldpLink dli34 = createLldpLink(getNode3(), "node3PortId", "node3PortDescr", 33, 30, LldpLink.LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode4().getLldpElement(), "node4PortDescr", "node4PortId"); - final LldpLink dli43 = createLldpLink(getNode4(), "node4PortId", "node4PortDescr", 44, 40, LldpLink.LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode3().getLldpElement(), "node3PortDescr", "node3PortId"); + final LldpLink dli34 = createLldpLink(getNode3(), "node3PortId", "node3PortDescr", 33, 30, LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode4().getLldpElement(), "node4PortDescr", "node4PortId"); + final LldpLink dli43 = createLldpLink(getNode4(), "node4PortId", "node4PortDescr", 44, 40, LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode3().getLldpElement(), "node3PortDescr", "node3PortId"); - final LldpLink dli45 = createLldpLink(getNode4(), "node4PortId", "node4PortDescr", 44, 40, LldpLink.LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode5().getLldpElement(), "node5PortDescr", "node5PortId"); - final LldpLink dli54 = createLldpLink(getNode5(), "node5PortId", "node5PortDescr", 55, 50, LldpLink.LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode4().getLldpElement(), "node4PortDescr", "node4PortId"); + final LldpLink dli45 = createLldpLink(getNode4(), "node4PortId", "node4PortDescr", 44, 40, LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode5().getLldpElement(), "node5PortDescr", "node5PortId"); + final LldpLink dli54 = createLldpLink(getNode5(), "node5PortId", "node5PortDescr", 55, 50, LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode4().getLldpElement(), "node4PortDescr", "node4PortId"); - final LldpLink dli56 = createLldpLink(getNode5(), "node5PortId", "node5PortDescr", 55, 50, LldpLink.LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode6().getLldpElement(), "node6PortDescr", "node6PortId"); - final LldpLink dli65 = createLldpLink(getNode6(), "node6PortId", "node6PortDescr", 66, 60, LldpLink.LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode5().getLldpElement(), "node5PortDescr", "node5PortId"); + final LldpLink dli56 = createLldpLink(getNode5(), "node5PortId", "node5PortDescr", 55, 50, LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode6().getLldpElement(), "node6PortDescr", "node6PortId"); + final LldpLink dli65 = createLldpLink(getNode6(), "node6PortId", "node6PortDescr", 66, 60, LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode5().getLldpElement(), "node5PortDescr", "node5PortId"); - final LldpLink dli67 = createLldpLink(getNode6(), "node6PortId", "node6PortDescr", 66, 60, LldpLink.LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode7().getLldpElement(), "node7PortDescr", "node7PortId"); - final LldpLink dli76 = createLldpLink(getNode7(), "node7PortId", "node7PortDescr", 77, 70, LldpLink.LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode6().getLldpElement(), "node6PortDescr", "node6PortId"); + final LldpLink dli67 = createLldpLink(getNode6(), "node6PortId", "node6PortDescr", 66, 60, LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode7().getLldpElement(), "node7PortDescr", "node7PortId"); + final LldpLink dli76 = createLldpLink(getNode7(), "node7PortId", "node7PortDescr", 77, 70, LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode6().getLldpElement(), "node6PortDescr", "node6PortId"); - final LldpLink dli78 = createLldpLink(getNode7(), "node7PortId", "node7PortDescr", 77, 70, LldpLink.LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode8().getLldpElement(), "node8PortDescr", "node8PortId"); - final LldpLink dli87 = createLldpLink(getNode8(), "node8PortId", "node8PortDescr", 88, 80, LldpLink.LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode7().getLldpElement(), "node7PortDescr", "node7PortId"); + final LldpLink dli78 = createLldpLink(getNode7(), "node7PortId", "node7PortDescr", 77, 70, LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode8().getLldpElement(), "node8PortDescr", "node8PortId"); + final LldpLink dli87 = createLldpLink(getNode8(), "node8PortId", "node8PortDescr", 88, 80, LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode7().getLldpElement(), "node7PortDescr", "node7PortId"); - final LldpLink dli81 = createLldpLink(getNode8(), "node8PortId", "node8PortDescr", 88, 80, LldpLink.LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode1().getLldpElement(), "node1PortDescr", "node1PortId"); - final LldpLink dli18 = createLldpLink(getNode1(), "node1PortId", "node1PortDescr", 12, 10, LldpLink.LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode8().getLldpElement(), "node8PortDescr", "node8PortId"); + final LldpLink dli81 = createLldpLink(getNode8(), "node8PortId", "node8PortDescr", 88, 80, LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode1().getLldpElement(), "node1PortDescr", "node1PortId"); + final LldpLink dli18 = createLldpLink(getNode1(), "node1PortId", "node1PortDescr", 12, 10, LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, getNode8().getLldpElement(), "node8PortDescr", "node8PortId"); dli12.setId(10012); dli21.setId(10021); @@ -351,10 +353,10 @@ private OspfLink createOspfLink(OnmsNode node, String sourceIpAddr, String sourc return ospfLink; } - private LldpLink createLldpLink(OnmsNode node, String nodePortId, String nodePortDescr, int portIfIndex, int localPortNum, LldpLink.LldpPortIdSubType portIdSubType, LldpElement remLldpElement, String node2PortDescr, String node2PortId) { + private LldpLink createLldpLink(OnmsNode node, String nodePortId, String nodePortDescr, int portIfIndex, int localPortNum, LldpPortIdSubType portIdSubType, LldpElement remLldpElement, String node2PortDescr, String node2PortId) { return new LldpLink(node, localPortNum, portIfIndex, nodePortId, nodePortDescr, portIdSubType, remLldpElement.getLldpChassisId(), remLldpElement.getLldpSysname(), remLldpElement.getLldpChassisIdSubType(), - node2PortId, LldpLink.LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, node2PortDescr); + node2PortId, LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, node2PortDescr); } private List getList(Set ipset) { diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/src/test/java/org/opennms/features/topology/plugins/topo/linkd/internal/LldpLinkStatusProviderTest.java b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/src/test/java/org/opennms/features/topology/plugins/topo/linkd/internal/LldpLinkStatusProviderTest.java index 646727b411e9..bf1128fdd4b1 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/src/test/java/org/opennms/features/topology/plugins/topo/linkd/internal/LldpLinkStatusProviderTest.java +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/src/test/java/org/opennms/features/topology/plugins/topo/linkd/internal/LldpLinkStatusProviderTest.java @@ -31,6 +31,8 @@ import org.easymock.EasyMock; import org.junit.Before; import org.junit.Test; +import org.opennms.core.utils.LldpUtils.LldpChassisIdSubType; +import org.opennms.core.utils.LldpUtils.LldpPortIdSubType; import org.opennms.features.topology.api.topo.*; import org.opennms.netmgt.EventConstants; import org.opennms.netmgt.dao.api.AlarmDao; @@ -58,11 +60,11 @@ public class LldpLinkStatusProviderTest { public void setUp() { m_node1 = new OnmsNode(); m_node1.setId(1); - m_node1.setLldpElement(new LldpElement(m_node1, "node1ChassisId", "node1SysName", LldpElement.LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL)); + m_node1.setLldpElement(new LldpElement(m_node1, "node1ChassisId", "node1SysName", LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL)); m_node2 = new OnmsNode(); m_node2.setId(2); - m_node2.setLldpElement(new LldpElement(m_node2, "node2ChassisId", "node2SysName", LldpElement.LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL)); + m_node2.setLldpElement(new LldpElement(m_node2, "node2ChassisId", "node2SysName", LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL)); m_alarmDao = EasyMock.createMock(AlarmDao.class); m_lldpLinkDao = EasyMock.createMock(LldpLinkDao.class); @@ -138,15 +140,15 @@ private List createEdges() { private List createLldpLinks() { List links = new ArrayList(); - LldpLink link = new LldpLink(m_node1, 12, 1, "node1PortId", "node1PortDescr", LldpLink.LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, - "node2ChassisId", "node2SysName", LldpElement.LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL, "node2PortId", - LldpLink.LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, "node2PortDescr"); + LldpLink link = new LldpLink(m_node1, 12, 1, "node1PortId", "node1PortDescr", LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, + "node2ChassisId", "node2SysName", LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL, "node2PortId", + LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, "node2PortDescr"); link.setId(1); links.add(link); - LldpLink link2 = new LldpLink(m_node2, 21, 2, "node2PortId", "node2PortDescr", LldpLink.LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, - "node1ChassisId", "node1SysName", LldpElement.LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL, "node1PortId", - LldpLink.LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, "node1PortDescr"); + LldpLink link2 = new LldpLink(m_node2, 21, 2, "node2PortId", "node2PortDescr", LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, + "node1ChassisId", "node1SysName", LldpChassisIdSubType.LLDP_CHASSISID_SUBTYPE_LOCAL, "node1PortId", + LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL, "node1PortDescr"); link2.setId(2); links.add(link2); diff --git a/opennms-dao-api/src/main/java/org/opennms/netmgt/dao/api/LldpElementDao.java b/opennms-dao-api/src/main/java/org/opennms/netmgt/dao/api/LldpElementDao.java index ec57c4eee0c6..8eadb93f5ee5 100644 --- a/opennms-dao-api/src/main/java/org/opennms/netmgt/dao/api/LldpElementDao.java +++ b/opennms-dao-api/src/main/java/org/opennms/netmgt/dao/api/LldpElementDao.java @@ -30,8 +30,8 @@ import java.util.List; +import org.opennms.core.utils.LldpUtils.LldpChassisIdSubType; import org.opennms.netmgt.model.LldpElement; -import org.opennms.netmgt.model.LldpElement.LldpChassisIdSubType; /** *

LldpElementDao interface.

diff --git a/opennms-dao/src/main/java/org/opennms/netmgt/dao/hibernate/LldpElementDaoHibernate.java b/opennms-dao/src/main/java/org/opennms/netmgt/dao/hibernate/LldpElementDaoHibernate.java index bb2de57d6fde..d64022620cc9 100644 --- a/opennms-dao/src/main/java/org/opennms/netmgt/dao/hibernate/LldpElementDaoHibernate.java +++ b/opennms-dao/src/main/java/org/opennms/netmgt/dao/hibernate/LldpElementDaoHibernate.java @@ -28,9 +28,9 @@ package org.opennms.netmgt.dao.hibernate; +import org.opennms.core.utils.LldpUtils.LldpChassisIdSubType; import org.opennms.netmgt.dao.api.LldpElementDao; import org.opennms.netmgt.model.LldpElement; -import org.opennms.netmgt.model.LldpElement.LldpChassisIdSubType; import java.util.List; diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/NodeDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/NodeDaoTest.java index 004da4b691f5..d111a5ec10b7 100644 --- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/NodeDaoTest.java +++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/NodeDaoTest.java @@ -51,10 +51,10 @@ import org.opennms.core.test.OpenNMSJUnit4ClassRunner; import org.opennms.core.test.db.annotations.JUnitTemporaryDatabase; import org.opennms.core.utils.InetAddressUtils; +import org.opennms.core.utils.LldpUtils.LldpChassisIdSubType; import org.opennms.netmgt.dao.api.DistPollerDao; import org.opennms.netmgt.dao.api.NodeDao; import org.opennms.netmgt.model.LldpElement; -import org.opennms.netmgt.model.LldpElement.LldpChassisIdSubType; import org.opennms.netmgt.model.OnmsDistPoller; import org.opennms.netmgt.model.OnmsIpInterface; import org.opennms.netmgt.model.OnmsMonitoredService; diff --git a/opennms-services/src/test/java/org/opennms/netmgt/enlinkd/EnLinkdSnmpTest.java b/opennms-services/src/test/java/org/opennms/netmgt/enlinkd/EnLinkdSnmpTest.java index cae7fce2e7cf..73cfe68bd31a 100644 --- a/opennms-services/src/test/java/org/opennms/netmgt/enlinkd/EnLinkdSnmpTest.java +++ b/opennms-services/src/test/java/org/opennms/netmgt/enlinkd/EnLinkdSnmpTest.java @@ -47,6 +47,8 @@ import org.opennms.core.test.snmp.annotations.JUnitSnmpAgent; import org.opennms.core.test.snmp.annotations.JUnitSnmpAgents; import org.opennms.core.utils.InetAddressUtils; +import org.opennms.core.utils.LldpUtils.LldpChassisIdSubType; +import org.opennms.core.utils.LldpUtils.LldpPortIdSubType; import org.opennms.netmgt.config.SnmpPeerFactory; import org.opennms.netmgt.enlinkd.snmp.Dot1dBasePortTableTracker; import org.opennms.netmgt.enlinkd.snmp.Dot1dBaseTracker; @@ -83,9 +85,7 @@ import org.opennms.netmgt.model.IsIsLink.IsisISAdjState; import org.opennms.netmgt.model.LldpElement; import org.opennms.netmgt.model.OspfLink; -import org.opennms.netmgt.model.LldpElement.LldpChassisIdSubType; import org.opennms.netmgt.model.LldpLink; -import org.opennms.netmgt.model.LldpLink.LldpPortIdSubType; import org.opennms.netmgt.model.OspfElement; import org.opennms.netmgt.model.OspfElement.Status; import org.opennms.netmgt.model.OspfElement.TruthValue; diff --git a/opennms-services/src/test/java/org/opennms/netmgt/enlinkd/EnLinkdTestHelper.java b/opennms-services/src/test/java/org/opennms/netmgt/enlinkd/EnLinkdTestHelper.java index 56838737cfdb..fec35bc662af 100644 --- a/opennms-services/src/test/java/org/opennms/netmgt/enlinkd/EnLinkdTestHelper.java +++ b/opennms-services/src/test/java/org/opennms/netmgt/enlinkd/EnLinkdTestHelper.java @@ -31,11 +31,11 @@ import java.util.List; +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.LldpElement; -import org.opennms.netmgt.model.LldpElement.LldpChassisIdSubType; import org.opennms.netmgt.model.LldpLink; -import org.opennms.netmgt.model.LldpLink.LldpPortIdSubType; import org.opennms.netmgt.model.OspfElement; import org.opennms.netmgt.model.OspfElement.Status; import org.opennms.netmgt.model.OspfElement.TruthValue; diff --git a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/EnLinkdElementFactory.java b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/EnLinkdElementFactory.java index 65ac6869e3b4..f4e9d6106865 100644 --- a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/EnLinkdElementFactory.java +++ b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/EnLinkdElementFactory.java @@ -41,6 +41,8 @@ import org.opennms.core.criteria.Alias.JoinType; import org.opennms.core.criteria.CriteriaBuilder; import org.opennms.core.spring.BeanUtils; +import org.opennms.core.utils.LldpUtils.LldpChassisIdSubType; +import org.opennms.core.utils.LldpUtils.LldpPortIdSubType; import org.opennms.netmgt.dao.api.BridgeBridgeLinkDao; import org.opennms.netmgt.dao.api.BridgeElementDao; import org.opennms.netmgt.dao.api.BridgeMacLinkDao; @@ -71,9 +73,7 @@ import org.opennms.netmgt.model.IsIsLink.IsisISAdjNeighSysType; import org.opennms.netmgt.model.IsIsLink.IsisISAdjState; import org.opennms.netmgt.model.LldpElement; -import org.opennms.netmgt.model.LldpElement.LldpChassisIdSubType; import org.opennms.netmgt.model.LldpLink; -import org.opennms.netmgt.model.LldpLink.LldpPortIdSubType; import org.opennms.netmgt.model.OnmsIpInterface; import org.opennms.netmgt.model.OnmsNode; import org.opennms.netmgt.model.OnmsSnmpInterface;