Cleanup of unused netconf renderer 46/46246/3
authorMichal Cmarada <mcmarada@cisco.com>
Thu, 20 Jul 2017 08:28:17 +0000 (10:28 +0200)
committerMichal Cmarada <mcmarada@cisco.com>
Thu, 20 Jul 2017 08:28:17 +0000 (10:28 +0200)
Change-Id: I232a3e4cd4ce604591b75810df7a2747ccdc25ed
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
13 files changed:
artifacts/pom.xml
features/features-groupbasedpolicy/pom.xml
features/odl-groupbasedpolicy-netconf/pom.xml [deleted file]
features/odl-groupbasedpolicy-netconf/src/main/feature/features.xml [deleted file]
features/pom.xml
renderers/netconf/pom.xml [deleted file]
renderers/netconf/src/main/config/default-config.xml [deleted file]
renderers/netconf/src/main/java/org/opendaylight/controller/config/yang/config/netconf_provider/impl/NetconfProviderModule.java [deleted file]
renderers/netconf/src/main/java/org/opendaylight/controller/config/yang/config/netconf_provider/impl/NetconfProviderModuleFactory.java [deleted file]
renderers/netconf/src/main/java/org/opendaylight/groupbasedpolicy/renderer/netconf/NetconfRenderer.java [deleted file]
renderers/netconf/src/main/yang/netconf-provider-impl.yang [deleted file]
renderers/netconf/src/main/yang/netconf.yang [deleted file]
renderers/pom.xml

index b271d210b47355c75de1b8b95f19c08e2e7d7db0..6b512b040537925986906aa879c970dda91cf5b7 100755 (executable)
         <artifactId>iovisor-renderer</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>netconf-renderer</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>ios-xe-renderer</artifactId>
         <type>xml</type>
         <classifier>config</classifier>
       </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>netconf-renderer</artifactId>
-        <version>${project.version}</version>
-        <type>xml</type>
-        <classifier>config</classifier>
-      </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>ne-location-provider</artifactId>
         <classifier>features</classifier>
         <type>xml</type>
       </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>odl-groupbasedpolicy-netconf</artifactId>
-        <version>${project.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-      </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>odl-groupbasedpolicy-neutronmapper</artifactId>
index d0d1a332a3c1e9d5454696f1ec44637ca4782156..0e76c88bfdab469e87add85ca2d38f70c5717085 100644 (file)
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-groupbasedpolicy-netconf</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-groupbasedpolicy-neutronmapper</artifactId>
diff --git a/features/odl-groupbasedpolicy-netconf/pom.xml b/features/odl-groupbasedpolicy-netconf/pom.xml
deleted file mode 100644 (file)
index 9f5e1cd..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         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.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.groupbasedpolicy</groupId>
-    <artifactId>odl-groupbasedpolicy-netconf</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-    <!--
-        The NETCONF renderer.
-
-        This renderer maps GBP service model to NETCONF based network elements.
-    -->
-    <!-- <name> formatting is used by autorelease to parse and notify projects on
-       build failure. Please do not modify this unless you have a good reason. -->
-    <name>ODL :: groupbasedpolicy :: ${project.artifactId}</name>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- ODL-GBP-ARTIFACTS -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>groupbasedpolicy-artifacts</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>netconf-renderer</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-groupbasedpolicy-base</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>netconf-renderer</artifactId>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/features/odl-groupbasedpolicy-netconf/src/main/feature/features.xml b/features/odl-groupbasedpolicy-netconf/src/main/feature/features.xml
deleted file mode 100644 (file)
index 5ef2235..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2014, 2016 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
--->
-<features name="odl-groupbasedpolicy-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-    <feature name="odl-groupbasedpolicy-netconf" version="${project.version}">
-        <configfile finalname="${config.configfile.directory}/15-groupbasedpolicy-netconf.xml">mvn:org.opendaylight.groupbasedpolicy/netconf-renderer/{{VERSION}}/xml/config</configfile>
-    </feature>
-</features>
\ No newline at end of file
index 3094fa31761d84093554ffdc0141759dc61a0c59..abdea0c57cd29cc293360f8244a6d72b85344a51 100755 (executable)
@@ -22,7 +22,6 @@
         <module>odl-groupbasedpolicy-base</module>
         <module>odl-groupbasedpolicy-ofoverlay</module>
         <module>odl-groupbasedpolicy-iovisor</module>
-        <module>odl-groupbasedpolicy-netconf</module>
         <module>odl-groupbasedpolicy-neutronmapper</module>
         <module>odl-groupbasedpolicy-neutron-and-ofoverlay</module>
         <module>odl-groupbasedpolicy-vpp</module>
diff --git a/renderers/netconf/pom.xml b/renderers/netconf/pom.xml
deleted file mode 100644 (file)
index a0d0aa8..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2015 Cisco Systems. 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.groupbasedpolicy</groupId>
-    <artifactId>groupbasedpolicy-renderers</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-
-  <artifactId>netconf-renderer</artifactId>
-  <packaging>bundle</packaging>
-  <!-- <name> formatting is used by autorelease to parse and notify projects on
-       build failure. Please do not modify this unless you have a good reason. -->
-  <name>ODL :: groupbasedpolicy :: ${project.artifactId}</name>
-
-  <properties>
-  </properties>
-
-  <dependencies>
-    <!-- testing dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/renderers/netconf/src/main/config/default-config.xml b/renderers/netconf/src/main/config/default-config.xml
deleted file mode 100644 (file)
index 4d6fd13..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2015 Cisco Systems.  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>
-    <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:netconf="urn:opendaylight:params:xml:ns:yang:controller:config:netconf-provider:impl">
-                        netconf:netconf-provider-impl
-                    </type>
-                    <name>netconf-provider-impl</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>
-
-                </module>
-            </modules>
-        </data>
-
-    </configuration>
-
-    <required-capabilities>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:netconf-provider:impl?module=netconf-provider-impl&amp;revision=2015-10-30</capability>
-    </required-capabilities>
-
-</snapshot>
\ No newline at end of file
diff --git a/renderers/netconf/src/main/java/org/opendaylight/controller/config/yang/config/netconf_provider/impl/NetconfProviderModule.java b/renderers/netconf/src/main/java/org/opendaylight/controller/config/yang/config/netconf_provider/impl/NetconfProviderModule.java
deleted file mode 100644 (file)
index 56a637a..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco Systems. 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.controller.config.yang.config.netconf_provider.impl;
-public class NetconfProviderModule extends org.opendaylight.controller.config.yang.config.netconf_provider.impl.AbstractNetconfProviderModule {
-    public NetconfProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public NetconfProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.netconf_provider.impl.NetconfProviderModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        // TODO:implement
-        throw new java.lang.UnsupportedOperationException();
-    }
-
-}
diff --git a/renderers/netconf/src/main/java/org/opendaylight/controller/config/yang/config/netconf_provider/impl/NetconfProviderModuleFactory.java b/renderers/netconf/src/main/java/org/opendaylight/controller/config/yang/config/netconf_provider/impl/NetconfProviderModuleFactory.java
deleted file mode 100644 (file)
index d9592b2..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco Systems. 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: netconf-provider-impl yang module local name: netconf-provider-impl
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Tue Nov 03 20:22:37 PST 2015
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.controller.config.yang.config.netconf_provider.impl;
-public class NetconfProviderModuleFactory extends org.opendaylight.controller.config.yang.config.netconf_provider.impl.AbstractNetconfProviderModuleFactory {
-
-}
diff --git a/renderers/netconf/src/main/java/org/opendaylight/groupbasedpolicy/renderer/netconf/NetconfRenderer.java b/renderers/netconf/src/main/java/org/opendaylight/groupbasedpolicy/renderer/netconf/NetconfRenderer.java
deleted file mode 100644 (file)
index 8f91860..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco Systems. 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.groupbasedpolicy.renderer.netconf;
-
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.NotificationService;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Renderer that converts GBP services to NETCONF devices
- */
-public class NetconfRenderer implements AutoCloseable {
-
-    private static final Logger LOG = LoggerFactory.getLogger(NetconfRenderer.class);
-
-    private final DataBroker dataBroker;
-    private final ScheduledExecutorService executor;
-
-
-    public NetconfRenderer(final DataBroker dataProvider, RpcProviderRegistry rpcRegistry,
-            NotificationService notificationService) {
-        super();
-        this.dataBroker = dataProvider;
-
-        int numCPU = Runtime.getRuntime().availableProcessors();
-        executor = Executors.newScheduledThreadPool(numCPU * 2);
-
-        LOG.info("Netconf Renderer has Started");
-    }
-
-    @Override
-    public void close() throws Exception {
-        executor.shutdownNow();
-    }
-
-}
diff --git a/renderers/netconf/src/main/yang/netconf-provider-impl.yang b/renderers/netconf/src/main/yang/netconf-provider-impl.yang
deleted file mode 100644 (file)
index 31999bc..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco System.  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
- */
-
-module netconf-provider-impl {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:config:netconf-provider:impl";
-    prefix "netconf-provider-impl";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; }
-    import opendaylight-sal-binding-broker-impl { prefix sal-broker; revision-date 2013-10-28; }
-
-    description
-        "This module contains the base YANG definitions for netconf-provider
-        impl implementation.";
-
-    revision "2015-10-30" {
-        description
-                "Initial revision.";
-    }
-
-    identity netconf-provider-impl {
-        base "config:module-type";
-
-        config:java-name-prefix NetconfProvider;
-    }
-
-    // Augments the 'configuration' choice node under modules/module.
-    augment "/config:modules/config:module/config:configuration" {
-        case netconf-provider-impl {
-            when "/config:modules/config:module/config:type = 'netconf-provider-impl'";
-
-            //wires in the data-broker service 
-            container data-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity mdsal:binding-async-data-broker;
-                    }
-                }
-            }
-            // RPC Registry
-            container rpc-registry {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity mdsal:binding-rpc-registry;
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/renderers/netconf/src/main/yang/netconf.yang b/renderers/netconf/src/main/yang/netconf.yang
deleted file mode 100644 (file)
index 0902f86..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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
- */
-
-module netconf {
-    yang-version 1;
-
-    namespace "urn:opendaylight:groupbasedpolicy:netconf";
-    prefix "netconf";
-
-    description
-        "This module defines the group-based policy netconf renderer model.";
-
-    revision "2015-10-30" {
-        description
-                "Initial revision.";
-    }
-
-    container netconf-renderer {
-        leaf netconf-renderer-name {
-            type string;
-        }
-    }
-}
index c09d3856159e0a03fdb777eaee774a966c1ebeca..81c41755991813c2c90e5cd84b70bd938ca27641 100644 (file)
@@ -30,7 +30,6 @@
   <modules>
     <module>ofoverlay</module>
     <module>iovisor</module>
-    <module>netconf</module>
     <module>vpp</module>
     <module>ios-xe</module>
   </modules>