From 42d113e3e191c68cb5141a69dede0ef55770bcd7 Mon Sep 17 00:00:00 2001 From: Milos Fabian Date: Thu, 19 Feb 2015 17:43:44 +0100 Subject: [PATCH] BUG-2738 : fixed path setup tlv type Change-Id: Ic19c57a9a614bacd9be2709b09c2e94214276282 Signed-off-by: Dana Kutenicsova Signed-off-by: Milos Fabian --- .../protocol/pcep/ietf/PCEPObjectParserTest.java | 2 +- .../protocol/pcep/impl/tlv/PathSetupTypeTlvParser.java | 9 ++++----- .../protocol/pcep/impl/PCEPObjectParserTest.java | 2 +- .../protocol/pcep/impl/PCEPTlvParserTest.java | 4 ++-- .../protocol/pcep/segment/routing/SrTlvParserTest.java | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPObjectParserTest.java b/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPObjectParserTest.java index de6fbe6744..ce4d9f56d6 100644 --- a/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPObjectParserTest.java +++ b/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPObjectParserTest.java @@ -228,7 +228,7 @@ public class PCEPObjectParserTest { final byte[] srpObjectWithPstTlvBytes = { 0x21, 0x10, 0x00, 0x14, 0x0, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x01, /* pst-tlv */ - 0x0, 0x1b, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }; + 0x0, 0x1C, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }; final CInitiated00SrpObjectParser parser = new CInitiated00SrpObjectParser(this.tlvRegistry, this.viTlvRegistry); SrpBuilder builder = new SrpBuilder(); builder.setProcessingRule(false); diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/PathSetupTypeTlvParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/PathSetupTypeTlvParser.java index 0b72a4c35d..8f87502a7f 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/PathSetupTypeTlvParser.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/PathSetupTypeTlvParser.java @@ -25,8 +25,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ public class PathSetupTypeTlvParser implements TlvParser, TlvSerializer { - // http://tools.ietf.org/html/draft-sivabalan-pce-ietf-routing-00#section-9.3 - public static final int TYPE = 27; + public static final int TYPE = 28; private static final int CONTENT_LENGTH = 4; private static final int PST_LENGTH = 1; @@ -41,18 +40,18 @@ public class PathSetupTypeTlvParser implements TlvParser, TlvSerializer { } @Override - public void serializeTlv(Tlv tlv, ByteBuf buffer) { + public void serializeTlv(final Tlv tlv, final ByteBuf buffer) { Preconditions.checkArgument(tlv instanceof PathSetupType, "PathSetupType is mandatory."); final PathSetupType pstTlv = (PathSetupType) tlv; Preconditions.checkArgument(checkPST(pstTlv.getPst()), UNSUPPORTED_PST); - ByteBuf body = Unpooled.buffer(CONTENT_LENGTH); + final ByteBuf body = Unpooled.buffer(CONTENT_LENGTH); body.writeZero(OFFSET); writeUnsignedByte(pstTlv.getPst(), body); TlvUtil.formatTlv(TYPE, body, buffer); } @Override - public Tlv parseTlv(ByteBuf buffer) throws PCEPDeserializerException { + public Tlv parseTlv(final ByteBuf buffer) throws PCEPDeserializerException { if (buffer == null) { return null; } diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java index 6cdfdb13bd..2292cc5d03 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java @@ -1268,7 +1268,7 @@ public class PCEPObjectParserTest { final byte[] rpObjectWithPstTlvBytes = { 0x2, 0x10, 0x0, 0x14, 0x0, 0x0, 0x4, 0x2d, (byte) 0xde, (byte) 0xad, (byte) 0xbe, (byte) 0xef, /* pst-tlv */ - 0x0, 0x1b, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }; + 0x0, 0x1C, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }; final PCEPRequestParameterObjectParser parser = new PCEPRequestParameterObjectParser(this.tlvRegistry, this.viTlvRegistry); final RpBuilder builder = new RpBuilder(); diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPTlvParserTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPTlvParserTest.java index 5917891162..cbd21943c8 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPTlvParserTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPTlvParserTest.java @@ -66,9 +66,9 @@ public class PCEPTlvParserTest { 0x00, 0x00, 0x00, 0x05 }; - private static final byte[] PST_TLV_BYTES = { 0x0, 0x1b, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }; + private static final byte[] PST_TLV_BYTES = { 0x0, 0x1C, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }; - private static final byte[] PST_TLV_BYTES_UNSUPPORTED = { 0x0, 0x1b, 0x0, 0x4, 0x0, 0x0, 0x0, 0x1 }; + private static final byte[] PST_TLV_BYTES_UNSUPPORTED = { 0x0, 0x1C, 0x0, 0x4, 0x0, 0x0, 0x0, 0x1 }; private final AbstractVendorSpecificTlvParser vsParser = new AbstractVendorSpecificTlvParser() { diff --git a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrTlvParserTest.java b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrTlvParserTest.java index 0854f7327a..68515b3b46 100644 --- a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrTlvParserTest.java +++ b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrTlvParserTest.java @@ -25,7 +25,7 @@ public class SrTlvParserTest { private static final byte[] SPC_TLV_BYTES = { 0x0, 0x1a, 0x0, 0x4, 0x0, 0x0, 0x0, 0x1 }; - private static final byte[] SR_TE_PST_BYTES = { 0x0, 0x1b, 0x0, 0x4, 0x0, 0x0, 0x0, 0x1 }; + private static final byte[] SR_TE_PST_BYTES = { 0x0, 0x1C, 0x0, 0x4, 0x0, 0x0, 0x0, 0x1 }; @Test public void testSrPceCapabilityParser() throws PCEPDeserializerException { -- 2.36.6