Merge "Remove AD-SAL dependencies from Neutron service"

[lispflowmapping.git] / features / src / main / resources / features.xml

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 04f5f06431da98b41cfc13cfaa52e239406c967f..c1da39f0e21eac21964140f00aea58f43703f3e0 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -13,6 +13,7 @@
 
     <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-adsal/${sal.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-neutron/${neutron.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-nsf/${nsf.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-netconf-connector/${mdsal.version}/xml/features</repository>
 
@@ -21,6 +22,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 +52,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="${neutron.version}">odl-neutron-all</feature>
+        <feature version="${lispflowmapping.version}">odl-lispflowmapping-mappingservice</feature>
+        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.neutron/${lispflowmapping.version}</bundle>
+    </feature>
 </features>