Bug 1877: Add LISP Neutron implementation to Karaf

Change-Id: Ie6b93a6f94660e5778a5c9e8a761b3667aab2d03
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --git a/features/pom.xml b/features/pom.xml
index ad1e500095f6544ea60f0a453ef6c35d2cf0f6c2..7138c0d728bbb398f162fd0642acf00d1ce8efbe 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -102,6 +102,11 @@
       <groupId>org.opendaylight.lispflowmapping</groupId>
       <artifactId>mappingservice.netconf</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.neutron</artifactId>
+    </dependency>
     <!-- error : java.lang.NoSuchMethodError: org.slf4j.helpers.MessageFormatter.format(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Lorg/slf4j/helpers/FormattingTuple; -->
     <dependency>
       <groupId>org.slf4j</groupId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 04f5f06431da98b41cfc13cfaa52e239406c967f..2d35267e5a39f51d1801d9b81895adeb8f7f1242 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -21,6 +21,7 @@
         <feature version="${lispflowmapping.version}">odl-lispflowmapping-southbound</feature>
         <feature version="${lispflowmapping.version}">odl-lispflowmapping-northbound</feature>
         <feature version="${lispflowmapping.version}">odl-lispflowmapping-netconf</feature>
+        <feature version="${lispflowmapping.version}">odl-lispflowmapping-neutron</feature>
     </feature>
 
     <feature name="odl-lispflowmapping-mappingservice" description="OpenDaylight :: LISP Flow Mapping :: Mapping Service" version='${lispflowmapping.version}'>
@@ -50,4 +51,10 @@
         <feature version="${lispflowmapping.version}">odl-lispflowmapping-mappingservice</feature>
         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.netconf/${lispflowmapping.version}</bundle>
     </feature>
+
+    <feature name="odl-lispflowmapping-neutron" description="OpenDaylight :: LISP Flow Mapping :: Neutron Integration" version='${lispflowmapping.version}'>
+        <feature version="${nsf.version}">odl-adsal-northbound</feature>
+        <feature version="${lispflowmapping.version}">odl-lispflowmapping-mappingservice</feature>
+        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.neutron/${lispflowmapping.version}</bundle>
+    </feature>
 </features>