commit 289652c591f7ed0ae8b460ae781bb63f685ed818
author alshabib <alshabibi.ali@gmail.com> Sun Sep 07 19:09:28 2014 -0700
committer alshabib <alshabibi.ali@gmail.com> Sun Sep 07 19:09:28 2014 -0700
tree ae4e074424e7aa6c51e1c78e52348b575dfa4f6e
parent 638dc71f006044f3942c9813b10091f393be3b1c

started adding link discovery

utils/misc/pom.xml

diff --git a/utils/misc/pom.xml b/utils/misc/pom.xml
index 79a0780..39d9042 100644
--- a/utils/misc/pom.xml
+++ b/utils/misc/pom.xml
@@ -23,6 +23,11 @@
             <version>17.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty</artifactId>
+            <version>3.9.0.Final</version>
+        </dependency>
     </dependencies>
 
 </project>

utils/misc/src/main/java/org/onlab/packet/ONLabLddp.java

diff --git a/utils/misc/src/main/java/org/onlab/packet/OVXLLDP.java b/utils/misc/src/main/java/org/onlab/packet/ONLabLddp.java
similarity index 95%
rename from utils/misc/src/main/java/org/onlab/packet/OVXLLDP.java
rename to utils/misc/src/main/java/org/onlab/packet/ONLabLddp.java
index f1a4b5f..b3aba43 100644
--- a/utils/misc/src/main/java/org/onlab/packet/OVXLLDP.java
+++ b/utils/misc/src/main/java/org/onlab/packet/ONLabLddp.java
@@ -29,7 +29,7 @@
  *
  */
 @SuppressWarnings("rawtypes")
-public class OVXLLDP extends LLDP {
+public class ONLabLddp extends LLDP {
 
     // ON.Lab OUI and OVX name for organizationally specific TLVs
     public static final byte[] ONLAB_OUI = {(byte) 0xa4, 0x23, 0x05};
@@ -58,7 +58,7 @@
 
     private static final byte NAME_TLV_TYPE = 127;
     // 4 = OUI (3) + subtype (1)
-    private static final byte NAME_TLV_SIZE = (byte) (4 + OVXLLDP.OVX_NAME.length());
+    private static final byte NAME_TLV_SIZE = (byte) (4 + ONLabLddp.OVX_NAME.length());
     private static final byte NAME_TLV_SUBTYPE = 1;
     private static final short NAME_TLV_OFFSET = 32;
     private static final short NAME_TLV_HEADER = (short) ((NAME_TLV_TYPE << 9) | NAME_TLV_SIZE);
@@ -119,7 +119,7 @@
     /**
      * Instantiates a new OVX LDDP message.
      */
-    public OVXLLDP() {
+    public ONLabLddp() {
         // Create TLVs
         this.chassisTLV = new LLDPTLV();
         this.portTLV = new LLDPTLV();
@@ -140,7 +140,7 @@
         this.setChassisTLV(DEFAULT_DPID);
         this.setPortTLV(DEFAULT_PORT);
         this.setTTLTLV(DEFAULT_TTL);
-        this.setOUIName(OVXLLDP.OVX_NAME);
+        this.setOUIName(ONLabLddp.OVX_NAME);
         this.setOUIDpid(DEFAULT_DPID);
     }
 
@@ -198,7 +198,7 @@
      */
     private void setOUIName(final String name) {
         this.bb = ByteBuffer.wrap(ouiName);
-        this.bb.put(OVXLLDP.ONLAB_OUI);
+        this.bb.put(ONLabLddp.ONLAB_OUI);
         this.bb.put(NAME_TLV_SUBTYPE);
         this.bb.put(name.getBytes());
 
@@ -214,7 +214,7 @@
      */
     private void setOUIDpid(final byte[] dpid) {
         this.bb = ByteBuffer.wrap(ouiDpid);
-        this.bb.put(OVXLLDP.ONLAB_OUI);
+        this.bb.put(ONLabLddp.ONLAB_OUI);
         this.bb.put(DPID_TLV_SUBTYPE);
         this.bb.put(dpid);
 
@@ -272,9 +272,9 @@
         final byte[] dst = new byte[6];
         bb.get(dst);
 
-        if (!(Arrays.equals(dst, OVXLLDP.LLDP_NICIRA)
-                || Arrays.equals(dst, OVXLLDP.LLDP_MULTICAST) || Arrays.equals(
-                        dst, OVXLLDP.BDDP_MULTICAST))) {
+        if (!(Arrays.equals(dst, ONLabLddp.LLDP_NICIRA)
+                || Arrays.equals(dst, ONLabLddp.LLDP_MULTICAST) || Arrays.equals(
+                        dst, ONLabLddp.BDDP_MULTICAST))) {
 
             return false;
         }