BUG-130 : split LSPIdentifiers parser to Ipv4 and Ipv6.

Change-Id: I60d20d2c3087a067d8b521edced6443b655d28aa
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/Activator.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/Activator.java
index e6d9c76cd695fa73dca88549124969cc1983e24f..1904edfe24b81629e84fa7301bea1d85766642a8 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/Activator.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/Activator.java
@@ -58,7 +58,8 @@ import org.opendaylight.protocol.pcep.impl.subobject.XROIpPrefixSubobjectParser;
 import org.opendaylight.protocol.pcep.impl.subobject.XROPathKeySubobjectParser;
 import org.opendaylight.protocol.pcep.impl.subobject.XROSRLGSubobjectParser;
 import org.opendaylight.protocol.pcep.impl.subobject.XROUnnumberedInterfaceSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.tlv.LSPIdentifierTlvParser;
+import org.opendaylight.protocol.pcep.impl.tlv.LSPIdentifierIpv4TlvParser;
+import org.opendaylight.protocol.pcep.impl.tlv.LSPIdentifierIpv6TlvParser;
 import org.opendaylight.protocol.pcep.impl.tlv.LspDbVersionTlvParser;
 import org.opendaylight.protocol.pcep.impl.tlv.LspSymbolicNameTlvParser;
 import org.opendaylight.protocol.pcep.impl.tlv.LspUpdateErrorTlvParser;
@@ -202,8 +203,8 @@ public final class Activator extends AbstractPCEPExtensionProviderActivator {
                context.registerTlvParser(OrderTlvParser.TYPE, new OrderTlvParser());
                context.registerTlvParser(PCEStatefulCapabilityTlvParser.TYPE, new PCEStatefulCapabilityTlvParser());
                context.registerTlvParser(LspSymbolicNameTlvParser.TYPE, new LspSymbolicNameTlvParser());
-               context.registerTlvParser(LSPIdentifierTlvParser.TYPE, new LSPIdentifierTlvParser());
-               context.registerTlvParser(LSPIdentifierTlvParser.TYPE_6, new LSPIdentifierTlvParser());
+               context.registerTlvParser(LSPIdentifierIpv4TlvParser.TYPE, new LSPIdentifierIpv4TlvParser());
+               context.registerTlvParser(LSPIdentifierIpv6TlvParser.TYPE, new LSPIdentifierIpv6TlvParser());
                context.registerTlvParser(LspUpdateErrorTlvParser.TYPE, new LspUpdateErrorTlvParser());
                context.registerTlvParser(RSVPErrorSpecTlvParser.TYPE, new RSVPErrorSpecTlvParser());
                context.registerTlvParser(LspDbVersionTlvParser.TYPE, new LspDbVersionTlvParser());
@@ -216,7 +217,7 @@ public final class Activator extends AbstractPCEPExtensionProviderActivator {
                context.registerTlvSerializer(Order.class, new OrderTlvParser());
                context.registerTlvSerializer(Stateful.class, new PCEStatefulCapabilityTlvParser());
                context.registerTlvSerializer(SymbolicPathName.class, new LspSymbolicNameTlvParser());
-               context.registerTlvSerializer(LspIdentifiers.class, new LSPIdentifierTlvParser());
+               context.registerTlvSerializer(LspIdentifiers.class, new LSPIdentifierIpv4TlvParser());
                context.registerTlvSerializer(LspErrorCode.class, new LspUpdateErrorTlvParser());
                context.registerTlvSerializer(RsvpErrorSpec.class, new RSVPErrorSpecTlvParser());
                context.registerTlvSerializer(LspDbVersion.class, new LspDbVersionTlvParser());

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/LSPIdentifierIpv4TlvParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/LSPIdentifierIpv4TlvParser.java
new file mode 100644 (file)
index 0000000..9908e41
--- /dev/null
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/LSPIdentifierIpv4TlvParser.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.protocol.pcep.impl.tlv;
+
+import org.opendaylight.protocol.concepts.Ipv4Util;
+import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
+import org.opendaylight.protocol.pcep.spi.TlvParser;
+import org.opendaylight.protocol.pcep.spi.TlvSerializer;
+import org.opendaylight.protocol.util.ByteArray;
+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.lsp.identifiers.tlv.LspIdentifiers;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.LspIdentifiersBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.lsp.identifiers.AddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.lsp.identifiers.address.family.Ipv4Case;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.lsp.identifiers.address.family.Ipv4CaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.lsp.identifiers.address.family.Ipv6Case;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.lsp.identifiers.address.family.ipv4._case.Ipv4;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.lsp.identifiers.address.family.ipv4._case.Ipv4Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.Ipv4ExtendedTunnelId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.LspId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.TunnelId;
+
+/**
+ * Parser for {@link LspIdentifiers}
+ */
+public class LSPIdentifierIpv4TlvParser implements TlvParser, TlvSerializer {
+
+       public static final int TYPE = 18;
+
+       private static final int IP4_F_LENGTH = 4;
+       private static final int EX_TUNNEL_ID4_F_LENGTH = 4;
+
+       private static final int LSP_ID_F_LENGTH = 2;
+       private static final int TUNNEL_ID_F_LENGTH = 2;
+
+       private static final int V4_LENGTH = 12;
+
+       @Override
+       public LspIdentifiers parseTlv(final byte[] valueBytes) throws PCEPDeserializerException {
+               if (valueBytes == null || valueBytes.length == 0) {
+                       throw new IllegalArgumentException("Value bytes array is mandatory. Can't be null or empty.");
+               }
+               if (valueBytes.length != V4_LENGTH) {
+                       throw new IllegalArgumentException("Length " + valueBytes.length + " does not match LSP Identifiers Ipv4 tlv length.");
+               }
+               int position = 0;
+               final Ipv4Builder builder = new Ipv4Builder();
+               builder.setIpv4TunnelSenderAddress(Ipv4Util.addressForBytes(ByteArray.subByte(valueBytes, position, IP4_F_LENGTH)));
+               position = IP4_F_LENGTH;
+               final LspId lspId = new LspId(ByteArray.bytesToLong(ByteArray.subByte(valueBytes, position, LSP_ID_F_LENGTH)));
+               position += LSP_ID_F_LENGTH;
+               final TunnelId tunnelId = new TunnelId(ByteArray.bytesToInt(ByteArray.subByte(valueBytes, position, TUNNEL_ID_F_LENGTH)));
+               position += TUNNEL_ID_F_LENGTH;
+               builder.setIpv4ExtendedTunnelId(new Ipv4ExtendedTunnelId(Ipv4Util.addressForBytes(ByteArray.subByte(valueBytes, position,
+                               EX_TUNNEL_ID4_F_LENGTH))));
+               final AddressFamily afi = new Ipv4CaseBuilder().setIpv4(builder.build()).build();
+               position += EX_TUNNEL_ID4_F_LENGTH;
+               return new LspIdentifiersBuilder().setAddressFamily(afi).setLspId(lspId).setTunnelId(tunnelId).build();
+       }
+
+       @Override
+       public byte[] serializeTlv(final Tlv tlv) {
+               if (tlv == null) {
+                       throw new IllegalArgumentException("LspIdentifiersTlv is mandatory.");
+               }
+               final LspIdentifiers lsp = (LspIdentifiers) tlv;
+               final AddressFamily afi = lsp.getAddressFamily();
+
+               if (afi.getImplementedInterface().equals(Ipv6Case.class)) {
+                       return new LSPIdentifierIpv6TlvParser().serializeTlv(tlv);
+
+               }
+               final byte[] bytes = new byte[V4_LENGTH];
+               int offset = 0;
+               final Ipv4 ipv4 = ((Ipv4Case) afi).getIpv4();
+               ByteArray.copyWhole(Ipv4Util.bytesForAddress(ipv4.getIpv4TunnelSenderAddress()), bytes, offset);
+               offset += IP4_F_LENGTH;
+               ByteArray.copyWhole(ByteArray.longToBytes(lsp.getLspId().getValue(), LSP_ID_F_LENGTH), bytes, offset);
+               offset += LSP_ID_F_LENGTH;
+               ByteArray.copyWhole(ByteArray.intToBytes(lsp.getTunnelId().getValue(), TUNNEL_ID_F_LENGTH), bytes, offset);
+               offset += TUNNEL_ID_F_LENGTH;
+               ByteArray.copyWhole(Ipv4Util.bytesForAddress(ipv4.getIpv4ExtendedTunnelId()), bytes, offset);
+               return bytes;
+       }
+
+       @Override
+       public int getType() {
+               return TYPE;
+       }
+}

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/LSPIdentifierIpv6TlvParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/LSPIdentifierIpv6TlvParser.java
new file mode 100644 (file)
index 0000000..9cafa2d
--- /dev/null
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/LSPIdentifierIpv6TlvParser.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.protocol.pcep.impl.tlv;
+
+import org.opendaylight.protocol.concepts.Ipv6Util;
+import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
+import org.opendaylight.protocol.pcep.spi.TlvParser;
+import org.opendaylight.protocol.pcep.spi.TlvSerializer;
+import org.opendaylight.protocol.util.ByteArray;
+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.lsp.identifiers.tlv.LspIdentifiers;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.LspIdentifiersBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.lsp.identifiers.AddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.lsp.identifiers.address.family.Ipv6Case;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.lsp.identifiers.address.family.Ipv6CaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.lsp.identifiers.address.family.ipv6._case.Ipv6;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.lsp.identifiers.address.family.ipv6._case.Ipv6Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.Ipv6ExtendedTunnelId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.LspId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.TunnelId;
+
+/**
+ * Parser for {@link LspIdentifiers}
+ */
+public class LSPIdentifierIpv6TlvParser implements TlvParser, TlvSerializer {
+
+       public static final int TYPE = 19;
+
+       private static final int IP6_F_LENGTH = 16;
+       private static final int EX_TUNNEL_ID6_F_LENGTH = 16;
+
+       private static final int LSP_ID_F_LENGTH = 2;
+       private static final int TUNNEL_ID_F_LENGTH = 2;
+
+       private static final int V6_LENGTH = 36;
+
+       @Override
+       public LspIdentifiers parseTlv(final byte[] valueBytes) throws PCEPDeserializerException {
+               if (valueBytes == null || valueBytes.length == 0) {
+                       throw new IllegalArgumentException("Value bytes array is mandatory. Can't be null or empty.");
+               }
+               if (valueBytes.length != V6_LENGTH) {
+                       throw new IllegalArgumentException("Length " + valueBytes.length + " does not match LSP Identifiers Ipv6 tlv length.");
+               }
+               int position = 0;
+               final Ipv6Builder builder = new Ipv6Builder();
+               builder.setIpv6TunnelSenderAddress(Ipv6Util.addressForBytes(ByteArray.subByte(valueBytes, position, IP6_F_LENGTH)));
+               position += IP6_F_LENGTH;
+               final LspId lspId = new LspId(ByteArray.bytesToLong(ByteArray.subByte(valueBytes, position, LSP_ID_F_LENGTH)));
+               position += LSP_ID_F_LENGTH;
+               final TunnelId tunnelId = new TunnelId(ByteArray.bytesToInt(ByteArray.subByte(valueBytes, position, TUNNEL_ID_F_LENGTH)));
+               position += TUNNEL_ID_F_LENGTH;
+               builder.setIpv6ExtendedTunnelId(new Ipv6ExtendedTunnelId(Ipv6Util.addressForBytes(ByteArray.subByte(valueBytes, position,
+                               EX_TUNNEL_ID6_F_LENGTH))));
+               final AddressFamily afi = new Ipv6CaseBuilder().setIpv6(builder.build()).build();
+               position += EX_TUNNEL_ID6_F_LENGTH;
+               return new LspIdentifiersBuilder().setAddressFamily(afi).setLspId(lspId).setTunnelId(tunnelId).build();
+       }
+
+       @Override
+       public byte[] serializeTlv(final Tlv tlv) {
+               if (tlv == null) {
+                       throw new IllegalArgumentException("LspIdentifiersTlv is mandatory.");
+               }
+               final byte[] bytes = new byte[V6_LENGTH];
+               int offset = 0;
+               final LspIdentifiers lsp = (LspIdentifiers) tlv;
+               final Ipv6 ipv6 = ((Ipv6Case) lsp.getAddressFamily()).getIpv6();
+               ByteArray.copyWhole(Ipv6Util.bytesForAddress(ipv6.getIpv6TunnelSenderAddress()), bytes, offset);
+               offset += IP6_F_LENGTH;
+               ByteArray.copyWhole(ByteArray.longToBytes(lsp.getLspId().getValue(), LSP_ID_F_LENGTH), bytes, offset);
+               offset += LSP_ID_F_LENGTH;
+               ByteArray.copyWhole(ByteArray.intToBytes(lsp.getTunnelId().getValue(), TUNNEL_ID_F_LENGTH), bytes, offset);
+               offset += TUNNEL_ID_F_LENGTH;
+               ByteArray.copyWhole(Ipv6Util.bytesForAddress(ipv6.getIpv6ExtendedTunnelId()), bytes, offset);
+               return bytes;
+       }
+
+       @Override
+       public int getType() {
+               return TYPE;
+       }
+}

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/LSPIdentifierTlvParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/LSPIdentifierTlvParser.java
deleted file mode 100644 (file)
index dfeb31a..0000000
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/LSPIdentifierTlvParser.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.pcep.impl.tlv;
-
-import org.opendaylight.protocol.concepts.Ipv4Util;
-import org.opendaylight.protocol.concepts.Ipv6Util;
-import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
-import org.opendaylight.protocol.pcep.spi.TlvParser;
-import org.opendaylight.protocol.pcep.spi.TlvSerializer;
-import org.opendaylight.protocol.util.ByteArray;
-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.lsp.identifiers.tlv.LspIdentifiers;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.LspIdentifiersBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.lsp.identifiers.AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.lsp.identifiers.address.family.Ipv4Case;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.lsp.identifiers.address.family.Ipv4CaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.lsp.identifiers.address.family.Ipv6Case;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.lsp.identifiers.address.family.Ipv6CaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.lsp.identifiers.address.family.ipv4._case.Ipv4;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.lsp.identifiers.address.family.ipv4._case.Ipv4Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.lsp.identifiers.address.family.ipv6._case.Ipv6;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.lsp.identifiers.tlv.lsp.identifiers.address.family.ipv6._case.Ipv6Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.Ipv4ExtendedTunnelId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.Ipv6ExtendedTunnelId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.LspId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.TunnelId;
-
-/**
- * Parser for {@link LspIdentifiers}
- */
-public class LSPIdentifierTlvParser implements TlvParser, TlvSerializer {
-
-       public static final int TYPE = 18;
-
-       public static final int TYPE_6 = 19;
-
-       private static final int IP6_F_LENGTH = 16;
-       private static final int EX_TUNNEL_ID6_F_LENGTH = 16;
-       private static final int IP4_F_LENGTH = 4;
-       private static final int EX_TUNNEL_ID4_F_LENGTH = 4;
-
-       private static final int LSP_ID_F_LENGTH = 2;
-       private static final int TUNNEL_ID_F_LENGTH = 2;
-
-       private static final int V4_LENGTH = 12;
-       private static final int V6_LENGTH = 36;
-
-       @Override
-       public LspIdentifiers parseTlv(final byte[] valueBytes) throws PCEPDeserializerException {
-               int position = 0;
-               if (valueBytes == null || valueBytes.length == 0) {
-                       throw new IllegalArgumentException("Value bytes array is mandatory. Can't be null or empty.");
-               }
-               AddressFamily afi = null;
-               LspId lspId = null;
-               TunnelId tunnelId = null;
-               if (valueBytes.length == V4_LENGTH) {
-                       final Ipv4Builder builder = new Ipv4Builder();
-                       builder.setIpv4TunnelSenderAddress(Ipv4Util.addressForBytes(ByteArray.subByte(valueBytes, position, IP4_F_LENGTH)));
-                       position += IP4_F_LENGTH;
-                       lspId = new LspId(ByteArray.bytesToLong(ByteArray.subByte(valueBytes, position, LSP_ID_F_LENGTH)));
-                       position += LSP_ID_F_LENGTH;
-                       tunnelId = new TunnelId(ByteArray.bytesToInt(ByteArray.subByte(valueBytes, position, TUNNEL_ID_F_LENGTH)));
-                       position += TUNNEL_ID_F_LENGTH;
-                       builder.setIpv4ExtendedTunnelId(new Ipv4ExtendedTunnelId(Ipv4Util.addressForBytes(ByteArray.subByte(valueBytes, position,
-                                       EX_TUNNEL_ID4_F_LENGTH))));
-                       afi = new Ipv4CaseBuilder().setIpv4(builder.build()).build();
-                       position += EX_TUNNEL_ID4_F_LENGTH;
-               } else if (valueBytes.length == V6_LENGTH) {
-                       final Ipv6Builder builder = new Ipv6Builder();
-                       builder.setIpv6TunnelSenderAddress(Ipv6Util.addressForBytes(ByteArray.subByte(valueBytes, position, IP6_F_LENGTH)));
-                       position += IP6_F_LENGTH;
-                       lspId = new LspId(ByteArray.bytesToLong(ByteArray.subByte(valueBytes, position, LSP_ID_F_LENGTH)));
-                       position += LSP_ID_F_LENGTH;
-                       tunnelId = new TunnelId(ByteArray.bytesToInt(ByteArray.subByte(valueBytes, position, TUNNEL_ID_F_LENGTH)));
-                       position += TUNNEL_ID_F_LENGTH;
-                       builder.setIpv6ExtendedTunnelId(new Ipv6ExtendedTunnelId(Ipv6Util.addressForBytes(ByteArray.subByte(valueBytes, position,
-                                       EX_TUNNEL_ID6_F_LENGTH))));
-                       afi = new Ipv6CaseBuilder().setIpv6(builder.build()).build();
-                       position += EX_TUNNEL_ID6_F_LENGTH;
-               } else {
-                       throw new IllegalArgumentException("Length " + valueBytes.length + " does not match LSP Identifiers tlv lengths.");
-               }
-
-               return new LspIdentifiersBuilder().setAddressFamily(afi).setLspId(lspId).setTunnelId(tunnelId).build();
-       }
-
-       @Override
-       public byte[] serializeTlv(final Tlv tlv) {
-               if (tlv == null) {
-                       throw new IllegalArgumentException("LspIdentifiersTlv is mandatory.");
-               }
-               final LspIdentifiers lsp = (LspIdentifiers) tlv;
-               final AddressFamily afi = lsp.getAddressFamily();
-               int offset = 0;
-               if (afi.getImplementedInterface().equals(Ipv4Case.class)) {
-                       final byte[] bytes = new byte[V4_LENGTH];
-                       final Ipv4 ipv4 = ((Ipv4Case) afi).getIpv4();
-                       ByteArray.copyWhole(Ipv4Util.bytesForAddress(ipv4.getIpv4TunnelSenderAddress()), bytes, offset);
-                       offset += IP4_F_LENGTH;
-                       ByteArray.copyWhole(ByteArray.longToBytes(lsp.getLspId().getValue(), LSP_ID_F_LENGTH), bytes, offset);
-                       offset += LSP_ID_F_LENGTH;
-                       ByteArray.copyWhole(ByteArray.intToBytes(lsp.getTunnelId().getValue(), TUNNEL_ID_F_LENGTH), bytes, offset);
-                       offset += TUNNEL_ID_F_LENGTH;
-                       ByteArray.copyWhole(Ipv4Util.bytesForAddress(ipv4.getIpv4ExtendedTunnelId()), bytes, offset);
-                       return bytes;
-               } else {
-                       final byte[] bytes = new byte[V6_LENGTH];
-                       final Ipv6 ipv6 = ((Ipv6Case) afi).getIpv6();
-                       ByteArray.copyWhole(Ipv6Util.bytesForAddress(ipv6.getIpv6TunnelSenderAddress()), bytes, offset);
-                       offset += IP6_F_LENGTH;
-                       ByteArray.copyWhole(ByteArray.longToBytes(lsp.getLspId().getValue(), LSP_ID_F_LENGTH), bytes, offset);
-                       offset += LSP_ID_F_LENGTH;
-                       ByteArray.copyWhole(ByteArray.intToBytes(lsp.getTunnelId().getValue(), TUNNEL_ID_F_LENGTH), bytes, offset);
-                       offset += TUNNEL_ID_F_LENGTH;
-                       ByteArray.copyWhole(Ipv6Util.bytesForAddress(ipv6.getIpv6ExtendedTunnelId()), bytes, offset);
-                       return bytes;
-               }
-       }
-
-       @Override
-       public int getType() {
-               return TYPE;
-       }
-
-       public int getType6() {
-               return TYPE_6;
-       }
-}

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 9f4e127216c409b95712712ce57a1282b5787449..0e741bc2e18c3068a55602d10c263726929441e3 100644 (file)
--- 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
@@ -15,7 +15,8 @@ import java.util.List;
 import org.junit.Test;
 import org.opendaylight.protocol.concepts.Ipv4Util;
 import org.opendaylight.protocol.concepts.Ipv6Util;
-import org.opendaylight.protocol.pcep.impl.tlv.LSPIdentifierTlvParser;
+import org.opendaylight.protocol.pcep.impl.tlv.LSPIdentifierIpv4TlvParser;
+import org.opendaylight.protocol.pcep.impl.tlv.LSPIdentifierIpv6TlvParser;
 import org.opendaylight.protocol.pcep.impl.tlv.LspDbVersionTlvParser;
 import org.opendaylight.protocol.pcep.impl.tlv.LspSymbolicNameTlvParser;
 import org.opendaylight.protocol.pcep.impl.tlv.LspUpdateErrorTlvParser;
@@ -157,7 +158,7 @@ public class PCEPTlvParserTest {
 
        @Test
        public void testLspIdentifiers4Tlv() throws PCEPDeserializerException {
-               final LSPIdentifierTlvParser parser = new LSPIdentifierTlvParser();
+               final LSPIdentifierIpv4TlvParser parser = new LSPIdentifierIpv4TlvParser();
                final Ipv4Builder afi = new Ipv4Builder();
                afi.setIpv4TunnelSenderAddress(Ipv4Util.addressForBytes(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }));
                afi.setIpv4ExtendedTunnelId(new Ipv4ExtendedTunnelId(Ipv4Util.addressForBytes(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56,
@@ -170,7 +171,7 @@ public class PCEPTlvParserTest {
 
        @Test
        public void testLspIdentifiers6Tlv() throws PCEPDeserializerException {
-               final LSPIdentifierTlvParser parser = new LSPIdentifierTlvParser();
+               final LSPIdentifierIpv6TlvParser parser = new LSPIdentifierIpv6TlvParser();
                final Ipv6Builder afi = new Ipv6Builder();
                afi.setIpv6TunnelSenderAddress(Ipv6Util.addressForBytes(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78,
                                (byte) 0x9A, (byte) 0xBC, (byte) 0xDE, (byte) 0xF0, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, (byte) 0x9A,