Moved stateful02 parsers to its own artefact.

Change-Id: I5dfc1f561c0b21932dcf6d9a4e4d35a5ebd77bb0
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>

diff --git a/pcep/ietf-stateful02/pom.xml b/pcep/ietf-stateful02/pom.xml
index c4383a61752cf170fe497abf3d07ecea692e4c52..e5b45210c55ac484de601e498bd7c93b7b2a80af 100644 (file)
--- a/pcep/ietf-stateful02/pom.xml
+++ b/pcep/ietf-stateful02/pom.xml
@@ -29,6 +29,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>pcep-spi</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>concepts</artifactId>

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/initiated00/InitiatedActivator.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/crabbe/initiated00/InitiatedActivator.java
similarity index 96%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/initiated00/InitiatedActivator.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/crabbe/initiated00/InitiatedActivator.java
index 7fa2ababa0156ce7c6a4126882904f6ad821d478..9e1db04738e36c537b2d7c98ac2989bea6dcdb6d 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/initiated00/InitiatedActivator.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/crabbe/initiated00/InitiatedActivator.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.initiated00;
+package org.opendaylight.protocol.pcep.crabbe.initiated00;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/initiated00/LSPCleanupTlvParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/crabbe/initiated00/LSPCleanupTlvParser.java
similarity index 95%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/initiated00/LSPCleanupTlvParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/crabbe/initiated00/LSPCleanupTlvParser.java
index 6317439b0485d4b50f4911909acbd31a93848a75..eb966aa100e956ecd1a3eaf9415d5df848b2e32c 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/initiated00/LSPCleanupTlvParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/crabbe/initiated00/LSPCleanupTlvParser.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.initiated00;
+package org.opendaylight.protocol.pcep.crabbe.initiated00;
 
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvParser;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/initiated00/PCEStatefulCapabilityTlvParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/crabbe/initiated00/PCEStatefulCapabilityTlvParser.java
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/initiated00/PCEStatefulCapabilityTlvParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/crabbe/initiated00/PCEStatefulCapabilityTlvParser.java
index c3dd740fe510a81c4a100cd4abb2b6a0dae2d4ab..aebf246869583c823bb4b520e31caff57a41d1e2 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/initiated00/PCEStatefulCapabilityTlvParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/crabbe/initiated00/PCEStatefulCapabilityTlvParser.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.initiated00;
+package org.opendaylight.protocol.pcep.crabbe.initiated00;
 
 import java.util.BitSet;
 

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/initiated00/PcinitiateMessageParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/crabbe/initiated00/PcinitiateMessageParser.java
similarity index 97%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/initiated00/PcinitiateMessageParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/crabbe/initiated00/PcinitiateMessageParser.java
index 764b1f07baa4bc7ca39991e42e88354736b1f9b1..cf2f58b47272c9232304be7b729afcf1d9446ffd 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/initiated00/PcinitiateMessageParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/crabbe/initiated00/PcinitiateMessageParser.java
@@ -5,13 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.initiated00;
+package org.opendaylight.protocol.pcep.crabbe.initiated00;
 
 import io.netty.buffer.ByteBuf;
 
 import java.util.List;
 
-import org.opendaylight.protocol.pcep.impl.message.AbstractMessageParser;
+import org.opendaylight.protocol.pcep.spi.AbstractMessageParser;
 import org.opendaylight.protocol.pcep.spi.ObjectHandlerRegistry;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated._00.rev140113.Pcinitiate;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/LspDbVersionTlvParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/LspDbVersionTlvParser.java
similarity index 97%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/LspDbVersionTlvParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/LspDbVersionTlvParser.java
index 3934d836a6dbc073175e7e7f2fc2107b7c525201..df9d40d8d805d4adb9f14a7f30f330d5831fb4b1 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/LspDbVersionTlvParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/LspDbVersionTlvParser.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.stateful02;
+package org.opendaylight.protocol.pcep.ietf.stateful02;
 
 import java.util.Arrays;
 

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/LspSymbolicNameTlvParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/LspSymbolicNameTlvParser.java
similarity index 96%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/LspSymbolicNameTlvParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/LspSymbolicNameTlvParser.java
index 740f97f39985c0a56d102339a833d62693e1b2e0..ee850b88b9fee73b2512f637e90fb32b99256f5c 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/LspSymbolicNameTlvParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/LspSymbolicNameTlvParser.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.stateful02;
+package org.opendaylight.protocol.pcep.ietf.stateful02;
 
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvParser;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/NodeIdentifierTlvParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/NodeIdentifierTlvParser.java
similarity index 95%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/NodeIdentifierTlvParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/NodeIdentifierTlvParser.java
index 666c8112ef8576f72e0a7fb1fb9daf340f7628df..35873dcc4d315f54315f86385628da6de1c5c58f 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/NodeIdentifierTlvParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/NodeIdentifierTlvParser.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.stateful02;
+package org.opendaylight.protocol.pcep.ietf.stateful02;
 
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvParser;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/PCEPLspObjectParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPLspObjectParser.java
similarity index 96%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/PCEPLspObjectParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPLspObjectParser.java
index 0528a095b411f28abc16bf8130a1363c83463f5e..1ae910086188aebd65bff19f083a3d15b055fb56 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/PCEPLspObjectParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPLspObjectParser.java
@@ -5,12 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.stateful02;
+package org.opendaylight.protocol.pcep.ietf.stateful02;
 
 import java.util.BitSet;
 
-import org.opendaylight.protocol.pcep.impl.object.AbstractObjectWithTlvsParser;
-import org.opendaylight.protocol.pcep.impl.object.ObjectUtil;
+import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
 import org.opendaylight.protocol.util.ByteArray;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/PCEPOpenObjectParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPOpenObjectParser.java
similarity index 97%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/PCEPOpenObjectParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPOpenObjectParser.java
index 705f4c01a74e8afefca5f326c76fa6c4fb6c4f46..9767d42dc201bfc7a046c0e90c105cdcdbb729af 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/PCEPOpenObjectParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPOpenObjectParser.java
@@ -5,10 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.stateful02;
+package org.opendaylight.protocol.pcep.ietf.stateful02;
 
-import org.opendaylight.protocol.pcep.impl.object.AbstractObjectWithTlvsParser;
-import org.opendaylight.protocol.pcep.impl.object.ObjectUtil;
+import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/PCEPReplyMessageParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPReplyMessageParser.java
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/PCEPReplyMessageParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPReplyMessageParser.java
index d1b8fd9912f20ba960e98ce41eb40968e737df3f..b4c167203e7350c753833538d8ea4babc7423718 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/PCEPReplyMessageParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPReplyMessageParser.java
@@ -5,13 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.stateful02;
+package org.opendaylight.protocol.pcep.ietf.stateful02;
 
 import io.netty.buffer.ByteBuf;
 
 import java.util.List;
 
-import org.opendaylight.protocol.pcep.impl.message.AbstractMessageParser;
+import org.opendaylight.protocol.pcep.spi.AbstractMessageParser;
 import org.opendaylight.protocol.pcep.spi.ObjectHandlerRegistry;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/PCEPReportMessageParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPReportMessageParser.java
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/PCEPReportMessageParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPReportMessageParser.java
index 1de8cac77521de7952434eb827b6fb0ded92d9ba..f0ceb64fa9313d5e3ea3a9dfee0ded3bc30a2c43 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/PCEPReportMessageParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPReportMessageParser.java
@@ -5,13 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.stateful02;
+package org.opendaylight.protocol.pcep.ietf.stateful02;
 
 import io.netty.buffer.ByteBuf;
 
 import java.util.List;
 
-import org.opendaylight.protocol.pcep.impl.message.AbstractMessageParser;
+import org.opendaylight.protocol.pcep.spi.AbstractMessageParser;
 import org.opendaylight.protocol.pcep.spi.ObjectHandlerRegistry;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/PCEPRequestMessageParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPRequestMessageParser.java
similarity index 99%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/PCEPRequestMessageParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPRequestMessageParser.java
index 5e71984a0deb6676687aa4b88ba18a6685c2ecaf..7a3f400a68852f2d49380184830eb5a497c99f3e 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/PCEPRequestMessageParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPRequestMessageParser.java
@@ -5,13 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.stateful02;
+package org.opendaylight.protocol.pcep.ietf.stateful02;
 
 import io.netty.buffer.ByteBuf;
 
 import java.util.List;
 
-import org.opendaylight.protocol.pcep.impl.message.AbstractMessageParser;
+import org.opendaylight.protocol.pcep.spi.AbstractMessageParser;
 import org.opendaylight.protocol.pcep.spi.ObjectHandlerRegistry;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/PCEPUpdateRequestMessageParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPUpdateRequestMessageParser.java
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/PCEPUpdateRequestMessageParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPUpdateRequestMessageParser.java
index 67231dbe3837c8b370776bb48111dd7131d7d04e..84ad820c9ed1477d7c56683dd8f7f1a8ff970ac5 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/PCEPUpdateRequestMessageParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEPUpdateRequestMessageParser.java
@@ -5,13 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.stateful02;
+package org.opendaylight.protocol.pcep.ietf.stateful02;
 
 import io.netty.buffer.ByteBuf;
 
 import java.util.List;
 
-import org.opendaylight.protocol.pcep.impl.message.AbstractMessageParser;
+import org.opendaylight.protocol.pcep.spi.AbstractMessageParser;
 import org.opendaylight.protocol.pcep.spi.ObjectHandlerRegistry;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/PCEStatefulCapabilityTlvParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEStatefulCapabilityTlvParser.java
similarity index 97%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/PCEStatefulCapabilityTlvParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEStatefulCapabilityTlvParser.java
index 56000347468b811cf5c5173691b48e6b5f1da590..22681b1213f1d77493bd71388206219fc6ebebb7 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/PCEStatefulCapabilityTlvParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/PCEStatefulCapabilityTlvParser.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.stateful02;
+package org.opendaylight.protocol.pcep.ietf.stateful02;
 
 import java.util.BitSet;
 

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/RSVPErrorSpecTlvParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/RSVPErrorSpecTlvParser.java
similarity index 99%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/RSVPErrorSpecTlvParser.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/RSVPErrorSpecTlvParser.java
index 513f99db1b25d8a6e10e5cec45d36c6b0e6d7964..4c724d25d24c436015bdd4d7aa7f7aff1a311140 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/RSVPErrorSpecTlvParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/RSVPErrorSpecTlvParser.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.stateful02;
+package org.opendaylight.protocol.pcep.ietf.stateful02;
 
 import java.util.BitSet;
 

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/StatefulActivator.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/StatefulActivator.java
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/StatefulActivator.java
rename to pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/StatefulActivator.java
index 4b7e501a7eabdf7f1ee23b0ea9fffbf51d2568d3..b4f5ec3629f41f541d75b96ef2e2a17c82eee41c 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/stateful02/StatefulActivator.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/StatefulActivator.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.stateful02;
+package org.opendaylight.protocol.pcep.ietf.stateful02;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/pcep/impl/pom.xml b/pcep/impl/pom.xml
index 096434d60af98415f4bcc8c3ef6f6683f80e8635..366f35f8000a10cdb994b178829e09caabe98879 100644 (file)
--- a/pcep/impl/pom.xml
+++ b/pcep/impl/pom.xml
@@ -33,10 +33,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-ietf-stateful02</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-ietf-stateful07</artifactId>

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPCloseMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPCloseMessageParser.java
index 301a9c9d609d4a183d3f17b64cdc97b157adebf5..2001581b1637e27a09636a6e710b9bc49e1f120c 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPCloseMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPCloseMessageParser.java
@@ -11,6 +11,7 @@ import io.netty.buffer.ByteBuf;
 
 import java.util.List;
 
+import org.opendaylight.protocol.pcep.spi.AbstractMessageParser;
 import org.opendaylight.protocol.pcep.spi.ObjectHandlerRegistry;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.Close;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPErrorMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPErrorMessageParser.java
index 6fc9192a2cf36e357e79c0c356557d6cae67db86..9606a223a0b23556d2b9add9c8943a96a6437e01 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPErrorMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPErrorMessageParser.java
@@ -12,6 +12,7 @@ import io.netty.buffer.ByteBuf;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.opendaylight.protocol.pcep.spi.AbstractMessageParser;
 import org.opendaylight.protocol.pcep.spi.ObjectHandlerRegistry;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPKeepAliveMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPKeepAliveMessageParser.java
index 0b44ffd2927aeacb40a20493135e43deb5ec2d1e..7eedb858f08d801e91dd10f545ce56b4974d9770 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPKeepAliveMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPKeepAliveMessageParser.java
@@ -11,6 +11,7 @@ import io.netty.buffer.ByteBuf;
 
 import java.util.List;
 
+import org.opendaylight.protocol.pcep.spi.AbstractMessageParser;
 import org.opendaylight.protocol.pcep.spi.ObjectHandlerRegistry;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.KeepaliveBuilder;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPNotificationMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPNotificationMessageParser.java
index 1cdec11e64bf5008ce02c88e0bcb8070ef5ef303..ca04a80df848a9128df4c3ac0e6490c55b0ad963 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPNotificationMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPNotificationMessageParser.java
@@ -11,6 +11,7 @@ import io.netty.buffer.ByteBuf;
 
 import java.util.List;
 
+import org.opendaylight.protocol.pcep.spi.AbstractMessageParser;
 import org.opendaylight.protocol.pcep.spi.ObjectHandlerRegistry;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPOpenMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPOpenMessageParser.java
index 118a405258044d6dee8a350221935ee02fd05d6f..2584a0144b484b9bf4a020706e8eadfca17c3d42 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPOpenMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPOpenMessageParser.java
@@ -11,6 +11,7 @@ import io.netty.buffer.ByteBuf;
 
 import java.util.List;
 
+import org.opendaylight.protocol.pcep.spi.AbstractMessageParser;
 import org.opendaylight.protocol.pcep.spi.ObjectHandlerRegistry;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.OpenBuilder;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReplyMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReplyMessageParser.java
index b4d650387659b9baddf43e34d2a79e2ab4999c9e..c2514e5a62afded3847d05e2c19cae8dba1f8e85 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReplyMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReplyMessageParser.java
@@ -11,6 +11,7 @@ import io.netty.buffer.ByteBuf;
 
 import java.util.List;
 
+import org.opendaylight.protocol.pcep.spi.AbstractMessageParser;
 import org.opendaylight.protocol.pcep.spi.ObjectHandlerRegistry;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReportMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReportMessageParser.java
index 10446ba3db93274b1fcc0902a42f7e1819f50d3c..3007c83e0e6eaa8f92e9ad92fbc9cb30c72a1f53 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReportMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReportMessageParser.java
@@ -11,6 +11,7 @@ import io.netty.buffer.ByteBuf;
 
 import java.util.List;
 
+import org.opendaylight.protocol.pcep.spi.AbstractMessageParser;
 import org.opendaylight.protocol.pcep.spi.ObjectHandlerRegistry;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPRequestMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPRequestMessageParser.java
index 4344fc84dfec82b34c9573b01358222a2245ce7e..4aed34242d87cca35d5964785915d9572d49085d 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPRequestMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPRequestMessageParser.java
@@ -11,6 +11,7 @@ import io.netty.buffer.ByteBuf;
 
 import java.util.List;
 
+import org.opendaylight.protocol.pcep.spi.AbstractMessageParser;
 import org.opendaylight.protocol.pcep.spi.ObjectHandlerRegistry;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPUpdateRequestMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPUpdateRequestMessageParser.java
index ff6018601d798b63d247446c42aa45fa3a7c8f10..fa3dc9762af4bd4566d5e55b367cdfceef3c4e35 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPUpdateRequestMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPUpdateRequestMessageParser.java
@@ -11,6 +11,7 @@ import io.netty.buffer.ByteBuf;
 
 import java.util.List;
 
+import org.opendaylight.protocol.pcep.spi.AbstractMessageParser;
 import org.opendaylight.protocol.pcep.spi.ObjectHandlerRegistry;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PcinitiateMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PcinitiateMessageParser.java
index 7b9c1af2d2642932ad4b976e3029eb1929403868..66e601e53a0b313f3e0240057c7fee345d5dfc40 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PcinitiateMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PcinitiateMessageParser.java
@@ -11,6 +11,7 @@ import io.netty.buffer.ByteBuf;
 
 import java.util.List;
 
+import org.opendaylight.protocol.pcep.spi.AbstractMessageParser;
 import org.opendaylight.protocol.pcep.spi.ObjectHandlerRegistry;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev131126.Pcinitiate;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/AbstractBandwidthParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/AbstractBandwidthParser.java
index 371bdc19a027303834f82872cb97fbff97cddf91..80e58fd142788e866a89c3946945899c6643d53e 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/AbstractBandwidthParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/AbstractBandwidthParser.java
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.protocol.pcep.impl.object;
 
+import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.ObjectHeader;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPBandwidthObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPBandwidthObjectParser.java
index 14bef1d5b2e478ecd2ce9b35bd2afb48a0c9e0fe..64ca01e1705815226b371ebef900ab480cc294ad 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPBandwidthObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPBandwidthObjectParser.java
@@ -9,6 +9,7 @@ package org.opendaylight.protocol.pcep.impl.object;
 
 import java.util.Arrays;
 
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
 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.bandwidth.object.Bandwidth;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPClassTypeObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPClassTypeObjectParser.java
index 9c065be2745de9d8f5dd609d183d9241db4bfa9f..64f7a349381f541d8d0eaed1112ca1699a225dc2 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPClassTypeObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPClassTypeObjectParser.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.protocol.pcep.impl.object;
 
+import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPCloseObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPCloseObjectParser.java
index 83fdbb83e9f185485866b2f8e8c17655b489e374..d18c6f938ebb82602c84ab13d9aaa4054f54ad58 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPCloseObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPCloseObjectParser.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.protocol.pcep.impl.object;
 
+import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
 import org.opendaylight.protocol.util.ByteArray;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPEndPointsIpv4ObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPEndPointsIpv4ObjectParser.java
index a699ff4b3a9a39ec4ea48bd4ca395f180bbd18dd..16ff4ec8405b944b23bc80843e75190a464c54ab 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPEndPointsIpv4ObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPEndPointsIpv4ObjectParser.java
@@ -8,6 +8,8 @@
 package org.opendaylight.protocol.pcep.impl.object;
 
 import org.opendaylight.protocol.concepts.Ipv4Util;
+import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPEndPointsIpv6ObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPEndPointsIpv6ObjectParser.java
index 5c3c1f2b83fe82e9f95e1c481be3aad005f08ca3..83c371901f927f538dc674dddf5da534c50c008b 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPEndPointsIpv6ObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPEndPointsIpv6ObjectParser.java
@@ -8,6 +8,8 @@
 package org.opendaylight.protocol.pcep.impl.object;
 
 import org.opendaylight.protocol.concepts.Ipv6Util;
+import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPErrorObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPErrorObjectParser.java
index 8ba72fe01321d6e1debac3001a3b8099c1b7d6c7..84c4479f29b0e02e7eca81db7da6b6060e2ddf24 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPErrorObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPErrorObjectParser.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.protocol.pcep.impl.object;
 
+import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
 import org.opendaylight.protocol.util.ByteArray;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPExcludeRouteObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPExcludeRouteObjectParser.java
index 1243ac0b342ddd707452db4b797c65ebeb55674e..1ca2adf11b1bae8e8f3f4dacc4687ade5d8e1674 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPExcludeRouteObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPExcludeRouteObjectParser.java
@@ -7,6 +7,7 @@
 */
 package org.opendaylight.protocol.pcep.impl.object;
 
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.XROSubobjectHandlerRegistry;
 import org.opendaylight.protocol.util.ByteArray;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPExistingBandwidthObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPExistingBandwidthObjectParser.java
index d54c335c4daff91b781cc7c3a483f3db5dd7b39f..af263908922f1b4c9af503afba4292e5c0807c4e 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPExistingBandwidthObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPExistingBandwidthObjectParser.java
@@ -9,6 +9,7 @@ package org.opendaylight.protocol.pcep.impl.object;
 
 import java.util.Arrays;
 
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
 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.bandwidth.object.Bandwidth;

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 5e67e0887e402aef07e16ffdf9351ca99cd6e309..bec1f4c5f59d642c6a21765ebba5772d8c41f2dd 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
@@ -8,6 +8,7 @@
 package org.opendaylight.protocol.pcep.impl.object;
 
 import org.opendaylight.protocol.pcep.spi.EROSubobjectHandlerRegistry;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 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;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPGlobalConstraintsObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPGlobalConstraintsObjectParser.java
index b3455fc9198fdb963a856e68ea9f9e5db93bb74c..4fb049679b6eb0814bcbb0d084f97e8b954ae2dc 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPGlobalConstraintsObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPGlobalConstraintsObjectParser.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.protocol.pcep.impl.object;
 
+import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Object;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPIncludeRouteObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPIncludeRouteObjectParser.java
index a05e975c5f73ae9c7eadf32322391e5e1c2919a1..47950d0e6307e0169e2d83a35fcc0f3150dea601 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPIncludeRouteObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPIncludeRouteObjectParser.java
@@ -10,6 +10,7 @@ package org.opendaylight.protocol.pcep.impl.object;
 import java.util.List;
 
 import org.opendaylight.protocol.pcep.spi.EROSubobjectHandlerRegistry;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 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;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLoadBalancingObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLoadBalancingObjectParser.java
index f626d144abce0cc2f1faaabe38dcb5faedadc78f..4821cff9d72fb1ffd313b916a1237ae084aa6a0f 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLoadBalancingObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLoadBalancingObjectParser.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.protocol.pcep.impl.object;
 
+import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
 import org.opendaylight.protocol.util.ByteArray;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLspObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLspObjectParser.java
index e735bd3d59597747bb6d7bc464e2a9e4ac6a62d8..1a9c942969844b858217988614179bd7958960d3 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLspObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLspObjectParser.java
@@ -9,6 +9,8 @@ package org.opendaylight.protocol.pcep.impl.object;
 
 import java.util.BitSet;
 
+import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
 import org.opendaylight.protocol.util.ByteArray;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLspaObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLspaObjectParser.java
index e25c37198b6766708542c9806aaa90a1df4df126..11b45613938c7df0ef8a958db966d7773dc44f1b 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLspaObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLspaObjectParser.java
@@ -9,6 +9,8 @@ package org.opendaylight.protocol.pcep.impl.object;
 
 import java.util.BitSet;
 
+import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
 import org.opendaylight.protocol.util.ByteArray;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPMetricObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPMetricObjectParser.java
index d8d9dcac3707e39b6c534dde83fbb0df2950881b..4d3fa4d440fbe783d4ce6c34728de047ffe6fa99 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPMetricObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPMetricObjectParser.java
@@ -9,6 +9,8 @@ package org.opendaylight.protocol.pcep.impl.object;
 
 import java.util.BitSet;
 
+import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
 import org.opendaylight.protocol.util.ByteArray;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPNoPathObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPNoPathObjectParser.java
index cca33656393b9bd6e432b319b00ed334c222e2e5..482905c580bb6a483f20564c54ff7ebb730e04d4 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPNoPathObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPNoPathObjectParser.java
@@ -9,6 +9,8 @@ package org.opendaylight.protocol.pcep.impl.object;
 
 import java.util.BitSet;
 
+import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
 import org.opendaylight.protocol.util.ByteArray;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPNotificationObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPNotificationObjectParser.java
index 362fc28e0f2e3032389da2e78381bd9119bdaa99..161963c6485f573d015f2d13151e73a566d4300c 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPNotificationObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPNotificationObjectParser.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.protocol.pcep.impl.object;
 
+import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
 import org.opendaylight.protocol.util.ByteArray;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPObjectiveFunctionObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPObjectiveFunctionObjectParser.java
index c659f79eec6ff39617975a1fb38a921ef35cbf95..1a953385a3966279572302fd94d9c4847111df28 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPObjectiveFunctionObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPObjectiveFunctionObjectParser.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.protocol.pcep.impl.object;
 
+import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
 import org.opendaylight.protocol.util.ByteArray;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPOpenObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPOpenObjectParser.java
index 7e831fbffb8ae6161b25b949255c4f13b1e552a5..cb27deba2f4d87c5337f408e5f76052cfe3f7911 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPOpenObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPOpenObjectParser.java
@@ -8,6 +8,8 @@
 
 package org.opendaylight.protocol.pcep.impl.object;
 
+import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPPathKeyObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPPathKeyObjectParser.java
index ec5b8d541fd7a1edfc4e0a80d0aee8995977455f..59a5327604d31a7290b555c21e06255db8f8d5f1 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPPathKeyObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPPathKeyObjectParser.java
@@ -10,6 +10,7 @@ package org.opendaylight.protocol.pcep.impl.object;
 import java.util.List;
 
 import org.opendaylight.protocol.pcep.spi.EROSubobjectHandlerRegistry;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 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;

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 587dcea3f09881ee96b3f69694045820ce52b4b2..e1db1036323ec3c712c56035a762b95119368d43 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,6 +7,7 @@
  */
 package org.opendaylight.protocol.pcep.impl.object;
 
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 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;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPRequestParameterObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPRequestParameterObjectParser.java
index 7f37000df912942f52c9e0a602e7618f85ab79b7..680a4ab8e4222d029a0ad94131a661ea90a81bb9 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPRequestParameterObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPRequestParameterObjectParser.java
@@ -11,6 +11,8 @@ package org.opendaylight.protocol.pcep.impl.object;
 import java.util.Arrays;
 import java.util.BitSet;
 
+import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
 import org.opendaylight.protocol.util.ByteArray;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPSrpObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPSrpObjectParser.java
index abefb1fdd124e200027ec2887bfff3a30bcede2b..23a5095255bc343cff0334b8723b9c61710bf91c 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPSrpObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPSrpObjectParser.java
@@ -10,6 +10,8 @@ package org.opendaylight.protocol.pcep.impl.object;
 import java.util.Arrays;
 import java.util.BitSet;
 
+import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
 import org.opendaylight.protocol.util.ByteArray;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPSvecObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPSvecObjectParser.java
index b64a6a4cc047f7de4158cd984cad638df4e82b3b..ecc2cde891b34518212a1cad3f86c985b1816fce 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPSvecObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPSvecObjectParser.java
@@ -10,6 +10,8 @@ package org.opendaylight.protocol.pcep.impl.object;
 import java.util.BitSet;
 import java.util.List;
 
+import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
 import org.opendaylight.protocol.util.ByteArray;

diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java
index 255864efd92cde69e971206fff36a1b01ee1294c..2d561fc600d077d806b239ce2bea8abdee7747b0 100644 (file)
--- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java
+++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java
@@ -17,7 +17,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.protocol.concepts.Ipv4Util;
 import org.opendaylight.protocol.concepts.Ipv6Util;
-import org.opendaylight.protocol.pcep.impl.message.ObjectHeaderImpl;
 import org.opendaylight.protocol.pcep.impl.object.PCEPBandwidthObjectParser;
 import org.opendaylight.protocol.pcep.impl.object.PCEPClassTypeObjectParser;
 import org.opendaylight.protocol.pcep.impl.object.PCEPCloseObjectParser;
@@ -42,6 +41,7 @@ import org.opendaylight.protocol.pcep.impl.object.PCEPReportedRouteObjectParser;
 import org.opendaylight.protocol.pcep.impl.object.PCEPRequestParameterObjectParser;
 import org.opendaylight.protocol.pcep.impl.object.PCEPSrpObjectParser;
 import org.opendaylight.protocol.pcep.impl.object.PCEPSvecObjectParser;
+import org.opendaylight.protocol.pcep.spi.ObjectHeaderImpl;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
 import org.opendaylight.protocol.pcep.spi.pojo.ServiceLoaderPCEPExtensionProviderContext;

diff --git a/pcep/pom.xml b/pcep/pom.xml
index 56e36d957361918832441e0690a8a67a2e0e6e86..8870cc1130d254780349f6a41b6b97c6c7a54578 100644 (file)
--- a/pcep/pom.xml
+++ b/pcep/pom.xml
@@ -27,12 +27,12 @@
     <modules>
         <module>api</module>
         <module>api-config</module>
-        <module>ietf-stateful02</module>
         <module>ietf-stateful07</module>
         <module>impl</module>
         <module>impl-config</module>
         <module>spi</module>
         <module>spi-config</module>
+        <module>ietf-stateful02</module>
         <module>testtool</module>
         <module>topology-api</module>
         <module>topology-spi</module>

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/AbstractMessageParser.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java
similarity index 92%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/AbstractMessageParser.java
rename to pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java
index 0acbec114d2a2ea7003db6280109a6e48d996476..bd29b3f9b97374c5ed74f57e94307ec463feb308 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/AbstractMessageParser.java
+++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java
@@ -5,20 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.message;
+package org.opendaylight.protocol.pcep.spi;
 
 import java.util.Arrays;
 import java.util.BitSet;
 import java.util.List;
 
-import org.opendaylight.protocol.pcep.spi.MessageParser;
-import org.opendaylight.protocol.pcep.spi.MessageSerializer;
-import org.opendaylight.protocol.pcep.spi.ObjectHandlerRegistry;
-import org.opendaylight.protocol.pcep.spi.ObjectParser;
-import org.opendaylight.protocol.pcep.spi.ObjectSerializer;
-import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
-import org.opendaylight.protocol.pcep.spi.PCEPErrorMapping;
-import org.opendaylight.protocol.pcep.spi.PCEPErrors;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.PcerrBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Message;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/AbstractObjectWithTlvsParser.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractObjectWithTlvsParser.java
similarity index 89%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/AbstractObjectWithTlvsParser.java
rename to pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractObjectWithTlvsParser.java
index 22aa8ec2b0f3ad50c98ac288fc212e97aa676238..5b074cb8eb060abfcd71cf778d1fdbebcd11fd0f 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/AbstractObjectWithTlvsParser.java
+++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractObjectWithTlvsParser.java
@@ -5,14 +5,8 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
-
-import org.opendaylight.protocol.pcep.spi.ObjectParser;
-import org.opendaylight.protocol.pcep.spi.ObjectSerializer;
-import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
-import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
-import org.opendaylight.protocol.pcep.spi.TlvParser;
-import org.opendaylight.protocol.pcep.spi.TlvSerializer;
+package org.opendaylight.protocol.pcep.spi;
+
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Tlv;
 import org.slf4j.Logger;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/ObjectHeaderImpl.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectHeaderImpl.java
similarity index 97%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/ObjectHeaderImpl.java
rename to pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectHeaderImpl.java
index 317e5b2465f704dbed2794a0b7411635618e26e0..2bc841848734bc88e6ef85edb1e65c54a4309276 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/ObjectHeaderImpl.java
+++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectHeaderImpl.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.message;
+package org.opendaylight.protocol.pcep.spi;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.ObjectHeader;
 import org.opendaylight.yangtools.yang.binding.DataContainer;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/ObjectUtil.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectUtil.java
similarity index 97%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/ObjectUtil.java
rename to pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectUtil.java
index 1220c8b723316ab5c9e4f501d4ec650ecc3f717a..e92a3e24b121c855502d3c6a7be3418f6b37d55a 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/ObjectUtil.java
+++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectUtil.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.spi;
 
 import org.opendaylight.protocol.util.ByteArray;