Karaf features for OVSDB modules.

1. Individual Features for library, schema wrappers and plugin.
2. Northbound and Openstack features will be added as soon as controller AD-SAL karaf features are resolved.
3. Updated proper <name> tag in each of the pom files as the default karaf behaviour is to print artifact-id in bundle:list.

Sample logs after kar:install : https://gist.github.com/4845f27a79cf74dd7431

Change-Id: I2180c8dc37a4cc06d0ab9a53b03162594439ac85
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

diff --git a/.gitignore b/.gitignore
index bfd8893496ffb6c3cb2c4b8a78ad3682e33ddebb..7326a4a5281fa86c98904f1174133a4fc695a96b 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ report.html
 target-ide/
 .vagrant
 .DS_Store
+.checkstyle

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index e708acf460c2ed5c8d389af938ce4f6d0d39ffff..3da53e38a98f2f6d699aa85448a4d020793c7f50 100755 (executable)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -49,7 +49,6 @@
     <checkstyle.rules.version>0.0.3-SNAPSHOT</checkstyle.rules.version>
     <!-- 3rd Pary Dependency Versions -->
     <commons.collection.version>1.0</commons.collection.version>
-    <netty.version>4.0.10.Final</netty.version>
     <portlet.version>2.0</portlet.version>
     <powermock.version>1.5.2</powermock.version>
     <httpcomponents.version>4.2.1</httpcomponents.version>

diff --git a/distribution/opendaylight/pom.xml b/distribution/opendaylight/pom.xml
index 125efe2b367d09e10438aa6b165ffdb97439b2bb..8c1a28c23163dd685c6e9c52bb1e4c01af2ea4ac 100755 (executable)
--- a/distribution/opendaylight/pom.xml
+++ b/distribution/opendaylight/pom.xml
@@ -14,7 +14,7 @@ see https://git.opendaylight.org/gerrit/#/c/390/
 
   <artifactId>distribution.ovsdb</artifactId>
   <packaging>pom</packaging>
-  <name>distribution</name>
+  <name>OpenDaylight OVSDB Distribution</name>
 
   <properties>
     <openflowjava.version>0.5-SNAPSHOT</openflowjava.version>

diff --git a/features/pom.xml b/features/pom.xml
new file mode 100644 (file)
index 0000000..5a23161
--- /dev/null
+++ b/features/pom.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.ovsdb</groupId>
+    <artifactId>commons</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+    <relativePath>../commons/parent</relativePath>
+  </parent>
+  <artifactId>ovsdb-features</artifactId>
+  <name>OpenDaylight OVSDB Project Karaf Features</name>
+  <packaging>pom</packaging>
+  <properties>
+    <features.file>features.xml</features.file>
+  </properties>
+  <build>
+    <resources>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.karaf.tooling</groupId>
+        <artifactId>karaf-maven-plugin</artifactId>
+        <version>${karaf.version}</version>
+        <extensions>true</extensions>
+        <executions>
+          <execution>
+            <id>features-create-kar</id>
+            <goals>
+              <goal>features-create-kar</goal>
+            </goals>
+            <configuration>
+              <featuresFile>${project.build.directory}/classes/${features.file}</featuresFile>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>filter</id>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+            <phase>generate-resources</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-artifacts</id>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>${project.build.directory}/classes/${features.file}</file>
+                  <type>xml</type>
+                  <classifier>features</classifier>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
+   </scm>
+</project>
\ No newline at end of file

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
new file mode 100644 (file)
index 0000000..c59b716
--- /dev/null
+++ b/features/src/main/resources/features.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features name="ovsdb-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+    <feature name="odl-ovsdb-all" description="OpenDaylight :: OVSDB :: all" version='${project.version}'>
+        <feature version="${ovsdb.library.version}">odl-ovsdb-library</feature>
+        <feature version="${ovsdb.plugin.version}">odl-ovsdb-plugin</feature>
+        <!--
+            TODO : Enable the northbound & netvirt features once AD-SAL NSF & northbound feature works in Controller project.
+        <feature version="${ovsdb.northbound.version}">odl-ovsdb-northbound</feature>
+        <feature version="${ovsdb.openstack.netvirt.version}">odl-ovsdb-openstack</feature>
+        -->
+    </feature>
+
+    <feature name="odl-ovsdb-library" description="OVSDB :: Library" version='${ovsdb.library.version}'>
+        <feature>base-all</feature>
+        <bundle>mvn:com.google.code.gson/gson/${gson.version}</bundle>
+        <bundle>mvn:org.opendaylight.ovsdb/library/${ovsdb.library.version}</bundle>
+    </feature>
+
+    <feature name="odl-ovsdb-schema-openvswitch" description="OVSDB :: Schema :: Open_vSwitch" version='${schema.openvswitch.version}'>
+        <feature version="${ovsdb.library.version}">odl-ovsdb-library</feature>
+        <bundle>mvn:org.opendaylight.ovsdb/schema.openvswitch/${schema.openvswitch.version}</bundle>
+    </feature>
+
+    <feature name="odl-ovsdb-schema-hardwarevtep" description="OVSDB :: Schema :: hardware_vtep" version='${schema.hardwarevtep.version}'>
+        <feature version="${ovsdb.library.version}">odl-ovsdb-library</feature>
+        <bundle>mvn:org.opendaylight.ovsdb/schema.hardwarevtep/${schema.hardwarevtep.version}</bundle>
+    </feature>
+
+    <feature name="odl-ovsdb-plugin" description="OpenDaylight :: OVSDB :: Plugin" version='${ovsdb.plugin.version}'>
+        <feature version="${sal.version}">odl-adsal-all</feature>
+        <feature version="${ovsdb.library.version}">odl-ovsdb-library</feature>
+        <feature version="${schema.openvswitch.version}">odl-ovsdb-schema-openvswitch</feature>
+        <feature version="${schema.hardwarevtep.version}">odl-ovsdb-schema-hardwarevtep</feature>
+        <bundle>mvn:org.opendaylight.ovsdb/plugin/${ovsdb.plugin.version}</bundle>
+    </feature>
+<!--
+    ADSAL Northbound and NSFs are not broken into Karaf Features yet.
+    Also, the ADSAL Northbound is not modular enough to easily isolate it into bit-sized feature.
+    It has a chain of AD-SAL NSF dependencies and hence the Controller project has not completed the AD-SAL karaf version.
+
+    TODO : Enable the northbound & netvirt features once AD-SAL northbound feature is working in Controller project.
+
+    <feature name="odl-ovsdb-northbound" description="OpenDaylight :: OVSDB :: Northbound" version='${ovsdb.northbound.version}'>
+        <feature version="${ovsdb.plugin.version}">odl-ovsdb-plugin</feature>
+        <bundle>mvn:org.opendaylight.ovsdb/northbound/${ovsdb.northbound.version}</bundle>
+    </feature>
+
+
+    <feature name="odl-ovsdb-openstack" description="OpenDaylight :: OVSDB :: OpenStack Network Virtualization" version='${ovsdb.openstack.netvirt.version}'>
+        <feature version="${ovsdb.plugin.version}">odl-ovsdb-plugin</feature>
+        <bundle>mvn:org.opendaylight.ovsdb/net-virt/${ovsdb.openstack.netvirt.version}</bundle>
+        <bundle>mvn:org.opendaylight.ovsdb/net-virt-providers/${ovsdb.openstack.netvirt.providers.version}</bundle>
+    </feature>
+
+-->
+</features>
\ No newline at end of file

diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index 752a6a10e11c660dce7dde5f7d55e4fd87aeed40..21f1826db9af3dd2a825a25ba57186daa6433d89 100644 (file)
--- a/integrationtest/pom.xml
+++ b/integrationtest/pom.xml
@@ -11,6 +11,7 @@
 
   <artifactId>integrationtest</artifactId>
   <version>1.2.0-SNAPSHOT</version>
+  <name>OpenDaylight OVSDB Integration Tests</name>
   <packaging>jar</packaging>
 
   <dependencies>

diff --git a/northbound/pom.xml b/northbound/pom.xml
index 6cd6d36bdaf61d1c8725bcb45418f89a6ea6ec9f..52b4af9628d43adae00762430d356ba9610825c5 100644 (file)
--- a/northbound/pom.xml
+++ b/northbound/pom.xml
@@ -9,6 +9,7 @@
   </parent>
   <artifactId>northbound</artifactId>
   <version>0.6.0-SNAPSHOT</version>
+  <name>OpenDaylight OVSDB Northbound APIs</name>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/openstack/net-virt-providers/pom.xml b/openstack/net-virt-providers/pom.xml
index ea53ce9f6285d9fc14002d999e7efb42395221c6..7b40f7481d45515f5a7b49793fd82ab653e8a7bc 100644 (file)
--- a/openstack/net-virt-providers/pom.xml
+++ b/openstack/net-virt-providers/pom.xml
@@ -12,6 +12,7 @@
 
     <artifactId>openstack.net-virt-providers</artifactId>
     <version>1.0.0-SNAPSHOT</version>
+    <name>Opendaylight OVS Network Virtualization Providers</name>
     <packaging>bundle</packaging>
 
     <dependencies>

diff --git a/openstack/net-virt/pom.xml b/openstack/net-virt/pom.xml
index 122742ef64e5ffdc7753fb93f23d02ef819490b7..47a3d179a19c28478dfc414213d22bfc14551964 100644 (file)
--- a/openstack/net-virt/pom.xml
+++ b/openstack/net-virt/pom.xml
@@ -10,6 +10,7 @@
 
   <artifactId>openstack.net-virt</artifactId>
   <version>1.0.0-SNAPSHOT</version>
+  <name>Opendaylight OVS Network Virtualization</name>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/plugin/pom.xml b/plugin/pom.xml
index cab0c0636b779050cdb0f6bc9ed5e8096b210740..97a377d4f5d1f8efebde0145c44cc7ad6653a5a7 100755 (executable)
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -10,6 +10,7 @@
 
   <artifactId>plugin</artifactId>
   <version>1.0.0-SNAPSHOT</version>
+  <name>OpenDaylight OVSDB Plugin</name>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/pom.xml b/pom.xml
index 7443fab23e0da680580d539992558acf3df3a7c3..63eb3fc46c37e18d717098319f35b15d01241020 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,8 @@
     <module>openstack/net-virt</module>
     <module>openstack/net-virt-providers</module>
     <module>distribution/opendaylight</module>
+    <!-- Karaf Distribution -->
+    <module>features</module>
   </modules>
 
   <profiles>