Bug 3178 - Statistics collection turned on by default

Change-Id: I75c540f22db1f79dafe61a80278cd0181ba1e551
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index e43bada61b21c7a5e327cef775abac140ee75d4e..1db95530299efb35343170bc20a07367f51a48a7 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -24,9 +24,6 @@
         <bundle>mvn:org.opendaylight.openflowjava/openflow-protocol-spi/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowjava/openflow-protocol-impl/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowjava/util/{{VERSION}}</bundle>
-    </feature>
-    <feature name='odl-openflowjava-stats' description="OpenDaylight :: Openflow Java :: Stats">
-        <feature version='${project.version}'>odl-openflowjava-protocol</feature>
         <configfile finalname="etc/opendaylight/karaf/45-openflowjava-stats.xml">mvn:org.opendaylight.openflowjava/openflowjava-config/${project.version}/xml/configstats</configfile>
     </feature>
 </features>

diff --git a/openflowjava-config/src/main/resources/45-openflowjava-stats.xml b/openflowjava-config/src/main/resources/45-openflowjava-stats.xml
index 882d7e181ee6c3b2b0c22edade5dc864a652e8a6..d3b96e51a6b628d81a3e1e855234623485672f99 100644 (file)
--- a/openflowjava-config/src/main/resources/45-openflowjava-stats.xml
+++ b/openflowjava-config/src/main/resources/45-openflowjava-stats.xml
@@ -25,14 +25,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                 <statistics-collect>true</statistics-collect>
                 <log-report-delay>10000</log-report-delay>
             </statistics>
-            <openflow-switch-connection-provider>
-                <type xmlns:ofSwitch="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider">ofSwitch:openflow-switch-connection-provider</type>
-                <name>openflow-switch-connection-provider-default</name>
-            </openflow-switch-connection-provider>
-            <openflow-switch-connection-provider>
-                <type xmlns:ofSwitch="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider">ofSwitch:openflow-switch-connection-provider</type>
-                <name>openflow-switch-connection-provider-legacy</name>
-            </openflow-switch-connection-provider>
         </module>
       </modules>
     </data>