Bug-194: Moved bgp configuration artifacts.

-moved yang models and java files
-added required dependencies and plugins
-uniformed yang models file name
-configuration artifacts left with minimal pom.xml

Change-Id: Iae53875bcd940163687e238becff319767c320b4
Signed-off-by: Milos Fabian <milfabia@cisco.com>

diff --git a/bgp/controller-config/src/main/resources/initial/31-bgp.xml b/bgp/controller-config/src/main/resources/initial/31-bgp.xml
index fc9a2454891451104fa674688701e04320c489f6..a940933aa169d3c48e607293281f8f2c591bf68e 100644 (file)
--- a/bgp/controller-config/src/main/resources/initial/31-bgp.xml
+++ b/bgp/controller-config/src/main/resources/initial/31-bgp.xml
@@ -11,9 +11,9 @@
     <required-capabilities>
         <capability>urn:opendaylight:params:xml:ns:yang:bgp-linkstate?module=bgp-linkstate&amp;revision=2013-11-25</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:bgp-types?module=bgp-types&amp;revision=2013-09-19</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:linkstate?module=config-bgp-linkstate&amp;revision=2013-11-15</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi?module=config-bgp-parser-spi&amp;revision=2013-11-15</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi?module=config-bgp-rib-spi&amp;revision=2013-11-15</capability>
+        <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:linkstate?module=odl-bgp-linkstate-cfg&amp;revision=2013-11-15</capability>
+        <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi?module=odl-bgp-parser-spi-cfg&amp;revision=2013-11-15</capability>
+        <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi?module=odl-bgp-rib-spi-cfg&amp;revision=2013-11-15</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl?module=bgp-rib-impl&amp;revision=2013-04-09</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:netty?module=netty&amp;revision=2013-11-19</capability>

diff --git a/bgp/controller-config/src/main/resources/initial/41-bgp-example.xml b/bgp/controller-config/src/main/resources/initial/41-bgp-example.xml
index 750b8238e42e6cd331f39ad564a17ac3960543a1..aef57cfd3bc2e51cea5a1a86edebd0ff49411a07 100644 (file)
--- a/bgp/controller-config/src/main/resources/initial/41-bgp-example.xml
+++ b/bgp/controller-config/src/main/resources/initial/41-bgp-example.xml
@@ -9,10 +9,10 @@
 -->
 <snapshot>
     <required-capabilities>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:cfg?module=config-bgp-rib&amp;revision=2013-07-01</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi?module=config-bgp-rib-spi&amp;revision=2013-11-15</capability>
+        <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:cfg?module=odl-bgp-rib-cfg&amp;revision=2013-07-01</capability>
+        <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi?module=odl-bgp-rib-spi-cfg&amp;revision=2013-11-15</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl?module=bgp-rib-impl&amp;revision=2013-04-09</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:topology:provider?module=config-bgp-topology-provider&amp;revision=2013-11-15</capability>
+        <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:topology:provider?module=odl-bgp-topology-provider-cfg&amp;revision=2013-11-15</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:netty?module=netty&amp;revision=2013-11-19</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:protocol:framework?module=protocol-framework&amp;revision=2014-03-13</capability>

diff --git a/bgp/linkstate-config/pom.xml b/bgp/linkstate-config/pom.xml
index 77ee9e3d974eeccbebb6ba4f3618cad103a355f3..17f1cb0830fe9092629c46c222b63f004b1604b6 100644 (file)
--- a/bgp/linkstate-config/pom.xml
+++ b/bgp/linkstate-config/pom.xml
@@ -31,71 +31,8 @@
       <maven>3.0.4</maven>
    </prerequisites>
 
-   <dependencies>
-      <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>config-api</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>${project.groupId}</groupId>
-         <artifactId>bgp-linkstate</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>${project.groupId}</groupId>
-         <artifactId>bgp-rib-spi</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>${project.groupId}</groupId>
-         <artifactId>bgp-rib-spi-config</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>${project.groupId}</groupId>
-         <artifactId>bgp-parser-spi-config</artifactId>
-      </dependency>
-      <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-      </dependency>
-      <!-- test scope dependencies -->
-      <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-      </dependency>
-      <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-manager</artifactId>
-          <type>test-jar</type>
-      </dependency>
-      <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-manager</artifactId>
-      </dependency>
-      <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-util</artifactId>
-      </dependency>
-      <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>mockito-configuration</artifactId>
-      </dependency>
-      <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>bgp-rib-spi-config</artifactId>
-          <type>test-jar</type>
-      </dependency>
-      <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>bgp-parser-spi-config</artifactId>
-          <type>test-jar</type>
-      </dependency>
-    </dependencies>
-
    <build>
       <plugins>
-         <plugin>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-maven-plugin</artifactId>
-         </plugin>
          <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>

diff --git a/bgp/linkstate/pom.xml b/bgp/linkstate/pom.xml
index ee8ffe3197c0d8ec47f6d03b87fbbe9196a222ac..57c922f8f35bd18c0690322fd9155c828bfe6644 100644 (file)
--- a/bgp/linkstate/pom.xml
+++ b/bgp/linkstate/pom.xml
@@ -82,16 +82,44 @@
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
+
+         <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-api</artifactId>
          </dependency>
+
+         <!-- test scope dependencies -->
          <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
-        </dependency>
+             <groupId>junit</groupId>
+             <artifactId>junit</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>org.opendaylight.controller</groupId>
+             <artifactId>config-manager</artifactId>
+             <type>test-jar</type>
+         </dependency>
+         <dependency>
+             <groupId>org.opendaylight.controller</groupId>
+             <artifactId>config-manager</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>org.opendaylight.controller</groupId>
+             <artifactId>config-util</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>org.opendaylight.yangtools</groupId>
+             <artifactId>mockito-configuration</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>${project.groupId}</groupId>
+             <artifactId>bgp-rib-spi</artifactId>
+             <type>test-jar</type>
+         </dependency>
+         <dependency>
+             <groupId>${project.groupId}</groupId>
+             <artifactId>bgp-parser-spi</artifactId>
+             <type>test-jar</type>
+         </dependency>
     </dependencies>
 
     <build>

diff --git a/bgp/linkstate-config/src/main/java/org/opendaylight/controller/config/yang/bgp/linkstate/LinkstateModule.java b/bgp/linkstate/src/main/java/org/opendaylight/controller/config/yang/bgp/linkstate/LinkstateModule.java
similarity index 100%
rename from bgp/linkstate-config/src/main/java/org/opendaylight/controller/config/yang/bgp/linkstate/LinkstateModule.java
rename to bgp/linkstate/src/main/java/org/opendaylight/controller/config/yang/bgp/linkstate/LinkstateModule.java

diff --git a/bgp/linkstate-config/src/main/java/org/opendaylight/controller/config/yang/bgp/linkstate/LinkstateModuleFactory.java b/bgp/linkstate/src/main/java/org/opendaylight/controller/config/yang/bgp/linkstate/LinkstateModuleFactory.java
similarity index 100%
rename from bgp/linkstate-config/src/main/java/org/opendaylight/controller/config/yang/bgp/linkstate/LinkstateModuleFactory.java
rename to bgp/linkstate/src/main/java/org/opendaylight/controller/config/yang/bgp/linkstate/LinkstateModuleFactory.java

diff --git a/bgp/linkstate-config/src/main/yang/config-bgp-linkstate.yang b/bgp/linkstate/src/main/yang/odl-bgp-linkstate-cfg.yang
similarity index 86%
rename from bgp/linkstate-config/src/main/yang/config-bgp-linkstate.yang
rename to bgp/linkstate/src/main/yang/odl-bgp-linkstate-cfg.yang
index 6bcdd44b61b36336a25a3d52fbecef648eb885cc..d9e39fd8e92e2a7e08c1736de3fb557169af2671 100644 (file)
--- a/bgp/linkstate-config/src/main/yang/config-bgp-linkstate.yang
+++ b/bgp/linkstate/src/main/yang/odl-bgp-linkstate-cfg.yang
@@ -1,12 +1,12 @@
 // vi: set smarttab et sw=4 tabstop=4:
-module config-bgp-linkstate {
+module odl-bgp-linkstate-cfg {
     yang-version 1;
     namespace "urn:opendaylight:params:xml:ns:yang:controller:bgp:linkstate";
     prefix "bgpls";
 
     import config { prefix config; revision-date 2013-04-05; }
-    import config-bgp-parser-spi { prefix bgpspi; revision-date 2013-11-15; }
-    import config-bgp-rib-spi { prefix ribspi; revision-date 2013-11-15; }
+    import odl-bgp-parser-spi-cfg { prefix bgpspi; revision-date 2013-11-15; }
+    import odl-bgp-rib-spi-cfg { prefix ribspi; revision-date 2013-11-15; }
 
     organization "Cisco Systems, Inc.";
 

diff --git a/bgp/linkstate-config/src/test/java/org/opendaylight/controller/config/yang/bgp/linkstate/LinkstateModuleTest.java b/bgp/linkstate/src/test/java/org/opendaylight/controller/config/yang/bgp/linkstate/LinkstateModuleTest.java
similarity index 100%
rename from bgp/linkstate-config/src/test/java/org/opendaylight/controller/config/yang/bgp/linkstate/LinkstateModuleTest.java
rename to bgp/linkstate/src/test/java/org/opendaylight/controller/config/yang/bgp/linkstate/LinkstateModuleTest.java

diff --git a/bgp/parser-api/pom.xml b/bgp/parser-api/pom.xml
index d7274b9755fec1f65409ae8b673d6890ea035398..d19998f3021739d22cb418eec06e669430a20713 100644 (file)
--- a/bgp/parser-api/pom.xml
+++ b/bgp/parser-api/pom.xml
@@ -32,10 +32,6 @@
     </prerequisites>
 
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>concepts</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>util</artifactId>

diff --git a/bgp/parser-mock/pom.xml b/bgp/parser-mock/pom.xml
index f2ef3566462c921cbc0787b531111827da109b18..b0971cb7611b445ad58abc70b0c900850a84c8fc 100644 (file)
--- a/bgp/parser-mock/pom.xml
+++ b/bgp/parser-mock/pom.xml
@@ -49,6 +49,11 @@
             <artifactId>bgp-parser-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-parser-spi</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>concepts</artifactId>
@@ -63,11 +68,6 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-parser-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-inet-types</artifactId>

diff --git a/bgp/parser-spi-config/pom.xml b/bgp/parser-spi-config/pom.xml
index cf3ee511878d2b9c166cc60d0370ab91f0ddfd44..6d980ab5ca9d1c8adcad75840a48b3e6db546b98 100644 (file)
--- a/bgp/parser-spi-config/pom.xml
+++ b/bgp/parser-spi-config/pom.xml
@@ -31,61 +31,8 @@
         <maven>3.0.4</maven>
     </prerequisites>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-parser-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <!--test dependencies -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>mockito-configuration</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

diff --git a/bgp/parser-spi/pom.xml b/bgp/parser-spi/pom.xml
index a1c8de6e88f9a25427a39b2e412594b25e9d1ed8..8ec5e75a3bead7d09dad76deb0347051b55b977e 100644 (file)
--- a/bgp/parser-spi/pom.xml
+++ b/bgp/parser-spi/pom.xml
@@ -45,11 +45,6 @@
             <artifactId>bgp-parser-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>protocol-framework</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -58,6 +53,12 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-api</artifactId>
+        </dependency>
+
         <!-- Testing dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -67,6 +68,24 @@
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-manager</artifactId>
+            <type>test-jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>mockito-configuration</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-manager</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-util</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -81,6 +100,22 @@
                     </instructions>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>

diff --git a/bgp/parser-spi-config/src/main/java/org/opendaylight/controller/config/yang/bgp/parser/spi/SimpleBGPExtensionProviderContextModule.java b/bgp/parser-spi/src/main/java/org/opendaylight/controller/config/yang/bgp/parser/spi/SimpleBGPExtensionProviderContextModule.java
similarity index 100%
rename from bgp/parser-spi-config/src/main/java/org/opendaylight/controller/config/yang/bgp/parser/spi/SimpleBGPExtensionProviderContextModule.java
rename to bgp/parser-spi/src/main/java/org/opendaylight/controller/config/yang/bgp/parser/spi/SimpleBGPExtensionProviderContextModule.java

diff --git a/bgp/parser-spi-config/src/main/java/org/opendaylight/controller/config/yang/bgp/parser/spi/SimpleBGPExtensionProviderContextModuleFactory.java b/bgp/parser-spi/src/main/java/org/opendaylight/controller/config/yang/bgp/parser/spi/SimpleBGPExtensionProviderContextModuleFactory.java
similarity index 100%
rename from bgp/parser-spi-config/src/main/java/org/opendaylight/controller/config/yang/bgp/parser/spi/SimpleBGPExtensionProviderContextModuleFactory.java
rename to bgp/parser-spi/src/main/java/org/opendaylight/controller/config/yang/bgp/parser/spi/SimpleBGPExtensionProviderContextModuleFactory.java

diff --git a/bgp/parser-spi-config/src/main/yang/config-bgp-parser-spi.yang b/bgp/parser-spi/src/main/yang/odl-bgp-parser-spi-cfg.yang
similarity index 98%
rename from bgp/parser-spi-config/src/main/yang/config-bgp-parser-spi.yang
rename to bgp/parser-spi/src/main/yang/odl-bgp-parser-spi-cfg.yang
index eeb7588b9a36e7c20f124df4c85b02784a466794..126ba291bc1b43566b0da75e7aa2ebc9480b63ef 100644 (file)
--- a/bgp/parser-spi-config/src/main/yang/config-bgp-parser-spi.yang
+++ b/bgp/parser-spi/src/main/yang/odl-bgp-parser-spi-cfg.yang
@@ -1,5 +1,5 @@
 // vi: set smarttab et sw=4 tabstop=4:
-module config-bgp-parser-spi {
+module odl-bgp-parser-spi-cfg {
     yang-version 1;
     namespace "urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi";
     prefix "bgpspi";

diff --git a/bgp/parser-spi-config/src/test/java/org/opendaylight/controller/config/yang/bgp/parser/spi/SimpleBGPExtensionProviderContextModuleTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/controller/config/yang/bgp/parser/spi/SimpleBGPExtensionProviderContextModuleTest.java
similarity index 100%
rename from bgp/parser-spi-config/src/test/java/org/opendaylight/controller/config/yang/bgp/parser/spi/SimpleBGPExtensionProviderContextModuleTest.java
rename to bgp/parser-spi/src/test/java/org/opendaylight/controller/config/yang/bgp/parser/spi/SimpleBGPExtensionProviderContextModuleTest.java

diff --git a/bgp/rib-api-config/pom.xml b/bgp/rib-api-config/pom.xml
index ba29e8a397a8ebbf523cfcc87b2cc42938ad5996..dfbbf85bd6a51fd4cba1152b170ab9af6835dff7 100644 (file)
--- a/bgp/rib-api-config/pom.xml
+++ b/bgp/rib-api-config/pom.xml
@@ -31,23 +31,8 @@
         <maven>3.0.4</maven>
     </prerequisites>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-rib-api</artifactId>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

diff --git a/bgp/rib-api/pom.xml b/bgp/rib-api/pom.xml
index 580c1f2fbefd73de6f0aca1f3aac3ff8aed421eb..9e383a6f5c686fe7cd050543b34d5ee9f431b97e 100644 (file)
--- a/bgp/rib-api/pom.xml
+++ b/bgp/rib-api/pom.xml
@@ -52,6 +52,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/bgp/rib-api-config/src/main/yang/config-bgp-rib.yang b/bgp/rib-api/src/main/yang/odl-bgp-rib-cfg.yang
similarity index 97%
rename from bgp/rib-api-config/src/main/yang/config-bgp-rib.yang
rename to bgp/rib-api/src/main/yang/odl-bgp-rib-cfg.yang
index 7d014945150570e12504b21e3bd41a913d8c910d..830382b2008e2f8dad7a5cdae441d26c0aefe57d 100644 (file)
--- a/bgp/rib-api-config/src/main/yang/config-bgp-rib.yang
+++ b/bgp/rib-api/src/main/yang/odl-bgp-rib-cfg.yang
@@ -1,5 +1,5 @@
 // vi: set smarttab et sw=4 tabstop=4:
-module config-bgp-rib {
+module odl-bgp-rib-cfg {
     yang-version 1;
     namespace "urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:cfg";
     prefix "cfgbgprib";

diff --git a/bgp/rib-impl-config/pom.xml b/bgp/rib-impl-config/pom.xml
index c30ea2a0e5aa492f2c7915343a01d7e78aa370b3..59eee727b0bd8a1ca319ef0032bcf9e6dc1ebce1 100644 (file)
--- a/bgp/rib-impl-config/pom.xml
+++ b/bgp/rib-impl-config/pom.xml
@@ -32,143 +32,8 @@
         <maven>3.0.4</maven>
     </prerequisites>
 
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-linkstate</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-rib-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-rib-api-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-rib-spi-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-parser-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-parser-spi-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-rib-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-parser-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>tcpmd5-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>tcpmd5-netty</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-config-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-timer-config</artifactId>
-        </dependency>
-
-        <!--test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-event-executor-config</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-threadgroup-config</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>protocol-framework</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>tcpmd5-jni-cfg</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>tcpmd5-jni</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

diff --git a/bgp/rib-impl/pom.xml b/bgp/rib-impl/pom.xml
index f50c427e92a12b31110a3a4f94f0d38dc6f84a43..4e0e70d57acba8b81a2f45b3c0ec786fe511a81f 100644 (file)
--- a/bgp/rib-impl/pom.xml
+++ b/bgp/rib-impl/pom.xml
@@ -32,14 +32,6 @@
     </prerequisites>
 
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>concepts</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>util</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-concepts</artifactId>
@@ -60,10 +52,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-rib-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-util</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>tcpmd5-api</artifactId>
@@ -109,6 +97,39 @@
             <artifactId>yang-binding</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-linkstate</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-parser-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tcpmd5-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tcpmd5-netty</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>netty-config-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>netty-timer-config</artifactId>
+        </dependency>
+
         <!-- Testing dependencies -->
         <dependency>
             <groupId>org.mockito</groupId>
@@ -119,17 +140,56 @@
             <artifactId>mockito-configuration</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-parser-impl</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-manager</artifactId>
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-manager</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-util</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>netty-event-executor-config</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>netty-threadgroup-config</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-broker-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>protocol-framework</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-linkstate</artifactId>
+            <artifactId>tcpmd5-jni-cfg</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tcpmd5-jni</artifactId>
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -149,6 +209,22 @@
                     </instructions>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>

diff --git a/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPDispatcherImplModule.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPDispatcherImplModule.java
similarity index 100%
rename from bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPDispatcherImplModule.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPDispatcherImplModule.java

diff --git a/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPDispatcherImplModuleFactory.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPDispatcherImplModuleFactory.java
similarity index 100%
rename from bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPDispatcherImplModuleFactory.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPDispatcherImplModuleFactory.java

diff --git a/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerAcceptorModule.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerAcceptorModule.java
similarity index 100%
rename from bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerAcceptorModule.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerAcceptorModule.java

diff --git a/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerAcceptorModuleFactory.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerAcceptorModuleFactory.java
similarity index 100%
rename from bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerAcceptorModuleFactory.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerAcceptorModuleFactory.java

diff --git a/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModule.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModule.java
similarity index 100%
rename from bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModule.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModule.java

diff --git a/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModuleFactory.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModuleFactory.java
similarity index 100%
rename from bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModuleFactory.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModuleFactory.java

diff --git a/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPTableTypeImplModule.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPTableTypeImplModule.java
similarity index 100%
rename from bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPTableTypeImplModule.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPTableTypeImplModule.java

diff --git a/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPTableTypeImplModuleFactory.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPTableTypeImplModuleFactory.java
similarity index 100%
rename from bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPTableTypeImplModuleFactory.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPTableTypeImplModuleFactory.java

diff --git a/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BaseBGPParserModule.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BaseBGPParserModule.java
similarity index 100%
rename from bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BaseBGPParserModule.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BaseBGPParserModule.java

diff --git a/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BaseBGPParserModuleFactory.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BaseBGPParserModuleFactory.java
similarity index 100%
rename from bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BaseBGPParserModuleFactory.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BaseBGPParserModuleFactory.java

diff --git a/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BaseBGPRIBModule.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BaseBGPRIBModule.java
similarity index 100%
rename from bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BaseBGPRIBModule.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BaseBGPRIBModule.java

diff --git a/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BaseBGPRIBModuleFactory.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BaseBGPRIBModuleFactory.java
similarity index 100%
rename from bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BaseBGPRIBModuleFactory.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BaseBGPRIBModuleFactory.java

diff --git a/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModule.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModule.java
similarity index 100%
rename from bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModule.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModule.java

diff --git a/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModuleFactory.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModuleFactory.java
similarity index 100%
rename from bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModuleFactory.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModuleFactory.java

diff --git a/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/StrictBgpPeerRegistryModule.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/StrictBgpPeerRegistryModule.java
similarity index 100%
rename from bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/StrictBgpPeerRegistryModule.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/StrictBgpPeerRegistryModule.java

diff --git a/bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/StrictBgpPeerRegistryModuleFactory.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/StrictBgpPeerRegistryModuleFactory.java
similarity index 100%
rename from bgp/rib-impl-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/StrictBgpPeerRegistryModuleFactory.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/StrictBgpPeerRegistryModuleFactory.java

diff --git a/bgp/rib-impl-config/src/main/yang/bgp-rib-impl.yang b/bgp/rib-impl/src/main/yang/odl-bgp-rib-impl-cfg.yang
similarity index 98%
rename from bgp/rib-impl-config/src/main/yang/bgp-rib-impl.yang
rename to bgp/rib-impl/src/main/yang/odl-bgp-rib-impl-cfg.yang
index 05fea88a163fcb8677bf376ef51164484eb8eadd..825c2e8f8067d7f95742a326f85cbac9e1f427b4 100644 (file)
--- a/bgp/rib-impl-config/src/main/yang/bgp-rib-impl.yang
+++ b/bgp/rib-impl/src/main/yang/odl-bgp-rib-impl-cfg.yang
@@ -1,5 +1,5 @@
 // vi: set smarttab et sw=4 tabstop=4:
-module bgp-rib-impl {
+module odl-bgp-rib-impl-cfg {
     yang-version 1;
     namespace "urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl";
     prefix "bgprib-impl";
@@ -7,9 +7,9 @@ module bgp-rib-impl {
     import bgp-multiprotocol { prefix bgp-mp; revision-date 2013-09-19; }
     import bgp-rib { prefix rib; revision-date 2013-09-25; }
     import bgp-types { prefix bgp-t; revision-date 2013-09-19; }
-    import config-bgp-rib { prefix bgprib; revision-date 2013-07-01; }
-    import config-bgp-parser-spi { prefix bgpspi; revision-date 2013-11-15; }
-    import config-bgp-rib-spi { prefix ribspi; revision-date 2013-11-15; }
+    import odl-bgp-rib-cfg { prefix bgprib; revision-date 2013-07-01; }
+    import odl-bgp-parser-spi-cfg { prefix bgpspi; revision-date 2013-11-15; }
+    import odl-bgp-rib-spi-cfg { prefix ribspi; revision-date 2013-11-15; }
     import ietf-inet-types { prefix inet; revision-date 2010-09-24; }
     import opendaylight-md-sal-binding {prefix mdsb; revision-date 2013-10-28; }
     import netty { prefix netty; revision-date 2013-11-19; }

diff --git a/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/AbstractRIBImplModuleTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/AbstractRIBImplModuleTest.java
similarity index 100%
rename from bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/AbstractRIBImplModuleTest.java
rename to bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/AbstractRIBImplModuleTest.java

diff --git a/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPDispatcherImplModuleTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPDispatcherImplModuleTest.java
similarity index 100%
rename from bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPDispatcherImplModuleTest.java
rename to bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPDispatcherImplModuleTest.java

diff --git a/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerAcceptorModuleTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerAcceptorModuleTest.java
similarity index 100%
rename from bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerAcceptorModuleTest.java
rename to bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerAcceptorModuleTest.java

diff --git a/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModuleTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModuleTest.java
similarity index 100%
rename from bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModuleTest.java
rename to bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModuleTest.java

diff --git a/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPTableTypeImplModuleTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPTableTypeImplModuleTest.java
similarity index 100%
rename from bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPTableTypeImplModuleTest.java
rename to bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPTableTypeImplModuleTest.java

diff --git a/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModuleTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModuleTest.java
similarity index 100%
rename from bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModuleTest.java
rename to bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModuleTest.java

diff --git a/bgp/rib-spi-config/pom.xml b/bgp/rib-spi-config/pom.xml
index 5210db48a0bfa0d3d242f57ff8b9c3e6ec48838c..4fad1d5755df337bbd6bbc29360abd98485fbc9c 100644 (file)
--- a/bgp/rib-spi-config/pom.xml
+++ b/bgp/rib-spi-config/pom.xml
@@ -31,57 +31,8 @@
         <maven>3.0.4</maven>
     </prerequisites>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-rib-spi</artifactId>
-        </dependency>
-        <!--test dependencies -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>mockito-configuration</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

diff --git a/bgp/rib-spi-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModuleTest.java b/bgp/rib-spi/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModuleTest.java
similarity index 100%
rename from bgp/rib-spi-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModuleTest.java
rename to bgp/rib-spi/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModuleTest.java

diff --git a/bgp/rib-spi/pom.xml b/bgp/rib-spi/pom.xml
index 98e1f71d1dc6df289e3ddb6eba50a1c15c97f0ca..65861b3a2544012363069be77d82baf8429f015f 100644 (file)
--- a/bgp/rib-spi/pom.xml
+++ b/bgp/rib-spi/pom.xml
@@ -48,6 +48,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-api</artifactId>
+        </dependency>
 
         <!-- Test dependencies -->
         <dependency>
@@ -62,6 +66,19 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-manager</artifactId>
+            <type>test-jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-manager</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-util</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -76,6 +93,22 @@
                     </instructions>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>

diff --git a/bgp/rib-spi-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModule.java b/bgp/rib-spi/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModule.java
similarity index 100%
rename from bgp/rib-spi-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModule.java
rename to bgp/rib-spi/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModule.java

diff --git a/bgp/rib-spi-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModuleFactory.java b/bgp/rib-spi/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModuleFactory.java
similarity index 100%
rename from bgp/rib-spi-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModuleFactory.java
rename to bgp/rib-spi/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModuleFactory.java

diff --git a/bgp/rib-spi-config/src/main/yang/config-bgp-rib-spi.yang b/bgp/rib-spi/src/main/yang/odl-bgp-rib-spi-cfg.yang
similarity index 98%
rename from bgp/rib-spi-config/src/main/yang/config-bgp-rib-spi.yang
rename to bgp/rib-spi/src/main/yang/odl-bgp-rib-spi-cfg.yang
index 5c1281f535358622da89a8ac2925e0169d7c0e2a..93e16044ed5750422fe76873e6b74ba6205b2b81 100644 (file)
--- a/bgp/rib-spi-config/src/main/yang/config-bgp-rib-spi.yang
+++ b/bgp/rib-spi/src/main/yang/odl-bgp-rib-spi-cfg.yang
@@ -1,5 +1,5 @@
 // vi: set smarttab et sw=4 tabstop=4:
-module config-bgp-rib-spi {
+module odl-bgp-rib-spi-cfg {
     yang-version 1;
     namespace "urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi";
     prefix "bgpribspi";

diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModuleTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModuleTest.java
new file mode 100644 (file)
index 0000000..a93a880
--- /dev/null
+++ b/bgp/rib-spi/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModuleTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * 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.controller.config.yang.bgp.rib.spi;
+
+import java.util.List;
+
+import javax.management.ObjectName;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.opendaylight.controller.config.api.jmx.CommitStatus;
+import org.opendaylight.controller.config.manager.impl.AbstractConfigTest;
+import org.opendaylight.controller.config.manager.impl.factoriesresolver.HardcodedModuleFactoriesResolver;
+import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
+
+public class RIBExtensionsImplModuleTest extends AbstractConfigTest {
+
+    private static final String FACTORY_NAME = RIBExtensionsImplModuleFactory.NAME;
+    private static final String INSTANCE_NAME = "bgp-rib-extensions-impl";
+
+    @Before
+    public void setUp() throws Exception {
+        super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(mockedContext, new RIBExtensionsImplModuleFactory()));
+    }
+
+    @Test
+    public void testCreateBean() throws Exception {
+        CommitStatus status = createInstance();
+        assertBeanCount(1, FACTORY_NAME);
+        assertStatus(status, 1, 0, 0);
+    }
+
+    @Test
+    public void testReusingOldInstance() throws Exception {
+        createInstance();
+        ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction();
+        assertBeanCount(1, FACTORY_NAME);
+        CommitStatus status = transaction.commit();
+        assertBeanCount(1, FACTORY_NAME);
+        assertStatus(status, 0, 0, 1);
+    }
+
+    private CommitStatus createInstance() throws Exception {
+        ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction();
+        transaction.createModule(FACTORY_NAME, INSTANCE_NAME);
+        return transaction.commit();
+    }
+
+    public static ObjectName createRIBExtensionsModuleInstance(final ConfigTransactionJMXClient transaction,
+            final List<ObjectName> extensions) throws Exception {
+        final ObjectName objectName = transaction.createModule(FACTORY_NAME, INSTANCE_NAME);
+        RIBExtensionsImplModuleMXBean mxBean = transaction.newMXBeanProxy(objectName, RIBExtensionsImplModuleMXBean.class);
+        mxBean.setExtension(extensions);
+        return objectName;
+    }
+}

diff --git a/bgp/topology-provider-config/pom.xml b/bgp/topology-provider-config/pom.xml
index f3c23cf5303284198442112ed7bdcf56067a594e..0e9c9a8e441d3e2d0d65f499ec192253d4e02f89 100644 (file)
--- a/bgp/topology-provider-config/pom.xml
+++ b/bgp/topology-provider-config/pom.xml
@@ -31,85 +31,8 @@
         <maven>3.0.4</maven>
     </prerequisites>
 
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-topology-provider</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-rib-api-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>topology-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
-        <!-- test scope dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>mockito-configuration</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-rib-impl-config</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-rib-impl-config</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-event-executor-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>protocol-framework</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-threadgroup-config</artifactId>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

diff --git a/bgp/topology-provider/pom.xml b/bgp/topology-provider/pom.xml
index 30abbba98a68eb3305d3636907e6a281218b71f5..3bd985ad5b22321e3297ebb813030ab092e44650 100644 (file)
--- a/bgp/topology-provider/pom.xml
+++ b/bgp/topology-provider/pom.xml
@@ -74,11 +74,65 @@
             <artifactId>ietf-topology-ospf</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-config</artifactId>
+        </dependency>
+
         <!-- Test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-manager</artifactId>
+            <type>test-jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-manager</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-util</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-rib-impl</artifactId>
+            <type>test-jar</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-rib-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-broker-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>netty-event-executor-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>protocol-framework</artifactId>
+            <type>test-jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>netty-threadgroup-config</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -93,6 +147,10 @@
                    </instructions>
                </configuration>
            </plugin>
+           <plugin>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>

diff --git a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModule.java b/bgp/topology-provider/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModule.java
similarity index 100%
rename from bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModule.java
rename to bgp/topology-provider/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModule.java

diff --git a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleFactory.java b/bgp/topology-provider/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleFactory.java
similarity index 100%
rename from bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleFactory.java
rename to bgp/topology-provider/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleFactory.java

diff --git a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModule.java b/bgp/topology-provider/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModule.java
similarity index 100%
rename from bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModule.java
rename to bgp/topology-provider/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModule.java

diff --git a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleFactory.java b/bgp/topology-provider/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleFactory.java
similarity index 100%
rename from bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleFactory.java
rename to bgp/topology-provider/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleFactory.java

diff --git a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModule.java b/bgp/topology-provider/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModule.java
similarity index 100%
rename from bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModule.java
rename to bgp/topology-provider/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModule.java

diff --git a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleFactory.java b/bgp/topology-provider/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleFactory.java
similarity index 100%
rename from bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleFactory.java
rename to bgp/topology-provider/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleFactory.java

diff --git a/bgp/topology-provider-config/src/main/yang/config-bgp-topology-provider.yang b/bgp/topology-provider/src/main/yang/odl-bgp-topology-provider-cfg.yang
similarity index 97%
rename from bgp/topology-provider-config/src/main/yang/config-bgp-topology-provider.yang
rename to bgp/topology-provider/src/main/yang/odl-bgp-topology-provider-cfg.yang
index aab8f13c5dd81a4d044b44bee2784c24ebe71ebe..8c6960b134702b487d8c541f44793b0480da6b42 100644 (file)
--- a/bgp/topology-provider-config/src/main/yang/config-bgp-topology-provider.yang
+++ b/bgp/topology-provider/src/main/yang/odl-bgp-topology-provider-cfg.yang
@@ -1,12 +1,12 @@
 // vi: set smarttab et sw=4 tabstop=4:
-module config-bgp-topology-provider {
+module odl-bgp-topology-provider-cfg {
     yang-version 1;
     namespace "urn:opendaylight:params:xml:ns:yang:controller:bgp:topology:provider";
     prefix "bgptopo";
 
     import config { prefix config; revision-date 2013-04-05; }
     import network-topology { prefix nt; revision-date 2013-10-21; }
-    import config-bgp-rib { prefix ribapi; revision-date 2013-07-01; }
+    import odl-bgp-rib-cfg { prefix ribapi; revision-date 2013-07-01; }
     import odl-topology-api-cfg { prefix topo; revision-date 2013-11-15; }
     import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; }
 

diff --git a/bgp/topology-provider-config/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleTest.java
similarity index 100%
rename from bgp/topology-provider-config/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleTest.java
rename to bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleTest.java

diff --git a/bgp/topology-provider-config/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleTest.java
similarity index 100%
rename from bgp/topology-provider-config/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleTest.java
rename to bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleTest.java

diff --git a/bgp/topology-provider-config/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleTest.java
similarity index 100%
rename from bgp/topology-provider-config/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleTest.java
rename to bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleTest.java

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index de5f347ab23dc43fd6a41c14240ddef75b46611f..c2dd9430a8e0d1f10854a907c885005d4272c0cd 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -135,21 +135,21 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>bgp-rib-spi-config</artifactId>
+                <artifactId>bgp-rib-spi</artifactId>
                 <version>${project.version}</version>
                 <scope>test</scope>
                 <type>test-jar</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>bgp-parser-spi-config</artifactId>
+                <artifactId>bgp-parser-spi</artifactId>
                 <version>${project.version}</version>
                 <scope>test</scope>
                 <type>test-jar</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>bgp-rib-impl-config</artifactId>
+                <artifactId>bgp-rib-impl</artifactId>
                 <version>${project.version}</version>
                 <type>test-jar</type>
                 <scope>test</scope>