Rename lists such that they follow IETF conventions

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

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPReportedRouteObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPReportedRouteObjectParser.java
index a9bcb769d91df984515648898b139df97fbc3843..587dcea3f09881ee96b3f69694045820ce52b4b2 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPReportedRouteObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPReportedRouteObjectParser.java
@@ -7,54 +7,49 @@
  */
 package org.opendaylight.protocol.pcep.impl.object;
 
-import org.opendaylight.protocol.pcep.PCEPDeserializerException;
-import org.opendaylight.protocol.pcep.PCEPDocumentedException;
-import org.opendaylight.protocol.pcep.spi.AbstractObjectWithSubobjectsParser;
-import org.opendaylight.protocol.pcep.spi.SubobjectHandlerRegistry;
+import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
+import org.opendaylight.protocol.pcep.spi.RROSubobjectHandlerRegistry;
 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.ReportedRouteObject;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcreq.message.pcreq.message.requests.segment.computation.p2p.ReportedRouteBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.reported.route.object.Rro;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.reported.route.object.RroBuilder;
 
 /**
- * Parser for {@link ReportedRouteObject}
+ * Parser for {@link Rro}
  */
-public class PCEPReportedRouteObjectParser extends AbstractObjectWithSubobjectsParser<ReportedRouteBuilder> {
+public class PCEPReportedRouteObjectParser extends AbstractRROWithSubobjectsParser {
 
        public static final int CLASS = 8;
 
        public static final int TYPE = 1;
 
-       public PCEPReportedRouteObjectParser(final SubobjectHandlerRegistry subobjReg) {
+       public PCEPReportedRouteObjectParser(final RROSubobjectHandlerRegistry subobjReg) {
                super(subobjReg);
        }
 
        @Override
-       public ReportedRouteObject parseObject(final ObjectHeader header, final byte[] bytes) throws PCEPDeserializerException,
-       PCEPDocumentedException {
+       public Rro parseObject(final ObjectHeader header, final byte[] bytes) throws PCEPDeserializerException {
                if (bytes == null || bytes.length == 0) {
                        throw new IllegalArgumentException("Byte array is mandatory. Can't be null or empty.");
                }
-
-               final ReportedRouteBuilder builder = new ReportedRouteBuilder();
+               final RroBuilder builder = new RroBuilder();
 
                builder.setIgnore(header.isIgnore());
                builder.setProcessingRule(header.isProcessingRule());
-               // FIXME: add subobjects
+               builder.setSubobject(parseSubobjects(bytes));
                return builder.build();
        }
 
        @Override
        public byte[] serializeObject(final Object object) {
-               if (!(object instanceof ReportedRouteObject)) {
+               if (!(object instanceof Rro)) {
                        throw new IllegalArgumentException("Wrong instance of PCEPObject. Passed " + object.getClass()
                                        + ". Needed ReportedRouteObject.");
                }
-
-               assert !(((ReportedRouteObject) object).getSubobjects().isEmpty()) : "Empty Reported Route Object.";
-               // FIXME add subobjects
-               // return PCEPRROSubobjectParser.put(((ReportedRouteObject) object).getSubobjects());
-               return null;
+               final Rro obj = (Rro) object;
+               assert !(obj.getSubobject().isEmpty()) : "Empty Reported Route Object.";
+               return ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(),
+                               serializeSubobject(obj.getSubobject()));
        }
 
        @Override