From 3670c2c6bd548744d43caf22ba03abc3e53a097c Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Thu, 14 Jun 2018 10:04:49 -0400 Subject: [PATCH] Remove CSS features Change-Id: I963daed0f5cc379edeaa98054890dcde0b75cf54 Signed-off-by: Tom Pantelis --- .../mdsal/odl-controller-mdsal-common/pom.xml | 7 -- features/mdsal/odl-mdsal-broker-local/pom.xml | 7 -- opendaylight/config/netty-config-api/pom.xml | 30 +---- .../netty-config-api/src/main/yang/netty.yang | 68 ----------- .../netty-event-executor-config/pom.xml | 61 +--------- .../GlobalEventExecutorModule.java | 61 ---------- .../GlobalEventExecutorModuleFactory.java | 48 -------- .../ImmediateEventExecutorModule.java | 37 ------ .../ImmediateEventExecutorModuleFactory.java | 32 ----- .../src/main/yang/netty-event-executor.yang | 55 --------- .../GlobalEventExecutorModuleTest.java | 103 ----------------- .../ImmediateEventExecutorModuleTest.java | 71 ------------ .../config/netty-threadgroup-config/pom.xml | 49 +------- .../threadgroup/NettyThreadgroupModule.java | 79 ------------- .../NettyThreadgroupModuleFactory.java | 43 ------- .../src/main/yang/netty-threadgroup.yang | 47 -------- .../NettyThreadgroupModuleTest.java | 109 ------------------ .../config/netty-timer-config/pom.xml | 70 +---------- .../netty/timer/HashedWheelTimerModule.java | 86 -------------- .../timer/HashedWheelTimerModuleFactory.java | 44 ------- .../opendaylight/blueprint/netty-timer.xml | 8 +- .../src/main/yang/netty-timer.yang | 52 --------- .../config/threadpool-config-api/pom.xml | 27 ----- .../config/threadpool-config-impl/pom.xml | 35 ------ opendaylight/md-sal/parent/pom.xml | 5 - 25 files changed, 12 insertions(+), 1222 deletions(-) delete mode 100644 opendaylight/config/netty-config-api/src/main/yang/netty.yang delete mode 100644 opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModule.java delete mode 100644 opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModuleFactory.java delete mode 100644 opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModule.java delete mode 100644 opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModuleFactory.java delete mode 100644 opendaylight/config/netty-event-executor-config/src/main/yang/netty-event-executor.yang delete mode 100644 opendaylight/config/netty-event-executor-config/src/test/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModuleTest.java delete mode 100644 opendaylight/config/netty-event-executor-config/src/test/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModuleTest.java delete mode 100644 opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModule.java delete mode 100644 opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModuleFactory.java delete mode 100644 opendaylight/config/netty-threadgroup-config/src/main/yang/netty-threadgroup.yang delete mode 100644 opendaylight/config/netty-threadgroup-config/src/test/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModuleTest.java delete mode 100644 opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModule.java delete mode 100644 opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModuleFactory.java delete mode 100644 opendaylight/config/netty-timer-config/src/main/yang/netty-timer.yang diff --git a/features/mdsal/odl-controller-mdsal-common/pom.xml b/features/mdsal/odl-controller-mdsal-common/pom.xml index 03503c62a6..d75f08b8ab 100644 --- a/features/mdsal/odl-controller-mdsal-common/pom.xml +++ b/features/mdsal/odl-controller-mdsal-common/pom.xml @@ -48,13 +48,6 @@ xml features - - org.opendaylight.controller - odl-config-api - 0.9.0-SNAPSHOT - xml - features - ${project.groupId} sal-common-api diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml index 92da77b5de..515821e997 100644 --- a/features/mdsal/odl-mdsal-broker-local/pom.xml +++ b/features/mdsal/odl-mdsal-broker-local/pom.xml @@ -86,13 +86,6 @@ xml features - - org.opendaylight.controller - odl-config-startup - 0.9.0-SNAPSHOT - xml - features - org.opendaylight.controller odl-config-netty diff --git a/opendaylight/config/netty-config-api/pom.xml b/opendaylight/config/netty-config-api/pom.xml index 0fc0d7ea1c..ccc242fb1d 100644 --- a/opendaylight/config/netty-config-api/pom.xml +++ b/opendaylight/config/netty-config-api/pom.xml @@ -4,44 +4,18 @@ 4.0.0 org.opendaylight.controller - config-plugin-parent + config-subsystem 0.9.0-SNAPSHOT - ../config-plugin-parent + ../ netty-config-api bundle ${project.artifactId} - - com.google.guava - guava - io.netty netty-transport - - org.opendaylight.controller - config-api - - - - - org.apache.felix - maven-bundle-plugin - - - org.opendaylight.controller.config.yang.netty, - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.netty.rev131119.*, - - - - - org.opendaylight.yangtools - yang-maven-plugin - - - diff --git a/opendaylight/config/netty-config-api/src/main/yang/netty.yang b/opendaylight/config/netty-config-api/src/main/yang/netty.yang deleted file mode 100644 index 9ab19dd959..0000000000 --- a/opendaylight/config/netty-config-api/src/main/yang/netty.yang +++ /dev/null @@ -1,68 +0,0 @@ -// vi: set smarttab et sw=4 tabstop=4: -module netty { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:netty"; - prefix "netty"; - - import config { prefix config; revision-date 2013-04-05; } - - organization "Cisco Systems, Inc."; - - contact "Milos Fabian "; - - description - "This module contains the base YANG definitions for - netty services. - - Copyright (c)2013 Cisco Systems, Inc. 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"; - - revision "2013-11-19" { - description - "Initial revision."; - } - - identity netty-threadgroup { - status deprecated; - description - "Configuration wrapper around netty's threadgroup"; - - base "config:service-type"; - config:java-class "io.netty.channel.EventLoopGroup"; - config:disable-osgi-service-registration; - } - - identity netty-event-executor { - status deprecated; - description - "Configuration wrapper around netty's event executor"; - - base "config:service-type"; - config:java-class "io.netty.util.concurrent.EventExecutor"; - config:disable-osgi-service-registration; - } - - identity netty-timer { - status deprecated; - description - "Configuration wrapper around netty's timer"; - - base "config:service-type"; - config:java-class "io.netty.util.Timer"; - config:disable-osgi-service-registration; - } - - identity channel-factory { - status deprecated; - description - "Configuration wrapper around netty's channel factory"; - - base "config:service-type"; - config:java-class "io.netty.bootstrap.ChannelFactory"; - config:disable-osgi-service-registration; - } -} diff --git a/opendaylight/config/netty-event-executor-config/pom.xml b/opendaylight/config/netty-event-executor-config/pom.xml index 90c3350717..ec7ffd5333 100644 --- a/opendaylight/config/netty-event-executor-config/pom.xml +++ b/opendaylight/config/netty-event-executor-config/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.opendaylight.controller - config-plugin-parent + config-subsystem 0.9.0-SNAPSHOT - ../config-plugin-parent + ../ netty-event-executor-config bundle @@ -15,65 +15,12 @@ - org.opendaylight.controller - config-api + com.google.guava + guava org.opendaylight.controller netty-config-api - - org.opendaylight.yangtools - mockito-configuration - - - org.slf4j - slf4j-api - - - - - junit - junit - test - - - org.opendaylight.controller - config-manager - test-jar - test - - - org.opendaylight.controller - config-manager - test - - - org.opendaylight.controller - config-util - test - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.groupId}.${project.artifactId} - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.netty.eventexecutor.rev131112.*, - - - - - org.opendaylight.yangtools - yang-maven-plugin - - - - diff --git a/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModule.java b/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModule.java deleted file mode 100644 index 427cad5c74..0000000000 --- a/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModule.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2013 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: netty-event-executor yang module local name: netty-global-event-executor - * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator - * Generated at: Tue Nov 12 10:44:21 CET 2013 - * - * Do not modify this file unless it is present under src/main directory - */ -package org.opendaylight.controller.config.yang.netty.eventexecutor; - -import io.netty.util.concurrent.EventExecutor; -import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker; -import org.opendaylight.controller.config.yang.netty.eventexecutor.AutoCloseableEventExecutor.CloseableEventExecutorMixin; -import org.osgi.framework.BundleContext; - -/** - * @deprecated Replaced by blueprint wiring - */ -@Deprecated -public final class GlobalEventExecutorModule extends - org.opendaylight.controller.config.yang.netty.eventexecutor.AbstractGlobalEventExecutorModule { - private BundleContext bundleContext; - - public GlobalEventExecutorModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, - final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public GlobalEventExecutorModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, - final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, - final GlobalEventExecutorModule oldModule, final java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void validate() { - super.validate(); - } - - @Override - public AutoCloseable createInstance() { - // The service is provided via blueprint so wait for and return it here for backwards compatibility. - final WaitingServiceTracker tracker = WaitingServiceTracker.create( - EventExecutor.class, bundleContext, "(type=global-event-executor)"); - EventExecutor eventExecutor = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES); - return CloseableEventExecutorMixin.forwardingEventExecutor(eventExecutor, tracker); - } - - public void setBundleContext(final BundleContext bundleContext) { - this.bundleContext = bundleContext; - } -} diff --git a/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModuleFactory.java b/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModuleFactory.java deleted file mode 100644 index d4597d46ac..0000000000 --- a/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModuleFactory.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2013 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: netty-event-executor yang module local name: netty-global-event-executor - * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator - * Generated at: Tue Nov 12 10:44:21 CET 2013 - * - * Do not modify this file unless it is present under src/main directory - */ -package org.opendaylight.controller.config.yang.netty.eventexecutor; - -import static com.google.common.base.Preconditions.checkArgument; -import org.opendaylight.controller.config.api.DependencyResolver; -import org.osgi.framework.BundleContext; - -/** - * @deprecated Replaced by blueprint wiring - */ -@Deprecated -public class GlobalEventExecutorModuleFactory extends org.opendaylight.controller.config.yang.netty.eventexecutor.AbstractGlobalEventExecutorModuleFactory { - public static final String SINGLETON_NAME = "singleton"; - - - @Override - public GlobalEventExecutorModule instantiateModule(final String instanceName, final DependencyResolver dependencyResolver, final GlobalEventExecutorModule oldModule, final AutoCloseable oldInstance, final BundleContext bundleContext) { - checkArgument(SINGLETON_NAME.equals(instanceName),"Illegal instance name '" + instanceName + "', only allowed name is " + SINGLETON_NAME); - GlobalEventExecutorModule module = super.instantiateModule(instanceName, dependencyResolver, oldModule, - oldInstance, bundleContext); - module.setBundleContext(bundleContext); - return module; - } - - @Override - public GlobalEventExecutorModule instantiateModule(final String instanceName, final DependencyResolver dependencyResolver, final BundleContext bundleContext) { - checkArgument(SINGLETON_NAME.equals(instanceName),"Illegal instance name '" + instanceName + "', only allowed name is " + SINGLETON_NAME); - GlobalEventExecutorModule module = super.instantiateModule(instanceName, dependencyResolver, bundleContext); - module.setBundleContext(bundleContext); - return module; - } -} diff --git a/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModule.java b/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModule.java deleted file mode 100644 index 6bdef5c1e4..0000000000 --- a/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModule.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2013 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.controller.config.yang.netty.eventexecutor; - -import org.opendaylight.controller.config.yang.netty.eventexecutor.AutoCloseableEventExecutor.CloseableEventExecutorMixin; - -/** - * @deprecated Replaced by blueprint wiring - */ -@Deprecated -public final class ImmediateEventExecutorModule extends org.opendaylight.controller.config.yang.netty.eventexecutor.AbstractImmediateEventExecutorModule { - - public ImmediateEventExecutorModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public ImmediateEventExecutorModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, - final ImmediateEventExecutorModule oldModule, final java.lang.AutoCloseable oldInstance) { - - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - protected void customValidation() { - // Add custom validation for module attributes here. - } - - @Override - public java.lang.AutoCloseable createInstance() { - return CloseableEventExecutorMixin.immediateEventExecutor(); - } -} diff --git a/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModuleFactory.java b/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModuleFactory.java deleted file mode 100644 index 814ca21245..0000000000 --- a/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModuleFactory.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2013 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.controller.config.yang.netty.eventexecutor; - -import static com.google.common.base.Preconditions.checkArgument; -import org.opendaylight.controller.config.api.DependencyResolver; -import org.osgi.framework.BundleContext; - -/** - * @deprecated Replaced by blueprint wiring - */ -@Deprecated -public class ImmediateEventExecutorModuleFactory extends org.opendaylight.controller.config.yang.netty.eventexecutor.AbstractImmediateEventExecutorModuleFactory { - public static final String SINGLETON_NAME = "singleton"; - - @Override - public ImmediateEventExecutorModule instantiateModule(final String instanceName, final DependencyResolver dependencyResolver, final ImmediateEventExecutorModule oldModule, final AutoCloseable oldInstance, final BundleContext bundleContext) { - checkArgument(SINGLETON_NAME.equals(instanceName), "Illegal instance name '" + instanceName + "', only allowed name is " + SINGLETON_NAME); - return super.instantiateModule(instanceName, dependencyResolver, oldModule, oldInstance, bundleContext); - } - - @Override - public ImmediateEventExecutorModule instantiateModule(final String instanceName, final DependencyResolver dependencyResolver, final BundleContext bundleContext) { - checkArgument(SINGLETON_NAME.equals(instanceName), "Illegal instance name '" + instanceName + "', only allowed name is " + SINGLETON_NAME); - return super.instantiateModule(instanceName, dependencyResolver, bundleContext); - } -} diff --git a/opendaylight/config/netty-event-executor-config/src/main/yang/netty-event-executor.yang b/opendaylight/config/netty-event-executor-config/src/main/yang/netty-event-executor.yang deleted file mode 100644 index ca15334ea2..0000000000 --- a/opendaylight/config/netty-event-executor-config/src/main/yang/netty-event-executor.yang +++ /dev/null @@ -1,55 +0,0 @@ -// vi: set smarttab et sw=4 tabstop=4: -module netty-event-executor { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:netty:eventexecutor"; - prefix "netty-ee"; - - import config { prefix config; revision-date 2013-04-05; } - import netty { prefix netty; revision-date 2013-11-19; } - - organization "Cisco Systems, Inc."; - - contact "Milos Fabian "; - - description - "This module contains the base YANG definitions for - netty event executor implementation. - - Copyright (c)2013 Cisco Systems, Inc. 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"; - - revision "2013-11-12" { - description - "Initial revision"; - } - - identity netty-global-event-executor { - status deprecated; - base config:module-type; - config:provided-service netty:netty-event-executor; - config:java-name-prefix GlobalEventExecutor; - } - - augment "/config:modules/config:module/config:configuration" { - case netty-global-event-executor { - when "/config:modules/config:module/config:type = 'netty-global-event-executor'"; - } - } - - identity netty-immediate-event-executor { - status deprecated; - base config:module-type; - config:provided-service netty:netty-event-executor; - config:java-name-prefix ImmediateEventExecutor; - } - - augment "/config:modules/config:module/config:configuration" { - case netty-immediate-event-executor { - when "/config:modules/config:module/config:type = 'netty-immediate-event-executor'"; - } - } -} diff --git a/opendaylight/config/netty-event-executor-config/src/test/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModuleTest.java b/opendaylight/config/netty-event-executor-config/src/test/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModuleTest.java deleted file mode 100644 index 2bf7149544..0000000000 --- a/opendaylight/config/netty-event-executor-config/src/test/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModuleTest.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright (c) 2013 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.controller.config.yang.netty.eventexecutor; - -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import io.netty.util.concurrent.EventExecutor; -import javax.management.InstanceAlreadyExistsException; -import javax.management.ObjectName; -import org.junit.Before; -import org.junit.Test; -import org.opendaylight.controller.config.api.ConflictingVersionException; -import org.opendaylight.controller.config.api.ValidationException; -import org.opendaylight.controller.config.api.jmx.CommitStatus; -import org.opendaylight.controller.config.manager.impl.AbstractConfigTest; -import org.opendaylight.controller.config.manager.impl.factoriesresolver.HardcodedModuleFactoriesResolver; -import org.opendaylight.controller.config.util.ConfigTransactionJMXClient; -import org.osgi.framework.Filter; -import org.osgi.framework.ServiceListener; -import org.osgi.framework.ServiceReference; - -public class GlobalEventExecutorModuleTest extends AbstractConfigTest { - - private GlobalEventExecutorModuleFactory factory; - private final String instanceName = GlobalEventExecutorModuleFactory.SINGLETON_NAME; - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Before - public void setUp() throws Exception { - factory = new GlobalEventExecutorModuleFactory(); - super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(mockedContext,factory)); - - Filter mockFilter = mock(Filter.class); - doReturn("mock").when(mockFilter).toString(); - doReturn(mockFilter).when(mockedContext).createFilter(anyString()); - doNothing().when(mockedContext).addServiceListener(any(ServiceListener.class), anyString()); - ServiceReference mockServiceRef = mock(ServiceReference.class); - doReturn(new ServiceReference[]{mockServiceRef}).when(mockedContext). - getServiceReferences(anyString(), anyString()); - doReturn(mock(EventExecutor.class)).when(mockedContext).getService(mockServiceRef); - } - - @Test - public void testCreateBean() throws InstanceAlreadyExistsException, ValidationException, - ConflictingVersionException { - ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction(); - - createInstance(transaction, instanceName); - - transaction.validateConfig(); - CommitStatus status = transaction.commit(); - - assertBeanCount(1, factory.getImplementationName()); - assertStatus(status, 1, 0, 0); - } - - @Test - public void testConflictingName() throws Exception { - ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction(); - try { - createInstance(transaction, instanceName + "x"); - fail(); - }catch(final IllegalArgumentException e){ - assertTrue(e.getMessage() + " failure", e.getMessage().contains("only allowed name is singleton")); - } - } - - @Test - public void testReusingOldInstance() throws InstanceAlreadyExistsException, ConflictingVersionException, - ValidationException { - - ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction(); - createInstance(transaction, instanceName); - - transaction.commit(); - - transaction = configRegistryClient.createTransaction(); - assertBeanCount(1, factory.getImplementationName()); - CommitStatus status = transaction.commit(); - - assertBeanCount(1, factory.getImplementationName()); - assertStatus(status, 0, 0, 1); - } - - private ObjectName createInstance(final ConfigTransactionJMXClient transaction, final String instanceName) - throws InstanceAlreadyExistsException { - ObjectName nameCreated = transaction.createModule(factory.getImplementationName(), instanceName); - transaction.newMXBeanProxy(nameCreated, GlobalEventExecutorModuleMXBean.class); - return nameCreated; - } - -} diff --git a/opendaylight/config/netty-event-executor-config/src/test/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModuleTest.java b/opendaylight/config/netty-event-executor-config/src/test/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModuleTest.java deleted file mode 100644 index 8ab15705e2..0000000000 --- a/opendaylight/config/netty-event-executor-config/src/test/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModuleTest.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2013 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.controller.config.yang.netty.eventexecutor; - -import javax.management.InstanceAlreadyExistsException; -import javax.management.ObjectName; -import org.junit.Before; -import org.junit.Test; -import org.opendaylight.controller.config.api.ConflictingVersionException; -import org.opendaylight.controller.config.api.ValidationException; -import org.opendaylight.controller.config.api.jmx.CommitStatus; -import org.opendaylight.controller.config.manager.impl.AbstractConfigTest; -import org.opendaylight.controller.config.manager.impl.factoriesresolver.HardcodedModuleFactoriesResolver; -import org.opendaylight.controller.config.util.ConfigTransactionJMXClient; - -public class ImmediateEventExecutorModuleTest extends AbstractConfigTest { - - private ImmediateEventExecutorModuleFactory factory; - private final String instanceName = ImmediateEventExecutorModuleFactory.SINGLETON_NAME; - - @Before - public void setUp() { - factory = new ImmediateEventExecutorModuleFactory(); - super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(mockedContext,factory)); - } - - @Test - public void testCreateBean() throws InstanceAlreadyExistsException, ValidationException, - ConflictingVersionException { - ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction(); - - createInstance(transaction, instanceName); - - transaction.validateConfig(); - CommitStatus status = transaction.commit(); - - assertBeanCount(1, factory.getImplementationName()); - assertStatus(status, 1, 0, 0); - } - - @Test - public void testReusingOldInstance() throws InstanceAlreadyExistsException, ConflictingVersionException, - ValidationException { - - ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction(); - createInstance(transaction, instanceName); - - transaction.commit(); - - transaction = configRegistryClient.createTransaction(); - assertBeanCount(1, factory.getImplementationName()); - CommitStatus status = transaction.commit(); - - assertBeanCount(1, factory.getImplementationName()); - assertStatus(status, 0, 0, 1); - } - - private ObjectName createInstance(final ConfigTransactionJMXClient transaction, final String instanceName) - throws InstanceAlreadyExistsException { - ObjectName nameCreated = transaction.createModule(factory.getImplementationName(), instanceName); - transaction.newMXBeanProxy(nameCreated, ImmediateEventExecutorModuleMXBean.class); - return nameCreated; - } - -} diff --git a/opendaylight/config/netty-threadgroup-config/pom.xml b/opendaylight/config/netty-threadgroup-config/pom.xml index 3516c979ab..ebdbdfb3a5 100644 --- a/opendaylight/config/netty-threadgroup-config/pom.xml +++ b/opendaylight/config/netty-threadgroup-config/pom.xml @@ -6,9 +6,9 @@ org.opendaylight.controller - config-plugin-parent + config-subsystem 0.9.0-SNAPSHOT - ../config-plugin-parent + ../ netty-threadgroup-config bundle @@ -16,46 +16,10 @@ Configuration Wrapper around netty's event group - - org.opendaylight.controller - config-api - org.opendaylight.controller netty-config-api - - org.opendaylight.yangtools - mockito-configuration - - - org.slf4j - slf4j-api - - - - - junit - junit - test - - - org.opendaylight.controller - config-manager - test-jar - test - - - org.opendaylight.controller - config-manager - test - - - org.opendaylight.controller - config-util - test - - @@ -66,17 +30,10 @@ true - ${project.groupId}.${project.artifactId} - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.netty.threadgroup.rev131107.*, + *,io.netty.channel - - - org.opendaylight.yangtools - yang-maven-plugin - - diff --git a/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModule.java b/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModule.java deleted file mode 100644 index d81a9dcb30..0000000000 --- a/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModule.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2013 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: nsos-threadpool yang module local name: netty-threadgroup-fixed -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Fri Nov 08 08:31:45 CET 2013 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.controller.config.yang.netty.threadgroup; - -import com.google.common.reflect.AbstractInvocationHandler; -import com.google.common.reflect.Reflection; -import io.netty.channel.EventLoopGroup; -import java.lang.reflect.Method; -import org.opendaylight.controller.config.api.JmxAttributeValidationException; -import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker; -import org.osgi.framework.BundleContext; - -/** - * @deprecated Replaced by blueprint wiring - */ -@Deprecated -public final class NettyThreadgroupModule extends org.opendaylight.controller.config.yang.netty.threadgroup.AbstractNettyThreadgroupModule -{ - private BundleContext bundleContext; - - public NettyThreadgroupModule(final org.opendaylight.controller.config.api.ModuleIdentifier name, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(name, dependencyResolver); - } - - public NettyThreadgroupModule(final org.opendaylight.controller.config.api.ModuleIdentifier name, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, final NettyThreadgroupModule oldModule, final java.lang.AutoCloseable oldInstance) { - super(name, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void validate(){ - if(getThreadCount()!=null) { - JmxAttributeValidationException.checkCondition(getThreadCount() > 0, "value must be greater than 0", - threadCountJmxAttribute); - } - } - - @Override - public AutoCloseable createInstance() { - // The service is provided via blueprint so wait for and return it here for backwards compatibility. - String typeFilter = String.format("(type=%s)", getIdentifier().getInstanceName()); - final WaitingServiceTracker tracker = WaitingServiceTracker.create( - EventLoopGroup.class, bundleContext, typeFilter); - final EventLoopGroup group = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES); - - return Reflection.newProxy(AutoCloseableEventLoopGroupInterface.class, new AbstractInvocationHandler() { - @Override - protected Object handleInvocation(final Object proxy, final Method method, final Object[] args) throws Throwable { - if (method.getName().equals("close")) { - tracker.close(); - return null; - } else { - return method.invoke(group, args); - } - } - }); - } - - public void setBundleContext(final BundleContext bundleContext) { - this.bundleContext = bundleContext; - } - - private interface AutoCloseableEventLoopGroupInterface extends EventLoopGroup, AutoCloseable { - } -} diff --git a/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModuleFactory.java b/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModuleFactory.java deleted file mode 100644 index d0f4249632..0000000000 --- a/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModuleFactory.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2013 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: nsos-threadpool yang module local name: netty-threadgroup-fixed -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Fri Nov 08 08:31:45 CET 2013 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.controller.config.yang.netty.threadgroup; - -import org.opendaylight.controller.config.api.DependencyResolver; -import org.osgi.framework.BundleContext; - -/** - * @deprecated Replaced by blueprint wiring - */ -@Deprecated -public class NettyThreadgroupModuleFactory extends AbstractNettyThreadgroupModuleFactory { - @Override - public NettyThreadgroupModule instantiateModule(final String instanceName, final DependencyResolver dependencyResolver, - final NettyThreadgroupModule oldModule, final AutoCloseable oldInstance, final BundleContext bundleContext) { - NettyThreadgroupModule module = super.instantiateModule(instanceName, dependencyResolver, oldModule, oldInstance, bundleContext); - module.setBundleContext(bundleContext); - return module; - } - - @Override - public NettyThreadgroupModule instantiateModule(final String instanceName, final DependencyResolver dependencyResolver, - final BundleContext bundleContext) { - NettyThreadgroupModule module = super.instantiateModule(instanceName, dependencyResolver, bundleContext); - module.setBundleContext(bundleContext); - return module; - } -} diff --git a/opendaylight/config/netty-threadgroup-config/src/main/yang/netty-threadgroup.yang b/opendaylight/config/netty-threadgroup-config/src/main/yang/netty-threadgroup.yang deleted file mode 100644 index 44c33f6fea..0000000000 --- a/opendaylight/config/netty-threadgroup-config/src/main/yang/netty-threadgroup.yang +++ /dev/null @@ -1,47 +0,0 @@ -// vi: set smarttab et sw=4 tabstop=4: -module threadgroup { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:netty:threadgroup"; - prefix "netty-th"; - - import config { prefix config; revision-date 2013-04-05; } - import netty { prefix netty; revision-date 2013-11-19; } - - organization "Cisco Systems, Inc."; - - contact "Robert Varga "; - - description - "This module contains the base YANG definitions for - netty threadgroup implementation. - - Copyright (c)2013 Cisco Systems, Inc. All rights reserved."; - - revision "2013-11-07" { - description - "Initial revision"; - } - - identity netty-threadgroup-fixed { - status deprecated; - base config:module-type; - config:provided-service netty:netty-threadgroup; - config:java-name-prefix NettyThreadgroup; - } - - augment "/config:modules/config:module/config:configuration" { - case netty-threadgroup-fixed { - when "/config:modules/config:module/config:type = 'netty-threadgroup-fixed'"; - - leaf thread-count { - status deprecated; - type uint16; - - description "Number of threads to be used by NioEventLoopGroup. This attribute is optional and default value will be 2* Number of CPUs"; - } - - // TODO add optional thread factory dependency - - } - } -} diff --git a/opendaylight/config/netty-threadgroup-config/src/test/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModuleTest.java b/opendaylight/config/netty-threadgroup-config/src/test/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModuleTest.java deleted file mode 100644 index 8d52a095f0..0000000000 --- a/opendaylight/config/netty-threadgroup-config/src/test/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModuleTest.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright (c) 2013 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.controller.config.yang.netty.threadgroup; - -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import io.netty.channel.EventLoopGroup; -import javax.management.InstanceAlreadyExistsException; -import javax.management.InstanceNotFoundException; -import javax.management.ObjectName; -import org.junit.Before; -import org.junit.Test; -import org.opendaylight.controller.config.api.ConflictingVersionException; -import org.opendaylight.controller.config.api.ValidationException; -import org.opendaylight.controller.config.api.jmx.CommitStatus; -import org.opendaylight.controller.config.manager.impl.AbstractConfigTest; -import org.opendaylight.controller.config.manager.impl.factoriesresolver.HardcodedModuleFactoriesResolver; -import org.opendaylight.controller.config.util.ConfigTransactionJMXClient; -import org.osgi.framework.Filter; -import org.osgi.framework.ServiceListener; -import org.osgi.framework.ServiceReference; - -public class NettyThreadgroupModuleTest extends AbstractConfigTest { - - private NettyThreadgroupModuleFactory factory; - private final String instanceName = "netty1"; - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Before - public void setUp() throws Exception { - factory = new NettyThreadgroupModuleFactory(); - super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(mockedContext,factory)); - - Filter mockFilter = mock(Filter.class); - doReturn("mock").when(mockFilter).toString(); - doReturn(mockFilter).when(mockedContext).createFilter(anyString()); - doNothing().when(mockedContext).addServiceListener(any(ServiceListener.class), anyString()); - ServiceReference mockServiceRef = mock(ServiceReference.class); - doReturn(new ServiceReference[]{mockServiceRef}).when(mockedContext). - getServiceReferences(anyString(), anyString()); - doReturn(mock(EventLoopGroup.class)).when(mockedContext).getService(mockServiceRef); - } - - @Test - public void testCreateBean() throws InstanceAlreadyExistsException, ValidationException, ConflictingVersionException { - ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction(); - - createInstance(transaction, instanceName, 2); - createInstance(transaction, instanceName + 2, null); - transaction.validateConfig(); - CommitStatus status = transaction.commit(); - - assertBeanCount(2, factory.getImplementationName()); - assertStatus(status, 2, 0, 0); - } - - @Test - public void testReusingOldInstance() throws InstanceAlreadyExistsException, ConflictingVersionException, ValidationException { - - ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction(); - createInstance(transaction, instanceName, null); - - transaction.commit(); - - transaction = configRegistryClient.createTransaction(); - assertBeanCount(1, factory.getImplementationName()); - CommitStatus status = transaction.commit(); - - assertBeanCount(1, factory.getImplementationName()); - assertStatus(status, 0, 0, 1); - } - - @Test - public void testReconfigure() throws InstanceAlreadyExistsException, ConflictingVersionException, - ValidationException, InstanceNotFoundException { - - ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction(); - createInstance(transaction, instanceName, null); - - transaction.commit(); - - transaction = configRegistryClient.createTransaction(); - assertBeanCount(1, factory.getImplementationName()); - NettyThreadgroupModuleMXBean mxBean = transaction.newMBeanProxy( - transaction.lookupConfigBean(AbstractNettyThreadgroupModuleFactory.NAME, instanceName), - NettyThreadgroupModuleMXBean.class); - mxBean.setThreadCount(1); - CommitStatus status = transaction.commit(); - - assertBeanCount(1, factory.getImplementationName()); - assertStatus(status, 0, 1, 0); - } - - private ObjectName createInstance(final ConfigTransactionJMXClient transaction, final String instanceName, final Integer threads) - throws InstanceAlreadyExistsException { - ObjectName nameCreated = transaction.createModule(factory.getImplementationName(), instanceName); - NettyThreadgroupModuleMXBean mxBean = transaction.newMBeanProxy(nameCreated, NettyThreadgroupModuleMXBean.class); - mxBean.setThreadCount(threads); - return nameCreated; - } -} diff --git a/opendaylight/config/netty-timer-config/pom.xml b/opendaylight/config/netty-timer-config/pom.xml index 3854de3b0f..00804f9fb0 100644 --- a/opendaylight/config/netty-timer-config/pom.xml +++ b/opendaylight/config/netty-timer-config/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.opendaylight.controller - config-plugin-parent + config-subsystem 0.9.0-SNAPSHOT - ../config-plugin-parent + ../ netty-timer-config bundle @@ -14,75 +14,9 @@ Configuration Wrapper around netty's timer - - org.opendaylight.controller - config-api - org.opendaylight.controller netty-config-api - - org.opendaylight.controller - threadpool-config-api - - - org.opendaylight.yangtools - mockito-configuration - - - org.slf4j - slf4j-api - - - - - junit - junit - test - - - org.opendaylight.controller - config-manager - test-jar - test - - - org.opendaylight.controller - config-manager - test - - - org.opendaylight.controller - config-util - test - - - org.opendaylight.controller - threadpool-config-impl - test - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.groupId}.${project.artifactId} - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.netty.timer.rev131119.*, - - - - - org.opendaylight.yangtools - yang-maven-plugin - - - - diff --git a/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModule.java b/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModule.java deleted file mode 100644 index 2564ef94fa..0000000000 --- a/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModule.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (c) 2013 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: netty-event-executor yang module local name: netty-hashed-wheel-timer - * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator - * Generated at: Tue Nov 19 12:49:59 CET 2013 - * - * Do not modify this file unless it is present under src/main directory - */ -package org.opendaylight.controller.config.yang.netty.timer; - -import com.google.common.reflect.AbstractInvocationHandler; -import com.google.common.reflect.Reflection; -import io.netty.util.Timer; -import java.lang.reflect.Method; -import org.opendaylight.controller.config.api.JmxAttributeValidationException; -import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker; -import org.osgi.framework.BundleContext; - -/** - * @deprecated Replaced by blueprint wiring - */ -@Deprecated -public final class HashedWheelTimerModule extends - org.opendaylight.controller.config.yang.netty.timer.AbstractHashedWheelTimerModule { - private BundleContext bundleContext; - - public HashedWheelTimerModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, - final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public HashedWheelTimerModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, - final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, - final HashedWheelTimerModule oldModule, final java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void validate() { - super.validate(); - if (getTickDuration() != null) { - JmxAttributeValidationException.checkCondition(getTickDuration() > 0, "value must be greater than 0", - tickDurationJmxAttribute); - } - if (getTicksPerWheel() != null) { - JmxAttributeValidationException.checkCondition(getTicksPerWheel() > 0, "value must be greater than 0", - ticksPerWheelJmxAttribute); - } - } - - @Override - public AutoCloseable createInstance() { - // The service is provided via blueprint so wait for and return it here for backwards compatibility. - final WaitingServiceTracker tracker = WaitingServiceTracker.create( - Timer.class, bundleContext, "(type=global-timer)"); - final Timer timer = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES); - - return Reflection.newProxy(AutoCloseableTimerInterface.class, new AbstractInvocationHandler() { - @Override - protected Object handleInvocation(final Object proxy, final Method method, final Object[] args) throws Throwable { - if (method.getName().equals("close")) { - tracker.close(); - return null; - } else { - return method.invoke(timer, args); - } - } - }); - } - - public void setBundleContext(final BundleContext bundleContext) { - this.bundleContext = bundleContext; - } - - private interface AutoCloseableTimerInterface extends Timer, AutoCloseable { - } -} diff --git a/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModuleFactory.java b/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModuleFactory.java deleted file mode 100644 index 6c337904cc..0000000000 --- a/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModuleFactory.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2013 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: netty-event-executor yang module local name: netty-hashed-wheel-timer - * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator - * Generated at: Tue Nov 19 12:49:59 CET 2013 - * - * Do not modify this file unless it is present under src/main directory - */ -package org.opendaylight.controller.config.yang.netty.timer; - -import org.opendaylight.controller.config.api.DependencyResolver; -import org.osgi.framework.BundleContext; - -/** - * @deprecated Replaced by blueprint wiring - */ -@Deprecated -public class HashedWheelTimerModuleFactory extends AbstractHashedWheelTimerModuleFactory { - @Override - public HashedWheelTimerModule instantiateModule(final String instanceName, final DependencyResolver dependencyResolver, - final HashedWheelTimerModule oldModule, final AutoCloseable oldInstance, final BundleContext bundleContext) { - HashedWheelTimerModule module = super.instantiateModule(instanceName, dependencyResolver, oldModule, - oldInstance, bundleContext); - module.setBundleContext(bundleContext); - return module; - } - - @Override - public HashedWheelTimerModule instantiateModule(final String instanceName, final DependencyResolver dependencyResolver, - final BundleContext bundleContext) { - HashedWheelTimerModule module = super.instantiateModule(instanceName, dependencyResolver, bundleContext); - module.setBundleContext(bundleContext); - return module; - } -} diff --git a/opendaylight/config/netty-timer-config/src/main/resources/org/opendaylight/blueprint/netty-timer.xml b/opendaylight/config/netty-timer-config/src/main/resources/org/opendaylight/blueprint/netty-timer.xml index b4783ecbca..2ecd1cc673 100644 --- a/opendaylight/config/netty-timer-config/src/main/resources/org/opendaylight/blueprint/netty-timer.xml +++ b/opendaylight/config/netty-timer-config/src/main/resources/org/opendaylight/blueprint/netty-timer.xml @@ -18,12 +18,6 @@ - - - - - - - + diff --git a/opendaylight/config/netty-timer-config/src/main/yang/netty-timer.yang b/opendaylight/config/netty-timer-config/src/main/yang/netty-timer.yang deleted file mode 100644 index 69a7a5248f..0000000000 --- a/opendaylight/config/netty-timer-config/src/main/yang/netty-timer.yang +++ /dev/null @@ -1,52 +0,0 @@ -// vi: set smarttab et sw=4 tabstop=4: -module netty-timer { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:netty:timer"; - prefix "netty-timer"; - - import config { prefix config; revision-date 2013-04-05; } - import netty { prefix netty; revision-date 2013-11-19; } - - organization "Cisco Systems, Inc."; - - contact "Milos Fabian "; - - description - "This module contains the base YANG definitions for - netty timer implementation. - - Copyright (c)2013 Cisco Systems, Inc. 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"; - - revision "2013-11-19" { - description - "Initial revision"; - } - - identity netty-hashed-wheel-timer { - status deprecated; - base config:module-type; - config:provided-service netty:netty-timer; - config:java-name-prefix HashedWheelTimer; - } - - augment "/config:modules/config:module/config:configuration" { - case netty-hashed-wheel-timer { - when "/config:modules/config:module/config:type = 'netty-hashed-wheel-timer'"; - - leaf tick-duration { - status deprecated; - type uint32; - } - - leaf ticks-per-wheel { - status deprecated; - type uint16; - } - } - } -} diff --git a/opendaylight/config/threadpool-config-api/pom.xml b/opendaylight/config/threadpool-config-api/pom.xml index e684f0531a..3496124553 100644 --- a/opendaylight/config/threadpool-config-api/pom.xml +++ b/opendaylight/config/threadpool-config-api/pom.xml @@ -11,31 +11,4 @@ threadpool-config-api bundle ${project.artifactId} - - - - com.google.guava - guava - - - - - - - org.apache.felix - maven-bundle-plugin - - - org.opendaylight.controller.config.threadpool, - org.opendaylight.controller.config.yang.threadpool, - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.threadpool.rev130409.*, - - - - - org.opendaylight.yangtools - yang-maven-plugin - - - diff --git a/opendaylight/config/threadpool-config-impl/pom.xml b/opendaylight/config/threadpool-config-impl/pom.xml index 29d381b03c..b654d13409 100644 --- a/opendaylight/config/threadpool-config-impl/pom.xml +++ b/opendaylight/config/threadpool-config-impl/pom.xml @@ -21,40 +21,5 @@ com.google.guava guava - - org.opendaylight.yangtools - mockito-configuration - - - org.slf4j - slf4j-api - - - - - - org.apache.felix - maven-bundle-plugin - - - org.opendaylight.controller.config.threadpool.util, - org.opendaylight.controller.config.yang.threadpool.impl*, - org.opendaylight.controller.config.threadpool.util, - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.threadpool.impl.*, - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - org.opendaylight.yangtools - yang-maven-plugin - - - - diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml index abf36a3cd9..7860bd2b79 100644 --- a/opendaylight/md-sal/parent/pom.xml +++ b/opendaylight/md-sal/parent/pom.xml @@ -41,11 +41,6 @@ org.osgi org.osgi.core - - org.opendaylight.controller - config-api - 0.9.0-SNAPSHOT - -- 2.36.6