From: Michal Cmarada Date: Thu, 20 Jul 2017 08:28:17 +0000 (+0200) Subject: Cleanup of unused netconf renderer X-Git-Tag: release/nitrogen~18 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=0ce9abd14848b75269309cfce4a416af061095ed;p=groupbasedpolicy.git Cleanup of unused netconf renderer Change-Id: I232a3e4cd4ce604591b75810df7a2747ccdc25ed Signed-off-by: Michal Cmarada --- diff --git a/artifacts/pom.xml b/artifacts/pom.xml index b271d210b..6b512b040 100755 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -44,11 +44,6 @@ iovisor-renderer ${project.version} - - ${project.groupId} - netconf-renderer - ${project.version} - ${project.groupId} ios-xe-renderer @@ -134,13 +129,6 @@ xml config - - ${project.groupId} - netconf-renderer - ${project.version} - xml - config - ${project.groupId} ne-location-provider @@ -277,13 +265,6 @@ features xml - - ${project.groupId} - odl-groupbasedpolicy-netconf - ${project.version} - features - xml - ${project.groupId} odl-groupbasedpolicy-neutronmapper diff --git a/features/features-groupbasedpolicy/pom.xml b/features/features-groupbasedpolicy/pom.xml index d0d1a332a..0e76c88bf 100644 --- a/features/features-groupbasedpolicy/pom.xml +++ b/features/features-groupbasedpolicy/pom.xml @@ -50,12 +50,6 @@ xml features - - ${project.groupId} - odl-groupbasedpolicy-netconf - xml - features - ${project.groupId} odl-groupbasedpolicy-neutronmapper diff --git a/features/odl-groupbasedpolicy-netconf/pom.xml b/features/odl-groupbasedpolicy-netconf/pom.xml deleted file mode 100644 index 9f5e1cdc5..000000000 --- a/features/odl-groupbasedpolicy-netconf/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - 4.0.0 - - org.opendaylight.odlparent - single-feature-parent - 2.0.2 - - - - org.opendaylight.groupbasedpolicy - odl-groupbasedpolicy-netconf - 0.6.0-SNAPSHOT - feature - - - ODL :: groupbasedpolicy :: ${project.artifactId} - - - - - - ${project.groupId} - groupbasedpolicy-artifacts - ${project.version} - pom - import - - - - - - - ${project.groupId} - netconf-renderer - - - ${project.groupId} - odl-groupbasedpolicy-base - xml - features - - - ${project.groupId} - netconf-renderer - xml - config - - - 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 index 5ef223534..000000000 --- a/features/odl-groupbasedpolicy-netconf/src/main/feature/features.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - mvn:org.opendaylight.groupbasedpolicy/netconf-renderer/{{VERSION}}/xml/config - - \ No newline at end of file diff --git a/features/pom.xml b/features/pom.xml index 3094fa317..abdea0c57 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -22,7 +22,6 @@ odl-groupbasedpolicy-base odl-groupbasedpolicy-ofoverlay odl-groupbasedpolicy-iovisor - odl-groupbasedpolicy-netconf odl-groupbasedpolicy-neutronmapper odl-groupbasedpolicy-neutron-and-ofoverlay odl-groupbasedpolicy-vpp diff --git a/renderers/netconf/pom.xml b/renderers/netconf/pom.xml deleted file mode 100644 index a0d0aa89a..000000000 --- a/renderers/netconf/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.groupbasedpolicy - groupbasedpolicy-renderers - 0.6.0-SNAPSHOT - ../ - - - netconf-renderer - bundle - - ODL :: groupbasedpolicy :: ${project.artifactId} - - - - - - - - junit - junit - test - - - org.mockito - mockito-core - test - - - diff --git a/renderers/netconf/src/main/config/default-config.xml b/renderers/netconf/src/main/config/default-config.xml deleted file mode 100644 index 4d6fd13bb..000000000 --- a/renderers/netconf/src/main/config/default-config.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - netconf:netconf-provider-impl - - netconf-provider-impl - - - binding:binding-rpc-registry - binding-rpc-broker - - - - binding:binding-async-data-broker - binding-data-broker - - - - - - - - - - urn:opendaylight:params:xml:ns:yang:controller:config:netconf-provider:impl?module=netconf-provider-impl&revision=2015-10-30 - - - \ 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 index 56a637a04..000000000 --- a/renderers/netconf/src/main/java/org/opendaylight/controller/config/yang/config/netconf_provider/impl/NetconfProviderModule.java +++ /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 index d9592b2a4..000000000 --- a/renderers/netconf/src/main/java/org/opendaylight/controller/config/yang/config/netconf_provider/impl/NetconfProviderModuleFactory.java +++ /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 index 8f918603e..000000000 --- a/renderers/netconf/src/main/java/org/opendaylight/groupbasedpolicy/renderer/netconf/NetconfRenderer.java +++ /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 index 31999bc3d..000000000 --- a/renderers/netconf/src/main/yang/netconf-provider-impl.yang +++ /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 index 0902f8694..000000000 --- a/renderers/netconf/src/main/yang/netconf.yang +++ /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; - } - } -} diff --git a/renderers/pom.xml b/renderers/pom.xml index c09d38561..81c417559 100644 --- a/renderers/pom.xml +++ b/renderers/pom.xml @@ -30,7 +30,6 @@ ofoverlay iovisor - netconf vpp ios-xe