Deprecate netty config modules 82/38282/6
authorTom Pantelis <tpanteli@brocade.com>
Wed, 20 Apr 2016 00:01:00 +0000 (20:01 -0400)
committerTom Pantelis <tpanteli@brocade.com>
Wed, 15 Jun 2016 22:47:39 +0000 (18:47 -0400)
Marked the md-sal dom/binding config yang modules, 01-md-sal.xml and
associated Module classes as deprecated.

Change-Id: I5c2b531ac489b3ce06e54078f28ad0ea76a35670
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
14 files changed:
opendaylight/config/config-netty-config/src/main/resources/initial/00-netty.xml
opendaylight/config/netty-config-api/src/main/yang/netty.yang
opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModule.java
opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModuleFactory.java
opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModule.java
opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModuleFactory.java
opendaylight/config/netty-event-executor-config/src/main/yang/netty-event-executor.yang
opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModule.java
opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModuleFactory.java
opendaylight/config/netty-threadgroup-config/src/main/resources/org/opendaylight/blueprint/netty-threadgroup.xml
opendaylight/config/netty-threadgroup-config/src/main/yang/netty-threadgroup.yang
opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModule.java
opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModuleFactory.java
opendaylight/config/netty-timer-config/src/main/yang/netty-timer.yang

index 2bf5b36..dc1ace2 100644 (file)
@@ -6,6 +6,9 @@
  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.
 -->
 <snapshot>
     <required-capabilities>
index 281b76c..9ab19dd 100644 (file)
@@ -27,6 +27,7 @@ module netty {
     }
 
     identity netty-threadgroup {
+        status deprecated;
         description
             "Configuration wrapper around netty's threadgroup";
 
@@ -36,6 +37,7 @@ module netty {
     }
 
     identity netty-event-executor {
+        status deprecated;
         description
             "Configuration wrapper around netty's event executor";
 
@@ -45,6 +47,7 @@ module netty {
     }
 
     identity netty-timer {
+        status deprecated;
         description
             "Configuration wrapper around netty's timer";
 
@@ -54,6 +57,7 @@ module netty {
     }
 
     identity channel-factory {
+        status deprecated;
         description
             "Configuration wrapper around netty's channel factory";
 
index da06391..476b202 100644 (file)
@@ -22,6 +22,10 @@ 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;
index 467f068..c15d80b 100644 (file)
@@ -21,6 +21,10 @@ 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";
 
index 9178452..6163ce0 100644 (file)
@@ -9,6 +9,10 @@ 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(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
index 2a804eb..f9d6417 100644 (file)
@@ -8,10 +8,13 @@
 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";
 
index 8d812ad..ca15334 100644 (file)
@@ -28,6 +28,7 @@ module netty-event-executor {
     }
 
     identity netty-global-event-executor {
+        status deprecated;
         base config:module-type;
         config:provided-service netty:netty-event-executor;
         config:java-name-prefix GlobalEventExecutor;
@@ -40,6 +41,7 @@ module netty-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;
index 09ea672..fa11652 100644 (file)
@@ -26,8 +26,9 @@ 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;
index b509932..89a5231 100644 (file)
@@ -20,6 +20,10 @@ 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(String instanceName, DependencyResolver dependencyResolver,
index bfb088f..5ab81de 100644 (file)
@@ -6,7 +6,7 @@
 
   <cm:property-placeholder persistent-id="org.opendaylight.netty.threadgroup" update-strategy="none">
     <cm:default-properties>
-      <!-- 0 means use the default number of threads  -->
+      <!-- 0 means use the default number of threads which is 2 * number of CPUs -->
       <cm:property name="global-boss-group-thread-count" value="0"/>
       <cm:property name="global-worker-group-thread-count" value="0"/>
     </cm:default-properties>
index 71cbff4..44c33f6 100644 (file)
@@ -23,6 +23,7 @@ module threadgroup {
     }
 
     identity netty-threadgroup-fixed {
+        status deprecated;
         base config:module-type;
         config:provided-service netty:netty-threadgroup;
         config:java-name-prefix NettyThreadgroup;
@@ -33,6 +34,7 @@ module threadgroup {
             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";
@@ -42,11 +44,4 @@ module threadgroup {
 
         }
     }
-
-    augment "/config:modules/config:module/config:state" {
-        case netty-threadgroup-fixed {
-            when "/config:modules/config:module/config:type = 'netty-threadgroup-fixed'";
-        }
-    }
-
 }
index 76d75e8..d1d5540 100644 (file)
@@ -26,8 +26,9 @@ 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;
index d8ec0fc..a4049c8 100644 (file)
@@ -20,6 +20,10 @@ 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(String instanceName, DependencyResolver dependencyResolver,
index e622be3..c9ada0c 100644 (file)
@@ -29,6 +29,7 @@ module netty-timer {
     }
 
     identity netty-hashed-wheel-timer {
+        status deprecated;
         base config:module-type;
         config:provided-service netty:netty-timer;
         config:java-name-prefix HashedWheelTimer;
@@ -39,14 +40,17 @@ module netty-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;
             }
 
             container thread-factory {
+                status deprecated;
                 uses config:service-ref {
                     refine type {
                         mandatory false;