BUG-113: move LinkstateAttributeParser

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

diff --git a/bgp/linkstate/pom.xml b/bgp/linkstate/pom.xml
index 2bb56937dfa3488cff709512077acc8702f79b2b..c15e411ee6b8003a95f87ffbb9d78c4b894867ee 100644 (file)
--- a/bgp/linkstate/pom.xml
+++ b/bgp/linkstate/pom.xml
@@ -37,6 +37,11 @@
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>bgp-parser-api</artifactId>
+            <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>bgp-parser-spi</artifactId>
             <version>${project.version}</version>
                </dependency>
                <dependency>

diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/LinkstateAttributeParser.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParser.java
similarity index 99%
rename from bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/LinkstateAttributeParser.java
rename to bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParser.java
index 23fd57f5ebe5ab1c8adcd9f137f5965d17ba0e2b..261f0cbc8688577a641b63e3ea6508f272d38344 100644 (file)
--- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/LinkstateAttributeParser.java
+++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParser.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.bgp.parser.impl.message.update;
+package org.opendaylight.protocol.bgp.linkstate;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -65,7 +65,7 @@ import com.google.common.primitives.UnsignedBytes;
  */
 public class LinkstateAttributeParser implements AttributeParser {
        // FIXME: update to IANA number once it is known
-       static final int TYPE = 99;
+       public static final int TYPE = 99;
 
        private static final Logger logger = LoggerFactory.getLogger(LinkstateAttributeParser.class);
 

diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/SimpleAttributeRegistry.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/SimpleAttributeRegistry.java
index 4a1b63b03776ec92ea2544147d38266be1596139..b26368c288fdcca7a921a8a35ef68ba4097c86ba 100644 (file)
--- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/SimpleAttributeRegistry.java
+++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/SimpleAttributeRegistry.java
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.protocol.bgp.parser.impl.message.update;
 
+import org.opendaylight.protocol.bgp.linkstate.LinkstateAttributeParser;
 import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
 import org.opendaylight.protocol.bgp.parser.BGPError;
 import org.opendaylight.protocol.bgp.parser.BGPParsingException;

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpLinkstateBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpLinkstateBundleTest.java
index 2d64de5a47978f59bc8ee25459545c8945d83344..30afc2e68d09958becc505fc8309e405385c7c31 100644 (file)
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpLinkstateBundleTest.java
+++ b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpLinkstateBundleTest.java
@@ -14,7 +14,7 @@ import com.google.common.collect.Lists;
 public final class BgpLinkstateBundleTest extends AbstractBundleTest {
        @Override
        protected Collection<String> prerequisiteBundles() {
-               return Lists.newArrayList("bgp-concepts", "bgp-parser-api", "concepts", "framework", "util");
+               return Lists.newArrayList("bgp-concepts", "bgp-parser-api", "bgp-parser-spi", "concepts", "framework", "util");
        }
 
        @Override

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpParserImplBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpParserImplBundleTest.java
index a97da6f0d77952e65f3a437c19b12e8992d5f2ff..17019fa4241ecafd97cdbcad66473f143ffc3dc5 100644 (file)
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpParserImplBundleTest.java
+++ b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpParserImplBundleTest.java
@@ -14,7 +14,7 @@ import com.google.common.collect.Lists;
 public final class BgpParserImplBundleTest extends AbstractBundleTest {
        @Override
        protected Collection<String> prerequisiteBundles() {
-               return Lists.newArrayList("bgp-concepts", "bgp-linkstate", "bgp-parser-api", "bgp-util", "concepts", "framework", "util");
+               return Lists.newArrayList("bgp-concepts", "bgp-linkstate", "bgp-parser-api", "bgp-parser-spi", "bgp-util", "concepts", "framework", "util");
        }
 
        @Override

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibImplBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibImplBundleTest.java
index 800a380e38e9e0a2136351fd7f5b4576f4d3c891..b403e993508724134f1bfc52c67eea215e2ac12a 100644 (file)
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibImplBundleTest.java
+++ b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibImplBundleTest.java
@@ -15,7 +15,8 @@ public final class BgpRibImplBundleTest extends AbstractBundleTest {
        @Override
        protected Collection<String> prerequisiteBundles() {
                return Lists.newArrayList("concepts", "bgp-concepts", "bgp-linkstate", "bgp-parser-api",
-                               "bgp-parser-impl", "bgp-rib-api", "bgp-rib-spi", "bgp-util", "framework", "util");
+                               "bgp-parser-impl", "bgp-parser-spi", "bgp-rib-api", "bgp-rib-spi",
+                               "bgp-util", "framework", "util");
        }
 
        @Override

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibMockBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibMockBundleTest.java
index ca330574a38b1fd12fc38243048853a326b73114..92a3da7fbaea9d32190218d9b2968600d27f0521 100644 (file)
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibMockBundleTest.java
+++ b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibMockBundleTest.java
@@ -15,7 +15,8 @@ public final class BgpRibMockBundleTest extends AbstractBundleTest {
        @Override
        protected Collection<String> prerequisiteBundles() {
                return Lists.newArrayList("concepts", "bgp-concepts", "bgp-linkstate", "bgp-parser-api",
-                               "bgp-parser-impl", "bgp-rib-api", "bgp-rib-impl", "bgp-rib-spi", "bgp-util", "framework", "util");
+                               "bgp-parser-impl", "bgp-parser-spi", "bgp-rib-api", "bgp-rib-impl",
+                               "bgp-rib-spi", "bgp-util", "framework", "util");
        }
 
        @Override

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpTesttoolBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpTesttoolBundleTest.java
index 099fd32e5e22e10fd00aa31967ee3780b193994e..c89047bf5a675df5d39a6f0afff7e4a7f5be6136 100644 (file)
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpTesttoolBundleTest.java
+++ b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpTesttoolBundleTest.java
@@ -15,8 +15,9 @@ public final class BgpTesttoolBundleTest extends AbstractBundleTest {
        @Override
        protected Collection<String> prerequisiteBundles() {
                return Lists.newArrayList("bgp-parser-api", "bgp-concepts", "bgp-linkstate",
-                               "bgp-parser-impl", "bgp-util", "concepts", "framework", "bgp-rib-api",
-                               "bgp-rib-impl", "bgp-rib-spi", "util");
+                               "bgp-parser-impl", "bgp-parser-spi", "bgp-util", "concepts",
+                               "framework", "bgp-rib-api", "bgp-rib-impl", "bgp-rib-spi",
+                               "util");
        }
 
        @Override