Merge "Replace tabs with spaces in config yang files"

diff --git a/opendaylight/config/logback-config/src/main/yang/config-logging.yang b/opendaylight/config/logback-config/src/main/yang/config-logging.yang
index 7f4ea39dd4ccb66d5e65979ce994848b884d2dd0..7af887671d21cf184cf7604284d1b58f77927e9f 100644 (file)
--- a/opendaylight/config/logback-config/src/main/yang/config-logging.yang
+++ b/opendaylight/config/logback-config/src/main/yang/config-logging.yang
@@ -32,7 +32,7 @@ module config-logging {
             when "/config:modules/config:module/config:type = 'logback'";
 
             list file-appenders {
-               leaf append {
+                leaf append {
                     type boolean;
                     mandatory false;
                 }
@@ -41,19 +41,19 @@ module config-logging {
                     type string;
                     mandatory true;
                 }
-                
+
                 leaf encoder-pattern {
                     type string;
                     mandatory true;
                 }
-                
+
                 leaf name {
                     type string;
                     mandatory true;
                 }
                 config:java-name-prefix FileAppenderTO;
             }
-            
+
             list rolling-appenders {
                 leaf append {
                     type boolean;
@@ -94,17 +94,17 @@ module config-logging {
                     type string;
                     mandatory true;
                 }
-                
+
                 leaf rolling-policy-type {
                     type string;
                     mandatory true;
                 }
-                
+
                 leaf max-history {
                     type int32;
                     mandatory true;
                 }
-                
+
                 leaf clean-history-on-start {
                     type boolean;
                     default 0;

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 7f7a3ff4ce83e7b5580a78455dce7943e9efac4c..32ecad9eb46a6de9896c38ebeb083537846ca398 100644 (file)
--- a/opendaylight/config/netty-config-api/src/main/yang/netty.yang
+++ b/opendaylight/config/netty-config-api/src/main/yang/netty.yang
@@ -1,14 +1,14 @@
 // vi: set smarttab et sw=4 tabstop=4:
 module netty {
-       yang-version 1;
-       namespace "urn:opendaylight:params:xml:ns:yang:controller:netty";
-       prefix "netty";
+    yang-version 1;
+    namespace "urn:opendaylight:params:xml:ns:yang:controller:netty";
+    prefix "netty";
 
-       import config { prefix config; revision-date 2013-04-05; }
+    import config { prefix config; revision-date 2013-04-05; }
 
-       organization "Cisco Systems, Inc.";
+    organization "Cisco Systems, Inc.";
 
-       contact "Milos Fabian <milfabia@cisco.com>";
+    contact "Milos Fabian <milfabia@cisco.com>";
 
     description
         "This module contains the base YANG definitions for
@@ -17,15 +17,15 @@ module netty {
         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";
+        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 {
         description
             "Configuration wrapper around netty's threadgroup";
@@ -33,7 +33,7 @@ module netty {
         base "config:service-type";
         config:java-class "io.netty.channel.EventLoopGroup";
     }
-    
+
     identity netty-event-executor {
         description
             "Configuration wrapper around netty's event executor";
@@ -41,12 +41,12 @@ module netty {
         base "config:service-type";
         config:java-class "io.netty.util.concurrent.EventExecutor";
     }
-    
+
     identity netty-timer {
         description
             "Configuration wrapper around netty's timer";
 
         base "config:service-type";
-        config:java-class "io.netty.util.Timer";       
+        config:java-class "io.netty.util.Timer";
     }
-}
\ No newline at end of file
+}

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 16e5c07356df97c6af8baf2f6e7eb80ac7d123f4..e9d1da3f2dd6de1f0c80701a68b21227fadd8c72 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
@@ -1,7 +1,7 @@
 // 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";
+    namespace "urn:opendaylight:params:xml:ns:yang:controller:netty:eventexecutor";
     prefix "netty-ee";
 
     import config { prefix config; revision-date 2013-04-05; }
@@ -16,17 +16,17 @@ module netty-event-executor {
          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";
+        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 {
         base config:module-type;
         config:provided-service netty:netty-event-executor;

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 e648c5328a71349f9261efa82f8c8ef02a798a58..6a2e51917c2d46b4771b9be929730cdb4783ac1d 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
@@ -1,7 +1,7 @@
 // vi: set smarttab et sw=4 tabstop=4:
 module threadgroup {
     yang-version 1;
-       namespace "urn:opendaylight:params:xml:ns:yang:controller:netty:threadgroup";
+    namespace "urn:opendaylight:params:xml:ns:yang:controller:netty:threadgroup";
     prefix "netty-th";
 
     import config { prefix config; revision-date 2013-04-05; }

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 b53b13f5a864c8be42f5c12e838a34d636685cc0..66466ee34531ffa77788cca608fb040b6731421d 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
@@ -1,7 +1,7 @@
 // vi: set smarttab et sw=4 tabstop=4:
 module netty-timer {
     yang-version 1;
-       namespace "urn:opendaylight:params:xml:ns:yang:controller:netty:timer";
+    namespace "urn:opendaylight:params:xml:ns:yang:controller:netty:timer";
     prefix "netty-timer";
 
     import config { prefix config; revision-date 2013-04-05; }
@@ -17,17 +17,17 @@ module netty-timer {
          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";
+        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 {
         base config:module-type;
         config:provided-service netty:netty-timer;
@@ -37,23 +37,23 @@ module netty-timer {
     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 {
                 type uint32;
             }
-            
+
             leaf ticks-per-wheel {
                 type uint16;
             }
-            
-                       container thread-factory {
-                               uses config:service-ref {
-                                       refine type {
-                                               mandatory false;
-                                               config:required-identity th:threadfactory;
-                                       }
-                               }
-                       }
+
+            container thread-factory {
+                uses config:service-ref {
+                    refine type {
+                        mandatory false;
+                        config:required-identity th:threadfactory;
+                    }
+                }
+            }
         }
     }
-}
\ No newline at end of file
+}

diff --git a/opendaylight/config/threadpool-config-api/src/main/yang/threadpool.yang b/opendaylight/config/threadpool-config-api/src/main/yang/threadpool.yang
index 8f3064822be319dfee6fd7c7061c8bee14db268f..4c34513591f51314769c89c8eaa3d409c0aea6a8 100644 (file)
--- a/opendaylight/config/threadpool-config-api/src/main/yang/threadpool.yang
+++ b/opendaylight/config/threadpool-config-api/src/main/yang/threadpool.yang
@@ -1,14 +1,14 @@
 // vi: set smarttab et sw=4 tabstop=4:
 module threadpool {
-       yang-version 1;
-       namespace "urn:opendaylight:params:xml:ns:yang:controller:threadpool";
-       prefix "th";
+    yang-version 1;
+    namespace "urn:opendaylight:params:xml:ns:yang:controller:threadpool";
+    prefix "th";
 
-       import config { prefix config; revision-date 2013-04-05; }
+    import config { prefix config; revision-date 2013-04-05; }
 
-       organization "Cisco Systems, Inc.";
+    organization "Cisco Systems, Inc.";
 
-       contact "Robert Varga <rovarga@cisco.com>";
+    contact "Robert Varga <rovarga@cisco.com>";
 
     description
         "This module contains the base YANG definitions for
@@ -17,9 +17,9 @@ module threadpool {
         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";
+        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-04-09" {
         description
@@ -57,20 +57,20 @@ module threadpool {
         config:java-class "java.util.concurrent.ThreadFactory";
     }
 
-       identity threadpool {
+    identity threadpool {
         description
             "A simple pool of threads able to execute work.";
 
-               base "config:service-type";
+        base "config:service-type";
         config:java-class "org.opendaylight.controller.config.threadpool.ThreadPool";
-       }
+    }
 
-       identity scheduled-threadpool {
+    identity scheduled-threadpool {
         description
             "An extension of the simple pool of threads able to schedule
              work to be executed at some point in time.";
 
-               base "threadpool";
+        base "threadpool";
         config:java-class "org.opendaylight.controller.config.threadpool.ScheduledThreadPool";
-       }
+    }
 }

diff --git a/opendaylight/config/threadpool-config-impl/src/main/yang/threadpool-impl.yang b/opendaylight/config/threadpool-config-impl/src/main/yang/threadpool-impl.yang
index a2366f285a0c0b8682b1093f18fb5ee184c9cde3..b454d94c271fbae28b25bd2b7a893d66ae507c34 100644 (file)
--- a/opendaylight/config/threadpool-config-impl/src/main/yang/threadpool-impl.yang
+++ b/opendaylight/config/threadpool-config-impl/src/main/yang/threadpool-impl.yang
@@ -17,11 +17,11 @@ module threadpool-impl {
          thread services pure Java 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";
+        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-04-05" {
         description
@@ -40,21 +40,21 @@ module threadpool-impl {
         config:java-name-prefix EventBus;
     }
 
-       augment "/config:modules/config:module/config:configuration" {
-               case eventbus {
-                       when "/config:modules/config:module/config:type = 'eventbus'";
-                       // No real configuration
+    augment "/config:modules/config:module/config:configuration" {
+        case eventbus {
+            when "/config:modules/config:module/config:type = 'eventbus'";
+            // No real configuration
         }
     }
 
-       augment "/config:modules/config:module/config:state" {
-               case eventbus {
-                       when "/config:modules/config:module/config:type = 'eventbus'";
-                       rpcx:rpc-context-instance "event-bus-rpc";
+    augment "/config:modules/config:module/config:state" {
+        case eventbus {
+            when "/config:modules/config:module/config:type = 'eventbus'";
+            rpcx:rpc-context-instance "event-bus-rpc";
         }
     }
 
-       identity event-bus-rpc;
+    identity event-bus-rpc;
 
     identity async-eventbus {
         base config:module-type;
@@ -62,134 +62,134 @@ module threadpool-impl {
         config:java-name-prefix AsyncEventBus;
     }
 
-       augment "/config:modules/config:module/config:configuration" {
-               case async-eventbus {
-                       when "/config:modules/config:module/config:type = 'async-eventbus'";
-                       container threadpool {
-                               uses config:service-ref {
-                                       refine type {
-                                               //mandatory true;
-                                               config:required-identity th:threadpool;
-                                       }
-                               }
-                       }
-               }
-       }
-
-       augment "/config:modules/config:module/config:state" {
-               case async-eventbus {
-                       when "/config:modules/config:module/config:type = 'async-eventbus'";
-                       rpcx:rpc-context-instance "event-bus-rpc";
+    augment "/config:modules/config:module/config:configuration" {
+        case async-eventbus {
+            when "/config:modules/config:module/config:type = 'async-eventbus'";
+            container threadpool {
+                uses config:service-ref {
+                    refine type {
+                        //mandatory true;
+                        config:required-identity th:threadpool;
+                    }
+                }
+            }
+        }
+    }
+
+    augment "/config:modules/config:module/config:state" {
+        case async-eventbus {
+            when "/config:modules/config:module/config:type = 'async-eventbus'";
+            rpcx:rpc-context-instance "event-bus-rpc";
         }
     }
 
-       rpc get-dead-events-count {
-               config:java-name-prefix countDeadEvents;
-               input {
-                       uses rpcx:rpc-context-ref {
-                               refine context-instance {
-                                       rpcx:rpc-context-instance event-bus-rpc;
-                               }
-                       }
-               }
-               output {
-                       leaf result {
-                               type uint32;
-                       }
-               }
-       }
-       
-       identity threadfactory-naming {
+    rpc get-dead-events-count {
+        config:java-name-prefix countDeadEvents;
+        input {
+            uses rpcx:rpc-context-ref {
+                refine context-instance {
+                    rpcx:rpc-context-instance event-bus-rpc;
+                }
+            }
+        }
+        output {
+            leaf result {
+                type uint32;
+            }
+        }
+    }
+
+    identity threadfactory-naming {
         base config:module-type;
-               config:provided-service th:threadfactory;
+        config:provided-service th:threadfactory;
         config:java-name-prefix NamingThreadFactory;
     }
 
-       augment "/config:modules/config:module/config:configuration" {
-               case threadfactory-naming {
-                       when "/config:modules/config:module/config:type = 'threadfactory-naming'";
-                       leaf name-prefix {
-                               type string;
-                       }
+    augment "/config:modules/config:module/config:configuration" {
+        case threadfactory-naming {
+            when "/config:modules/config:module/config:type = 'threadfactory-naming'";
+            leaf name-prefix {
+                type string;
+            }
         }
     }
 
     identity threadpool-fixed {
-       base config:module-type;
-       config:provided-service th:threadpool;
-       config:java-name-prefix FixedThreadPool;
-    }
-
-       augment "/config:modules/config:module/config:configuration" {
-               case threadpool-fixed {
-                       when "/config:modules/config:module/config:type = 'threadpool-fixed'";
-                       leaf max-thread-count {
-                               type uint16;
-                       }
-
-                       container threadFactory {
-                               uses config:service-ref {
-                                       refine type {
-                                               //mandatory true;
-                                               config:required-identity th:threadfactory;
-                                       }
-                               }
-                       }
+        base config:module-type;
+        config:provided-service th:threadpool;
+        config:java-name-prefix FixedThreadPool;
+    }
+
+    augment "/config:modules/config:module/config:configuration" {
+        case threadpool-fixed {
+            when "/config:modules/config:module/config:type = 'threadpool-fixed'";
+            leaf max-thread-count {
+                type uint16;
+            }
+
+            container threadFactory {
+                uses config:service-ref {
+                    refine type {
+                        //mandatory true;
+                        config:required-identity th:threadfactory;
+                    }
+                }
+            }
         }
-       }
-
-       identity threadpool-flexible {
-               base config:module-type;
-               config:provided-service th:threadpool;
-               config:java-name-prefix FlexibleThreadPool;
-       }
-
-       augment "/config:modules/config:module/config:configuration" {
-               case threadpool-flexible {
-                       when "/config:modules/config:module/config:type = 'threadpool-flexible'";
-                       leaf max-thread-count {
-                               type uint16;
-                       }
-                       leaf minThreadCount {
-                               type uint16;
-                       }
-                       leaf keepAliveMillis {
-                               type uint32;
-                       }
-
-                       container threadFactory {
-                               uses config:service-ref {
-                                       refine type {
-                                          // mandatory true;
-                                               config:required-identity th:threadfactory;
-                                       }
-                               }
-                       }
+    }
+
+    identity threadpool-flexible {
+        base config:module-type;
+        config:provided-service th:threadpool;
+        config:java-name-prefix FlexibleThreadPool;
+    }
+
+    augment "/config:modules/config:module/config:configuration" {
+        case threadpool-flexible {
+            when "/config:modules/config:module/config:type = 'threadpool-flexible'";
+            leaf max-thread-count {
+                type uint16;
+            }
+            leaf minThreadCount {
+                type uint16;
+            }
+            leaf keepAliveMillis {
+                type uint32;
+            }
+
+            container threadFactory {
+                uses config:service-ref {
+                    refine type {
+                       // mandatory true;
+                        config:required-identity th:threadfactory;
+                    }
+                }
+            }
         }
-       }
+    }
 
     identity threadpool-scheduled {
-               base config:module-type;
-               config:provided-service th:scheduled-threadpool;
-               config:java-name-prefix ScheduledThreadPool;
-       }
-
-       augment "/config:modules/config:module/config:configuration" {
-               case threadpool-scheduled {
-                       when "/config:modules/config:module/config:type = 'threadpool-scheduled'";
-                       leaf max-thread-count {
-                               type uint16;
-                       }
-
-                       container threadFactory {
-                               uses config:service-ref {
-                                       refine type {
-                                        //   mandatory true;
-                                               config:required-identity th:threadfactory;
-                                       }
-                               }
-                       }
-               }
-       }
+        base config:module-type;
+        config:provided-service th:scheduled-threadpool;
+        config:java-name-prefix ScheduledThreadPool;
+    }
+
+    augment "/config:modules/config:module/config:configuration" {
+        case threadpool-scheduled {
+            when "/config:modules/config:module/config:type = 'threadpool-scheduled'";
+            leaf max-thread-count {
+                type uint16;
+            }
+
+            container threadFactory {
+                uses config:service-ref {
+                    refine type {
+                     //   mandatory true;
+                        config:required-identity th:threadfactory;
+                    }
+                }
+            }
+        }
+    }
 }