From 469c65356d15832801188e234281bc59e60f84b7 Mon Sep 17 00:00:00 2001
From: Michal Polkorab <michal.polkorab@pantheon.sk>
Date: Tue, 18 Nov 2014 10:41:42 +0100
Subject: [PATCH] Statistics loadable / installable in Karaf

 - created new feature odl-openflowjava-stats in order to ensure correct
   module start
 - created new project openflowjava-config to properly store and delagate
   statistics config file
 - removed stats-collection as a service from configuration xml

Change-Id: If2b94c4ec9bf2a2c8157eaad546672df6e1d1500
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
---
 features/src/main/resources/features.xml      |  4 ++
 .../rev140328/StatisticsCollectionModule.java |  3 --
 openflowjava-config/pom.xml                   | 53 +++++++++++++++++++
 .../main/resources/45-openflowjava-stats.xml  | 41 ++++++++++++++
 pom.xml                                       | 19 +++----
 5 files changed, 108 insertions(+), 12 deletions(-)
 create mode 100644 openflowjava-config/pom.xml
 create mode 100644 openflowjava-config/src/main/resources/45-openflowjava-stats.xml

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index ace7ba14..87d05699 100644
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -24,4 +24,8 @@
         <bundle>mvn:org.opendaylight.openflowjava/openflow-protocol-impl/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.openflowjava/util/${project.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/openflow-protocol-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/_switch/connection/provider/impl/rev140328/StatisticsCollectionModule.java b/openflow-protocol-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/_switch/connection/provider/impl/rev140328/StatisticsCollectionModule.java
index ff686c16..5de0a75f 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/_switch/connection/provider/impl/rev140328/StatisticsCollectionModule.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/_switch/connection/provider/impl/rev140328/StatisticsCollectionModule.java
@@ -50,10 +50,7 @@ public class StatisticsCollectionModule extends org.opendaylight.yang.gen.v1.urn
                     return 0;
                 }
             };
-        } else {
-            LOGGER.error("STATISTICS ARE NULL");
         }
-        LOGGER.error("config " + statsConfig);
         if (statsConfig != null) {
             statsCounter.startCounting(statsConfig.getStatisticsCollect(), statsConfig.getLogReportDelay());
         } else {
diff --git a/openflowjava-config/pom.xml b/openflowjava-config/pom.xml
new file mode 100644
index 00000000..60647655
--- /dev/null
+++ b/openflowjava-config/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. 
+    This program and the accompanying materials are made available under the 
+    terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+    and is available at http://www.eclipse.org/legal/epl-v10.html -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.openflowjava</groupId>
+        <artifactId>openflow-protocol-parent</artifactId>
+        <version>0.6.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>openflowjava-config</artifactId>
+    <description>Configuration files for openflowjava statistics</description>
+    <packaging>jar</packaging>
+    <name>Openflow Protocol Library - CONFIG</name>
+    <scm>
+        <url>https://wiki.opendaylight.org/view/Openflow_Protocol_Library:Main</url>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <configfile>45-openflowjava-stats.xml</configfile>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>${project.build.directory}/classes/${configfile}</file>
+                                    <type>xml</type>
+                                    <classifier>configstats</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/openflowjava-config/src/main/resources/45-openflowjava-stats.xml b/openflowjava-config/src/main/resources/45-openflowjava-stats.xml
new file mode 100644
index 00000000..12761959
--- /dev/null
+++ b/openflowjava-config/src/main/resources/45-openflowjava-stats.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+Copyright (c) 2013 Pantheon Technologies s.r.o. and others. All rights reserved.
+
+This program and the accompanying materials are made available under the
+terms of the Eclipse Public License v1.0 which accompanies this distribution,
+and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<snapshot>
+  <required-capabilities>
+    <!-- openflowjava -->
+    <capability>urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider:impl?module=openflow-switch-connection-provider-impl&amp;revision=2014-03-28</capability>
+    <capability>urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider?module=openflow-switch-connection-provider&amp;revision=2014-03-28</capability>
+  </required-capabilities>
+
+  <configuration>
+
+    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
+        <module>
+            <type xmlns:stats="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider:impl">stats:statistics-collection-service-impl</type>
+            <name>statistics-collection-service-impl</name>
+            <statistics>
+                <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>
+
+  </configuration>
+</snapshot>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d2d90009..da66cf0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,6 +6,7 @@
     <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modules>
+        <module>openflowjava-config</module>
         <module>openflow-protocol-api</module>
         <module>openflow-protocol-spi</module>
         <module>util</module>
@@ -13,7 +14,7 @@
         <module>openflow-protocol-it</module>
         <module>features</module>
         <module>simple-client</module>
-    </modules>
+  </modules>
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/openflowjava.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowjava.git</developerConnection>
@@ -434,7 +435,7 @@
                             </goals>
                           </pluginExecutionFilter>
                           <action>
-                            <ignore></ignore>
+                            <ignore/>
                           </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -447,7 +448,7 @@
                             </goals>
                           </pluginExecutionFilter>
                           <action>
-                            <ignore></ignore>
+                            <ignore/>
                           </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -462,7 +463,7 @@
                             </goals>
                           </pluginExecutionFilter>
                           <action>
-                            <ignore></ignore>
+                            <ignore/>
                           </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -490,7 +491,7 @@
                             </goals>
                           </pluginExecutionFilter>
                           <action>
-                            <ignore></ignore>
+                            <ignore/>
                           </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -503,7 +504,7 @@
                             </goals>
                           </pluginExecutionFilter>
                           <action>
-                            <execute></execute>
+                            <execute/>
                           </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -516,7 +517,7 @@
                             </goals>
                           </pluginExecutionFilter>
                           <action>
-                            <ignore></ignore>
+                            <ignore/>
                           </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -529,7 +530,7 @@
                             </goals>
                           </pluginExecutionFilter>
                           <action>
-                            <ignore></ignore>
+                            <ignore/>
                           </action>
                         </pluginExecution>
                       </pluginExecutions>
@@ -628,4 +629,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>
\ No newline at end of file
-- 
2.36.6