From: Tom Pantelis <tpanteli@brocade.com>
Date: Mon, 16 May 2016 22:00:55 +0000 (-0400)
Subject: Remove statistics manager config yang and XML
X-Git-Tag: release/boron~202^2~1
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F33%2F39133%2F5;p=openflowplugin.git

Remove statistics manager config yang and XML

Change-Id: I56c38dcb3ca57e9ccc7a4d37e2873ea8b29cb515
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
---

diff --git a/applications/pom.xml b/applications/pom.xml
index c7e776a7f6..c27464c2f2 100644
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -92,7 +92,6 @@
         <!-- nsf apps -->
         <module>inventory-manager</module>
         <module>statistics-manager</module>
-        <module>statistics-manager-config</module>
         <module>topology-manager</module>
         <module>forwardingrules-manager</module>
         <module>forwardingrules-manager-config</module>
diff --git a/applications/statistics-manager-config/pom.xml b/applications/statistics-manager-config/pom.xml
deleted file mode 100644
index 09d31a98e2..0000000000
--- a/applications/statistics-manager-config/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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.openflowplugin</groupId>
-        <artifactId>applications</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.opendaylight.openflowplugin.applications</groupId>
-    <artifactId>statistics-manager-config</artifactId>
-    <description>Configuration files for statistics manager</description>
-    <packaging>jar</packaging>
-
-    <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/initial/30-statistics-manager.xml</file>
-                                    <type>xml</type>
-                                    <classifier>config</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    
-    <scm>
-      <connection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</connection>
-      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</developerConnection>
-      <url>https://wiki.opendaylight.org/view/OpenDaylight_OpenFlow_Plugin:Main</url>
-      <tag>HEAD</tag>
-    </scm>
-
-</project>
diff --git a/applications/statistics-manager-config/src/main/resources/initial/30-statistics-manager.xml b/applications/statistics-manager-config/src/main/resources/initial/30-statistics-manager.xml
deleted file mode 100644
index 5103b5bf68..0000000000
--- a/applications/statistics-manager-config/src/main/resources/initial/30-statistics-manager.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- 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
-
- NOTE: This file is deprecated as wiring is now done via blueprint. This file is kept for
-       backwards compatibility. Runtime modifications are not honored.
-
--->
-<snapshot>
-    <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:statsmanager="urn:opendaylight:params:xml:ns:yang:openflowplugin:app:statistics-manager">
-                        statsmanager:statistics-manager
-                    </type>
-                    <name>statistics-manager</name>
-
-                    <rpc-registry>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-rpc-registry</type>
-                        <name>binding-rpc-broker</name>
-                    </rpc-registry>
-
-                    <data-broker>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-                        <name>binding-data-broker</name>
-                    </data-broker>
-
-                    <notification-service>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
-                            binding:binding-notification-service
-                        </type>
-                        <name>binding-notification-broker</name>
-                    </notification-service>
-
-                    <ownership-service>
-                        <type xmlns:entity-ownership="urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:entity-ownership-service">entity-ownership:entity-ownership-service</type>
-                        <name>entity-ownership-service</name>
-                    </ownership-service>
-
-                    <statistics-manager-settings>
-                        <min-request-net-monitor-interval>3000</min-request-net-monitor-interval>
-                        <max-nodes-for-collector>16</max-nodes-for-collector>
-                    </statistics-manager-settings>
-
-                </module>
-            </modules>
-        </data>
-    </configuration>
-
-    <required-capabilities>
-        <capability>urn:opendaylight:params:xml:ns:yang:openflowplugin:app:statistics-manager?module=statistics-manager&amp;revision=2014-09-25</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:distributed-entity-ownership-service?module=distributed-entity-ownership-service&amp;revision=2015-08-10</capability>
-    </required-capabilities>
-
-</snapshot>
-
diff --git a/applications/statistics-manager/pom.xml b/applications/statistics-manager/pom.xml
index 5eb232f41d..0425c4faf3 100644
--- a/applications/statistics-manager/pom.xml
+++ b/applications/statistics-manager/pom.xml
@@ -61,10 +61,6 @@
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>sal-binding-config</artifactId>
       </dependency>
-      <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-api</artifactId>
-      </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
diff --git a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/config/yang/statistics_manager/StatisticsManagerModule.java b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/config/yang/statistics_manager/StatisticsManagerModule.java
deleted file mode 100644
index 31bedd8ae2..0000000000
--- a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/config/yang/statistics_manager/StatisticsManagerModule.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright (c) 2015 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
- */
-
-package org.opendaylight.openflowplugin.applications.config.yang.statistics_manager;
-
-import org.opendaylight.controller.sal.common.util.NoopAutoCloseable;
-
-/**
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class StatisticsManagerModule extends AbstractStatisticsManagerModule {
-    public StatisticsManagerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public StatisticsManagerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.openflowplugin.applications.config.yang.statistics_manager.StatisticsManagerModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public AutoCloseable createInstance() {
-        // StatisticsManager instance is created via blueprint so this in a no-op.
-        return NoopAutoCloseable.INSTANCE;
-    }
-}
diff --git a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/config/yang/statistics_manager/StatisticsManagerModuleFactory.java b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/config/yang/statistics_manager/StatisticsManagerModuleFactory.java
deleted file mode 100644
index 444459e9f2..0000000000
--- a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/config/yang/statistics_manager/StatisticsManagerModuleFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) 2015 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
- */
-
-/*
-* Generated file
-*
-* Generated from: yang module name: statistics-manager yang module local name: statistics-manager
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Thu Jan 22 17:17:48 CET 2015
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.openflowplugin.applications.config.yang.statistics_manager;
-
-/**
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class StatisticsManagerModuleFactory extends AbstractStatisticsManagerModuleFactory {
-
-}
diff --git a/applications/statistics-manager/src/main/yang/statistics-manager.yang b/applications/statistics-manager/src/main/yang/statistics-manager.yang
deleted file mode 100644
index 43acf0a105..0000000000
--- a/applications/statistics-manager/src/main/yang/statistics-manager.yang
+++ /dev/null
@@ -1,77 +0,0 @@
-module statistics-manager {
-
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:openflowplugin:app:statistics-manager";
-    prefix "statistics-manager";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; }
-    import opendaylight-entity-ownership-service { prefix ownership-service; }
-
-    description
-        "This module contains the base YANG definitions for
-        statitics-manager implementation.";
-
-    revision "2014-09-25" {
-        description
-            "Initial revision.";
-    }
-
-    identity statistics-manager {
-            base config:module-type;
-            config:java-name-prefix StatisticsManager;
-            status deprecated;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case statistics-manager {
-            when "/config:modules/config:module/config:type = 'statistics-manager'";
-
-            container rpc-registry {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity mdsal:binding-rpc-registry;
-                    }
-                }
-            }
-
-            container notification-service {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity mdsal:binding-notification-service;
-                    }
-                }
-            }
-
-            container ownership-service {
-                uses config:service-ref {
-                    refine type {
-                        mandatory false;
-                        config:required-identity ownership-service:entity-ownership-service;
-                    }
-                }
-            }
-
-            container data-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory false;
-                        config:required-identity mdsal:binding-async-data-broker;
-                    }
-                }
-            }
-
-            container statistics-manager-settings {
-                leaf min-request-net-monitor-interval {
-                    type int32;
-                }
-                leaf max-nodes-for-collector {
-                    type int32;
-                }
-            }
-        }
-    }
-
-}
diff --git a/features/pom.xml b/features/pom.xml
index 080dee7ceb..796afb19ca 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -24,7 +24,6 @@
         <lldp.version>0.11.0-SNAPSHOT</lldp.version>
 
         <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
-        <config.statistics.manager.configfile>30-statistics-manager.xml</config.statistics.manager.configfile>
         <config.inventory.manager.configfile>40-inventory-manager.xml</config.inventory.manager.configfile>
         <restconf.version>1.4.0-SNAPSHOT</restconf.version>
         <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
@@ -173,12 +172,6 @@
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>statistics-manager</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>statistics-manager-config</artifactId>
-            <classifier>config</classifier>
-            <type>xml</type>
-        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.dlux</groupId>
diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 02cb32f792..de81dd81ac 100644
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -37,7 +37,6 @@
         <bundle>mvn:org.opendaylight.openflowplugin.applications/inventory-manager/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin.applications/statistics-manager/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-blueprint-config-he/{{VERSION}}</bundle>
-        <configfile finalname="${config.configfile.directory}/${config.statistics.manager.configfile}">mvn:org.opendaylight.openflowplugin.applications/statistics-manager-config/{{VERSION}}/xml/config</configfile>
         <configfile finalname="${config.configfile.directory}/${config.inventory.manager.configfile}">mvn:org.opendaylight.openflowplugin.applications/inventory-manager/{{VERSION}}/xml/config</configfile>
         <configfile finalname="etc/opendaylight/karaf/42-openflowplugin-He.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/{{VERSION}}/xml/config-He</configfile>
         <configfile finalname="etc/opendaylight/karaf/43-msg-spy.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/{{VERSION}}/xml/configmsgspy</configfile>