Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Revert "Revert "BUG-1425: Integrated new Binding to Normalized Node codec for write...
[controller.git]
/
opendaylight
/
md-sal
/
sal-binding-broker
/
src
/
main
/
yang
/
opendaylight-binding-broker-impl.yang
diff --git
a/opendaylight/md-sal/sal-binding-broker/src/main/yang/opendaylight-binding-broker-impl.yang
b/opendaylight/md-sal/sal-binding-broker/src/main/yang/opendaylight-binding-broker-impl.yang
index 4456dea77f98fad1f4f43c79f67b224d9e44990e..aec27235910633fb34389208e02b550c81a85a43 100644
(file)
--- a/
opendaylight/md-sal/sal-binding-broker/src/main/yang/opendaylight-binding-broker-impl.yang
+++ b/
opendaylight/md-sal/sal-binding-broker/src/main/yang/opendaylight-binding-broker-impl.yang
@@
-18,10
+18,9
@@
module opendaylight-sal-binding-broker-impl {
identity binding-dom-mapping-service {
base config:service-type;
identity binding-dom-mapping-service {
base config:service-type;
- config:java-class "org.opendaylight.
yangtools.yang.data.impl.codec.BindingIndependentMappingService
";
+ config:java-class "org.opendaylight.
controller.md.sal.binding.impl.BindingToNormalizedNodeCodec
";
}
}
-
identity binding-broker-impl {
base config:module-type;
config:provided-service sal:binding-broker-osgi-registry;
identity binding-broker-impl {
base config:module-type;
config:provided-service sal:binding-broker-osgi-registry;
@@
-29,13
+28,6
@@
module opendaylight-sal-binding-broker-impl {
config:java-name-prefix BindingBrokerImpl;
}
config:java-name-prefix BindingBrokerImpl;
}
- identity binding-data-broker {
- base config:module-type;
- config:provided-service sal:binding-data-broker;
- config:provided-service sal:binding-data-consumer-broker;
- config:java-name-prefix DataBrokerImpl;
- }
-
identity binding-data-compatible-broker {
base config:module-type;
config:provided-service sal:binding-data-broker;
identity binding-data-compatible-broker {
base config:module-type;
config:provided-service sal:binding-data-broker;
@@
-105,7
+97,7
@@
module opendaylight-sal-binding-broker-impl {
container data-broker {
uses config:service-ref {
refine type {
container data-broker {
uses config:service-ref {
refine type {
- mandatory
tru
e;
+ mandatory
fals
e;
config:required-identity sal:binding-data-broker;
}
}
config:required-identity sal:binding-data-broker;
}
}
@@
-119,26
+111,12
@@
module opendaylight-sal-binding-broker-impl {
}
}
}
}
}
}
- }
- }
- augment "/config:modules/config:module/config:configuration" {
- case binding-data-broker {
- when "/config:modules/config:module/config:type = 'binding-data-broker'";
- container dom-broker {
+ container root-data-broker {
uses config:service-ref {
refine type {
uses config:service-ref {
refine type {
- mandatory true;
- config:required-identity dom:dom-broker-osgi-registry;
- }
- }
- }
-
- container mapping-service {
- uses config:service-ref {
- refine type {
- mandatory true;
- config:required-identity binding-dom-mapping-service;
+ mandatory false;
+ config:required-identity sal:binding-async-data-broker;
}
}
}
}
}
}
@@
-169,14
+147,6
@@
module opendaylight-sal-binding-broker-impl {
}
}
}
}
- augment "/config:modules/config:module/config:state" {
- case binding-data-broker {
- when "/config:modules/config:module/config:type = 'binding-data-broker'";
- container data {
- uses common:data-state;
- }
- }
- }
augment "/config:modules/config:module/config:state" {
case binding-rpc-broker {
when "/config:modules/config:module/config:type = 'binding-rpc-broker'";
augment "/config:modules/config:module/config:state" {
case binding-rpc-broker {
when "/config:modules/config:module/config:type = 'binding-rpc-broker'";