Use LLDP for inter-instance link discovery.
Brought in OVXLLDP.java (renamed to OnosLldp) from OVX to encapsulate
LLDP building and verifying logic. There's also some small changes to
LLDP.java and LLDPTLV.java from OVX.
LinkDiscoveryManager.java has been changed to use the new OnosLldp class.
All links are now discovered using LLDPs, the BDDP code has been disabled.
Note: LinkDiscoveryManager still quite messy and contains unneeded
functionality which will be cleaned up in later patches.
OK to merge now (passed nightly tests).
Change-Id: Ifd8773f7531dc0f462c31aff1854a0dcd384c153
diff --git a/src/test/java/net/onrc/onos/core/linkdiscovery/internal/LinkDiscoveryManagerTest.java b/src/test/java/net/onrc/onos/core/linkdiscovery/internal/LinkDiscoveryManagerTest.java
index cdcf010..4cebdaa 100644
--- a/src/test/java/net/onrc/onos/core/linkdiscovery/internal/LinkDiscoveryManagerTest.java
+++ b/src/test/java/net/onrc/onos/core/linkdiscovery/internal/LinkDiscoveryManagerTest.java
@@ -395,6 +395,8 @@
*/
@Test
public void testSendDiscoveryMessage() throws IOException {
+ byte[] macAddress = new byte[] {0x0, 0x0, 0x0, 0x0, 0x0, 0x1};
+
LinkDiscoveryManager topology = getTopology();
// Mock up our expected behavior
@@ -404,6 +406,7 @@
short portNum = 1;
OFPhysicalPort ofpPort = new OFPhysicalPort();
ofpPort.setPortNumber(portNum);
+ ofpPort.setHardwareAddress(macAddress);
/* sendDiscoverMessage() should perform the following actions on
* IOFSwitch object