X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fsrc%2Fmain%2Fresources%2Ffeatures.xml;h=9a3125d20ebae707f0a74d5a61a5aabba03b3dc8;hb=75b9446d67267b3cc6bc8fbc99e2c188d9cae16a;hp=ccbfbe88aa05b8d47ded9eb3f3998da248f87da1;hpb=764457f3deb04f8e39266526a2c399c6afb5a7e4;p=integration%2Fdistribution.git

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index ccbfbe88..9a3125d2 100644
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -49,15 +49,33 @@
     -->
 
     <repository>mvn:org.opendaylight.controller/features-mdsal/${feature.mdsal.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-adsal/${feature.adsal.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-nsf/${feature.nsf.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.ovsdb/features-ovsdb/${feature.ovsdb.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.0.3-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.l2switch/features-l2switch/0.1.0-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-adsal-compatibility/1.4.2-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.ovsdb/features-openflow-nxm/0.0.3-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.aaa/features-aaa/0.1.0-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.lispflowmapping/features-lispflowmapping/${feature.lispflowmapping.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.vtn/features-vtn-manager/${feature.vtn-manager.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.bgpcep/features-bgp/${feature.bgp.version}/xml/features</repository>
     <feature name='odl-integration-compatible-with-all' version='${project.version}'>
         <feature version='1.1-SNAPSHOT'>odl-mdsal-broker</feature>
         <feature version='1.1-SNAPSHOT'>odl-restconf</feature>
+        <feature version='${feature.adsal.version}'>odl-adsal-all</feature>
+        <feature version='${feature.nsf.version}'>odl-nsf-all</feature>
         <feature version='0.0.3-SNAPSHOT'>odl-openflowplugin-flow-services</feature>
+        <feature version='0.5-SNAPSHOT'>odl-openflowjava-protocol</feature>
+        <feature version='${feature.ovsdb.version}'>odl-ovsdb-all</feature>
+        <feature version='0.0.3-SNAPSHOT'>odl-openflow-nxm-extensions</feature>
+        <feature version='${feature.adsal.version}'>odl-adsal-compatibility</feature>
+        <feature version='0.1.0-SNAPSHOT'>odl-aaa-all</feature>
+        <feature version='${feature.bgp.version}'>odl-bgpcep-all</feature>
+        <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-all</feature>
     </feature>
 
-    <!-- 
+    <!--
         * Reason why l2switch has compatibility issues with others:
             l2switch simply provides a simple l2switch among all ports
             this is great for seeing basic functionality like pingall,
@@ -68,4 +86,21 @@
     	<feature version='${project.version}'>odl-integration-compatible-with-all</feature>
 		<feature version='0.1.0-SNAPSHOT'>odl-l2switch-switch</feature>
 	</feature>
+
+    <!--
+          Since ODL supports a few Incompatible Openstack integration such as ovs-openstack and vtn-openstack,
+          it is appropriate to create compatible feature for each of the incompatible openstack approaches.
+    -->
+	<feature name='odl-integration-compatible-with-ovs-openstack' description="OpenDaylight :: OVS :: OpenStack Network Virtualization" version='${project.version}'>
+            <feature version='${project.version}'>odl-integration-compatible-with-all</feature>
+	    <feature version='${feature.ovsdb.openstack.version}'>odl-ovsdb-openstack</feature>
+	</feature>
+
+    <!-- Since VTN Manager is not compatible with other flow programming apps,
+         and not compatible with other openstack apps,
+         it is appropriate to create compatible feature for VTN Manager. -->
+    <feature name='odl-integration-compatible-with-vtn-manager' version='${project.version}'>
+        <feature version='${project.version}'>odl-integration-compatible-with-all</feature>
+        <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-all</feature>
+    </feature>
 </features>