Consider snmp4sdn feature not compatible with all

This is a temporary workaround to Bug 4583.
Snmp4sdn is not comatible with netconf-connector
due to name conflict on "config" module (Bug 4498).

Change-Id: Id0a2d23d859d955ed5f62528f3b0f642ca8a78e0
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index c613c45caab9e26f8661fcaf36fe9ccfdfb2909d..4f522b5e3d7d8c1cc93d90cef158f7713120ddf5 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -95,7 +95,6 @@
         <feature version='${feature.sfc.version}'>odl-sfc-netconf</feature>
         <feature version='${feature.sxp.version}'>odl-sxp-controller</feature>
         <feature version='${snmp.plugin.version}'>odl-snmp-plugin</feature>
-        <feature version='${feature.snmp4sdn.version}'>odl-snmp4sdn-all</feature>
         <feature version='${feature.tcpmd5.version}'>odl-tcpmd5-all</feature>
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-framework</feature>
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-mlmt</feature>
@@ -123,6 +122,7 @@
         <feature version='1.0.3-SNAPSHOT'>odl-persistence-api</feature>
         <feature version='${feature.sfc.version}'>odl-sfcofl2</feature>
         <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
+        <feature version='${feature.snmp4sdn.version}'>odl-snmp4sdn-all</feature> <!-- Bug 4498 and Bug 4583 -->
         <feature version='${feature.tsdr.version}'>odl-tsdr-all</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-neutron</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-rest</feature>