Bug-602: Fixed PcepRpObjectWithPstTlvParser Tlvs augmentation class

Change-Id: Ic824b025139261e9d8c0348c26da7c6e860f24bb
Signed-off-by: Milos Fabian <milfabia@cisco.com>

diff --git a/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/lsp/setup/type01/PcepRpObjectWithPstTlvParser.java b/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/lsp/setup/type01/PcepRpObjectWithPstTlvParser.java
index 550069bf52c285f903d9a86dc7b6728ff03d96cc..012cbc587b7ff4257188e242fe2ef9f1811a081a 100644 (file)
--- a/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/lsp/setup/type01/PcepRpObjectWithPstTlvParser.java
+++ b/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/lsp/setup/type01/PcepRpObjectWithPstTlvParser.java
@@ -11,8 +11,8 @@ package org.opendaylight.protocol.pcep.lsp.setup.type01;
 import org.opendaylight.protocol.pcep.impl.object.PCEPRequestParameterObjectParser;
 import org.opendaylight.protocol.pcep.spi.TlvRegistry;
 import org.opendaylight.protocol.util.ByteArray;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.lsp.setup.type._01.rev140507.Tlvs3;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.lsp.setup.type._01.rev140507.Tlvs3Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.lsp.setup.type._01.rev140507.Tlvs1;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.lsp.setup.type._01.rev140507.Tlvs1Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.lsp.setup.type._01.rev140507.path.setup.type.tlv.PathSetupType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Tlv;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.rp.object.RpBuilder;
@@ -28,10 +28,10 @@ public class PcepRpObjectWithPstTlvParser extends PCEPRequestParameterObjectPars
     @Override
     public void addTlv(RpBuilder builder, Tlv tlv) {
         super.addTlv(builder, tlv);
-        final Tlvs3Builder tlvBuilder = new Tlvs3Builder();
+        final Tlvs1Builder tlvBuilder = new Tlvs1Builder();
         if (builder.getTlvs() != null) {
-            if (builder.getTlvs().getAugmentation(Tlvs3.class) != null) {
-                final Tlvs3 t = builder.getTlvs().getAugmentation(Tlvs3.class);
+            if (builder.getTlvs().getAugmentation(Tlvs1.class) != null) {
+                final Tlvs1 t = builder.getTlvs().getAugmentation(Tlvs1.class);
                 if (t.getPathSetupType() != null) {
                     tlvBuilder.setPathSetupType(t.getPathSetupType());
                 }
@@ -40,7 +40,7 @@ public class PcepRpObjectWithPstTlvParser extends PCEPRequestParameterObjectPars
         if (tlv instanceof PathSetupType) {
             tlvBuilder.setPathSetupType((PathSetupType) tlv);
         }
-        builder.setTlvs(new TlvsBuilder().addAugmentation(Tlvs3.class, tlvBuilder.build()).build());
+        builder.setTlvs(new TlvsBuilder().addAugmentation(Tlvs1.class, tlvBuilder.build()).build());
     }
 
     @Override
@@ -51,8 +51,8 @@ public class PcepRpObjectWithPstTlvParser extends PCEPRequestParameterObjectPars
         final byte[] prev = super.serializeTlvs(tlvs);
         int finalLength = prev.length;
         byte[] nameBytes = null;
-        if (tlvs.getAugmentation(Tlvs3.class) != null) {
-            final Tlvs3 nameTlvs = tlvs.getAugmentation(Tlvs3.class);
+        if (tlvs.getAugmentation(Tlvs1.class) != null) {
+            final Tlvs1 nameTlvs = tlvs.getAugmentation(Tlvs1.class);
             if (nameTlvs.getPathSetupType() != null) {
                 nameBytes = serializeTlv(nameTlvs.getPathSetupType());
                 finalLength += nameBytes.length;

diff --git a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/lsp/setup/type01/PcepObjectParserTest.java b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/lsp/setup/type01/PcepObjectParserTest.java
index b57a99c9253ac56e21ebbdf34413047786f2aec1..66a2c8c9df7c425ef337ea025fb53624b6b4f694 100644 (file)
--- a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/lsp/setup/type01/PcepObjectParserTest.java
+++ b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/lsp/setup/type01/PcepObjectParserTest.java
@@ -24,8 +24,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.cra
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev131126.Srp1Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.SrpIdNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.srp.object.SrpBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.lsp.setup.type._01.rev140507.Tlvs3;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.lsp.setup.type._01.rev140507.Tlvs3Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.lsp.setup.type._01.rev140507.Tlvs1;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.lsp.setup.type._01.rev140507.Tlvs1Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.lsp.setup.type._01.rev140507.Tlvs8;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.lsp.setup.type._01.rev140507.Tlvs8Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.lsp.setup.type._01.rev140507.path.setup.type.tlv.PathSetupTypeBuilder;
@@ -76,8 +76,8 @@ public class PcepObjectParserTest {
         builder.setEroCompression(false);
         builder.setPriority((short) 5);
         builder.setRequestId(new RequestId(0xdeadbeefL));
-        builder.setTlvs(new TlvsBuilder().addAugmentation(Tlvs3.class,
-                new Tlvs3Builder().setPathSetupType(new PathSetupTypeBuilder().setPst(true).build()).build()).build());
+        builder.setTlvs(new TlvsBuilder().addAugmentation(Tlvs1.class,
+                new Tlvs1Builder().setPathSetupType(new PathSetupTypeBuilder().setPst(true).build()).build()).build());
 
         final ByteBuf result = Unpooled.wrappedBuffer(rpObjectWithPstTlvBytes);
         assertEquals(builder.build(),