Rename stateful02 handlers

Preparatory work for tying them with the base implementations.

Change-Id: Ie4a6727e25b9de2217bc78ece8fae91d8c2d94fa
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/LspDbVersionTlvParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02LspDbVersionTlvParser.java
similarity index 96%
rename from pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/LspDbVersionTlvParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02LspDbVersionTlvParser.java
index df9d40d8d805d4adb9f14a7f30f330d5831fb4b1..7ba14028af3f538a83c3c668c4aac6c8f258c9f7 100644 (file)
--- a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/LspDbVersionTlvParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02LspDbVersionTlvParser.java
@@ -22,7 +22,7 @@ import com.google.common.primitives.UnsignedLong;
 /**
  * Parser for {@link LspDbVersion}
  */
-public class LspDbVersionTlvParser implements TlvParser, TlvSerializer {
+public class Stateful02LspDbVersionTlvParser implements TlvParser, TlvSerializer {
 
        public static final int TYPE = 23;
 

diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPLspObjectParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02LspObjectParser.java
similarity index 97%
rename from pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPLspObjectParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02LspObjectParser.java
index b1a2477e91bd23fcd04dddfb32976c1b1704d8a0..641d04a4230e9e9d2c374c01e60041fe6f8fbe60 100644 (file)
--- a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPLspObjectParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02LspObjectParser.java
@@ -29,7 +29,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 Stateful02LspObjectParser extends AbstractObjectWithTlvsParser<TlvsBuilder> {
 
        public static final int CLASS = 32;
 
@@ -49,7 +49,7 @@ public class PCEPLspObjectParser extends AbstractObjectWithTlvsParser<TlvsBuilde
        private static final int REMOVE_FLAG_OFFSET = 12;
        private static final int OPERATIONAL_FLAG_OFFSET = 13;
 
-       public PCEPLspObjectParser(final TlvHandlerRegistry tlvReg) {
+       public Stateful02LspObjectParser(final TlvHandlerRegistry tlvReg) {
                super(tlvReg);
        }
 

diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/LspSymbolicNameTlvParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02LspSymbolicNameTlvParser.java
similarity index 95%
rename from pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/LspSymbolicNameTlvParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02LspSymbolicNameTlvParser.java
index ee850b88b9fee73b2512f637e90fb32b99256f5c..3e7097fa923ac5585bd815fdac1d5cbf93a754ec 100644 (file)
--- a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/LspSymbolicNameTlvParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02LspSymbolicNameTlvParser.java
@@ -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 Stateful02LspSymbolicNameTlvParser implements TlvParser, TlvSerializer {
 
        public static final int TYPE = 17;
 

diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPLspaObjectParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02LspaObjectParser.java
similarity index 97%
rename from pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPLspaObjectParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02LspaObjectParser.java
index 2cd843a9379ef98449f0e0cbd0a752d8476c5ba6..dad968cb0a13c809288f5c98a9be77ccd11539a8 100644 (file)
--- a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPLspaObjectParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02LspaObjectParser.java
@@ -30,7 +30,7 @@ import com.google.common.primitives.UnsignedBytes;
 /**
  * Parser for {@link Lspa}
  */
-public class PCEPLspaObjectParser extends AbstractObjectWithTlvsParser<TlvsBuilder> {
+public class Stateful02LspaObjectParser extends AbstractObjectWithTlvsParser<TlvsBuilder> {
 
        public static final int CLASS = 9;
 
@@ -62,7 +62,7 @@ public class PCEPLspaObjectParser extends AbstractObjectWithTlvsParser<TlvsBuild
        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 Stateful02LspaObjectParser(final TlvHandlerRegistry tlvReg) {
                super(tlvReg);
        }
 

diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/NodeIdentifierTlvParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02NodeIdentifierTlvParser.java
similarity index 93%
rename from pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/NodeIdentifierTlvParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02NodeIdentifierTlvParser.java
index 35873dcc4d315f54315f86385628da6de1c5c58f..441f220623b273c62c47a045602fcd942bbe5a86 100644 (file)
--- a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/NodeIdentifierTlvParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02NodeIdentifierTlvParser.java
@@ -14,7 +14,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.cra
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.stateful._02.rev140110.node.identifier.tlv.NodeIdentifierBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Tlv;
 
-public class NodeIdentifierTlvParser implements TlvParser, TlvSerializer {
+public class Stateful02NodeIdentifierTlvParser implements TlvParser, TlvSerializer {
 
        public static final int TYPE = 24;
 

diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPOpenObjectParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02OpenObjectParser.java
similarity index 96%
rename from pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPOpenObjectParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02OpenObjectParser.java
index 9767d42dc201bfc7a046c0e90c105cdcdbb729af..274236c7f5839bad36ac5a46e8bbcdfdd5317f88 100644 (file)
--- a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPOpenObjectParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02OpenObjectParser.java
@@ -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 Stateful02OpenObjectParser extends AbstractObjectWithTlvsParser<TlvsBuilder> {
+       private static final Logger LOG = LoggerFactory.getLogger(Stateful02OpenObjectParser.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 Stateful02OpenObjectParser(final TlvHandlerRegistry tlvReg) {
                super(tlvReg);
        }
 

diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPReplyMessageParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCReplyMessageParser.java
similarity index 98%
rename from pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPReplyMessageParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCReplyMessageParser.java
index b4c167203e7350c753833538d8ea4babc7423718..3d8d074e3d20b526559af6fdbbfdfefd9dab19a0 100644 (file)
--- a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPReplyMessageParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCReplyMessageParser.java
@@ -49,11 +49,11 @@ import com.google.common.collect.Lists;
 /**
  * Parser for {@link Pcrep}
  */
-public class PCEPReplyMessageParser extends AbstractMessageParser {
+public class Stateful02PCReplyMessageParser extends AbstractMessageParser {
 
        public static final int TYPE = 4;
 
-       public PCEPReplyMessageParser(final ObjectHandlerRegistry registry) {
+       public Stateful02PCReplyMessageParser(final ObjectHandlerRegistry registry) {
                super(registry);
        }
 

diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPReportMessageParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCReportMessageParser.java
similarity index 97%
rename from pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPReportMessageParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCReportMessageParser.java
index f0ceb64fa9313d5e3ea3a9dfee0ded3bc30a2c43..6dcf375a4e38ef140f008ec704937bf63ae93655 100644 (file)
--- a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPReportMessageParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCReportMessageParser.java
@@ -38,11 +38,11 @@ import com.google.common.collect.Lists;
 /**
  * Parser for {@link Pcrpt}
  */
-public class PCEPReportMessageParser extends AbstractMessageParser {
+public class Stateful02PCReportMessageParser extends AbstractMessageParser {
 
        public static final int TYPE = 10;
 
-       public PCEPReportMessageParser(final ObjectHandlerRegistry registry) {
+       public Stateful02PCReportMessageParser(final ObjectHandlerRegistry registry) {
                super(registry);
        }
 

diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPRequestMessageParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCRequestMessageParser.java
similarity index 98%
rename from pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPRequestMessageParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCRequestMessageParser.java
index 7a3f400a68852f2d49380184830eb5a497c99f3e..64874c810b760c54770a80e64b5b55acc592c8be 100644 (file)
--- a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPRequestMessageParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCRequestMessageParser.java
@@ -57,11 +57,11 @@ import com.google.common.collect.Lists;
 /**
  * Parser for {@link Pcreq}
  */
-public class PCEPRequestMessageParser extends AbstractMessageParser {
+public class Stateful02PCRequestMessageParser extends AbstractMessageParser {
 
        public static final int TYPE = 3;
 
-       public PCEPRequestMessageParser(final ObjectHandlerRegistry registry) {
+       public Stateful02PCRequestMessageParser(final ObjectHandlerRegistry registry) {
                super(registry);
        }
 

diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPUpdateRequestMessageParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCUpdateRequestMessageParser.java
similarity index 97%
rename from pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPUpdateRequestMessageParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCUpdateRequestMessageParser.java
index 84ad820c9ed1477d7c56683dd8f7f1a8ff970ac5..82590c05cc435ff33c5e34bf23b8bda1bc1a6919 100644 (file)
--- a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPUpdateRequestMessageParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCUpdateRequestMessageParser.java
@@ -38,11 +38,11 @@ import com.google.common.collect.Lists;
 /**
  * Parser for {@link Pcupd}
  */
-public class PCEPUpdateRequestMessageParser extends AbstractMessageParser {
+public class Stateful02PCUpdateRequestMessageParser extends AbstractMessageParser {
 
        public static final int TYPE = 11;
 
-       public PCEPUpdateRequestMessageParser(final ObjectHandlerRegistry registry) {
+       public Stateful02PCUpdateRequestMessageParser(final ObjectHandlerRegistry registry) {
                super(registry);
        }
 

diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/RSVPErrorSpecTlvParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02RSVPErrorSpecTlvParser.java
similarity index 99%
rename from pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/RSVPErrorSpecTlvParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02RSVPErrorSpecTlvParser.java
index 4c724d25d24c436015bdd4d7aa7f7aff1a311140..8b4da97f0693fc165ed1657f6958b531ff3ffaa2 100644 (file)
--- a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/RSVPErrorSpecTlvParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02RSVPErrorSpecTlvParser.java
@@ -37,7 +37,7 @@ import com.google.common.primitives.UnsignedBytes;
 /**
  * Parser for {@link RsvpErrorSpec}
  */
-public final class RSVPErrorSpecTlvParser implements TlvParser, TlvSerializer {
+public final class Stateful02RSVPErrorSpecTlvParser implements TlvParser, TlvSerializer {
 
        public static final int TYPE = 21;
 

diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEStatefulCapabilityTlvParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02StatefulCapabilityTlvParser.java
similarity index 96%
rename from pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEStatefulCapabilityTlvParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02StatefulCapabilityTlvParser.java
index 22681b1213f1d77493bd71388206219fc6ebebb7..dd49c3ff9e9f2471ad5fb1b0d852befd2dd3de88 100644 (file)
--- a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEStatefulCapabilityTlvParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02StatefulCapabilityTlvParser.java
@@ -17,7 +17,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.cra
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.stateful._02.rev140110.stateful.capability.tlv.StatefulBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Tlv;
 
-public final class PCEStatefulCapabilityTlvParser implements TlvParser, TlvSerializer {
+public final class Stateful02StatefulCapabilityTlvParser implements TlvParser, TlvSerializer {
 
        public static final int TYPE = 16;
 

diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/StatefulActivator.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/StatefulActivator.java
index 8417336f57fc32b8a4eeb3924e8efeffd75002c4..e33c0dc297fb624c08ad2942611fb93f52215f85 100644 (file)
--- a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/StatefulActivator.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/StatefulActivator.java
@@ -30,47 +30,47 @@ public class StatefulActivator extends AbstractPCEPExtensionProviderActivator {
        protected List<AutoCloseable> startImpl(final PCEPExtensionProviderContext context) {
                final List<AutoCloseable> regs = new ArrayList<>();
 
-               regs.add(context.registerMessageParser(PCEPUpdateRequestMessageParser.TYPE,
-                               new PCEPUpdateRequestMessageParser(context.getObjectHandlerRegistry())));
-               regs.add(context.registerMessageSerializer(Pcupd.class, new PCEPUpdateRequestMessageParser(context.getObjectHandlerRegistry())));
+               regs.add(context.registerMessageParser(Stateful02PCUpdateRequestMessageParser.TYPE,
+                               new Stateful02PCUpdateRequestMessageParser(context.getObjectHandlerRegistry())));
+               regs.add(context.registerMessageSerializer(Pcupd.class, new Stateful02PCUpdateRequestMessageParser(context.getObjectHandlerRegistry())));
 
-               regs.add(context.registerMessageParser(PCEPReportMessageParser.TYPE,
-                               new PCEPReportMessageParser(context.getObjectHandlerRegistry())));
-               regs.add(context.registerMessageSerializer(Pcrpt.class, new PCEPReportMessageParser(context.getObjectHandlerRegistry())));
+               regs.add(context.registerMessageParser(Stateful02PCReportMessageParser.TYPE,
+                               new Stateful02PCReportMessageParser(context.getObjectHandlerRegistry())));
+               regs.add(context.registerMessageSerializer(Pcrpt.class, new Stateful02PCReportMessageParser(context.getObjectHandlerRegistry())));
 
-               regs.add(context.registerMessageParser(PCEPReplyMessageParser.TYPE, new PCEPReplyMessageParser(context.getObjectHandlerRegistry())));
-               regs.add(context.registerMessageSerializer(Pcrep.class, new PCEPReplyMessageParser(context.getObjectHandlerRegistry())));
+               regs.add(context.registerMessageParser(Stateful02PCReplyMessageParser.TYPE, new Stateful02PCReplyMessageParser(context.getObjectHandlerRegistry())));
+               regs.add(context.registerMessageSerializer(Pcrep.class, new Stateful02PCReplyMessageParser(context.getObjectHandlerRegistry())));
 
-               regs.add(context.registerMessageParser(PCEPRequestMessageParser.TYPE,
-                               new PCEPRequestMessageParser(context.getObjectHandlerRegistry())));
-               regs.add(context.registerMessageSerializer(Pcreq.class, new PCEPRequestMessageParser(context.getObjectHandlerRegistry())));
+               regs.add(context.registerMessageParser(Stateful02PCRequestMessageParser.TYPE,
+                               new Stateful02PCRequestMessageParser(context.getObjectHandlerRegistry())));
+               regs.add(context.registerMessageSerializer(Pcreq.class, new Stateful02PCRequestMessageParser(context.getObjectHandlerRegistry())));
 
-               regs.add(context.registerObjectParser(PCEPLspObjectParser.CLASS, PCEPLspObjectParser.TYPE,
-                               new PCEPLspObjectParser(context.getTlvHandlerRegistry())));
-               regs.add(context.registerObjectSerializer(Lsp.class, new PCEPLspObjectParser(context.getTlvHandlerRegistry())));
+               regs.add(context.registerObjectParser(Stateful02LspObjectParser.CLASS, Stateful02LspObjectParser.TYPE,
+                               new Stateful02LspObjectParser(context.getTlvHandlerRegistry())));
+               regs.add(context.registerObjectSerializer(Lsp.class, new Stateful02LspObjectParser(context.getTlvHandlerRegistry())));
 
-               regs.add(context.registerObjectParser(PCEPOpenObjectParser.CLASS, PCEPOpenObjectParser.TYPE,
-                               new PCEPOpenObjectParser(context.getTlvHandlerRegistry())));
-               regs.add(context.registerObjectSerializer(Open.class, new PCEPOpenObjectParser(context.getTlvHandlerRegistry())));
+               regs.add(context.registerObjectParser(Stateful02OpenObjectParser.CLASS, Stateful02OpenObjectParser.TYPE,
+                               new Stateful02OpenObjectParser(context.getTlvHandlerRegistry())));
+               regs.add(context.registerObjectSerializer(Open.class, new Stateful02OpenObjectParser(context.getTlvHandlerRegistry())));
 
-               regs.add(context.registerObjectParser(PCEPLspaObjectParser.CLASS, PCEPLspaObjectParser.TYPE,
-                               new PCEPLspaObjectParser(context.getTlvHandlerRegistry())));
-               regs.add(context.registerObjectSerializer(Lspa.class, new PCEPLspaObjectParser(context.getTlvHandlerRegistry())));
+               regs.add(context.registerObjectParser(Stateful02LspaObjectParser.CLASS, Stateful02LspaObjectParser.TYPE,
+                               new Stateful02LspaObjectParser(context.getTlvHandlerRegistry())));
+               regs.add(context.registerObjectSerializer(Lspa.class, new Stateful02LspaObjectParser(context.getTlvHandlerRegistry())));
 
-               regs.add(context.registerTlvParser(PCEStatefulCapabilityTlvParser.TYPE, new PCEStatefulCapabilityTlvParser()));
-               regs.add(context.registerTlvSerializer(Stateful.class, new PCEStatefulCapabilityTlvParser()));
+               regs.add(context.registerTlvParser(Stateful02StatefulCapabilityTlvParser.TYPE, new Stateful02StatefulCapabilityTlvParser()));
+               regs.add(context.registerTlvSerializer(Stateful.class, new Stateful02StatefulCapabilityTlvParser()));
 
-               regs.add(context.registerTlvParser(LspDbVersionTlvParser.TYPE, new LspDbVersionTlvParser()));
-               regs.add(context.registerTlvSerializer(LspDbVersion.class, new LspDbVersionTlvParser()));
+               regs.add(context.registerTlvParser(Stateful02LspDbVersionTlvParser.TYPE, new Stateful02LspDbVersionTlvParser()));
+               regs.add(context.registerTlvSerializer(LspDbVersion.class, new Stateful02LspDbVersionTlvParser()));
 
-               regs.add(context.registerTlvParser(NodeIdentifierTlvParser.TYPE, new NodeIdentifierTlvParser()));
-               regs.add(context.registerTlvSerializer(NodeIdentifier.class, new NodeIdentifierTlvParser()));
+               regs.add(context.registerTlvParser(Stateful02NodeIdentifierTlvParser.TYPE, new Stateful02NodeIdentifierTlvParser()));
+               regs.add(context.registerTlvSerializer(NodeIdentifier.class, new Stateful02NodeIdentifierTlvParser()));
 
-               regs.add(context.registerTlvParser(LspSymbolicNameTlvParser.TYPE, new LspSymbolicNameTlvParser()));
-               regs.add(context.registerTlvSerializer(SymbolicPathName.class, new LspSymbolicNameTlvParser()));
+               regs.add(context.registerTlvParser(Stateful02LspSymbolicNameTlvParser.TYPE, new Stateful02LspSymbolicNameTlvParser()));
+               regs.add(context.registerTlvSerializer(SymbolicPathName.class, new Stateful02LspSymbolicNameTlvParser()));
 
-               regs.add(context.registerTlvParser(RSVPErrorSpecTlvParser.TYPE, new RSVPErrorSpecTlvParser()));
-               regs.add(context.registerTlvSerializer(RsvpErrorSpec.class, new RSVPErrorSpecTlvParser()));
+               regs.add(context.registerTlvParser(Stateful02RSVPErrorSpecTlvParser.TYPE, new Stateful02RSVPErrorSpecTlvParser()));
+               regs.add(context.registerTlvSerializer(RsvpErrorSpec.class, new Stateful02RSVPErrorSpecTlvParser()));
 
                return regs;
        }

diff --git a/pcep/ietf-stateful02/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPObjectParserTest.java b/pcep/ietf-stateful02/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPObjectParserTest.java
index 143de6a34a3928690f2955922be5eb6f39eb7c2e..1680815c53b78d54e62f3d5f3f1dd591c14eca33 100644 (file)
--- a/pcep/ietf-stateful02/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPObjectParserTest.java
+++ b/pcep/ietf-stateful02/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPObjectParserTest.java
@@ -13,8 +13,8 @@ import java.io.IOException;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.protocol.pcep.ietf.stateful02.PCEPOpenObjectParser;
-import org.opendaylight.protocol.pcep.ietf.stateful02.PCEPLspaObjectParser;
+import org.opendaylight.protocol.pcep.ietf.stateful02.Stateful02OpenObjectParser;
+import org.opendaylight.protocol.pcep.ietf.stateful02.Stateful02LspaObjectParser;
 import org.opendaylight.protocol.pcep.spi.ObjectHeaderImpl;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
@@ -47,7 +47,7 @@ public class PCEPObjectParserTest {
 
        @Test
        public void testOpenObjectWithTLV() throws PCEPDeserializerException, IOException {
-               final PCEPOpenObjectParser parser = new PCEPOpenObjectParser(this.tlvRegistry);
+               final Stateful02OpenObjectParser parser = new Stateful02OpenObjectParser(this.tlvRegistry);
                final byte[] result = ByteArray.fileToBytes("src/test/resources/PCEPOpenObject1.bin");
 
                final OpenBuilder builder = new OpenBuilder();
@@ -78,7 +78,7 @@ public class PCEPObjectParserTest {
 
        @Test
        public void testLspaObjectWithTlv() throws IOException, PCEPDeserializerException {
-               final PCEPLspaObjectParser parser = new PCEPLspaObjectParser(this.tlvRegistry);
+               final Stateful02LspaObjectParser parser = new Stateful02LspaObjectParser(this.tlvRegistry);
                final byte[] result = ByteArray.fileToBytes("src/test/resources/PCEPLspaObject1LowerBounds.bin");
 
                final LspaBuilder builder = new LspaBuilder();

diff --git a/pcep/ietf-stateful02/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPTlvParserTest.java b/pcep/ietf-stateful02/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPTlvParserTest.java
index 26192853e325e18abc2b7c962187e8a9c57c3766..83bec50d9ab7b6f17656c7343f7c644f7e23ed46 100644 (file)
--- a/pcep/ietf-stateful02/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPTlvParserTest.java
+++ b/pcep/ietf-stateful02/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPTlvParserTest.java
@@ -13,9 +13,9 @@ 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.stateful02.LspSymbolicNameTlvParser;
-import org.opendaylight.protocol.pcep.ietf.stateful02.PCEStatefulCapabilityTlvParser;
-import org.opendaylight.protocol.pcep.ietf.stateful02.RSVPErrorSpecTlvParser;
+import org.opendaylight.protocol.pcep.ietf.stateful02.Stateful02LspSymbolicNameTlvParser;
+import org.opendaylight.protocol.pcep.ietf.stateful02.Stateful02StatefulCapabilityTlvParser;
+import org.opendaylight.protocol.pcep.ietf.stateful02.Stateful02RSVPErrorSpecTlvParser;
 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;
@@ -48,7 +48,7 @@ public class PCEPTlvParserTest {
 
        @Test
        public void testStatefulTlv() throws PCEPDeserializerException {
-               final PCEStatefulCapabilityTlvParser parser = new PCEStatefulCapabilityTlvParser();
+               final Stateful02StatefulCapabilityTlvParser parser = new Stateful02StatefulCapabilityTlvParser();
                final Stateful tlv = new StatefulBuilder().setLspUpdateCapability(Boolean.TRUE).setIncludeDbVersion(false).build();
                assertEquals(tlv, parser.parseTlv(statefulBytes));
                assertArrayEquals(statefulBytes, parser.serializeTlv(tlv));
@@ -56,7 +56,7 @@ public class PCEPTlvParserTest {
 
        @Test
        public void testSymbolicNameTlv() throws PCEPDeserializerException {
-               final LspSymbolicNameTlvParser parser = new LspSymbolicNameTlvParser();
+               final Stateful02LspSymbolicNameTlvParser parser = new Stateful02LspSymbolicNameTlvParser();
                final SymbolicPathName tlv = new SymbolicPathNameBuilder().setPathName(
                                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.stateful._02.rev140110.SymbolicPathName("Med test of symbolic name".getBytes())).build();
                assertEquals(tlv, parser.parseTlv(symbolicNameBytes));
@@ -65,7 +65,7 @@ public class PCEPTlvParserTest {
 
        @Test
        public void testRSVPError4SpecTlv() throws PCEPDeserializerException {
-               final RSVPErrorSpecTlvParser parser = new RSVPErrorSpecTlvParser();
+               final Stateful02RSVPErrorSpecTlvParser parser = new Stateful02RSVPErrorSpecTlvParser();
                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));
@@ -78,7 +78,7 @@ public class PCEPTlvParserTest {
 
        @Test
        public void testRSVPError6SpecTlv() throws PCEPDeserializerException {
-               final RSVPErrorSpecTlvParser parser = new RSVPErrorSpecTlvParser();
+               final Stateful02RSVPErrorSpecTlvParser parser = new Stateful02RSVPErrorSpecTlvParser();
                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,
@@ -93,7 +93,7 @@ public class PCEPTlvParserTest {
 
        @Test
        public void testUserErrorSpecTlv() throws PCEPDeserializerException {
-               final RSVPErrorSpecTlvParser parser = new RSVPErrorSpecTlvParser();
+               final Stateful02RSVPErrorSpecTlvParser parser = new Stateful02RSVPErrorSpecTlvParser();
                final UserErrorBuilder builder = new UserErrorBuilder();
                builder.setEnterprise(new EnterpriseNumber(12345L));
                builder.setSubOrg((short) 5);