Revert "Moving SNBI features to not compatible"

[integration/distribution.git] / features / test / src / main / resources / features.xml

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index f45b0e1dd126878b185d6eb687dba42e20f61817..f42c02b4466dbeaff17d82c8fd7aa0064bbf9888 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -84,6 +84,7 @@
         <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>
@@ -94,17 +95,16 @@
 
     <!-- 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>