Rename from TLV to Tlv to make renaming consistent with others

Change-Id: I1bbf91b9ac1ef6c3e64676301a4c178725c09442

@@ -22,13 +22,13 @@ import java.util.ListIterator;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.onosproject.pcepio.exceptions.PcepParseException;
 import org.onosproject.pcepio.protocol.PcepTEObject;
-import org.onosproject.pcepio.types.LocalTENodeDescriptorsTLV;
+import org.onosproject.pcepio.types.LocalTENodeDescriptorsTlv;
 import org.onosproject.pcepio.types.PcepObjectHeader;
 import org.onosproject.pcepio.types.PcepValueType;
-import org.onosproject.pcepio.types.RemoteTENodeDescriptorsTLV;
-import org.onosproject.pcepio.types.RoutingUniverseTLV;
+import org.onosproject.pcepio.types.RemoteTENodeDescriptorsTlv;
+import org.onosproject.pcepio.types.RoutingUniverseTlv;
 import org.onosproject.pcepio.types.TELinkAttributesTlv;
-import org.onosproject.pcepio.types.TELinkDescriptorsTLV;
+import org.onosproject.pcepio.types.TELinkDescriptorsTlv;
 import org.onosproject.pcepio.types.TENodeAttributesTlv;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -288,18 +288,18 @@ public class PcepTEObjectVer1 implements PcepTEObject {
 
             switch (hType) {
 
-            case RoutingUniverseTLV.TYPE:
+            case RoutingUniverseTlv.TYPE:
                 lValue = cb.readLong();
-                tlv = new RoutingUniverseTLV(lValue);
+                tlv = new RoutingUniverseTlv(lValue);
                 break;
-            case LocalTENodeDescriptorsTLV.TYPE:
-                tlv = LocalTENodeDescriptorsTLV.read(cb, hLength);
+            case LocalTENodeDescriptorsTlv.TYPE:
+                tlv = LocalTENodeDescriptorsTlv.read(cb, hLength);
                 break;
-            case RemoteTENodeDescriptorsTLV.TYPE:
-                tlv = RemoteTENodeDescriptorsTLV.read(cb, hLength);
+            case RemoteTENodeDescriptorsTlv.TYPE:
+                tlv = RemoteTENodeDescriptorsTlv.read(cb, hLength);
                 break;
-            case TELinkDescriptorsTLV.TYPE:
-                tlv = TELinkDescriptorsTLV.read(cb, hLength);
+            case TELinkDescriptorsTlv.TYPE:
+                tlv = TELinkDescriptorsTlv.read(cb, hLength);
                 break;
             case TENodeAttributesTlv.TYPE:
                 tlv = TENodeAttributesTlv.read(cb, hLength);

@@ -31,7 +31,7 @@ import com.google.common.base.MoreObjects;
 /**
  * Provides Local TE Node Descriptors TLV which contains Node Descriptor Sub-TLVs.
  */
-public class LocalTENodeDescriptorsTLV implements PcepValueType {
+public class LocalTENodeDescriptorsTlv implements PcepValueType {
 
     /* REFERENCE :draft-ietf-idr-ls-distribution-10
      *  0                   1                   2                   3
@@ -46,7 +46,7 @@ public class LocalTENodeDescriptorsTLV implements PcepValueType {
      Note: Length is including header here. Refer Routing Universe TLV.
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(LocalTENodeDescriptorsTLV.class);
+    protected static final Logger log = LoggerFactory.getLogger(LocalTENodeDescriptorsTlv.class);
 
     public static final short TYPE = 1637; //TODD:change this TBD8
     public short hLength;
@@ -60,7 +60,7 @@ public class LocalTENodeDescriptorsTLV implements PcepValueType {
      *
      * @param llNodeDescriptorSubTLVs LinkedList of PcepValueType
      */
-    public LocalTENodeDescriptorsTLV(LinkedList<PcepValueType> llNodeDescriptorSubTLVs) {
+    public LocalTENodeDescriptorsTlv(LinkedList<PcepValueType> llNodeDescriptorSubTLVs) {
         this.llNodeDescriptorSubTLVs = llNodeDescriptorSubTLVs;
     }
 
@@ -70,8 +70,8 @@ public class LocalTENodeDescriptorsTLV implements PcepValueType {
      * @param llNodeDescriptorSubTLVs linked list of Node Descriptor Sub TLVs
      * @return object of LocalTENodeDescriptorsTLV
      */
-    public static LocalTENodeDescriptorsTLV of(final LinkedList<PcepValueType> llNodeDescriptorSubTLVs) {
-        return new LocalTENodeDescriptorsTLV(llNodeDescriptorSubTLVs);
+    public static LocalTENodeDescriptorsTlv of(final LinkedList<PcepValueType> llNodeDescriptorSubTLVs) {
+        return new LocalTENodeDescriptorsTlv(llNodeDescriptorSubTLVs);
     }
 
     /**
@@ -117,14 +117,14 @@ public class LocalTENodeDescriptorsTLV implements PcepValueType {
          * the size, if both are same then we should check for the subtlv objects otherwise
          * we should return false.
          */
-        if (obj instanceof LocalTENodeDescriptorsTLV) {
+        if (obj instanceof LocalTENodeDescriptorsTlv) {
             int countObjSubTlv = 0;
             int countOtherSubTlv = 0;
             boolean isCommonSubTlv = true;
-            LocalTENodeDescriptorsTLV other = (LocalTENodeDescriptorsTLV) obj;
-            Iterator<PcepValueType> objListIterator = ((LocalTENodeDescriptorsTLV) obj).llNodeDescriptorSubTLVs
+            LocalTENodeDescriptorsTlv other = (LocalTENodeDescriptorsTlv) obj;
+            Iterator<PcepValueType> objListIterator = ((LocalTENodeDescriptorsTlv) obj).llNodeDescriptorSubTLVs
                     .iterator();
-            countObjSubTlv = ((LocalTENodeDescriptorsTLV) obj).llNodeDescriptorSubTLVs.size();
+            countObjSubTlv = ((LocalTENodeDescriptorsTlv) obj).llNodeDescriptorSubTLVs.size();
             countOtherSubTlv = other.llNodeDescriptorSubTLVs.size();
             if (countObjSubTlv != countOtherSubTlv) {
                 return false;
@@ -232,7 +232,7 @@ public class LocalTENodeDescriptorsTLV implements PcepValueType {
         if (0 < tempCb.readableBytes()) {
             throw new PcepParseException("Sub Tlv parsing error. Extra bytes received.");
         }
-        return new LocalTENodeDescriptorsTLV(llNodeDescriptorSubTLVs);
+        return new LocalTENodeDescriptorsTlv(llNodeDescriptorSubTLVs);
     }
 
     @Override

@@ -31,7 +31,7 @@ import com.google.common.base.MoreObjects;
 /**
  * Provides Remote TE Node Descriptors TLV.
  */
-public class RemoteTENodeDescriptorsTLV implements PcepValueType {
+public class RemoteTENodeDescriptorsTlv implements PcepValueType {
 
     /* Reference :PCEP Extension for Transporting TE Data
         draft-dhodylee-pce-pcep-te-data-extn-02
@@ -47,7 +47,7 @@ public class RemoteTENodeDescriptorsTLV implements PcepValueType {
          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(RemoteTENodeDescriptorsTLV.class);
+    protected static final Logger log = LoggerFactory.getLogger(RemoteTENodeDescriptorsTlv.class);
 
     public static final short TYPE = 1003; //TODD:change this TBD9
     public short hLength;
@@ -61,7 +61,7 @@ public class RemoteTENodeDescriptorsTLV implements PcepValueType {
      *
      * @param llRemoteTENodeDescriptorSubTLVs LinkedList of PcepValueType
      */
-    public RemoteTENodeDescriptorsTLV(LinkedList<PcepValueType> llRemoteTENodeDescriptorSubTLVs) {
+    public RemoteTENodeDescriptorsTlv(LinkedList<PcepValueType> llRemoteTENodeDescriptorSubTLVs) {
         this.llRemoteTENodeDescriptorSubTLVs = llRemoteTENodeDescriptorSubTLVs;
     }
 
@@ -71,8 +71,8 @@ public class RemoteTENodeDescriptorsTLV implements PcepValueType {
      * @param llRemoteTENodeDescriptorSubTLVs LinkedList of PcepValueType
      * @return object of RemoteTENodeDescriptorsTLV
      */
-    public static RemoteTENodeDescriptorsTLV of(final LinkedList<PcepValueType> llRemoteTENodeDescriptorSubTLVs) {
-        return new RemoteTENodeDescriptorsTLV(llRemoteTENodeDescriptorSubTLVs);
+    public static RemoteTENodeDescriptorsTlv of(final LinkedList<PcepValueType> llRemoteTENodeDescriptorSubTLVs) {
+        return new RemoteTENodeDescriptorsTlv(llRemoteTENodeDescriptorSubTLVs);
     }
 
     /**
@@ -117,14 +117,14 @@ public class RemoteTENodeDescriptorsTLV implements PcepValueType {
          * the size, if both are same then we should check for the subtlv objects otherwise
          * we should return false.
          */
-        if (obj instanceof RemoteTENodeDescriptorsTLV) {
+        if (obj instanceof RemoteTENodeDescriptorsTlv) {
             int countObjSubTlv = 0;
             int countOtherSubTlv = 0;
             boolean isCommonSubTlv = true;
-            RemoteTENodeDescriptorsTLV other = (RemoteTENodeDescriptorsTLV) obj;
-            Iterator<PcepValueType> objListIterator = ((RemoteTENodeDescriptorsTLV) obj).llRemoteTENodeDescriptorSubTLVs
+            RemoteTENodeDescriptorsTlv other = (RemoteTENodeDescriptorsTlv) obj;
+            Iterator<PcepValueType> objListIterator = ((RemoteTENodeDescriptorsTlv) obj).llRemoteTENodeDescriptorSubTLVs
                     .iterator();
-            countObjSubTlv = ((RemoteTENodeDescriptorsTLV) obj).llRemoteTENodeDescriptorSubTLVs.size();
+            countObjSubTlv = ((RemoteTENodeDescriptorsTlv) obj).llRemoteTENodeDescriptorSubTLVs.size();
             countOtherSubTlv = other.llRemoteTENodeDescriptorSubTLVs.size();
             if (countObjSubTlv != countOtherSubTlv) {
                 return false;
@@ -235,7 +235,7 @@ public class RemoteTENodeDescriptorsTLV implements PcepValueType {
 
             throw new PcepParseException("Sub Tlv parsing error. Extra bytes received.");
         }
-        return new RemoteTENodeDescriptorsTLV(llRemoteTENodeDescriptorSubTLVs);
+        return new RemoteTENodeDescriptorsTlv(llRemoteTENodeDescriptorSubTLVs);
     }
 
     @Override

@@ -27,7 +27,7 @@ import com.google.common.base.MoreObjects;
 /**
  * Provides RoutingUniverseTLV identifiers.
  */
-public class RoutingUniverseTLV implements PcepValueType {
+public class RoutingUniverseTlv implements PcepValueType {
 
     /*
      * Reference : draft-dhodylee-pce-pcep-te-data-extn-02, section 9.2.1.
@@ -50,7 +50,7 @@ public class RoutingUniverseTLV implements PcepValueType {
                    +------------+---------------------+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(RoutingUniverseTLV.class);
+    protected static final Logger log = LoggerFactory.getLogger(RoutingUniverseTlv.class);
 
     public static final short TYPE = 14; // TODO:need to change TBD7
     public static final short LENGTH = 8;
@@ -62,7 +62,7 @@ public class RoutingUniverseTLV implements PcepValueType {
      *
      * @param rawValue raw value
      */
-    public RoutingUniverseTLV(long rawValue) {
+    public RoutingUniverseTlv(long rawValue) {
         this.rawValue = rawValue;
     }
 
@@ -72,8 +72,8 @@ public class RoutingUniverseTLV implements PcepValueType {
      * @param raw value
      * @return object of RoutingUniverseTLV
      */
-    public static RoutingUniverseTLV of(final long raw) {
-        return new RoutingUniverseTLV(raw);
+    public static RoutingUniverseTlv of(final long raw) {
+        return new RoutingUniverseTlv(raw);
     }
 
     /**
@@ -110,8 +110,8 @@ public class RoutingUniverseTLV implements PcepValueType {
         if (this == obj) {
             return true;
         }
-        if (obj instanceof RoutingUniverseTLV) {
-            RoutingUniverseTLV other = (RoutingUniverseTLV) obj;
+        if (obj instanceof RoutingUniverseTlv) {
+            RoutingUniverseTlv other = (RoutingUniverseTlv) obj;
             return Objects.equals(this.rawValue, other.rawValue);
         }
         return false;
@@ -132,8 +132,8 @@ public class RoutingUniverseTLV implements PcepValueType {
      * @param c input channel buffer
      * @return object of RoutingUniverseTLV
      */
-    public static RoutingUniverseTLV read(ChannelBuffer c) {
-        return RoutingUniverseTLV.of(c.readLong());
+    public static RoutingUniverseTlv read(ChannelBuffer c) {
+        return RoutingUniverseTlv.of(c.readLong());
     }
 
     @Override

@@ -31,7 +31,7 @@ import com.google.common.base.MoreObjects;
 /**
  * Provides TE Link Descriptors TLV.
  */
-public class TELinkDescriptorsTLV implements PcepValueType {
+public class TELinkDescriptorsTlv implements PcepValueType {
 
     /*
      * Reference: PCEP Extension for Transporting TE Data draft-dhodylee-pce-pcep-te-data-extn-02
@@ -47,7 +47,7 @@ public class TELinkDescriptorsTLV implements PcepValueType {
 
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(TELinkDescriptorsTLV.class);
+    protected static final Logger log = LoggerFactory.getLogger(TELinkDescriptorsTlv.class);
 
     public static final short TYPE = 1070; //TODD:change this TBD14
     public short hLength;
@@ -62,7 +62,7 @@ public class TELinkDescriptorsTLV implements PcepValueType {
      *
      * @param llLinkDescriptorsSubTLVs of PcepValueType
      */
-    public TELinkDescriptorsTLV(LinkedList<PcepValueType> llLinkDescriptorsSubTLVs) {
+    public TELinkDescriptorsTlv(LinkedList<PcepValueType> llLinkDescriptorsSubTLVs) {
         this.llLinkDescriptorsSubTLVs = llLinkDescriptorsSubTLVs;
     }
 
@@ -72,8 +72,8 @@ public class TELinkDescriptorsTLV implements PcepValueType {
      * @param llLinkDescriptorsSubTLVs of PcepValueType
      * @return object of TELinkDescriptorsTLV
      */
-    public static TELinkDescriptorsTLV of(final LinkedList<PcepValueType> llLinkDescriptorsSubTLVs) {
-        return new TELinkDescriptorsTLV(llLinkDescriptorsSubTLVs);
+    public static TELinkDescriptorsTlv of(final LinkedList<PcepValueType> llLinkDescriptorsSubTLVs) {
+        return new TELinkDescriptorsTlv(llLinkDescriptorsSubTLVs);
     }
 
     /**
@@ -118,13 +118,13 @@ public class TELinkDescriptorsTLV implements PcepValueType {
          * the size, if both are same then we should check for the subtlv objects otherwise
          * we should return false.
          */
-        if (obj instanceof TELinkDescriptorsTLV) {
+        if (obj instanceof TELinkDescriptorsTlv) {
             int countObjSubTlv = 0;
             int countOtherSubTlv = 0;
             boolean isCommonSubTlv = true;
-            TELinkDescriptorsTLV other = (TELinkDescriptorsTLV) obj;
-            Iterator<PcepValueType> objListIterator = ((TELinkDescriptorsTLV) obj).llLinkDescriptorsSubTLVs.iterator();
-            countObjSubTlv = ((TELinkDescriptorsTLV) obj).llLinkDescriptorsSubTLVs.size();
+            TELinkDescriptorsTlv other = (TELinkDescriptorsTlv) obj;
+            Iterator<PcepValueType> objListIterator = ((TELinkDescriptorsTlv) obj).llLinkDescriptorsSubTLVs.iterator();
+            countObjSubTlv = ((TELinkDescriptorsTlv) obj).llLinkDescriptorsSubTLVs.size();
             countOtherSubTlv = other.llLinkDescriptorsSubTLVs.size();
             if (countObjSubTlv != countOtherSubTlv) {
                 return false;
@@ -237,7 +237,7 @@ public class TELinkDescriptorsTLV implements PcepValueType {
 
             throw new PcepParseException("Sub Tlv parsing error. Extra bytes received.");
         }
-        return new TELinkDescriptorsTLV(llLinkDescriptorsSubTLVs);
+        return new TELinkDescriptorsTlv(llLinkDescriptorsSubTLVs);
     }
 
     @Override

-/*
 * Copyright 2015 Open Networking Laboratory
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */package org.onosproject.pcepio;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
import java.util.LinkedList;
import org.onosproject.pcepio.types.LocalTENodeDescriptorsTLV;import org.onosproject.pcepio.types.AutonomousSystemTlv;import org.onosproject.pcepio.types.BGPLSidentifierTlv;import org.onosproject.pcepio.types.PcepValueType;
/**
 * Test of the LocalTENodeDescriptorsTlv.
 */public class LocalTENodeDescriptorsTlvTest {

    private final AutonomousSystemTlv baAutoSysTlvRawValue1 = new AutonomousSystemTlv(1);
    private final BGPLSidentifierTlv baBgplsIdRawValue1 = new BGPLSidentifierTlv(1);

    private final AutonomousSystemTlv baAutoSysTlvRawValue2 = new AutonomousSystemTlv(2);
    private final BGPLSidentifierTlv baBgplsIdRawValue2 = new BGPLSidentifierTlv(2);

    private final LinkedList<PcepValueType> llNodeDescriptorSubTLVs1 = new LinkedList<PcepValueType>();
    private final boolean a = llNodeDescriptorSubTLVs1.add(baAutoSysTlvRawValue1);
    private final boolean b = llNodeDescriptorSubTLVs1.add(baBgplsIdRawValue1);

    private final LinkedList<PcepValueType> llNodeDescriptorSubTLVs2 = new LinkedList<PcepValueType>();
    private final boolean c = llNodeDescriptorSubTLVs2.add(baAutoSysTlvRawValue2);
    private final boolean d = llNodeDescriptorSubTLVs2.add(baBgplsIdRawValue2);

    private final LocalTENodeDescriptorsTLV tlv1 = LocalTENodeDescriptorsTLV.of(llNodeDescriptorSubTLVs1);
    private final LocalTENodeDescriptorsTLV sameAstlv1 = LocalTENodeDescriptorsTLV.of(llNodeDescriptorSubTLVs1);
    private final LocalTENodeDescriptorsTLV tlv2 = LocalTENodeDescriptorsTLV.of(llNodeDescriptorSubTLVs2);

    @Test
    public void basics() {
        new EqualsTester().addEqualityGroup(tlv1, sameAstlv1).addEqualityGroup(tlv2).testEquals();
    }}
\ No newline at end of file
+/*
 * Copyright 2015 Open Networking Laboratory
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */package org.onosproject.pcepio;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
import java.util.LinkedList;
import org.onosproject.pcepio.types.LocalTENodeDescriptorsTlv;import org.onosproject.pcepio.types.AutonomousSystemTlv;import org.onosproject.pcepio.types.BGPLSidentifierTlv;import org.onosproject.pcepio.types.PcepValueType;
/**
 * Test of the LocalTENodeDescriptorsTlv.
 */public class LocalTENodeDescriptorsTlvTest {

    private final AutonomousSystemTlv baAutoSysTlvRawValue1 = new AutonomousSystemTlv(1);
    private final BGPLSidentifierTlv baBgplsIdRawValue1 = new BGPLSidentifierTlv(1);

    private final AutonomousSystemTlv baAutoSysTlvRawValue2 = new AutonomousSystemTlv(2);
    private final BGPLSidentifierTlv baBgplsIdRawValue2 = new BGPLSidentifierTlv(2);

    private final LinkedList<PcepValueType> llNodeDescriptorSubTLVs1 = new LinkedList<PcepValueType>();
    private final boolean a = llNodeDescriptorSubTLVs1.add(baAutoSysTlvRawValue1);
    private final boolean b = llNodeDescriptorSubTLVs1.add(baBgplsIdRawValue1);

    private final LinkedList<PcepValueType> llNodeDescriptorSubTLVs2 = new LinkedList<PcepValueType>();
    private final boolean c = llNodeDescriptorSubTLVs2.add(baAutoSysTlvRawValue2);
    private final boolean d = llNodeDescriptorSubTLVs2.add(baBgplsIdRawValue2);

    private final LocalTENodeDescriptorsTlv tlv1 = LocalTENodeDescriptorsTlv.of(llNodeDescriptorSubTLVs1);
    private final LocalTENodeDescriptorsTlv sameAstlv1 = LocalTENodeDescriptorsTlv.of(llNodeDescriptorSubTLVs1);
    private final LocalTENodeDescriptorsTlv tlv2 = LocalTENodeDescriptorsTlv.of(llNodeDescriptorSubTLVs2);

    @Test
    public void basics() {
        new EqualsTester().addEqualityGroup(tlv1, sameAstlv1).addEqualityGroup(tlv2).testEquals();
    }}
\ No newline at end of file

@@ -21,14 +21,14 @@ import org.junit.Test;
 import org.onosproject.pcepio.types.AutonomousSystemTlv;
 import org.onosproject.pcepio.types.BGPLSidentifierTlv;
 import org.onosproject.pcepio.types.PcepValueType;
-import org.onosproject.pcepio.types.RemoteTENodeDescriptorsTLV;
+import org.onosproject.pcepio.types.RemoteTENodeDescriptorsTlv;
 
 import com.google.common.testing.EqualsTester;
 
 /**
  * Test case for Remote TE Node Descriptors tlv.
  */
-public class RemoteTENodeDescriptorsTLVTest {
+public class RemoteTENodeDescriptorsTlvTest {
 
     private final AutonomousSystemTlv autonomousSystemTlv1 = new AutonomousSystemTlv(10);
     private final BGPLSidentifierTlv bGPLSidentifierTlv1 = new BGPLSidentifierTlv(20);
@@ -44,10 +44,10 @@ public class RemoteTENodeDescriptorsTLVTest {
     private final boolean c = llRemoteTENodeDescriptorSubTLV2.add(autonomousSystemTlv2);
     private final boolean d = llRemoteTENodeDescriptorSubTLV2.add(bGPLSidentifierTlv2);
 
-    private final RemoteTENodeDescriptorsTLV tlv1 = RemoteTENodeDescriptorsTLV.of(llRemoteTENodeDescriptorSubTLV1);
-    private final RemoteTENodeDescriptorsTLV sameAsTlv1 =
-            RemoteTENodeDescriptorsTLV.of(llRemoteTENodeDescriptorSubTLV1);
-    private final RemoteTENodeDescriptorsTLV tlv2 = RemoteTENodeDescriptorsTLV.of(llRemoteTENodeDescriptorSubTLV2);
+    private final RemoteTENodeDescriptorsTlv tlv1 = RemoteTENodeDescriptorsTlv.of(llRemoteTENodeDescriptorSubTLV1);
+    private final RemoteTENodeDescriptorsTlv sameAsTlv1 =
+            RemoteTENodeDescriptorsTlv.of(llRemoteTENodeDescriptorSubTLV1);
+    private final RemoteTENodeDescriptorsTlv tlv2 = RemoteTENodeDescriptorsTlv.of(llRemoteTENodeDescriptorSubTLV2);
 
     @Test
     public void basics() {

@@ -17,18 +17,18 @@
 package org.onosproject.pcepio;
 
 import org.junit.Test;
-import org.onosproject.pcepio.types.RoutingUniverseTLV;
+import org.onosproject.pcepio.types.RoutingUniverseTlv;
 
 import com.google.common.testing.EqualsTester;
 
 /**
  * Equality test for RoutingUniverseTlv.
  */
-public class RoutingUniverseTLVTest {
+public class RoutingUniverseTlvTest {
 
-    private final RoutingUniverseTLV tlv1 = RoutingUniverseTLV.of(2);
-    private final RoutingUniverseTLV tlv2 = RoutingUniverseTLV.of(2);
-    private final RoutingUniverseTLV tlv3 = RoutingUniverseTLV.of(3);
+    private final RoutingUniverseTlv tlv1 = RoutingUniverseTlv.of(2);
+    private final RoutingUniverseTlv tlv2 = RoutingUniverseTlv.of(2);
+    private final RoutingUniverseTlv tlv3 = RoutingUniverseTlv.of(3);
 
     @Test
     public void basics() {

@@ -21,14 +21,14 @@ import org.junit.Test;
 import org.onosproject.pcepio.types.IPv4InterfaceAddressTlv;
 import org.onosproject.pcepio.types.LinkLocalRemoteIdentifiersTlv;
 import org.onosproject.pcepio.types.PcepValueType;
-import org.onosproject.pcepio.types.TELinkDescriptorsTLV;
+import org.onosproject.pcepio.types.TELinkDescriptorsTlv;
 
 import com.google.common.testing.EqualsTester;
 
 /**
  * Test case for TE link descriptors Tlv.
  */
-public class TELinkDescriptorsTLVTest {
+public class TELinkDescriptorsTlvTest {
     private final LinkLocalRemoteIdentifiersTlv linkLocalRemoteIdentifiersTlv1 = new
             LinkLocalRemoteIdentifiersTlv(10, 10);
     private final IPv4InterfaceAddressTlv iPv4InterfaceAddressTlv1 = new IPv4InterfaceAddressTlv(0x01010101);
@@ -45,9 +45,9 @@ public class TELinkDescriptorsTLVTest {
     private final boolean c = llLinkDescriptorsSubTLVs2.add(linkLocalRemoteIdentifiersTlv2);
     private final boolean d = llLinkDescriptorsSubTLVs2.add(iPv4InterfaceAddressTlv2);
 
-    private final TELinkDescriptorsTLV tlv1 = TELinkDescriptorsTLV.of(llLinkDescriptorsSubTLVs1);
-    private final TELinkDescriptorsTLV sameAstlv1 = TELinkDescriptorsTLV.of(llLinkDescriptorsSubTLVs1);
-    private final TELinkDescriptorsTLV tlv2 = TELinkDescriptorsTLV.of(llLinkDescriptorsSubTLVs2);
+    private final TELinkDescriptorsTlv tlv1 = TELinkDescriptorsTlv.of(llLinkDescriptorsSubTLVs1);
+    private final TELinkDescriptorsTlv sameAstlv1 = TELinkDescriptorsTlv.of(llLinkDescriptorsSubTLVs1);
+    private final TELinkDescriptorsTlv tlv2 = TELinkDescriptorsTlv.of(llLinkDescriptorsSubTLVs2);
 
     @Test
     public void basics() {