Bug 1823 : Adding Karaf openflowjava-nx-config bundle

Patch#4: Fixed a few more missing items that makes it integration-friendly
Patch#3: forgot I had dskiptests aliased from long build times.
This builds :0
Patch2: Deleting a config file a config file from before
we realized it needed to be new bundles.

Change-Id: I9cb6fe69eadc8df9bcffebfc3e15639e491db662
Signed-off-by: Brent Salisbury <[email protected]>
Signed-off-by: Madhu Venugopal <[email protected]>

diff --git a/features/of-nxm-extensions/pom.xml b/features/of-nxm-extensions/pom.xml
index 92521e1b7e58591f21002e9e948a8cbd9ca16817..c6adfd234317812e27fc9439ff022bb0cdf9b86d 100644 (file)
--- a/features/of-nxm-extensions/pom.xml
+++ b/features/of-nxm-extensions/pom.xml
@@ -61,6 +61,13 @@
       <artifactId>of-extension.nx-sal</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>of-extension.openflowjava-nx-config</artifactId>
+      <version>${ovsdb.ofextension.version}</version>
+      <classifier>config</classifier>
+      <type>xml</type>
+    </dependency>
   </dependencies>
   <build>
     <resources>

diff --git a/features/of-nxm-extensions/src/main/resources/features.xml b/features/of-nxm-extensions/src/main/resources/features.xml
index fe25b554230729f1aee0b46b38246db1734a4aff..a1f1013fd4f6c9c37d98cf2dd3762c089a1d15ab 100644 (file)
--- a/features/of-nxm-extensions/src/main/resources/features.xml
+++ b/features/of-nxm-extensions/src/main/resources/features.xml
@@ -9,8 +9,6 @@
         <bundle>mvn:org.opendaylight.openflowplugin/openflowjava-extension-nicira/${openflowplugin.version}</bundle>
         <bundle>mvn:org.opendaylight.ovsdb/of-extension.nx-ofjava/${ovsdb.nx.version}</bundle>
         <bundle>mvn:org.opendaylight.ovsdb/of-extension.nx-sal/${ovsdb.nx.version}</bundle>
-<!--
-        <configfile finalname="etc/opendaylight/karaf/42-openflowplugin.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/${project.version}/xml/config</configfile>
--->
+        <configfile finalname="etc/opendaylight/karaf/44-openflowjava-nx-config.xml">mvn:org.opendaylight.ovsdb/of-extension.openflowjava-nx-config/${ovsdb.ofextension.version}/xml/config</configfile>
     </feature>
 </features>

diff --git a/of-extension/openflowjava-nx-config/pom.xml b/of-extension/openflowjava-nx-config/pom.xml
new file mode 100644 (file)
index 0000000..acb4f4c
--- /dev/null
+++ b/of-extension/openflowjava-nx-config/pom.xml
@@ -0,0 +1,46 @@
+<?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">
+  <parent>
+    <artifactId>commons</artifactId>
+    <groupId>org.opendaylight.ovsdb</groupId>
+    <version>1.2.0-SNAPSHOT</version>
+    <relativePath>../../commons/parent</relativePath>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>of-extension.openflowjava-nx-config</artifactId>
+  <version>${ovsdb.ofextension.version}</version>
+  <packaging>jar</packaging>
+
+  <properties>
+    <configfile>44-openflowjava-nx-config.xml</configfile>
+  </properties>
+  <build>
+    <plugins>
+      <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/${configfile}</file>
+                            <type>xml</type>
+                            <classifier>config</classifier>
+                        </artifact>
+                    </artifacts>
+                </configuration>
+            </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

diff --git a/of-extension/openflowjava-nx-config/src/main/resources/44-openflowjava-nx-config.xml b/of-extension/openflowjava-nx-config/src/main/resources/44-openflowjava-nx-config.xml
new file mode 100644 (file)
index 0000000..756bd15
--- /dev/null
+++ b/of-extension/openflowjava-nx-config/src/main/resources/44-openflowjava-nx-config.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<snapshot>
+  <required-capabilities>
+    <capability>urn:opendaylight:params:xml:ns:yang:openflowplugin:ofjava:nx:config?module=openflowjava-nx-config&amp;revision=2014-07-11</capability>
+  </required-capabilities>
+
+  <configuration>
+
+    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
+        <module>
+          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflowplugin:ofjava:nx:config">prefix:openflowjava-extension-nicira</type>
+          <name>openflow-nx-bundle</name>
+          <nicira-extension-codec-registrator>
+            <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflowplugin:ofjava:nx:api:config">prefix:nicira-extension-codec-registrator</type>
+            <name>openflowjava-nicira-ext-registrator</name>
+          </nicira-extension-codec-registrator>
+        </module>
+      </modules>
+    </data>
+
+  </configuration>
+</snapshot>

diff --git a/pom.xml b/pom.xml
index d25500beea697c201b2b5c8a4b9032bf88e86f00..11342d4de4fb817534cdc1f17be20e605068895a 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,8 @@
     <module>ovs-sfc</module>
     <!-- Integration Tests -->
     <module>integrationtest</module>
+    <!-- Config Files -->
+    <module>of-extension/openflowjava-nx-config</module>
     <!-- Karaf Distribution -->
     <module>features/ovsdb</module>
     <module>features/of-nxm-extensions</module>