Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bug-590: Packet loss on first time ping test"
[controller.git]
/
opendaylight
/
md-sal
/
sal-netconf-connector
/
src
/
main
/
yang
/
odl-sal-netconf-connector-cfg.yang
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 b28e72eb80251adb294d99f2e72d17c7edd7cbaf..d4dad11ec3b4f70e67ede2e1ddc4f690d59e9b52 100644
(file)
--- 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
@@
-7,10
+7,11
@@
module odl-sal-netconf-connector-cfg {
import threadpool {prefix th;}
import netty {prefix netty;}
import opendaylight-md-sal-dom {prefix dom;}
import threadpool {prefix th;}
import netty {prefix netty;}
import opendaylight-md-sal-dom {prefix dom;}
+ import odl-netconf-cfg { prefix cfg-net; revision-date 2014-04-08; }
description
"Service definition for Binding Aware MD-SAL.";
description
"Service definition for Binding Aware MD-SAL.";
-
+
revision "2013-10-28" {
description
"Initial revision";
revision "2013-10-28" {
description
"Initial revision";
@@
-26,7
+27,7
@@
module odl-sal-netconf-connector-cfg {
leaf address {
type string;
}
leaf address {
type string;
}
-
+
leaf port {
type uint32;
}
leaf port {
type uint32;
}
@@
-36,7
+37,7
@@
module odl-sal-netconf-connector-cfg {
augment "/config:modules/config:module/config:configuration" {
case sal-netconf-connector {
when "/config:modules/config:module/config:type = 'sal-netconf-connector'";
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;
}
leaf address {
type string;
}
@@
-44,7
+45,7
@@
module odl-sal-netconf-connector-cfg {
leaf port {
type uint32;
}
leaf port {
type uint32;
}
-
+
leaf tcp-only {
type boolean;
}
leaf tcp-only {
type boolean;
}
@@
-52,10
+53,11
@@
module odl-sal-netconf-connector-cfg {
leaf username {
type string;
}
leaf username {
type string;
}
-
+
leaf password {
type string;
}
leaf password {
type string;
}
+
container dom-registry {
uses config:service-ref {
refine type {
container dom-registry {
uses config:service-ref {
refine type {
@@
-65,17
+67,25
@@
module odl-sal-netconf-connector-cfg {
}
}
}
}
+ // FIXME BUG-944 remove backwards compatibility
+ // Deprecated, replaced by client dispatcher.
+ // This dependency will be removed in near future and all configurations of netconf-connector need to be changed to use dispatcher dependency.
container boss-thread-group {
uses config:service-ref {
refine type {
container boss-thread-group {
uses config:service-ref {
refine type {
+ mandatory false;
config:required-identity netty:netty-threadgroup;
}
}
}
config:required-identity netty:netty-threadgroup;
}
}
}
+ // FIXME BUG-944 remove backwards compatibility
+ // Deprecated, replaced by client dispatcher.
+ // This dependency will be removed in near future and all configurations of netconf-connector need to be changed to use dispatcher dependency.
container worker-thread-group {
uses config:service-ref {
refine type {
container worker-thread-group {
uses config:service-ref {
refine type {
+ mandatory false;
config:required-identity netty:netty-threadgroup;
}
}
config:required-identity netty:netty-threadgroup;
}
}
@@
-89,10
+99,20
@@
module odl-sal-netconf-connector-cfg {
}
}
}
}
+ // Replaces thread group dependencies
+ container client-dispatcher {
+ uses config:service-ref {
+ refine type {
+ mandatory false;
+ config:required-identity cfg-net:netconf-client-dispatcher;
+ }
+ }
+ }
+
leaf connection-timeout-millis {
description "Specifies timeout in milliseconds after which connection must be established.";
type uint32;
leaf connection-timeout-millis {
description "Specifies timeout in milliseconds after which connection must be established.";
type uint32;
- default
5
000;
+ default
20
000;
}
leaf max-connection-attempts {
}
leaf max-connection-attempts {
@@
-101,7
+121,6
@@
module odl-sal-netconf-connector-cfg {
default 0; // retry forever
}
default 0; // retry forever
}
-
leaf between-attempts-timeout-millis {
description "Timeout in milliseconds to wait between connection attempts.";
type uint16;
leaf between-attempts-timeout-millis {
description "Timeout in milliseconds to wait between connection attempts.";
type uint16;