Bug-6346: Allow over-ride of non-module capabilities

[netconf.git] / netconf / sal-netconf-connector / src / main / yang / odl-sal-netconf-connector-cfg.yang

diff --git a/netconf/sal-netconf-connector/src/main/yang/odl-sal-netconf-connector-cfg.yang b/netconf/sal-netconf-connector/src/main/yang/odl-sal-netconf-connector-cfg.yang
index a7bb0827148efc97b99e6b96469c2086c382baa7..ec5f31c1019e7ae2b6a96a6a733132f6aa34ae00 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/yang/odl-sal-netconf-connector-cfg.yang
+++ b/netconf/sal-netconf-connector/src/main/yang/odl-sal-netconf-connector-cfg.yang
@@ -9,7 +9,7 @@ module odl-sal-netconf-connector-cfg {
     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";}
+    import ietf-inet-types {prefix inet; revision-date "2013-07-15";}
 
     description
         "Config definition for Netconf Connector modules";
@@ -27,6 +27,7 @@ module odl-sal-netconf-connector-cfg {
     identity sal-netconf-connector {
         base config:module-type;
         config:java-name-prefix NetconfConnector;
+        status deprecated;
     }
 
     grouping server {
@@ -40,6 +41,7 @@ module odl-sal-netconf-connector-cfg {
     }
 
     augment "/config:modules/config:module/config:configuration" {
+        status deprecated;
         case sal-netconf-connector {
             when "/config:modules/config:module/config:type = 'sal-netconf-connector'";
 
@@ -63,6 +65,13 @@ module odl-sal-netconf-connector-cfg {
                 type string;
             }
 
+            leaf concurrent-rpc-limit {
+                type uint16;
+                default 0;
+                description "Limit of concurrent messages that can be send before reply messages are received.
+                             If value less than 1 is provided, no limit will be enforced";
+            }
+
             leaf schema-cache-directory {
                 type string;
                 default "schema";
@@ -84,6 +93,22 @@ module odl-sal-netconf-connector-cfg {
                 }
             }
 
+            container non-module-capabilities {
+                leaf override {
+                    type boolean;
+                    default false;
+                    description "Whether to override or merge this list of non-module based capabilities with non-module
+                                 based capabilities from device";
+                }
+
+                leaf-list capability {
+                    type string;
+                    description "Set a list of non-module based capabilities to override or merge non-module capabilities
+                                 provided in device's hello message. Can be used for devices that do not report or
+                                 incorrectly report non-module based capabilities in their hello message";
+                }
+            }
+
             leaf reconnect-on-changed-schema {
                 type boolean;
                 default false;