Moving SNBI feature to not compatible.

Explanation: SNBI feature brings l2switch features that are not compatible with other features. This makes SNBI feature not compatible too.

Project has been informed about this issue a few days ago. https://lists.opendaylight.org/pipermail/release/2015-March/001535.html

Change-Id: Ie9d62fd6b8de4fc0e6f1bcc9d7ba4c3e9f423ebe
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index f42c02b4466dbeaff17d82c8fd7aa0064bbf9888..f45b0e1dd126878b185d6eb687dba42e20f61817 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -84,7 +84,6 @@
         <feature version='0.1.0-SNAPSHOT'>odl-sfc-all</feature>
         <feature version='0.1.0-SNAPSHOT'>odl-sfclisp</feature>
         <feature version='0.1.0-SNAPSHOT'>odl-sfcofl2</feature>
-        <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-framework</feature>
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-mlmt</feature>
         <feature version='${feature.ttp.version}'>odl-ttp-all</feature>
@@ -95,16 +94,17 @@
 
     <!-- Please use aphabetical order for non-compatible features -->
     <feature name='odl-integration-all' version='${project.version}'>
-         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ofoverlay</feature>
-         <feature version='${project.version}'>odl-integration-compatible-with-all</feature>
-         <feature version='0.2.0-SNAPSHOT'>odl-l2switch-switch</feature>
-         <feature version='0.2.0-SNAPSHOT'>odl-l2switch-switch-rest</feature>
-         <feature version='0.2.0-SNAPSHOT'>odl-l2switch-switch-ui</feature>
+        <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ofoverlay</feature>
+        <feature version='${project.version}'>odl-integration-compatible-with-all</feature>
+        <feature version='0.2.0-SNAPSHOT'>odl-l2switch-switch</feature>
+        <feature version='0.2.0-SNAPSHOT'>odl-l2switch-switch-rest</feature>
+        <feature version='0.2.0-SNAPSHOT'>odl-l2switch-switch-ui</feature>
 <!--
-         <feature version='0.2.0-SNAPSHOT'>odl-plugin2oc</feature>
+        <feature version='0.2.0-SNAPSHOT'>odl-plugin2oc</feature>
 -->
-         <feature version='${feature.ovsdb.openstack.version}'>odl-ovsdb-openstack</feature>
+        <feature version='${feature.ovsdb.openstack.version}'>odl-ovsdb-openstack</feature>
         <feature version='0.1.0-SNAPSHOT'>odl-ovsdb-ovssfc</feature>
+        <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-all</feature>
     </feature>