commit 0f38354c95fe77cf64c8bf96c79d4903dfb94359
author Jonathan Hart <jono@onlab.us> Wed Jul 09 11:38:03 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Sun Jul 13 20:41:41 2014 -0700
tree 32cf5633afba957b9785e646f92cfa034c6b6c1c
parent 49d67be6a308956871ad63e203d4bb8116800c8b

Added a couple more link discovery tests to cover the recent changes

Change-Id: I71bbcb9d4570366272ce77eb6a292019f8ad7865

src/main/java/net/onrc/onos/core/linkdiscovery/LinkDiscoveryManager.java

diff --git a/src/main/java/net/onrc/onos/core/linkdiscovery/LinkDiscoveryManager.java b/src/main/java/net/onrc/onos/core/linkdiscovery/LinkDiscoveryManager.java
index db35809..c02aff0 100644
--- a/src/main/java/net/onrc/onos/core/linkdiscovery/LinkDiscoveryManager.java
+++ b/src/main/java/net/onrc/onos/core/linkdiscovery/LinkDiscoveryManager.java
@@ -113,7 +113,7 @@
     private IControllerRegistryService registryService;
 
     // LLDP fields
-    private static final byte[] LLDP_STANDARD_DST_MAC_STRING =
+    static final byte[] LLDP_STANDARD_DST_MAC_STRING =
             HexString.fromHexString("01:80:c2:00:00:0e");
     private static final long LINK_LOCAL_MASK = 0xfffffffffff0L;
     private static final long LINK_LOCAL_VALUE = 0x0180c2000000L;
@@ -418,7 +418,7 @@
         return Command.CONTINUE;
     }
 
-    private Command handleLldp(LLDP lldp, long sw, OFPacketIn pi) {
+    protected Command handleLldp(LLDP lldp, long sw, OFPacketIn pi) {
         // If LLDP is suppressed on this port, ignore received packet as well
         IOFSwitch iofSwitch = floodlightProvider.getSwitches().get(sw);
         if (iofSwitch == null) {