Move odl-sfcofl2 from compatible-with-all.

The odl-sfcofl2 feature is not compatible with any other features which
control OpenFlow switches. Therefore, this patch moves the odl-sfcofl2
feature from the odl-integration-compatible-with-all feature to the
odl-integration-all.

Change-Id: If91bb07fcd394f855848ba532ed9bd8f44563ab9
Signed-off-by: Hideyuki Tai <Hideyuki.Tai@necam.com>

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index a3cf7cc8425b2b443a1522c5fd94fc83506650cb..5262ee924c4e3b843d8cddc7fab94220c6741de7 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -91,7 +91,6 @@
         <feature version='${feature.sfc.version}'>odl-sfc-core</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-test-consumer</feature>
         <feature version='${feature.sfc.version}'>odl-sfclisp</feature>
-        <feature version='${feature.sfc.version}'>odl-sfcofl2</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-ui</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-sb-rest</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-ovs</feature>
@@ -121,6 +120,7 @@
         <feature version='${feature.ovsdb.openstack.version}'>odl-ovsdb-openstack</feature>
         <feature version='${feature.packetcable.version}'>odl-packetcable-all</feature>
         <feature version='${feature.packetcable.version}'>odl-packetcable-policy-server-all</feature>
+        <feature version='${feature.sfc.version}'>odl-sfcofl2</feature>
         <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
         <feature version='${feature.tsdr.version}'>odl-tsdr-all</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-neutron</feature>