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 "Added conflict handling between configuration and state choice nodes. -unique...
[controller.git]
/
opendaylight
/
config
/
yang-test
/
src
/
main
/
yang
/
config-test-impl.yang
diff --git
a/opendaylight/config/yang-test/src/main/yang/config-test-impl.yang
b/opendaylight/config/yang-test/src/main/yang/config-test-impl.yang
index ba5021ea099361fd5d548e318a6448811020177f..9ad7a44915b15bdfbce7a64cbdaf2eb02f8bba14 100644
(file)
--- a/
opendaylight/config/yang-test/src/main/yang/config-test-impl.yang
+++ b/
opendaylight/config/yang-test/src/main/yang/config-test-impl.yang
@@
-48,28
+48,40
@@
module config-test-impl {
container dto-a {
leaf simple-arg {
type uint32;
container dto-a {
leaf simple-arg {
type uint32;
+ default 1;
}
leaf port {
type inet:port-number;
}
leaf port {
type inet:port-number;
+ default 8080;
}
}
+ leaf ip4 {
+ type inet:ipv4-address;
+ default 127.0.0.1;
+ }
+
+ leaf ip {
+ type inet:ip-address;
+ // TODO defaults for union default 0:0:0:0:0:0:0:1;
+ }
}
leaf as-number {
}
leaf as-number {
- mandatory true;
type inet:as-number;
type inet:as-number;
+ default 44;
}
leaf simpleInt {
type uint32;
}
leaf simpleInt {
type uint32;
- default 99
L
;
+ default 99;
}
container dto_b {
leaf simple-int1 {
type uint32;
}
container dto_b {
leaf simple-int1 {
type uint32;
+ default 32;
}
leaf simple-int2 {
}
leaf simple-int2 {
@@
-101,28
+113,34
@@
module config-test-impl {
when "/config:modules/config:module/config:type = 'impl-netconf'";
leaf binaryLeaf {
type binary;
when "/config:modules/config:module/config:type = 'impl-netconf'";
leaf binaryLeaf {
type binary;
+ default ZGVmYXVsdEJpbg==;
}
leaf type {
type string;
}
leaf type {
type string;
+ default "default-string";
}
leaf extended {
type tt:extend-once;
}
leaf extended {
type tt:extend-once;
+ default 1;
}
leaf extended-twice {
type tt:extend-twice;
}
leaf extended-twice {
type tt:extend-twice;
+ default 2;
}
leaf extended-enum {
type tt:extend-enum;
}
leaf extended-enum {
type tt:extend-enum;
+ default ONE;
}
leaf sleep-factor {
type decimal64 {
fraction-digits 2;
}
}
leaf sleep-factor {
type decimal64 {
fraction-digits 2;
}
+ default 2.00;
}
container dto-c {
}
container dto-c {
@@
-153,23
+171,28
@@
module config-test-impl {
}
leaf simple-long {
}
leaf simple-long {
- type int64 ;
+ type int64;
+ default -45;
}
leaf simple-long-2 {
type uint32;
}
leaf simple-long-2 {
type uint32;
+ default 445;
}
leaf simple-BigInteger {
type uint64;
}
leaf simple-BigInteger {
type uint64;
+ default 545454;
}
leaf simple-byte {
type int8;
}
leaf simple-byte {
type int8;
+ default -4;
}
leaf simple-short {
type uint8;
}
leaf simple-short {
type uint8;
+ default 45;
}
leaf simple-test {
}
leaf simple-test {
@@
-209,6
+232,7
@@
module config-test-impl {
container deep {
leaf simple-int3 {
type uint16;
container deep {
leaf simple-int3 {
type uint16;
+ default 0;
}
}
}
}
}
}
@@
-242,6
+266,15
@@
module config-test-impl {
}
}
}
}
}
}
+
+ list testing-deps {
+ uses config:service-ref {
+ refine type {
+ mandatory true;
+ config:required-identity test:testing;
+ }
+ }
+ }
}
}
}
}
@@
-384,6
+417,7
@@
module config-test-impl {
container retValContainer {
leaf v1 {
type string;
container retValContainer {
leaf v1 {
type string;
+ default "from rpc";
}
leaf v2 {
}
leaf v2 {