BUG-5731: Send Error Message if LSP-IDENTIFIERS TLV is missing

[bgpcep.git] / pcep / spi / src / main / java / org / opendaylight / protocol / pcep / spi / AbstractObjectWithTlvsParser.java

diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractObjectWithTlvsParser.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractObjectWithTlvsParser.java
index 3a79af9decaf121811f45a45cab82dc141599374..3b5768716bdc229ebef6e89f7fc8bbfdee698a4c 100644 (file)
--- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractObjectWithTlvsParser.java
+++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractObjectWithTlvsParser.java
@@ -7,10 +7,15 @@
  */
 package org.opendaylight.protocol.pcep.spi;
 
+import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
+import java.util.List;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.iana.rev130816.EnterpriseNumber;
 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.vendor.information.tlvs.VendorInformationTlv;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,16 +23,13 @@ public abstract class AbstractObjectWithTlvsParser<T> implements ObjectParser, O
 
     private static final Logger LOG = LoggerFactory.getLogger(AbstractObjectWithTlvsParser.class);
 
-    private static final int TLV_TYPE_F_LENGTH = 2;
-    private static final int TLV_LENGTH_F_LENGTH = 2;
-    private static final int TLV_HEADER_LENGTH = TLV_LENGTH_F_LENGTH + TLV_TYPE_F_LENGTH;
-
-    public static final int PADDED_TO = 4;
-
     private final TlvRegistry tlvReg;
 
-    protected AbstractObjectWithTlvsParser(final TlvRegistry tlvReg) {
+    private final VendorInformationTlvRegistry viTlvReg;
+
+    protected AbstractObjectWithTlvsParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg) {
         this.tlvReg = Preconditions.checkNotNull(tlvReg);
+        this.viTlvReg = Preconditions.checkNotNull(viTlvReg);
     }
 
     protected final void parseTlvs(final T builder, final ByteBuf bytes) throws PCEPDeserializerException {
@@ -35,20 +37,34 @@ public abstract class AbstractObjectWithTlvsParser<T> implements ObjectParser, O
         if (!bytes.isReadable()) {
             return;
         }
+        final List<VendorInformationTlv> viTlvs = Lists.newArrayList();
         while (bytes.isReadable()) {
-            int type = bytes.readUnsignedShort();
-            int length = bytes.readUnsignedShort();
+            final int type = bytes.readUnsignedShort();
+            final int length = bytes.readUnsignedShort();
             if (length > bytes.readableBytes()) {
                 throw new PCEPDeserializerException("Wrong length specified. Passed: " + length + "; Expected: <= " + bytes.readableBytes()
                     + ".");
             }
-            final ByteBuf tlvBytes = bytes.slice(bytes.readerIndex(), length);
+            final ByteBuf tlvBytes = bytes.readSlice(length);
             LOG.trace("Parsing PCEP TLV : {}", ByteBufUtil.hexDump(tlvBytes));
-            final Tlv tlv = this.tlvReg.parseTlv(type, tlvBytes);
-            LOG.trace("Parsed PCEP TLV {}.", tlv);
-            addTlv(builder, tlv);
-            bytes.skipBytes(length + TlvUtil.getPadding(TlvUtil.HEADER_SIZE + length, TlvUtil.PADDED_TO));
+
+            if (VendorInformationUtil.isVendorInformationTlv(type)) {
+                final EnterpriseNumber enterpriseNumber = new EnterpriseNumber(tlvBytes.readUnsignedInt());
+                final Optional<VendorInformationTlv> viTlv = this.viTlvReg.parseVendorInformationTlv(enterpriseNumber, tlvBytes);
+                if(viTlv.isPresent()) {
+                    LOG.trace("Parsed VENDOR-INFORMATION TLV {}.", viTlv.get());
+                    viTlvs.add(viTlv.get());
+                }
+            } else {
+                final Tlv tlv = this.tlvReg.parseTlv(type, tlvBytes);
+                if(tlv != null) {
+                    LOG.trace("Parsed PCEP TLV {}.", tlv);
+                    addTlv(builder, tlv);
+                }
+            }
+            bytes.skipBytes(TlvUtil.getPadding(TlvUtil.HEADER_SIZE + length, TlvUtil.PADDED_TO));
         }
+        addVendorInformationTlvs(builder, viTlvs);
     }
 
     protected final void serializeTlv(final Tlv tlv, final ByteBuf buffer) {
@@ -61,4 +77,16 @@ public abstract class AbstractObjectWithTlvsParser<T> implements ObjectParser, O
     protected void addTlv(final T builder, final Tlv tlv) {
         // FIXME: No TLVs by default, fallback to augments
     }
+
+    protected abstract void addVendorInformationTlvs(final T builder, final List<VendorInformationTlv> tlvs);
+
+    protected final void serializeVendorInformationTlvs(final List<VendorInformationTlv> tlvs, final ByteBuf buffer) {
+        if (tlvs != null) {
+            for (final VendorInformationTlv tlv : tlvs) {
+                LOG.trace("Serializing VENDOR-INFORMATION TLV {}", tlv);
+                this.viTlvReg.serializeVendorInformationTlv(tlv, buffer);
+                LOG.trace("Serialized VENDOR-INFORMATION TLV : {}.", ByteBufUtil.hexDump(buffer));
+            }
+        }
+    }
 }