Remove of-switch-config-pusher config yang and XML

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

diff --git a/applications/of-switch-config-pusher/pom.xml b/applications/of-switch-config-pusher/pom.xml
index 33ab30c62e57e485b5369bddafb1919e8939ad2c..cee02afa01a282d4f73d198191eaf73b0a306ed0 100644 (file)
--- a/applications/of-switch-config-pusher/pom.xml
+++ b/applications/of-switch-config-pusher/pom.xml
@@ -54,29 +54,6 @@
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
             </plugin>
-
-            <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/70-of-switch-config-pusher.xml</file>
-                                    <type>xml</type>
-                                    <classifier>config</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>

diff --git a/applications/of-switch-config-pusher/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/applications/of/_switch/config/pusher/rev141015/DefaultConfigPusherModule.java b/applications/of-switch-config-pusher/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/applications/of/_switch/config/pusher/rev141015/DefaultConfigPusherModule.java
deleted file mode 100644 (file)
index a38f826..0000000
--- a/applications/of-switch-config-pusher/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/applications/of/_switch/config/pusher/rev141015/DefaultConfigPusherModule.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.applications.of._switch.config.pusher.rev141015;
-
-import org.opendaylight.controller.sal.common.util.NoopAutoCloseable;
-
-/**
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class DefaultConfigPusherModule extends AbstractDefaultConfigPusherModule {
-    public DefaultConfigPusherModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public DefaultConfigPusherModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.applications.of._switch.config.pusher.rev141015.DefaultConfigPusherModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        // DefaultConfigPusher instance is created via blueprint so this in a no-op.
-        return NoopAutoCloseable.INSTANCE;
-    }
-}

diff --git a/applications/of-switch-config-pusher/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/applications/of/_switch/config/pusher/rev141015/DefaultConfigPusherModuleFactory.java b/applications/of-switch-config-pusher/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/applications/of/_switch/config/pusher/rev141015/DefaultConfigPusherModuleFactory.java
deleted file mode 100644 (file)
index d6079be..0000000
--- a/applications/of-switch-config-pusher/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/applications/of/_switch/config/pusher/rev141015/DefaultConfigPusherModuleFactory.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: of-switch-config-pusher yang module local name: of-switch-config-pusher
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Wed Oct 15 10:43:24 CEST 2014
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.applications.of._switch.config.pusher.rev141015;
-
-/**
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class DefaultConfigPusherModuleFactory extends AbstractDefaultConfigPusherModuleFactory {
-
-}

diff --git a/applications/of-switch-config-pusher/src/main/resources/initial/70-of-switch-config-pusher.xml b/applications/of-switch-config-pusher/src/main/resources/initial/70-of-switch-config-pusher.xml
deleted file mode 100644 (file)
index 8aded67..0000000
--- a/applications/of-switch-config-pusher/src/main/resources/initial/70-of-switch-config-pusher.xml
+++ /dev/null
@@ -1,35 +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
-
-  NOTE: This file is deprecated as wiring is now done via blueprint. This file is kept for
-       backwards compatibility. Runtime modifications are not honored.
-  -->
-
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-
-<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:prefix="urn:opendaylight:params:xml:ns:yang:openflow:applications:of-switch-config-pusher">prefix:of-switch-config-pusher</type>
-                    <name>of-switch-config-pusher</name>
-                    <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>
-                    <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>
-                </module>
-
-            </modules>
-        </data>
-    </configuration>
-</snapshot>
\ No newline at end of file

diff --git a/applications/of-switch-config-pusher/src/main/yang/of-switch-config-pusher.yang b/applications/of-switch-config-pusher/src/main/yang/of-switch-config-pusher.yang
deleted file mode 100644 (file)
index adaa2a9..0000000
--- a/applications/of-switch-config-pusher/src/main/yang/of-switch-config-pusher.yang
+++ /dev/null
@@ -1,43 +0,0 @@
-module of-switch-config-pusher {
-       yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:openflow:applications:of-switch-config-pusher";
-    prefix "of-switch-config-pusher";
-    import config {prefix config; revision-date 2013-04-05;}
-    import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; }
-
-    description
-        "of-switch-config-pusher-custom-config-impl";
-
-    revision "2014-10-15" {
-        description
-            "Initial revision";
-    }
-
-    identity of-switch-config-pusher {
-        base "config:module-type";
-        config:java-name-prefix DefaultConfigPusher;
-        status deprecated;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case of-switch-config-pusher {
-            when "/config:modules/config:module/config:type = 'of-switch-config-pusher'";
-            container rpc-registry {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity mdsal:binding-rpc-registry;
-                    }
-                }
-            }
-            container data-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory false;
-                        config:required-identity mdsal:binding-async-data-broker;
-                    }
-                }
-            }
-        }
-    }
-}

diff --git a/features-li/pom.xml b/features-li/pom.xml
index 66890d9bc13fb3d744c36b8c2e47bbbde4a8b5a6..8819634405685188b082f927087f9142e9e0b4f1 100644 (file)
--- a/features-li/pom.xml
+++ b/features-li/pom.xml
@@ -218,12 +218,6 @@
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>of-switch-config-pusher</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>of-switch-config-pusher</artifactId>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.openflowplugin.applications</groupId>

diff --git a/features-li/src/main/features/features.xml b/features-li/src/main/features/features.xml
index 04e926acf58f3db009718ed4c0266b7dbdf65779..9c05c6542e9c84027ca94f8e5be62113c5740558 100644 (file)
--- a/features-li/src/main/features/features.xml
+++ b/features-li/src/main/features/features.xml
@@ -98,7 +98,6 @@
     <feature name='odl-openflowplugin-app-config-pusher-li' description="OpenDaylight :: Openflow Plugin :: app - default config-pusher" version='${project.version}'>
         <feature version="${project.version}">odl-openflowplugin-southbound-li</feature>
         <bundle>mvn:org.opendaylight.openflowplugin.applications/of-switch-config-pusher/{{VERSION}}</bundle>
-        <configfile finalname="etc/opendaylight/karaf/70-of-switch-config-pusher.xml">mvn:org.opendaylight.openflowplugin.applications/of-switch-config-pusher/{{VERSION}}/xml/config</configfile>
     </feature>
 
     <feature name='odl-openflowplugin-app-lldp-speaker-li' description="OpenDaylight :: Openflow Plugin :: app lldp-speaker" version='${project.version}'>

diff --git a/features/pom.xml b/features/pom.xml
index c085f8bdf4e5c37629217c510aa00c3922478d12..8212d4adba56a9d786ef576c95b0cd87266a356f 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -208,12 +208,6 @@
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>of-switch-config-pusher</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>of-switch-config-pusher</artifactId>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.openflowplugin.applications</groupId>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index d376b752ea412a5720b38e79c854b2899844f03f..03db096d9877ee9c6565912570cb5822f2c34982 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -97,7 +97,6 @@
     <feature name='odl-openflowplugin-app-config-pusher' description="OpenDaylight :: Openflow Plugin :: app - default config-pusher" version='${project.version}'>
         <feature version="${project.version}">odl-openflowplugin-southbound</feature>
         <bundle>mvn:org.opendaylight.openflowplugin.applications/of-switch-config-pusher/{{VERSION}}</bundle>
-        <configfile finalname="etc/opendaylight/karaf/70-of-switch-config-pusher.xml">mvn:org.opendaylight.openflowplugin.applications/of-switch-config-pusher/{{VERSION}}/xml/config</configfile>
     </feature>
 
     <feature name='odl-openflowplugin-app-lldp-speaker' description="OpenDaylight :: Openflow Plugin :: app lldp-speaker" version='${project.version}'>