Deprecate netty config modules

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>

diff --git a/opendaylight/config/config-netty-config/src/main/resources/initial/00-netty.xml b/opendaylight/config/config-netty-config/src/main/resources/initial/00-netty.xml
index 2bf5b36d7a770c43bc5a51fa2e7eb7c057624041..dc1ace2a41834dadd33e9fb37066a862c04f11de 100644 (file)
--- a/opendaylight/config/config-netty-config/src/main/resources/initial/00-netty.xml
+++ b/opendaylight/config/config-netty-config/src/main/resources/initial/00-netty.xml
@@ -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
  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>
 -->
 <snapshot>
     <required-capabilities>

diff --git a/opendaylight/config/netty-config-api/src/main/yang/netty.yang b/opendaylight/config/netty-config-api/src/main/yang/netty.yang
index 281b76c1b84900b8fa0eb613da39547a16ebe0e8..9ab19dd959e79f4f20e384e031acba344fa3653a 100644 (file)
--- a/opendaylight/config/netty-config-api/src/main/yang/netty.yang
+++ b/opendaylight/config/netty-config-api/src/main/yang/netty.yang
@@ -27,6 +27,7 @@ module netty {
     }
 
     identity netty-threadgroup {
     }
 
     identity netty-threadgroup {

+        status deprecated;

         description
             "Configuration wrapper around netty's threadgroup";
 
         description
             "Configuration wrapper around netty's threadgroup";
 


@@ -36,6 +37,7 @@ module netty {
     }
 
     identity netty-event-executor {
     }
 
     identity netty-event-executor {

+        status deprecated;

         description
             "Configuration wrapper around netty's event executor";
 
         description
             "Configuration wrapper around netty's event executor";
 


@@ -45,6 +47,7 @@ module netty {
     }
 
     identity netty-timer {
     }
 
     identity netty-timer {

+        status deprecated;

         description
             "Configuration wrapper around netty's timer";
 
         description
             "Configuration wrapper around netty's timer";
 


@@ -54,6 +57,7 @@ module netty {
     }
 
     identity channel-factory {
     }
 
     identity channel-factory {

+        status deprecated;

         description
             "Configuration wrapper around netty's channel factory";
 
         description
             "Configuration wrapper around netty's channel factory";
 

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
index da0639187d0cd7b7569f93b1b5f6416384de9108..476b2029215f42cc1d45517cac1ca207986a5155 100644 (file)
--- 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
@@ -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;
 
 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 final class GlobalEventExecutorModule extends
         org.opendaylight.controller.config.yang.netty.eventexecutor.AbstractGlobalEventExecutorModule {
     private 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
index 467f0689e9b5c0d852d0cb273dac036afcab3900..c15d80b15b072340feb9b5808f6051180661ac8b 100644 (file)
--- 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
@@ -21,6 +21,10 @@ import static com.google.common.base.Preconditions.checkArgument;
 import org.opendaylight.controller.config.api.DependencyResolver;
 import org.osgi.framework.BundleContext;
 
 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";
 
 public class GlobalEventExecutorModuleFactory extends org.opendaylight.controller.config.yang.netty.eventexecutor.AbstractGlobalEventExecutorModuleFactory {
     public static final String SINGLETON_NAME = "singleton";
 

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
index 9178452a3ec72d0f8623af7a07c7a19ecaa72038..6163ce0041d356beb789d924b5e678418340d42d 100644 (file)
--- 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
@@ -9,6 +9,10 @@ package org.opendaylight.controller.config.yang.netty.eventexecutor;
 
 import org.opendaylight.controller.config.yang.netty.eventexecutor.AutoCloseableEventExecutor.CloseableEventExecutorMixin;
 
 
 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) {
 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) {

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
index 2a804eb40e039f8a1d46fa591a4239fa7fb1a43b..f9d6417bdbab6d3011d20c488cc36831a8cfe4f3 100644 (file)
--- 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
@@ -8,10 +8,13 @@
 package org.opendaylight.controller.config.yang.netty.eventexecutor;
 
 import static com.google.common.base.Preconditions.checkArgument;
 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;
 
 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";
 
 public class ImmediateEventExecutorModuleFactory extends org.opendaylight.controller.config.yang.netty.eventexecutor.AbstractImmediateEventExecutorModuleFactory {
     public static final String SINGLETON_NAME = "singleton";
 

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
index 8d812adc4d1231f4507c19a70c9d5df4a28e72d0..ca15334ea29d7916092d792db8991d1a5b87be7e 100644 (file)
--- 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
@@ -28,6 +28,7 @@ module netty-event-executor {
     }
 
     identity netty-global-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;
         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 {
     }
 
     identity netty-immediate-event-executor {

+        status deprecated;

         base config:module-type;
         config:provided-service netty:netty-event-executor;
         config:java-name-prefix ImmediateEventExecutor;
         base config:module-type;
         config:provided-service netty:netty-event-executor;
         config:java-name-prefix ImmediateEventExecutor;

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
index 09ea6720019cdf9c539c1e81921745d757d4f07d..fa11652850009c43ee5d579b55c33cef0575a6b6 100644 (file)
--- 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
@@ -26,8 +26,9 @@ import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker;
 import org.osgi.framework.BundleContext;
 
 /**
 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 final class NettyThreadgroupModule extends org.opendaylight.controller.config.yang.netty.threadgroup.AbstractNettyThreadgroupModule
 {
     private BundleContext bundleContext;

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
index b509932568426701d1e7e224cc42ba13a8e7f01a..89a5231114ca4ec883787dc5e46d0ae43fc5ef28 100644 (file)
--- 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
@@ -20,6 +20,10 @@ package org.opendaylight.controller.config.yang.netty.threadgroup;
 import org.opendaylight.controller.config.api.DependencyResolver;
 import org.osgi.framework.BundleContext;
 
 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,
 public class NettyThreadgroupModuleFactory extends AbstractNettyThreadgroupModuleFactory {
     @Override
     public NettyThreadgroupModule instantiateModule(String instanceName, DependencyResolver dependencyResolver,

diff --git a/opendaylight/config/netty-threadgroup-config/src/main/resources/org/opendaylight/blueprint/netty-threadgroup.xml b/opendaylight/config/netty-threadgroup-config/src/main/resources/org/opendaylight/blueprint/netty-threadgroup.xml
index bfb088f765e99f49921b8f090cc1818f1da5bef4..5ab81de75a31dcdabb2a0ffe2185ecf8486d2f4a 100644 (file)
--- a/opendaylight/config/netty-threadgroup-config/src/main/resources/org/opendaylight/blueprint/netty-threadgroup.xml
+++ b/opendaylight/config/netty-threadgroup-config/src/main/resources/org/opendaylight/blueprint/netty-threadgroup.xml
@@ -6,7 +6,7 @@
 
   <cm:property-placeholder persistent-id="org.opendaylight.netty.threadgroup" update-strategy="none">
     <cm:default-properties>
 
   <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>
       <cm:property name="global-boss-group-thread-count" value="0"/>
       <cm:property name="global-worker-group-thread-count" value="0"/>
     </cm:default-properties>

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
index 71cbff4bcd136167dbf64afff8f741000965de8b..44c33f6fea96c8492f99897843a46e88ac6deca2 100644 (file)
--- a/opendaylight/config/netty-threadgroup-config/src/main/yang/netty-threadgroup.yang
+++ b/opendaylight/config/netty-threadgroup-config/src/main/yang/netty-threadgroup.yang
@@ -23,6 +23,7 @@ module threadgroup {
     }
 
     identity netty-threadgroup-fixed {
     }
 
     identity netty-threadgroup-fixed {

+        status deprecated;

         base config:module-type;
         config:provided-service netty:netty-threadgroup;
         config:java-name-prefix NettyThreadgroup;
         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 {
             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";
                 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'";
-        }
-    }
-

 }
 }

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
index 76d75e83728ca6aa86ec0fc903c14c163bc33e7c..d1d55405a96a825ff23c44a00f4b9b10e80eec17 100644 (file)
--- 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
@@ -26,8 +26,9 @@ import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker;
 import org.osgi.framework.BundleContext;
 
 /**
 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 final class HashedWheelTimerModule extends
         org.opendaylight.controller.config.yang.netty.timer.AbstractHashedWheelTimerModule {
     private BundleContext bundleContext;

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
index d8ec0fcf90606515a96d69cd4055c94ba2153eb9..a4049c89e67f6f124dc5bbbb6ff0aa67bc9a9b01 100644 (file)
--- 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
@@ -20,6 +20,10 @@ package org.opendaylight.controller.config.yang.netty.timer;
 import org.opendaylight.controller.config.api.DependencyResolver;
 import org.osgi.framework.BundleContext;
 
 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,
 public class HashedWheelTimerModuleFactory extends AbstractHashedWheelTimerModuleFactory {
     @Override
     public HashedWheelTimerModule instantiateModule(String instanceName, DependencyResolver dependencyResolver,

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
index e622be39c7f1d944cb0a15ae4bc4e5343f3f1559..c9ada0c3d98440d85d6a76b27fcfa01718883aa2 100644 (file)
--- a/opendaylight/config/netty-timer-config/src/main/yang/netty-timer.yang
+++ b/opendaylight/config/netty-timer-config/src/main/yang/netty-timer.yang
@@ -29,6 +29,7 @@ module netty-timer {
     }
 
     identity netty-hashed-wheel-timer {
     }
 
     identity netty-hashed-wheel-timer {

+        status deprecated;

         base config:module-type;
         config:provided-service netty:netty-timer;
         config:java-name-prefix HashedWheelTimer;
         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 {
             when "/config:modules/config:module/config:type = 'netty-hashed-wheel-timer'";
 
             leaf tick-duration {

+                status deprecated;

                 type uint32;
             }
 
             leaf ticks-per-wheel {
                 type uint32;
             }
 
             leaf ticks-per-wheel {

+                status deprecated;

                 type uint16;
             }
 
             container thread-factory {
                 type uint16;
             }
 
             container thread-factory {

+                status deprecated;

                 uses config:service-ref {
                     refine type {
                         mandatory false;
                 uses config:service-ref {
                     refine type {
                         mandatory false;