From: Jamo Luhrsen <jluhrsen@redhat.com>
Date: Tue, 16 Feb 2016 21:53:47 +0000 (-0800)
Subject: removing ovsdb-sfc feature from compatible-with-all
X-Git-Tag: release/boron~76
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=ae56d3d817a99398c82429a137767c0a37b46a53

removing ovsdb-sfc feature from compatible-with-all

- ovsdb-sfc brings in ovsdb-openstack which is proactively making
  configs in the network.  This gets in the way of typical southbound
  ovsdb system tests, and maybe others.

Change-Id: I18e8f5538cce7114f22b53b5c2b8c8398e0b6823
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
(cherry picked from commit 90022723467076117f2f2f4994ab61c41fba7546)
---

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index d03cc5de..de707b4f 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -104,7 +104,6 @@
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-nxm-extensions</feature>
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-hwvtepsouthbound</feature>
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-library</feature>
-        <feature version='${feature.ovsdb.version}'>odl-ovsdb-sfc</feature>
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-southbound-impl</feature>
         <feature version='${feature.packetcable.version}'>odl-packetcable-policy-server-all</feature>
         <feature version='${feature.reservation.version}'>odl-reservation-models</feature>
@@ -166,6 +165,7 @@
         which leads to BindException.
         <feature version='${feature.nic.version}'>odl-nic-core-mdsal</feature>
 -->
+        <feature version='${feature.ovsdb.version}'>odl-ovsdb-sfc</feature>
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-openstack</feature>
         <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
         <feature version='${feature.sfc.version}'>odl-sfcofl2</feature>