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
/
editConfig_none.xml
diff --git
a/opendaylight/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_none.xml
b/opendaylight/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_none.xml
index 42021c59a303ee17672129bbd9741e5213b511b2..b48730d3f71e74a86fde37131c38602d3f1169c1 100644
(file)
--- a/
opendaylight/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_none.xml
+++ b/
opendaylight/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_none.xml
@@
-27,9
+27,7
@@
</type>
<name>test1</name>
<simple-long-2>44</simple-long-2>
</type>
<name>test1</name>
<simple-long-2>44</simple-long-2>
- <binaryLeaf>8</binaryLeaf>
- <binaryLeaf>7</binaryLeaf>
- <binaryLeaf>9</binaryLeaf>
+ <binaryLeaf>8ad1</binaryLeaf>
<dto_d>
<simple-int1>444</simple-int1>
<simple-int2>4444</simple-int2>
<dto_d>
<simple-int1>444</simple-int1>
<simple-int2>4444</simple-int2>
@@
-69,7
+67,7
@@
<core-size>44</core-size>
</peers>
<testing-dep>
<core-size>44</core-size>
</peers>
<testing-dep>
- <type
>
testing</type>
+ <type
xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:test">prefix:
testing</type>
<name>ref_dep</name>
</testing-dep>
</module>
<name>ref_dep</name>
</testing-dep>
</module>
@@
-79,27
+77,28
@@
</type>
<name>test2</name>
<testing-dep>
</type>
<name>test2</name>
<testing-dep>
- <type
>
testing</type>
+ <type
xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:test">prefix:
testing</type>
<name>ref_dep</name>
</testing-dep>
</module>
</modules>
<services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
<service>
<name>ref_dep</name>
</testing-dep>
</module>
</modules>
<services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
<service>
- <type
>
testing</type>
+ <type
xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:test">prefix:
testing</type>
<instance>
<name>ref_dep</name>
<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>