Adding Karaf feature of clustering test app

Signed-off-by: Harman Singh <harmasin@cisco.com>

diff --git a/features/pom.xml b/features/pom.xml
index 9ff83f188276ac98e3561b87887bca140213ec2e..b1aaceba2fabde0cda78b7c9c2b0b8fcd932b87c 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -156,6 +156,7 @@
       <type>xml</type>
     </dependency>
 
+
     <dependency>
        <groupId>org.opendaylight.packetcable</groupId>
        <artifactId>features-packetcable</artifactId>
@@ -163,6 +164,22 @@
        <classifier>features</classifier>
        <type>xml</type>
     </dependency>
+    <!-- clustering test application -->
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>clustering-it-config</artifactId>
+      <version>${clustering.it.test.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>clustering-it-model</artifactId>
+      <version>${clustering.it.test.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>clustering-it-provider</artifactId>
+      <version>${clustering.it.test.version}</version>
+    </dependency>
 
     <!-- test to validate features.xml -->
     <dependency>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index bd072cb41435788c22cd6e2673b822660c875714..0e23a0c20e703c0ab100bba42f27056f2f88a3c9 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -64,8 +64,8 @@
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.0.3-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/features-openflow-nxm/0.0.3-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/features-ovsdb/${feature.ovsdb.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.packetcable/features-packetcable/${feature.packetcable.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/features-ovs-sfc/0.0.1-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.packetcable/features-packetcable/${feature.packetcable.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.sfc/features-sfc/0.0.1-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.snbi/features-snbi/${feature.snbi.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ttp/features-ttp/${feature.ttp.version}/xml/features</repository>
@@ -133,4 +133,14 @@
             <feature version='${project.version}'>odl-integration-compatible-with-all</feature>
             <feature version='0.0.1-SNAPSHOT'>odl-ovsdb-ovssfc</feature>
         </feature>
+
+    <feature name='odl-clustering-test-app' version='${project.version}'>
+        <feature version='${feature.mdsal.version}'>odl-mdsal-clustering</feature>
+        <feature version='${feature.mdsal.version}'>odl-restconf</feature>
+        <feature version='${yangtools.version}'>odl-yangtools-models</feature>
+        <bundle>mvn:org.opendaylight.controller/clustering-it-model/${clustering.it.test.version}</bundle>
+        <bundle>mvn:org.opendaylight.controller/clustering-it-provider/${clustering.it.test.version}</bundle>
+        <configfile finalname="${config.configfile.directory}/20-clustering-test-app.xml">mvn:org.opendaylight.controller/clustering-it-config/${clustering.it.test.version}/xml/config</configfile>
+    </feature>
+
 </features>

diff --git a/pom.xml b/pom.xml
index 44e09d3028358dbace1f450a875eddbc6dee04f9..c41871b6a0528eb2e08da8a97e55bab35563691d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -39,8 +39,13 @@
     <karaf.version>3.0.1</karaf.version>
     <maven.surefire.version>2.16</maven.surefire.version>
     <checkstyle.version>2.12</checkstyle.version>
+    <checkstyle.version>2.12</checkstyle.version>
+    <clustering.it.test.version>1.1-SNAPSHOT</clustering.it.test.version>
+    <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
+    <yangtools.version>0.6.2-SNAPSHOT</yangtools.version>
   </properties>
   <modules>
+    <module>test/tools/odl-mdsal-clustering-tests/clustering-test-app/</module>
     <module>distributions/</module>
     <module>features/</module>
   </modules>