BUG-50 : adjusted ERO object.

[bgpcep.git] / pcep / impl / src / main / java / org / opendaylight / protocol / pcep / impl / subobject / EROLabelSubobjectParser.java

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/EROLabelSubobjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/EROLabelSubobjectParser.java
index 0ffc42fa7c4e5bd0219928e4eb1c6f705b0d6bd3..78752aa7ab1e9522746128c78410cd772ceaa873 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/EROLabelSubobjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/EROLabelSubobjectParser.java
@@ -17,13 +17,14 @@ import org.opendaylight.protocol.pcep.spi.LabelHandlerRegistry;
 import org.opendaylight.protocol.pcep.spi.LabelParser;
 import org.opendaylight.protocol.pcep.spi.LabelSerializer;
 import org.opendaylight.protocol.util.ByteArray;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.explicit.route.object.Subobjects;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.explicit.route.object.SubobjectsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.CLabel;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.LabelSubobject;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.explicit.route.object.ero.Subobjects;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.explicit.route.object.ero.SubobjectsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.basic.explicit.route.subobjects.subobject.type.Label;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.basic.explicit.route.subobjects.subobject.type.LabelBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.label.subobject.LabelType;
 
 import com.google.common.base.Preconditions;
+import com.google.common.primitives.UnsignedBytes;
 
 public class EROLabelSubobjectParser implements EROSubobjectParser, EROSubobjectSerializer {
 
@@ -49,22 +50,22 @@ public class EROLabelSubobjectParser implements EROSubobjectParser, EROSubobject
 
        @Override
        public Subobjects parseSubobject(final byte[] buffer, final boolean loose) throws PCEPDeserializerException {
-               if (buffer == null || buffer.length == 0)
+               if (buffer == null || buffer.length == 0) {
                        throw new IllegalArgumentException("Array of bytes is mandatory. Can't be null or empty.");
-               if (buffer.length < HEADER_LENGTH)
+               }
+               if (buffer.length < HEADER_LENGTH) {
                        throw new PCEPDeserializerException("Wrong length of array of bytes. Passed: " + buffer.length + "; Expected: >"
                                        + HEADER_LENGTH + ".");
-
+               }
                final BitSet reserved = ByteArray.bytesToBitSet(Arrays.copyOfRange(buffer, RES_F_OFFSET, RES_F_LENGTH));
 
-               final short c_type = (short) (buffer[C_TYPE_F_OFFSET] & 0xFF);
+               final short cType = (short) UnsignedBytes.toInt(buffer[C_TYPE_F_OFFSET]);
 
-               final LabelParser parser = this.registry.getLabelParser(c_type);
+               final LabelParser parser = this.registry.getLabelParser(cType);
 
                if (parser == null) {
-                       throw new PCEPDeserializerException("Unknown C-TYPE for ero label subobject. Passed: " + c_type);
+                       throw new PCEPDeserializerException("Unknown C-TYPE for ero label subobject. Passed: " + cType);
                }
-
                final LabelBuilder builder = new LabelBuilder();
                builder.setUniDirectional(reserved.get(U_FLAG_OFFSET));
                builder.setLabelType(parser.parseLabel(ByteArray.cutBytes(buffer, HEADER_LENGTH)));
@@ -75,15 +76,16 @@ public class EROLabelSubobjectParser implements EROSubobjectParser, EROSubobject
        public byte[] serializeSubobject(final Subobjects subobject) {
                Preconditions.checkNotNull(subobject.getSubobjectType(), "Subobject type cannot be empty.");
 
-               final LabelSubobject label = (LabelSubobject) subobject.getSubobjectType();
-
-               final LabelSerializer serializer = this.registry.getLabelSerializer((CLabel) label);
+               final Label label = (Label) subobject.getSubobjectType();
+               final LabelType l = label.getLabelType();
 
-               if (serializer == null)
-                       throw new IllegalArgumentException("Unknown EROLabelSubobject instance. Passed " + label.getClass());
-
-               final byte[] labelbytes = serializer.serializeLabel((CLabel) label);
+               final LabelSerializer serializer = this.registry.getLabelSerializer(l);
 
+               if (serializer == null) {
+                       throw new IllegalArgumentException("Unknown EROLabelSubobject instance. Passed "
+                                       + label.getLabelType().getImplementedInterface());
+               }
+               final byte[] labelbytes = serializer.serializeLabel(l);
                final byte[] retBytes = new byte[labelbytes.length + HEADER_LENGTH];
 
                System.arraycopy(labelbytes, 0, retBytes, HEADER_LENGTH, labelbytes.length);
@@ -91,9 +93,7 @@ public class EROLabelSubobjectParser implements EROSubobjectParser, EROSubobject
                final BitSet reserved = new BitSet();
                reserved.set(U_FLAG_OFFSET, label.isUniDirectional());
                System.arraycopy(ByteArray.bitSetToBytes(reserved, RES_F_LENGTH), 0, retBytes, RES_F_OFFSET, RES_F_LENGTH);
-
-               retBytes[C_TYPE_F_OFFSET] = (byte) serializer.getType();
-
+               retBytes[C_TYPE_F_OFFSET] = UnsignedBytes.checkedCast(serializer.getType());
                return retBytes;
        }