BUG-50 : adjusted ERO object.

[bgpcep.git] / pcep / impl / src / main / java / org / opendaylight / protocol / pcep / impl / object / PCEPExplicitRouteObjectParser.java

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPExplicitRouteObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPExplicitRouteObjectParser.java
index 1f3c87b3ab98deb0d0c050b4f0280cbf2d779fb3..33ca3f94ab9a3d9652515db531645c11efa8f90f 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPExplicitRouteObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPExplicitRouteObjectParser.java
@@ -7,100 +7,52 @@
  */
 package org.opendaylight.protocol.pcep.impl.object;
 
-import java.util.Map;
-
 import org.opendaylight.protocol.pcep.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.PCEPDocumentedException;
-import org.opendaylight.protocol.pcep.spi.AbstractObjectParser;
-import org.opendaylight.protocol.pcep.spi.SubobjectHandlerRegistry;
-import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.ExplicitRouteObject;
+import org.opendaylight.protocol.pcep.spi.EROSubobjectHandlerRegistry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Object;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.ObjectHeader;
-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.explicit.route.object.Subobjects;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.path.definition.ExplicitRouteBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.CSubobject;
-
-import com.google.common.collect.Maps;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.explicit.route.object.Ero;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.explicit.route.object.EroBuilder;
 
 /**
- * Parser for {@link ExplicitRouteObject}
+ * Parser for {@link Ero}
  */
-public class PCEPExplicitRouteObjectParser extends AbstractObjectParser<ExplicitRouteBuilder> {
+public class PCEPExplicitRouteObjectParser extends AbstractEROWithSubobjectsParser {
 
        public static final int CLASS = 7;
 
        public static final int TYPE = 1;
 
-       public PCEPExplicitRouteObjectParser(final SubobjectHandlerRegistry subobjReg, final TlvHandlerRegistry tlvReg) {
-               super(subobjReg, tlvReg);
+       public PCEPExplicitRouteObjectParser(final EROSubobjectHandlerRegistry subobjReg) {
+               super(subobjReg);
        }
 
        @Override
-       public ExplicitRouteObject parseObject(final ObjectHeader header, final byte[] bytes) throws PCEPDeserializerException,
-       PCEPDocumentedException {
+       public Ero parseObject(final ObjectHeader header, final byte[] bytes) throws PCEPDeserializerException, PCEPDocumentedException {
                if (bytes == null || bytes.length == 0) {
                        throw new IllegalArgumentException("Byte array is mandatory. Can't be null or empty.");
                }
-
-               final ExplicitRouteBuilder builder = new ExplicitRouteBuilder();
-
+               final EroBuilder builder = new EroBuilder();
                builder.setIgnore(header.isIgnore());
                builder.setProcessingRule(header.isProcessingRule());
-
-               parseSubobjects(builder, bytes);
+               builder.setSubobjects(parseSubobjects(bytes));
                return builder.build();
        }
 
-       @Override
-       public void addTlv(final ExplicitRouteBuilder builder, final Tlv tlv) {
-               // No tlvs defined
-       }
-
        @Override
        public byte[] serializeObject(final Object object) {
-               if (!(object instanceof ExplicitRouteObject)) {
+               if (!(object instanceof Ero)) {
                        throw new IllegalArgumentException("Wrong instance of PCEPObject. Passed " + object.getClass()
                                        + ". Needed ExplicitRouteObject.");
                }
-
-               final ExplicitRouteObject ero = ((ExplicitRouteObject) object);
+               final Ero ero = ((Ero) object);
 
                assert !(ero.getSubobjects().isEmpty()) : "Empty Explicit Route Object.";
 
-               final Map<CSubobject, Boolean> subs = Maps.newHashMap();
-               for (final Subobjects s : ero.getSubobjects()) {
-                       subs.put((CSubobject) s, s.isLoose());
-               }
-               return serializeSubobject(subs);
+               return serializeSubobject(ero.getSubobjects());
        }
 
-       // @Override
-       // public void addSubobject(ExplicitRouteBuilder builder, Map<CSubobject, Boolean> subobjects) {
-       // List<Subobjects> subs = Lists.newArrayList();
-       // for (Entry<CSubobject, Boolean> entry : subobjects.entrySet()) {
-       // SubobjectsBuilder b = new SubobjectsBuilder();
-       // b.setLoose(entry.getValue());
-       // CSubobject sub = entry.getKey();
-       // if (sub instanceof IpPrefixSubobject) {
-       // b.setSubobjectType(new IpPrefixBuilder().setIpPrefix(((IpPrefix)sub).getIpPrefix()).build());
-       // subs.add(b.build());
-       // } else if (sub instanceof AsNumberSubobject) {
-       // b.setSubobjectType(new AsNumberBuilder().setAsNumber((AsNumber)sub).build());
-       // subs.add(b.build());
-       // } else if (sub instanceof LabelSubobject) {
-       // b.setSubobjectType(new LabelBuilder().setLabels(((Label)sub).getLabels()).build());
-       // subs.add(b.build());
-       // } else if (sub instanceof UnnumberedSubobject) {
-       // b.setSubobjectType(new
-       // UnnumberedBuilder().setInterfaceId(((Unnumbered)sub).getInterfaceId()).setRouterId(((Unnumbered)sub).getRouterId()).build());
-       // subs.add(b.build());
-       // }
-       // }
-       // builder.setSubobjects(subs);
-       // }
-
        @Override
        public int getObjectType() {
                return TYPE;