Remove bulk-o-matic config yang and XML

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

diff --git a/applications/bulk-o-matic/pom.xml b/applications/bulk-o-matic/pom.xml
index 7b5ec1865a7f96c353d5d03bbaeac3a94f552018..a955629b847c56c7e8e237b9b386effb5abc770b 100644 (file)
--- a/applications/bulk-o-matic/pom.xml
+++ b/applications/bulk-o-matic/pom.xml
@@ -36,10 +36,6 @@
             <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-base</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
 
         <!-- Test dependencies -->
         <dependency>
@@ -60,29 +56,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/71-bulk-o-matic.xml</file>
-                                    <type>xml</type>
-                                    <classifier>config</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>

diff --git a/applications/bulk-o-matic/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/applications/bulk/o/matic/rev150608/BulkOMaticModule.java b/applications/bulk-o-matic/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/applications/bulk/o/matic/rev150608/BulkOMaticModule.java
deleted file mode 100644 (file)
index da55a97..0000000
--- a/applications/bulk-o-matic/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/applications/bulk/o/matic/rev150608/BulkOMaticModule.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.applications.bulk.o.matic.rev150608;
-
-import org.opendaylight.controller.sal.common.util.NoopAutoCloseable;
-
-/**
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class BulkOMaticModule extends AbstractBulkOMaticModule {
-    public BulkOMaticModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public BulkOMaticModule(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.bulk.o.matic.rev150608.BulkOMaticModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        // Instances are created via blueprint so this in a no-op.
-        return NoopAutoCloseable.INSTANCE;
-    }
-}

diff --git a/applications/bulk-o-matic/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/applications/bulk/o/matic/rev150608/BulkOMaticModuleFactory.java b/applications/bulk-o-matic/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/applications/bulk/o/matic/rev150608/BulkOMaticModuleFactory.java
deleted file mode 100644 (file)
index a28c7e2..0000000
--- a/applications/bulk-o-matic/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/applications/bulk/o/matic/rev150608/BulkOMaticModuleFactory.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: bulk-o-matic yang module local name: bulk-o-matic
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Mon Jun 08 16:32:10 CEST 2015
-*
-* 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.bulk.o.matic.rev150608;
-
-/**
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class BulkOMaticModuleFactory extends AbstractBulkOMaticModuleFactory {
-
-}

diff --git a/applications/bulk-o-matic/src/main/resources/initial/71-bulk-o-matic.xml b/applications/bulk-o-matic/src/main/resources/initial/71-bulk-o-matic.xml
deleted file mode 100644 (file)
index 0094e3f..0000000
--- a/applications/bulk-o-matic/src/main/resources/initial/71-bulk-o-matic.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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
-
-  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:bulk-o-matic">prefix:bulk-o-matic</type>
-                    <name>bulk-o-matic</name>
-                    <data-broker>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-                        <name>pingpong-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>
-
-    <required-capabilities>
-        <capability>urn:opendaylight:flow:inventory?module=flow-node-inventory&amp;revision=2013-08-19</capability>
-        <capability>urn:ietf:params:xml:ns:yang:ietf-yang-types?module=ietf-yang-types&amp;revision=2010-09-24</capability>
-        <capability>urn:opendaylight:inventory?module=opendaylight-inventory&amp;revision=2013-08-19</capability>
-        <capability>urn:opendaylight:flow:types?module=opendaylight-flow-types&amp;revision=2013-10-26</capability>
-    </required-capabilities>
-</snapshot>

diff --git a/applications/bulk-o-matic/src/main/yang/bulk-o-matic.yang b/applications/bulk-o-matic/src/main/yang/bulk-o-matic.yang
deleted file mode 100644 (file)
index 8da9818..0000000
--- a/applications/bulk-o-matic/src/main/yang/bulk-o-matic.yang
+++ /dev/null
@@ -1,44 +0,0 @@
-module bulk-o-matic {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:openflow:applications:bulk-o-matic";
-    prefix "bulk";
-    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 entity-ownership-service; }
-
-    description
-        "End point application providing bulk operation via DS and via rpc";
-
-    revision "2015-06-08" {
-        description
-            "Initial revision";
-    }
-
-    identity bulk-o-matic {
-        base "config:module-type";
-        config:java-name-prefix BulkOMatic;
-        status deprecated;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case bulk-o-matic {
-            when "/config:modules/config:module/config:type = 'bulk-o-matic'";
-            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-he/pom.xml b/features-he/pom.xml
index ef1ceec9f72414bcbff242940db58ca88b3e42aa..2a2466820cb6e29f55df8ffe672f76b09e3a3dd7 100644 (file)
--- a/features-he/pom.xml
+++ b/features-he/pom.xml
@@ -241,11 +241,5 @@
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>bulk-o-matic</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>bulk-o-matic</artifactId>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
     </dependencies>
 </project>

diff --git a/features-he/src/main/features/features.xml b/features-he/src/main/features/features.xml
index a581af2ef2cfb7d5ac66633876db4e80e226c449..3a8ccfe97178d0eeed4936a88ba6cc6b97e45f3a 100644 (file)
--- a/features-he/src/main/features/features.xml
+++ b/features-he/src/main/features/features.xml
@@ -108,7 +108,6 @@
     <feature name='odl-openflowplugin-app-bulk-o-matic-he' description="OpenDaylight :: Openflow Plugin :: app bulk flow operations support" version='${project.version}'>
         <feature version="${project.version}">odl-openflowplugin-southbound-he</feature>
         <bundle>mvn:org.opendaylight.openflowplugin.applications/bulk-o-matic/{{VERSION}}</bundle>
-        <configfile finalname="etc/opendaylight/karaf/71-bulk-o-matic.xml">mvn:org.opendaylight.openflowplugin.applications/bulk-o-matic/{{VERSION}}/xml/config</configfile>
     </feature>
 
 </features>

diff --git a/features/pom.xml b/features/pom.xml
index f375253e25d77663c9d8ce4b669e622ba5b90dd5..7bf9ea2bea2a970d181e415cc52d77cb35c611d1 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -246,12 +246,6 @@
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>bulk-o-matic</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>bulk-o-matic</artifactId>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>notification-supplier</artifactId>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 02dc31fa816a0e7830a23dd691a4dcfcc29423ec..eb2d44a4e3160f68c1d2741e3376f5c21fedc665 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -108,7 +108,6 @@
     <feature name='odl-openflowplugin-app-bulk-o-matic' description="OpenDaylight :: Openflow Plugin :: app bulk flow operations support" version='${project.version}'>
         <feature version="${project.version}">odl-openflowplugin-southbound</feature>
         <bundle>mvn:org.opendaylight.openflowplugin.applications/bulk-o-matic/${project.version}</bundle>
-        <configfile finalname="etc/opendaylight/karaf/71-bulk-o-matic.xml">mvn:org.opendaylight.openflowplugin.applications/bulk-o-matic/${project.version}/xml/config</configfile>
     </feature>
 
     <feature name='odl-openflowplugin-notifications' description="OpenDaylight :: Openflow Plugin :: app notifications supplier" version='${project.version}'>