Add northbound karaf feature

With this feature, manual functional tests are now passing for
odl-lispflowmapping-all.

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

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 1cb6f02f09a381ad24a38fd67a2b396d9b7912fa..daec4437e73cb2adee767e3065d1222c095d4668 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -18,7 +18,8 @@
                <jacoco.version>0.6.2.201302030002</jacoco.version>
                <sal.version>0.8.1-SNAPSHOT</sal.version>
                <mdsal.version>1.1-SNAPSHOT</mdsal.version>
-                <clustering.services.version>0.5.1-SNAPSHOT</clustering.services.version>
+               <nsf.version>0.4.2-SNAPSHOT</nsf.version>
+               <clustering.services.version>0.5.1-SNAPSHOT</clustering.services.version>
                <enforcer.version>1.3.1</enforcer.version>
                <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/features/pom.xml b/features/pom.xml
index f40c48d7d6eb50a8346434ee299b3417e3a1f329..186a34a00ce0aac63ba9c2031c81e80e3090b516 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -36,6 +36,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-nsf</artifactId>
+      <version>${nsf.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <!-- test to validate features.xml -->
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index b281749c34738b558475754dfbfc7c767952838f..1c34efe8e256f57bab371b56b3aadc863ba99850 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -13,14 +13,12 @@
 
     <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-nsf/${nsf.version}/xml/features</repository>
 
     <feature name="odl-lispflowmapping-all" description="OpenDaylight :: LISP Flow Mapping :: All" version='${lispflowmapping.version}'>
         <feature version="${lispflowmapping.version}">odl-lispflowmapping-mappingservice</feature>
         <feature version="${lispflowmapping.version}">odl-lispflowmapping-southbound</feature>
-        <!--
-            TODO : Enable the northbound feature once AD-SAL NSF & northbound feature works in Controller project.
-        <feature version="${lispflowmapping.northbound.version}">odl-lispflowmapping-northbound</feature>
-        -->
+        <feature version="${lispflowmapping.version}">odl-lispflowmapping-northbound</feature>
     </feature>
 
     <feature name="odl-lispflowmapping-mappingservice" description="OpenDaylight :: LISP Flow Mapping :: Mapping Service" version='${lispflowmapping.version}'>
@@ -38,17 +36,10 @@
         <feature version="${lispflowmapping.version}">odl-lispflowmapping-mappingservice</feature>
         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.southbound/${lispflowmapping.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 feature once AD-SAL northbound feature is working in Controller project.
 
     <feature name="odl-lispflowmapping-northbound" description="OpenDaylight :: LISP Flow Mapping :: Northbound" 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.northbound/${lispflowmapping.version}</bundle>
     </feature>
-
--->
 </features>