Karaf Feature support for OVS based Openstack Network Virtualization

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

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 34215fe0b02554382e68db00fddbf08ab205d047..ab4681e94b6cf1084b811e7e01c7a755d08baeb6 100755 (executable)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -33,6 +33,7 @@
     <schema.openvswitch.version>1.0.0-SNAPSHOT</schema.openvswitch.version>
     <schema.hardwarevtep.version>1.0.0-SNAPSHOT</schema.hardwarevtep.version>
     <ovsdb.ofextension.version>1.0.0-SNAPSHOT</ovsdb.ofextension.version>
+    <utils.mdsal.openflow>1.0.0-SNAPSHOT</utils.mdsal.openflow>
     <!-- Skip Coverage and IT by default -->
     <skip.coverage>true</skip.coverage>
     <skip.integrationtest>true</skip.integrationtest>

diff --git a/features/ovsdb/pom.xml b/features/ovsdb/pom.xml
index b3e95ca057b0c6fa8459447f98c2c3f1cb9db846..cc590f6ee045282a300dcc19bd678380fdc43b71 100644 (file)
--- a/features/ovsdb/pom.xml
+++ b/features/ovsdb/pom.xml
@@ -36,6 +36,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>features-openflow-nxm</artifactId>
+      <version>${openflowplugin.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>features-test</artifactId>

diff --git a/features/ovsdb/src/main/resources/features.xml b/features/ovsdb/src/main/resources/features.xml
index c401b4bda4042dc8c6168e49537b2e774c6cb1e1..1a60f8d9dac857b81ca97f8010debd5e78a9da0e 100644 (file)
--- a/features/ovsdb/src/main/resources/features.xml
+++ b/features/ovsdb/src/main/resources/features.xml
@@ -3,6 +3,7 @@
     <repository>mvn:org.opendaylight.controller/features-base/${odl.karaf.base.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-adsal/${sal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-nsf/${nsf.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.ovsdb/features-openflow-nxm/${openflowplugin.version}/xml/features</repository>
 
     <feature name="odl-ovsdb-all" description="OpenDaylight :: OVSDB :: all" version='${project.version}'>
         <feature version="${ovsdb.library.version}">odl-ovsdb-library</feature>
@@ -40,4 +41,12 @@
         <feature version="${nsf.version}">odl-adsal-northbound</feature>
         <bundle>mvn:org.opendaylight.ovsdb/northbound/${ovsdb.northbound.version}</bundle>
     </feature>
+
+    <feature name="odl-ovsdb-openstack" description="OpenDaylight :: OVSDB :: OpenStack Network Virtualization" version='${openstack.netvirt.version}'>
+        <feature version="${ovsdb.plugin.version}">odl-ovsdb-plugin</feature>
+        <feature version="${openflowplugin.version}">odl-openflow-nxm-extensions</feature>
+        <feature version="${nsf.version}">odl-nsf-all</feature>
+        <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt/${openstack.netvirt.version}</bundle>
+        <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt-providers/${openstack.netvirt.providers.version}</bundle>
+    </feature>
 </features>