X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-netconf-connector%2Fsrc%2Fmain%2Fyang%2Fodl-sal-netconf-connector-cfg.yang;h=e13398b1dfd36a748bcdeb019db55b30b01c4c04;hp=f0fa452dc5c989138481a50ac89b120f02edb03c;hb=5a9287bb6ddaaa8805939b3b3301f648c03785f4;hpb=7755106575294f8b0c938127cd813fcc85a8f7f9

diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/yang/odl-sal-netconf-connector-cfg.yang b/opendaylight/md-sal/sal-netconf-connector/src/main/yang/odl-sal-netconf-connector-cfg.yang
index f0fa452dc5..e13398b1df 100644
--- a/opendaylight/md-sal/sal-netconf-connector/src/main/yang/odl-sal-netconf-connector-cfg.yang
+++ b/opendaylight/md-sal/sal-netconf-connector/src/main/yang/odl-sal-netconf-connector-cfg.yang
@@ -3,14 +3,17 @@ module odl-sal-netconf-connector-cfg {
     namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf";
     prefix "sal-netconf";
 
-	import config { prefix config; revision-date 2013-04-05; }
-	import threadpool {prefix th;}
-	import netty {prefix netty;}
- 	import opendaylight-md-sal-dom {prefix dom;}
+    import config { prefix config; revision-date 2013-04-05; }
+    import threadpool {prefix th;}
+    import netty {prefix netty;}
+    import opendaylight-md-sal-dom {prefix dom;}
+    import opendaylight-md-sal-binding {prefix md-sal-binding; revision-date 2013-10-28;}
+    import odl-netconf-cfg { prefix cfg-net; revision-date 2014-04-08; }
+    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
 
     description
         "Service definition for Binding Aware MD-SAL.";
- 
+
     revision "2013-10-28" {
         description
             "Initial revision";
@@ -21,30 +24,28 @@ module odl-sal-netconf-connector-cfg {
         config:java-name-prefix NetconfConnector;
     }
 
-
     grouping server {
         leaf address {
             type string;
         }
-    
+
         leaf port {
             type uint32;
         }
     }
 
-
     augment "/config:modules/config:module/config:configuration" {
         case sal-netconf-connector {
             when "/config:modules/config:module/config:type = 'sal-netconf-connector'";
-            
+
             leaf address {
-                type string;
+                type inet:host;
             }
 
             leaf port {
-                type uint32;
+                type inet:port-number;
             }
-            
+
             leaf tcp-only {
                 type boolean;
             }
@@ -52,10 +53,19 @@ module odl-sal-netconf-connector-cfg {
             leaf username {
                 type string;
             }
-            
+
             leaf password {
                 type string;
             }
+
+            container yang-module-capabilities {
+                leaf-list capability {
+                    type string;
+                    description "Set a list of capabilities to override capabilities provided in device's hello message.
+                                 Can be used for devices that do not report any yang modules in their hello message";
+                }
+            }
+
             container dom-registry {
                 uses config:service-ref {
                     refine type {
@@ -65,26 +75,40 @@ module odl-sal-netconf-connector-cfg {
                 }
             }
 
-            container boss-thread-group {
+            container binding-registry {
                 uses config:service-ref {
                     refine type {
-                        config:required-identity netty:netty-threadgroup;
+                        mandatory true;
+                        config:required-identity md-sal-binding:binding-broker-osgi-registry;
                     }
                 }
             }
 
-            container worker-thread-group {
+            container event-executor {
                 uses config:service-ref {
                     refine type {
-                        config:required-identity netty:netty-threadgroup;
+                        mandatory true;
+                        config:required-identity netty:netty-event-executor;
                     }
                 }
             }
 
-            container event-executor {
+            container processing-executor {
                 uses config:service-ref {
                     refine type {
-                        config:required-identity netty:netty-event-executor;
+                        mandatory true;
+                        config:required-identity th:threadpool;
+                    }
+                }
+
+                description "Makes up for flaws in netty threading design";
+            }
+
+            container client-dispatcher {
+                uses config:service-ref {
+                    refine type {
+                        mandatory false;
+                        config:required-identity cfg-net:netconf-client-dispatcher;
                     }
                 }
             }
@@ -101,11 +125,17 @@ module odl-sal-netconf-connector-cfg {
                 default 0; // retry forever
             }
 
-
             leaf between-attempts-timeout-millis {
-                description "Timeout in milliseconds to wait between connection attempts.";
+                description "Initial timeout in milliseconds to wait between connection attempts. Will be multiplied by sleep-factor with every additional attempt";
                 type uint16;
-                default 10000;
+                default 2000;
+            }
+
+            leaf sleep-factor {
+                type decimal64 {
+                    fraction-digits 1;
+                }
+                default 1.5;
             }
         }
     }