X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pcep%2Fspi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fprotocol%2Fpcep%2Fspi%2FAbstractObjectWithTlvsParser.java;h=f6999e16ece31bc8a7c36fc4695708a00400ccdd;hb=1f18c032706004ce9bf0fcc648090ec5211b945a;hp=ec57536c6b4e2bff98c993359613da20c929b8d9;hpb=c892860728a08edf372880c612c217b4954c568c;p=bgpcep.git

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 ec57536c6b..f6999e16ec 100644
--- 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,29 +7,33 @@
  */
 package org.opendaylight.protocol.pcep.spi;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
 
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Tlv;
+import java.util.List;
+import java.util.Optional;
+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.rev181109.Tlv;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.vendor.information.tlvs.VendorInformationTlv;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public abstract class AbstractObjectWithTlvsParser<T> implements ObjectParser, ObjectSerializer {
+public abstract class AbstractObjectWithTlvsParser<T> extends CommonObjectParser implements ObjectSerializer {
 
     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;
-
-    protected static final int PADDED_TO = 4;
-
     private final TlvRegistry tlvReg;
 
-    protected AbstractObjectWithTlvsParser(final TlvRegistry tlvReg) {
-        this.tlvReg = Preconditions.checkNotNull(tlvReg);
+    private final VendorInformationTlvRegistry viTlvReg;
+
+    protected AbstractObjectWithTlvsParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg,
+        final int objectClass, final int objectType) {
+        super(objectClass, objectType);
+        this.tlvReg = requireNonNull(tlvReg);
+        this.viTlvReg = requireNonNull(viTlvReg);
     }
 
     protected final void parseTlvs(final T builder, final ByteBuf bytes) throws PCEPDeserializerException {
@@ -37,34 +41,56 @@ 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);
-            LOG.trace("Attempt to parse tlv from bytes: {}", ByteBufUtil.hexDump(tlvBytes));
-            final Tlv tlv = this.tlvReg.parseTlv(type, tlvBytes);
-            LOG.trace("Tlv was parsed. {}", tlv);
-            addTlv(builder, tlv);
-            bytes.readerIndex(bytes.readerIndex() + length + getPadding(TLV_HEADER_LENGTH + length, PADDED_TO));
+            final ByteBuf tlvBytes = bytes.readSlice(length);
+            LOG.trace("Parsing PCEP TLV : {}", ByteBufUtil.hexDump(tlvBytes));
+
+            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) {
-        Preconditions.checkNotNull(tlv, "PCEP TLV is mandatory.");
+        requireNonNull(tlv, "PCEP TLV is mandatory.");
         LOG.trace("Serializing PCEP TLV {}", tlv);
         this.tlvReg.serializeTlv(tlv, buffer);
-        LOG.trace("Serialized PCEP TLV {}.", ByteBufUtil.hexDump(buffer));
+        LOG.trace("Serialized PCEP TLV : {}.", ByteBufUtil.hexDump(buffer));
     }
 
     protected void addTlv(final T builder, final Tlv tlv) {
         // FIXME: No TLVs by default, fallback to augments
     }
 
-    public static int getPadding(final int length, final int padding) {
-        return (padding - (length % padding)) % padding;
+    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));
+            }
+        }
     }
 }