With the Controller Project exposing NSF features, we can enable OVSDB Northbound...

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

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index c59b716356d48ccd0b2e8de498d69596ee200301..1794058d0d51d7973dc2c7f64024926f08fe3229 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -3,9 +3,8 @@
     <feature name="odl-ovsdb-all" description="OpenDaylight :: OVSDB :: all" version='${project.version}'>
         <feature version="${ovsdb.library.version}">odl-ovsdb-library</feature>
         <feature version="${ovsdb.plugin.version}">odl-ovsdb-plugin</feature>
-        <!--
-            TODO : Enable the northbound & netvirt features once AD-SAL NSF & northbound feature works in Controller project.
         <feature version="${ovsdb.northbound.version}">odl-ovsdb-northbound</feature>
+        <!--
         <feature version="${ovsdb.openstack.netvirt.version}">odl-ovsdb-openstack</feature>
         -->
     </feature>
@@ -33,24 +32,18 @@
         <feature version="${schema.hardwarevtep.version}">odl-ovsdb-schema-hardwarevtep</feature>
         <bundle>mvn:org.opendaylight.ovsdb/plugin/${ovsdb.plugin.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 & netvirt features once AD-SAL northbound feature is working in Controller project.
 
     <feature name="odl-ovsdb-northbound" description="OpenDaylight :: OVSDB :: Northbound" version='${ovsdb.northbound.version}'>
         <feature version="${ovsdb.plugin.version}">odl-ovsdb-plugin</feature>
+        <feature>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='${ovsdb.openstack.netvirt.version}'>
         <feature version="${ovsdb.plugin.version}">odl-ovsdb-plugin</feature>
         <bundle>mvn:org.opendaylight.ovsdb/net-virt/${ovsdb.openstack.netvirt.version}</bundle>
         <bundle>mvn:org.opendaylight.ovsdb/net-virt-providers/${ovsdb.openstack.netvirt.providers.version}</bundle>
     </feature>
-
 -->
 </features>
\ No newline at end of file