Rename stateful07 handlers 58/5158/1
authorRobert Varga <rovarga@cisco.com>
Thu, 6 Feb 2014 22:34:23 +0000 (23:34 +0100)
committerRobert Varga <rovarga@cisco.com>
Thu, 6 Feb 2014 22:34:23 +0000 (23:34 +0100)
This prepares for sticking them under the base parser as subclasses
without getting lost in names.

Change-Id: Ia3c756399fd1ca28ae8f495ec9da790be56716ef
Signed-off-by: Robert Varga <rovarga@cisco.com>
22 files changed:
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/CInitiated00LspObjectParser.java [moved from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/PCEPLspObjectParser.java with 98% similarity]
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/CInitiated00PCInitiateMessageParser.java [moved from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/PcinitiateMessageParser.java with 97% similarity]
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/CInitiated00SrpObjectParser.java [moved from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/PCEPSrpObjectParser.java with 96% similarity]
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/CInitiated00StatefulCapabilityTlvParser.java [moved from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/PCEStatefulCapabilityTlvParser.java with 96% similarity]
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/CrabbeInitiatedActivator.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07ErrorMessageParser.java [moved from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PCEPErrorMessageParser.java with 98% similarity]
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LSPIdentifierIpv4TlvParser.java [moved from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/LSPIdentifierIpv4TlvParser.java with 97% similarity]
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LSPIdentifierIpv6TlvParser.java [moved from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/LSPIdentifierIpv6TlvParser.java with 98% similarity]
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LspObjectParser.java [moved from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PCEPLspObjectParser.java with 97% similarity]
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LspSymbolicNameTlvParser.java [moved from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/LspSymbolicNameTlvParser.java with 94% similarity]
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LspUpdateErrorTlvParser.java [moved from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/LspUpdateErrorTlvParser.java with 95% similarity]
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LspaObjectParser.java [moved from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PCEPLspaObjectParser.java with 96% similarity]
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07OpenObjectParser.java [moved from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PCEPOpenObjectParser.java with 96% similarity]
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCReportMessageParser.java [moved from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PCEPReportMessageParser.java with 97% similarity]
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCUpdateRequestMessageParser.java [moved from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PCEPUpdateRequestMessageParser.java with 97% similarity]
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07RSVPErrorSpecTlvParser.java [moved from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/RSVPErrorSpecTlvParser.java with 99% similarity]
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07SrpObjectParser.java [moved from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PCEPSrpObjectParser.java with 96% similarity]
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07StatefulCapabilityTlvParser.java [moved from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PCEStatefulCapabilityTlvParser.java with 95% similarity]
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/StatefulActivator.java
pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPObjectParserTest.java
pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPTlvParserTest.java
pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPValidatorTest.java

similarity index 98%
rename from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/PCEPLspObjectParser.java
rename to pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/CInitiated00LspObjectParser.java
index 40cec190bff4a4974a39b7d34513ebf3c7463f83..83c2fbedad49bd706a6b89f80394f47cb2a616eb 100644 (file)
@@ -33,7 +33,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 /**
  * Parser for {@link Lsp}
  */
-public class PCEPLspObjectParser extends AbstractObjectWithTlvsParser<TlvsBuilder> {
+public class CInitiated00LspObjectParser extends AbstractObjectWithTlvsParser<TlvsBuilder> {
 
        public static final int CLASS = 32;
 
@@ -55,7 +55,7 @@ public class PCEPLspObjectParser extends AbstractObjectWithTlvsParser<TlvsBuilde
        private static final int OPERATIONAL_OFFSET = 9;
        private static final int CREATE_FLAG_OFFSET = 8;
 
-       public PCEPLspObjectParser(final TlvHandlerRegistry tlvReg) {
+       public CInitiated00LspObjectParser(final TlvHandlerRegistry tlvReg) {
                super(tlvReg);
        }
 
@@ -38,11 +38,11 @@ import com.google.common.collect.Lists;
 /**
  * Parser for {@link Pcinitiate}
  */
-public class PcinitiateMessageParser extends AbstractMessageParser {
+public class CInitiated00PCInitiateMessageParser extends AbstractMessageParser {
 
        public static final int TYPE = 12;
 
-       public PcinitiateMessageParser(final ObjectHandlerRegistry registry) {
+       public CInitiated00PCInitiateMessageParser(final ObjectHandlerRegistry registry) {
                super(registry);
        }
 
similarity index 96%
rename from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/PCEPSrpObjectParser.java
rename to pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/CInitiated00SrpObjectParser.java
index bcbc9195ce07d8b3ca2d5be5a195115671afa7e2..c9edfa880075017df2a6b552403c18edabdc83a2 100644 (file)
@@ -30,7 +30,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 /**
  * Parser for {@link Srp}
  */
-public final class PCEPSrpObjectParser extends AbstractObjectWithTlvsParser<SrpBuilder> {
+public final class CInitiated00SrpObjectParser extends AbstractObjectWithTlvsParser<SrpBuilder> {
 
        public static final int CLASS = 33;
 
@@ -46,7 +46,7 @@ public final class PCEPSrpObjectParser extends AbstractObjectWithTlvsParser<SrpB
 
        private static final int REMOVE_FLAG = 31;
 
-       public PCEPSrpObjectParser(final TlvHandlerRegistry tlvReg) {
+       public CInitiated00SrpObjectParser(final TlvHandlerRegistry tlvReg) {
                super(tlvReg);
        }
 
@@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 /**
  * Parser for {@link Stateful}
  */
-public final class PCEStatefulCapabilityTlvParser implements TlvParser, TlvSerializer {
+public final class CInitiated00StatefulCapabilityTlvParser implements TlvParser, TlvSerializer {
 
        public static final int TYPE = 16;
 
index b8c35d5874839733b9ece54eb68c9cb73d528e64..ef59729b67eb8d514a6dd4db3253f0859bf92d47 100644 (file)
@@ -23,18 +23,18 @@ public final class CrabbeInitiatedActivator extends AbstractPCEPExtensionProvide
        protected List<AutoCloseable> startImpl(final PCEPExtensionProviderContext context) {
                final List<AutoCloseable> regs = new ArrayList<>();
 
-               regs.add(context.registerMessageParser(PcinitiateMessageParser.TYPE,
-                               new PcinitiateMessageParser(context.getObjectHandlerRegistry())));
-               regs.add(context.registerMessageSerializer(Pcinitiate.class, new PcinitiateMessageParser(context.getObjectHandlerRegistry())));
+               regs.add(context.registerMessageParser(CInitiated00PCInitiateMessageParser.TYPE,
+                               new CInitiated00PCInitiateMessageParser(context.getObjectHandlerRegistry())));
+               regs.add(context.registerMessageSerializer(Pcinitiate.class, new CInitiated00PCInitiateMessageParser(context.getObjectHandlerRegistry())));
 
                final TlvHandlerRegistry tlvReg = context.getTlvHandlerRegistry();
-               regs.add(context.registerObjectParser(PCEPLspObjectParser.CLASS, PCEPLspObjectParser.TYPE, new PCEPLspObjectParser(tlvReg)));
-               regs.add(context.registerObjectSerializer(Lsp.class, new PCEPLspObjectParser(tlvReg)));
-               regs.add(context.registerObjectParser(PCEPSrpObjectParser.CLASS, PCEPSrpObjectParser.TYPE, new PCEPSrpObjectParser(tlvReg)));
-               regs.add(context.registerObjectSerializer(Srp.class, new PCEPSrpObjectParser(tlvReg)));
+               regs.add(context.registerObjectParser(CInitiated00LspObjectParser.CLASS, CInitiated00LspObjectParser.TYPE, new CInitiated00LspObjectParser(tlvReg)));
+               regs.add(context.registerObjectSerializer(Lsp.class, new CInitiated00LspObjectParser(tlvReg)));
+               regs.add(context.registerObjectParser(CInitiated00SrpObjectParser.CLASS, CInitiated00SrpObjectParser.TYPE, new CInitiated00SrpObjectParser(tlvReg)));
+               regs.add(context.registerObjectSerializer(Srp.class, new CInitiated00SrpObjectParser(tlvReg)));
 
-               regs.add(context.registerTlvParser(PCEStatefulCapabilityTlvParser.TYPE, new PCEStatefulCapabilityTlvParser()));
-               regs.add(context.registerTlvSerializer(Stateful.class, new PCEStatefulCapabilityTlvParser()));
+               regs.add(context.registerTlvParser(CInitiated00StatefulCapabilityTlvParser.TYPE, new CInitiated00StatefulCapabilityTlvParser()));
+               regs.add(context.registerTlvSerializer(Stateful.class, new CInitiated00StatefulCapabilityTlvParser()));
 
                return regs;
        }
@@ -43,11 +43,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 /**
  * Parser for {@link PcerrMessage}
  */
-public class PCEPErrorMessageParser extends AbstractMessageParser {
+public class Stateful07ErrorMessageParser extends AbstractMessageParser {
 
        public static final int TYPE = 6;
 
-       public PCEPErrorMessageParser(final ObjectHandlerRegistry registry) {
+       public Stateful07ErrorMessageParser(final ObjectHandlerRegistry registry) {
                super(registry);
        }
 
@@ -28,7 +28,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev
 /**
  * Parser for {@link LspIdentifiers}
  */
-public class LSPIdentifierIpv4TlvParser implements TlvParser, TlvSerializer {
+public class Stateful07LSPIdentifierIpv4TlvParser implements TlvParser, TlvSerializer {
 
        public static final int TYPE = 18;
 
@@ -73,7 +73,7 @@ public class LSPIdentifierIpv4TlvParser implements TlvParser, TlvSerializer {
                final AddressFamily afi = lsp.getAddressFamily();
 
                if (afi.getImplementedInterface().equals(Ipv6Case.class)) {
-                       return new LSPIdentifierIpv6TlvParser().serializeTlv(tlv);
+                       return new Stateful07LSPIdentifierIpv6TlvParser().serializeTlv(tlv);
                }
 
                final byte[] bytes = new byte[V4_LENGTH];
@@ -27,7 +27,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev
 /**
  * Parser for {@link LspIdentifiers}
  */
-public class LSPIdentifierIpv6TlvParser implements TlvParser, TlvSerializer {
+public class Stateful07LSPIdentifierIpv6TlvParser implements TlvParser, TlvSerializer {
 
        public static final int TYPE = 19;
 
similarity index 97%
rename from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PCEPLspObjectParser.java
rename to pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LspObjectParser.java
index 6e48ac9cdcb4aade760337ffba46d4e78610d31d..2dcde797f8a9d19ea79be796f0d086b7fbd415ac 100644 (file)
@@ -33,7 +33,7 @@ import com.google.common.base.Preconditions;
 /**
  * Parser for {@link Lsp}
  */
-public class PCEPLspObjectParser extends AbstractObjectWithTlvsParser<TlvsBuilder> {
+public class Stateful07LspObjectParser extends AbstractObjectWithTlvsParser<TlvsBuilder> {
 
        public static final int CLASS = 32;
 
@@ -54,7 +54,7 @@ public class PCEPLspObjectParser extends AbstractObjectWithTlvsParser<TlvsBuilde
        private static final int ADMINISTRATIVE_FLAG_OFFSET = 12;
        private static final int OPERATIONAL_OFFSET = 9;
 
-       public PCEPLspObjectParser(final TlvHandlerRegistry tlvReg) {
+       public Stateful07LspObjectParser(final TlvHandlerRegistry tlvReg) {
                super(tlvReg);
        }
 
@@ -17,7 +17,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 /**
  * Parser for {@link SymbolicPathName}
  */
-public class LspSymbolicNameTlvParser implements TlvParser, TlvSerializer {
+public class Stateful07LspSymbolicNameTlvParser implements TlvParser, TlvSerializer {
 
        public static final int TYPE = 17;
 
@@ -18,7 +18,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 /**
  * Parser for {@link LspErrorCode}
  */
-public class LspUpdateErrorTlvParser implements TlvParser, TlvSerializer {
+public class Stateful07LspUpdateErrorTlvParser implements TlvParser, TlvSerializer {
 
        public static final int TYPE = 20;
 
similarity index 96%
rename from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PCEPLspaObjectParser.java
rename to pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LspaObjectParser.java
index a7a7b416f0d3bf461778e2ff0cdba3f12924765e..a7f6286128ba78e69f6f26482d32d74b6644973e 100644 (file)
@@ -25,7 +25,7 @@ import com.google.common.primitives.UnsignedBytes;
 /**
  * Parser for {@link Lspa}
  */
-public class PCEPLspaObjectParser extends AbstractObjectWithTlvsParser<LspaBuilder> {
+public class Stateful07LspaObjectParser extends AbstractObjectWithTlvsParser<LspaBuilder> {
 
        public static final int CLASS = 9;
 
@@ -57,7 +57,7 @@ public class PCEPLspaObjectParser extends AbstractObjectWithTlvsParser<LspaBuild
        private static final int FLAGS_F_OFFSET = HOLD_PRIO_F_OFFSET + HOLD_PRIO_F_LENGTH;
        private static final int TLVS_F_OFFSET = FLAGS_F_OFFSET + FLAGS_F_LENGTH + 1;
 
-       public PCEPLspaObjectParser(final TlvHandlerRegistry tlvReg) {
+       public Stateful07LspaObjectParser(final TlvHandlerRegistry tlvReg) {
                super(tlvReg);
        }
 
similarity index 96%
rename from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PCEPOpenObjectParser.java
rename to pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07OpenObjectParser.java
index a37f8293de4059ca65ef3779388dc6641012d6b6..0578b2f0072a6c8426ce9689ab77ba90691379a4 100644 (file)
@@ -35,8 +35,8 @@ import com.google.common.primitives.UnsignedBytes;
 /**
  * Parser for {@link Open}
  */
-public class PCEPOpenObjectParser extends AbstractObjectWithTlvsParser<TlvsBuilder> {
-       private static final Logger LOG = LoggerFactory.getLogger(PCEPOpenObjectParser.class);
+public class Stateful07OpenObjectParser extends AbstractObjectWithTlvsParser<TlvsBuilder> {
+       private static final Logger LOG = LoggerFactory.getLogger(Stateful07OpenObjectParser.class);
 
        public static final int CLASS = 1;
 
@@ -71,7 +71,7 @@ public class PCEPOpenObjectParser extends AbstractObjectWithTlvsParser<TlvsBuild
 
        private static final int PCEP_VERSION = 1;
 
-       public PCEPOpenObjectParser(final TlvHandlerRegistry tlvReg) {
+       public Stateful07OpenObjectParser(final TlvHandlerRegistry tlvReg) {
                super(tlvReg);
        }
 
@@ -40,11 +40,11 @@ import com.google.common.collect.Lists;
 /**
  * Parser for {@link Pcrpt}
  */
-public class PCEPReportMessageParser extends AbstractMessageParser {
+public class Stateful07PCReportMessageParser extends AbstractMessageParser {
 
        public static final int TYPE = 10;
 
-       public PCEPReportMessageParser(final ObjectHandlerRegistry registry) {
+       public Stateful07PCReportMessageParser(final ObjectHandlerRegistry registry) {
                super(registry);
        }
 
@@ -39,11 +39,11 @@ import com.google.common.collect.Lists;
 /**
  * Parser for {@link Pcupd}
  */
-public class PCEPUpdateRequestMessageParser extends AbstractMessageParser {
+public class Stateful07PCUpdateRequestMessageParser extends AbstractMessageParser {
 
        public static final int TYPE = 11;
 
-       public PCEPUpdateRequestMessageParser(final ObjectHandlerRegistry registry) {
+       public Stateful07PCUpdateRequestMessageParser(final ObjectHandlerRegistry registry) {
                super(registry);
        }
 
@@ -37,7 +37,7 @@ import com.google.common.primitives.UnsignedBytes;
 /**
  * Parser for {@link RsvpErrorSpec}
  */
-public final class RSVPErrorSpecTlvParser implements TlvParser, TlvSerializer {
+public final class Stateful07RSVPErrorSpecTlvParser implements TlvParser, TlvSerializer {
 
        public static final int TYPE = 21;
 
similarity index 96%
rename from pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PCEPSrpObjectParser.java
rename to pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07SrpObjectParser.java
index 36f20bbaa1abefd35876086cfc0400ec675bc228..3a89f646cb0e20ccc8cc6a5389550ffdfe5ea3e3 100644 (file)
@@ -27,7 +27,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 /**
  * Parser for {@link Srp}
  */
-public final class PCEPSrpObjectParser extends AbstractObjectWithTlvsParser<SrpBuilder> {
+public final class Stateful07SrpObjectParser extends AbstractObjectWithTlvsParser<SrpBuilder> {
 
        public static final int CLASS = 33;
 
@@ -41,7 +41,7 @@ public final class PCEPSrpObjectParser extends AbstractObjectWithTlvsParser<SrpB
 
        private static final int MIN_SIZE = FLAGS_SIZE + SRP_ID_SIZE;
 
-       public PCEPSrpObjectParser(final TlvHandlerRegistry tlvReg) {
+       public Stateful07SrpObjectParser(final TlvHandlerRegistry tlvReg) {
                super(tlvReg);
        }
 
@@ -20,7 +20,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 /**
  * Parser for {@link Stateful}
  */
-public final class PCEStatefulCapabilityTlvParser implements TlvParser, TlvSerializer {
+public final class Stateful07StatefulCapabilityTlvParser implements TlvParser, TlvSerializer {
 
        public static final int TYPE = 16;
 
index 8ca65db648e70ec41b742d72c397e79806ae580f..ce274ba45b2c6a4b4a47b73c8d0f6dec8ab317d6 100644 (file)
@@ -31,30 +31,30 @@ public final class StatefulActivator extends AbstractPCEPExtensionProviderActiva
                final List<AutoCloseable> regs = new ArrayList<>();
 
                final ObjectHandlerRegistry objReg = context.getObjectHandlerRegistry();
-               regs.add(context.registerMessageParser(PCEPUpdateRequestMessageParser.TYPE, new PCEPUpdateRequestMessageParser(objReg)));
-               regs.add(context.registerMessageSerializer(Pcupd.class, new PCEPUpdateRequestMessageParser(objReg)));
-               regs.add(context.registerMessageParser(PCEPReportMessageParser.TYPE, new PCEPReportMessageParser(objReg)));
-               regs.add(context.registerMessageSerializer(Pcrpt.class, new PCEPReportMessageParser(objReg)));
+               regs.add(context.registerMessageParser(Stateful07PCUpdateRequestMessageParser.TYPE, new Stateful07PCUpdateRequestMessageParser(objReg)));
+               regs.add(context.registerMessageSerializer(Pcupd.class, new Stateful07PCUpdateRequestMessageParser(objReg)));
+               regs.add(context.registerMessageParser(Stateful07PCReportMessageParser.TYPE, new Stateful07PCReportMessageParser(objReg)));
+               regs.add(context.registerMessageSerializer(Pcrpt.class, new Stateful07PCReportMessageParser(objReg)));
 
                final TlvHandlerRegistry tlvReg = context.getTlvHandlerRegistry();
-               regs.add(context.registerObjectParser(PCEPLspObjectParser.CLASS, PCEPLspObjectParser.TYPE, new PCEPLspObjectParser(tlvReg)));
-               regs.add(context.registerObjectSerializer(Lsp.class, new PCEPLspObjectParser(tlvReg)));
-               regs.add(context.registerObjectParser(PCEPSrpObjectParser.CLASS, PCEPSrpObjectParser.TYPE, new PCEPSrpObjectParser(tlvReg)));
-               regs.add(context.registerObjectSerializer(Srp.class, new PCEPSrpObjectParser(tlvReg)));
-               regs.add(context.registerObjectParser(PCEPOpenObjectParser.CLASS, PCEPOpenObjectParser.TYPE, new PCEPOpenObjectParser(tlvReg)));
-               regs.add(context.registerObjectSerializer(Open.class, new PCEPOpenObjectParser(tlvReg)));
+               regs.add(context.registerObjectParser(Stateful07LspObjectParser.CLASS, Stateful07LspObjectParser.TYPE, new Stateful07LspObjectParser(tlvReg)));
+               regs.add(context.registerObjectSerializer(Lsp.class, new Stateful07LspObjectParser(tlvReg)));
+               regs.add(context.registerObjectParser(Stateful07SrpObjectParser.CLASS, Stateful07SrpObjectParser.TYPE, new Stateful07SrpObjectParser(tlvReg)));
+               regs.add(context.registerObjectSerializer(Srp.class, new Stateful07SrpObjectParser(tlvReg)));
+               regs.add(context.registerObjectParser(Stateful07OpenObjectParser.CLASS, Stateful07OpenObjectParser.TYPE, new Stateful07OpenObjectParser(tlvReg)));
+               regs.add(context.registerObjectSerializer(Open.class, new Stateful07OpenObjectParser(tlvReg)));
 
-               regs.add(context.registerTlvParser(LSPIdentifierIpv4TlvParser.TYPE, new LSPIdentifierIpv4TlvParser()));
-               regs.add(context.registerTlvParser(LSPIdentifierIpv6TlvParser.TYPE, new LSPIdentifierIpv6TlvParser()));
-               regs.add(context.registerTlvSerializer(LspIdentifiers.class, new LSPIdentifierIpv4TlvParser()));
-               regs.add(context.registerTlvParser(LspUpdateErrorTlvParser.TYPE, new LspUpdateErrorTlvParser()));
-               regs.add(context.registerTlvSerializer(LspErrorCode.class, new LspUpdateErrorTlvParser()));
-               regs.add(context.registerTlvParser(RSVPErrorSpecTlvParser.TYPE, new RSVPErrorSpecTlvParser()));
-               regs.add(context.registerTlvSerializer(RsvpErrorSpec.class, new RSVPErrorSpecTlvParser()));
-               regs.add(context.registerTlvParser(PCEStatefulCapabilityTlvParser.TYPE, new PCEStatefulCapabilityTlvParser()));
-               regs.add(context.registerTlvSerializer(Stateful.class, new PCEStatefulCapabilityTlvParser()));
-               regs.add(context.registerTlvParser(LspSymbolicNameTlvParser.TYPE, new LspSymbolicNameTlvParser()));
-               regs.add(context.registerTlvSerializer(SymbolicPathName.class, new LspSymbolicNameTlvParser()));
+               regs.add(context.registerTlvParser(Stateful07LSPIdentifierIpv4TlvParser.TYPE, new Stateful07LSPIdentifierIpv4TlvParser()));
+               regs.add(context.registerTlvParser(Stateful07LSPIdentifierIpv6TlvParser.TYPE, new Stateful07LSPIdentifierIpv6TlvParser()));
+               regs.add(context.registerTlvSerializer(LspIdentifiers.class, new Stateful07LSPIdentifierIpv4TlvParser()));
+               regs.add(context.registerTlvParser(Stateful07LspUpdateErrorTlvParser.TYPE, new Stateful07LspUpdateErrorTlvParser()));
+               regs.add(context.registerTlvSerializer(LspErrorCode.class, new Stateful07LspUpdateErrorTlvParser()));
+               regs.add(context.registerTlvParser(Stateful07RSVPErrorSpecTlvParser.TYPE, new Stateful07RSVPErrorSpecTlvParser()));
+               regs.add(context.registerTlvSerializer(RsvpErrorSpec.class, new Stateful07RSVPErrorSpecTlvParser()));
+               regs.add(context.registerTlvParser(Stateful07StatefulCapabilityTlvParser.TYPE, new Stateful07StatefulCapabilityTlvParser()));
+               regs.add(context.registerTlvSerializer(Stateful.class, new Stateful07StatefulCapabilityTlvParser()));
+               regs.add(context.registerTlvParser(Stateful07LspSymbolicNameTlvParser.TYPE, new Stateful07LspSymbolicNameTlvParser()));
+               regs.add(context.registerTlvSerializer(SymbolicPathName.class, new Stateful07LspSymbolicNameTlvParser()));
 
                return regs;
        }
index d8c2cf7eafe6bc7de5926584274f60fffa3cc714..53441e1402e5bf21607c4913a1fb78f301a432e8 100644 (file)
@@ -14,10 +14,10 @@ import java.io.IOException;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.protocol.pcep.ietf.initiated00.PCEPLspObjectParser;
-import org.opendaylight.protocol.pcep.ietf.initiated00.PCEPSrpObjectParser;
-import org.opendaylight.protocol.pcep.ietf.stateful07.PCEPLspaObjectParser;
-import org.opendaylight.protocol.pcep.ietf.stateful07.PCEPOpenObjectParser;
+import org.opendaylight.protocol.pcep.ietf.initiated00.CInitiated00LspObjectParser;
+import org.opendaylight.protocol.pcep.ietf.initiated00.CInitiated00SrpObjectParser;
+import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07LspaObjectParser;
+import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07OpenObjectParser;
 import org.opendaylight.protocol.pcep.spi.ObjectHeaderImpl;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
@@ -56,7 +56,7 @@ public class PCEPObjectParserTest {
 
        @Test
        public void testOpenObjectWithTLV() throws PCEPDeserializerException, IOException {
-               final PCEPOpenObjectParser parser = new PCEPOpenObjectParser(this.tlvRegistry);
+               final Stateful07OpenObjectParser parser = new Stateful07OpenObjectParser(this.tlvRegistry);
                final byte[] result = ByteArray.fileToBytes("src/test/resources/PCEPOpenObject1.bin");
 
                final OpenBuilder builder = new OpenBuilder();
@@ -81,7 +81,7 @@ public class PCEPObjectParserTest {
 
        @Test
        public void testLspObjectWithTLV() throws IOException, PCEPDeserializerException {
-               final PCEPLspObjectParser parser = new PCEPLspObjectParser(this.tlvRegistry);
+               final CInitiated00LspObjectParser parser = new CInitiated00LspObjectParser(this.tlvRegistry);
                final byte[] result = ByteArray.fileToBytes("src/test/resources/PCEPLspObject1WithTLV.bin");
 
                final LspBuilder builder = new LspBuilder();
@@ -106,7 +106,7 @@ public class PCEPObjectParserTest {
 
        @Test
        public void testLspaObject() throws IOException, PCEPDeserializerException {
-               final PCEPLspaObjectParser parser = new PCEPLspaObjectParser(this.tlvRegistry);
+               final Stateful07LspaObjectParser parser = new Stateful07LspaObjectParser(this.tlvRegistry);
                final LspaBuilder builder = new LspaBuilder();
                final byte[] result = ByteArray.fileToBytes("src/test/resources/PCEPLspaObject3RandVals.bin");
 
@@ -125,7 +125,7 @@ public class PCEPObjectParserTest {
 
        @Test
        public void testSrpObject() throws IOException, PCEPDeserializerException {
-               final PCEPSrpObjectParser parser = new PCEPSrpObjectParser(this.tlvRegistry);
+               final CInitiated00SrpObjectParser parser = new CInitiated00SrpObjectParser(this.tlvRegistry);
                final byte[] result = new byte[] { (byte) 0x21, (byte) 0x10, (byte) 0x00, (byte) 0x0c, 0, 0, 0, (byte) 0x01, 0, 0, 0, (byte) 0x01 };
 
                final SrpBuilder builder = new SrpBuilder();
index 8fae87462d07af007fdbb96c1a9bb62e04c791b9..0516f279c86c839d538168c561fbf2b3c8eab223 100644 (file)
@@ -13,12 +13,12 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 import org.opendaylight.protocol.concepts.Ipv4Util;
 import org.opendaylight.protocol.concepts.Ipv6Util;
-import org.opendaylight.protocol.pcep.ietf.stateful07.LSPIdentifierIpv4TlvParser;
-import org.opendaylight.protocol.pcep.ietf.stateful07.LSPIdentifierIpv6TlvParser;
-import org.opendaylight.protocol.pcep.ietf.stateful07.LspSymbolicNameTlvParser;
-import org.opendaylight.protocol.pcep.ietf.stateful07.LspUpdateErrorTlvParser;
-import org.opendaylight.protocol.pcep.ietf.stateful07.PCEStatefulCapabilityTlvParser;
-import org.opendaylight.protocol.pcep.ietf.stateful07.RSVPErrorSpecTlvParser;
+import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07LSPIdentifierIpv4TlvParser;
+import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07LSPIdentifierIpv6TlvParser;
+import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07LspSymbolicNameTlvParser;
+import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07LspUpdateErrorTlvParser;
+import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07StatefulCapabilityTlvParser;
+import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07RSVPErrorSpecTlvParser;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.iana.rev130816.EnterpriseNumber;
@@ -74,7 +74,7 @@ public class PCEPTlvParserTest {
 
        @Test
        public void testStatefulTlv() throws PCEPDeserializerException {
-               final PCEStatefulCapabilityTlvParser parser = new PCEStatefulCapabilityTlvParser();
+               final Stateful07StatefulCapabilityTlvParser parser = new Stateful07StatefulCapabilityTlvParser();
                final Stateful tlv = new StatefulBuilder().setLspUpdateCapability(Boolean.TRUE).build();
                assertEquals(tlv, parser.parseTlv(statefulBytes));
                assertArrayEquals(statefulBytes, parser.serializeTlv(tlv));
@@ -82,7 +82,7 @@ public class PCEPTlvParserTest {
 
        @Test
        public void testSymbolicNameTlv() throws PCEPDeserializerException {
-               final LspSymbolicNameTlvParser parser = new LspSymbolicNameTlvParser();
+               final Stateful07LspSymbolicNameTlvParser parser = new Stateful07LspSymbolicNameTlvParser();
                final SymbolicPathName tlv = new SymbolicPathNameBuilder().setPathName(
                                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.SymbolicPathName("Med test of symbolic name".getBytes())).build();
                assertEquals(tlv, parser.parseTlv(symbolicNameBytes));
@@ -91,7 +91,7 @@ public class PCEPTlvParserTest {
 
        @Test
        public void testLspErrorCodeTlv() throws PCEPDeserializerException {
-               final LspUpdateErrorTlvParser parser = new LspUpdateErrorTlvParser();
+               final Stateful07LspUpdateErrorTlvParser parser = new Stateful07LspUpdateErrorTlvParser();
                final LspErrorCode tlv = new LspErrorCodeBuilder().setErrorCode(627610883L).build();
                assertEquals(tlv, parser.parseTlv(lspUpdateErrorBytes));
                assertArrayEquals(lspUpdateErrorBytes, parser.serializeTlv(tlv));
@@ -99,7 +99,7 @@ public class PCEPTlvParserTest {
 
        @Test
        public void testLspIdentifiers4Tlv() throws PCEPDeserializerException {
-               final LSPIdentifierIpv4TlvParser parser = new LSPIdentifierIpv4TlvParser();
+               final Stateful07LSPIdentifierIpv4TlvParser parser = new Stateful07LSPIdentifierIpv4TlvParser();
                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,
@@ -113,7 +113,7 @@ public class PCEPTlvParserTest {
 
        @Test
        public void testLspIdentifiers6Tlv() throws PCEPDeserializerException {
-               final LSPIdentifierIpv6TlvParser parser = new LSPIdentifierIpv6TlvParser();
+               final Stateful07LSPIdentifierIpv6TlvParser parser = new Stateful07LSPIdentifierIpv6TlvParser();
                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,
@@ -132,7 +132,7 @@ public class PCEPTlvParserTest {
 
        @Test
        public void testRSVPError4SpecTlv() throws PCEPDeserializerException {
-               final RSVPErrorSpecTlvParser parser = new RSVPErrorSpecTlvParser();
+               final Stateful07RSVPErrorSpecTlvParser parser = new Stateful07RSVPErrorSpecTlvParser();
                final RsvpErrorBuilder builder = new RsvpErrorBuilder();
                builder.setNode(new IpAddress(Ipv4Util.addressForBytes(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })));
                builder.setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.ErrorSpec.Flags(false, true));
@@ -145,7 +145,7 @@ public class PCEPTlvParserTest {
 
        @Test
        public void testRSVPError6SpecTlv() throws PCEPDeserializerException {
-               final RSVPErrorSpecTlvParser parser = new RSVPErrorSpecTlvParser();
+               final Stateful07RSVPErrorSpecTlvParser parser = new Stateful07RSVPErrorSpecTlvParser();
                final RsvpErrorBuilder builder = new RsvpErrorBuilder();
                builder.setNode(new IpAddress(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,
@@ -160,7 +160,7 @@ public class PCEPTlvParserTest {
 
        @Test
        public void testUserErrorSpecTlv() throws PCEPDeserializerException {
-               final RSVPErrorSpecTlvParser parser = new RSVPErrorSpecTlvParser();
+               final Stateful07RSVPErrorSpecTlvParser parser = new Stateful07RSVPErrorSpecTlvParser();
                final UserErrorBuilder builder = new UserErrorBuilder();
                builder.setEnterprise(new EnterpriseNumber(12345L));
                builder.setSubOrg((short) 5);
index 6e0fb25a39c7d28bd2266a5251fb78ad3f3efd5c..fed334d99d3417f7f4b66e00bc5b452e4c20b6cd 100644 (file)
@@ -19,9 +19,9 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.protocol.pcep.ietf.initiated00.CrabbeInitiatedActivator;
-import org.opendaylight.protocol.pcep.ietf.initiated00.PcinitiateMessageParser;
-import org.opendaylight.protocol.pcep.ietf.stateful07.PCEPReportMessageParser;
-import org.opendaylight.protocol.pcep.ietf.stateful07.PCEPUpdateRequestMessageParser;
+import org.opendaylight.protocol.pcep.ietf.initiated00.CInitiated00PCInitiateMessageParser;
+import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07PCReportMessageParser;
+import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07PCUpdateRequestMessageParser;
 import org.opendaylight.protocol.pcep.ietf.stateful07.StatefulActivator;
 import org.opendaylight.protocol.pcep.impl.Activator;
 import org.opendaylight.protocol.pcep.impl.message.PCEPCloseMessageParser;
@@ -501,7 +501,7 @@ public class PCEPValidatorTest {
                        a.start(this.ctx);
                        byte[] result = ByteArray.fileToBytes("src/test/resources/PCUpd.2.bin");
 
-                       final PCEPUpdateRequestMessageParser parser = new PCEPUpdateRequestMessageParser(this.ctx.getObjectHandlerRegistry());
+                       final Stateful07PCUpdateRequestMessageParser parser = new Stateful07PCUpdateRequestMessageParser(this.ctx.getObjectHandlerRegistry());
 
                        final PcupdMessageBuilder builder = new PcupdMessageBuilder();
 
@@ -542,7 +542,7 @@ public class PCEPValidatorTest {
                        a.start(this.ctx);
                        byte[] result = ByteArray.fileToBytes("src/test/resources/PCRpt.1.bin");
 
-                       final PCEPReportMessageParser parser = new PCEPReportMessageParser(this.ctx.getObjectHandlerRegistry());
+                       final Stateful07PCReportMessageParser parser = new Stateful07PCReportMessageParser(this.ctx.getObjectHandlerRegistry());
 
                        final PcrptMessageBuilder builder = new PcrptMessageBuilder();
 
@@ -613,7 +613,7 @@ public class PCEPValidatorTest {
                        a.start(this.ctx);
                        final byte[] result = ByteArray.fileToBytes("src/test/resources/Pcinit.bin");
 
-                       final PcinitiateMessageParser parser = new PcinitiateMessageParser(this.ctx.getObjectHandlerRegistry());
+                       final CInitiated00PCInitiateMessageParser parser = new CInitiated00PCInitiateMessageParser(this.ctx.getObjectHandlerRegistry());
 
                        final PcinitiateMessageBuilder builder = new PcinitiateMessageBuilder();
                        final RequestsBuilder rBuilder = new RequestsBuilder();