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
/
netconf
/
netconf-util
/
src
/
test
/
resources
/
netconfMessages
/
unrecognised
/
editConfig_unrecognised7.xml
diff --git
a/opendaylight/netconf/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised7.xml
b/opendaylight/netconf/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised7.xml
index a1e304b374686390c17eb5a4360aad631f41a166..825be6d19fff18b2d8ccb0c078e6266e4e89c3f1 100644
(file)
--- a/
opendaylight/netconf/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised7.xml
+++ b/
opendaylight/netconf/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised7.xml
@@
-32,9
+32,7
@@
<name>test1</name>
<simple-long-2>44</simple-long-2>
<name>test1</name>
<simple-long-2>44</simple-long-2>
- <binaryLeaf>8</binaryLeaf>
- <binaryLeaf>1</binaryLeaf>
- <binaryLeaf>0</binaryLeaf>
+ <binaryLeaf>8545649856</binaryLeaf>
<dto_d>
<unknownAttribute>error</unknownAttribute>
<simple-int1>444</simple-int1>
<dto_d>
<unknownAttribute>error</unknownAttribute>
<simple-int1>444</simple-int1>
@@
-97,17
+95,18
@@
<type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:test">prefix:testing</type>
<instance>
<name>ref_dep</name>
<type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:test">prefix:testing</type>
<instance>
<name>ref_dep</name>
- <provider>/
config/modules/module[name='impl-dep']/instance
[name='dep']
+ <provider>/
modules/module[type='impl-dep']
[name='dep']
</provider>
</instance>
<instance>
<name>ref_dep_2</name>
</provider>
</instance>
<instance>
<name>ref_dep_2</name>
- <provider>/
config/modules/module[name='impl-dep']/instance
[name='dep2']
+ <provider>/
modules/module[type='impl-dep']
[name='dep2']
</provider>
</instance>
<instance>
<name>ref_test1</name>
</provider>
</instance>
<instance>
<name>ref_test1</name>
- <provider>/config/modules/module[name='impl-netconf']/instance[name='test1']
+ <provider>
+ /modules/module[type='impl-netconf'][name='test1']
</provider>
</instance>
</service>
</provider>
</instance>
</service>