X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fnetconf-util%2Fsrc%2Ftest%2Fresources%2FnetconfMessages%2Fnamespaces%2FeditConfig_sameAttrDifferentNamespaces.xml;h=3dbaef4042a304cc0f03ec67de7cdb2b009442c1;hp=7c19b9f7b3b9005fda4f339704ad6f887dcc82a8;hb=aefe82b158bc1694fe633053d04f2364bcbe67d9;hpb=0f14bf97fb20a4d506a7ed4826b2a6ed3b9ebeab

diff --git a/opendaylight/netconf/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespaces.xml b/opendaylight/netconf/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespaces.xml
index 7c19b9f7b3..3dbaef4042 100644
--- a/opendaylight/netconf/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespaces.xml
+++ b/opendaylight/netconf/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespaces.xml
@@ -24,61 +24,70 @@
                     </type>
                 </module>
 
+              <module>
+                <type xmlns:test-impl="urn:opendaylight:params:xml:ns:yang:controller:test:impl">
+                  test-impl:impl
+                </type>
+
+                <name>testimpl</name>
+                <simpleInt>1</simpleInt>
+                <simpleInt xmlns="urn:opendaylight:params:xml:ns:yang:controller:test:impl">2</simpleInt>
+              </module>
+
                 <module>
                     <type xmlns:test-impl="urn:opendaylight:params:xml:ns:yang:controller:test:impl">
                         test-impl:impl-netconf
                     </type>
 
                     <name>test1</name>
-
-                    <simple-long-2>44</simple-long-2>
-                    <simple-long-2 xmlns="urn:opendaylight:params:xml:ns:yang:controller:test:impl">44</simple-long-2>
-                    <binaryLeaf>8</binaryLeaf>
-                    <binaryLeaf>1</binaryLeaf>
-                    <binaryLeaf>0</binaryLeaf>
-                    <type xmlns="urn:opendaylight:params:xml:ns:yang:controller:test:impl">configAttributeType</type>
-                    <dto_d xmlns="urn:opendaylight:params:xml:ns:yang:controller:test:impl">
-                        <simple-int1>444</simple-int1>
-                        <simple-int2>4444</simple-int2>
-                        <simple-int3>454</simple-int3>
-                        <complex-dto-bInner>
-                            <simple-int3>44</simple-int3>
-                            <deep>
-                                <simple-int3>4</simple-int3>
-                            </deep>
+                    <impl-netconf xmlns="urn:opendaylight:params:xml:ns:yang:controller:test:impl">
+                        <simple-long-2>44</simple-long-2>
+                        <simple-long-2 xmlns="urn:opendaylight:params:xml:ns:yang:controller:test:impl">44</simple-long-2>
+                        <binaryLeaf></binaryLeaf>
+                        <type xmlns="urn:opendaylight:params:xml:ns:yang:controller:test:impl">configAttributeType</type>
+                        <dto_d xmlns="urn:opendaylight:params:xml:ns:yang:controller:test:impl">
+                            <simple-int1>444</simple-int1>
+                            <simple-int2>4444</simple-int2>
+                            <simple-int3>454</simple-int3>
+                            <complex-dto-bInner>
+                                <simple-int3>44</simple-int3>
+                                <deep>
+                                    <simple-int3>4</simple-int3>
+                                </deep>
+                                <simple-list>4</simple-list>
+                            </complex-dto-bInner>
                             <simple-list>4</simple-list>
-                        </complex-dto-bInner>
-                        <simple-list>4</simple-list>
-                    </dto_d>
-                    <simpleInt>44</simpleInt>
-                    <simple-test>545</simple-test>
-                    <simple-long>454545</simple-long>
-                    <simpleBoolean>false</simpleBoolean>
-                    <dto-c>
-                        <dto-a-inner>
-                            <dto-a-inner-inner>
-                                <simple-arg>456</simple-arg>
-                            </dto-a-inner-inner>
-                            <simple-arg>44</simple-arg>
-                        </dto-a-inner>
-                    </dto-c>
-                    <simple-short>4</simple-short>
-                    <simple-BigInteger>999</simple-BigInteger>
-                    <simple-byte>4</simple-byte>
-                    <peers>
-                        <port>port1</port>
-                        <simple-int3>456</simple-int3>
-                        <core-size>44</core-size>
-                    </peers>
-                    <peers>
-                        <port>port23</port>
-                        <simple-int3>456</simple-int3>
-                        <core-size>44</core-size>
-                    </peers>
-                    <testing-dep>
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:test">prefix:testing</type>
-                        <name>ref_dep</name>
-                    </testing-dep>
+                        </dto_d>
+                        <simpleInt>44</simpleInt>
+                        <simple-test>545</simple-test>
+                        <simple-long>454545</simple-long>
+                        <simpleBoolean>false</simpleBoolean>
+                        <dto-c>
+                            <dto-a-inner>
+                                <dto-a-inner-inner>
+                                    <simple-arg>456</simple-arg>
+                                </dto-a-inner-inner>
+                                <simple-arg>44</simple-arg>
+                            </dto-a-inner>
+                        </dto-c>
+                        <simple-short>4</simple-short>
+                        <simple-BigInteger>999</simple-BigInteger>
+                        <simple-byte>4</simple-byte>
+                        <peers>
+                            <port>port1</port>
+                            <simple-int3>456</simple-int3>
+                            <core-size>44</core-size>
+                        </peers>
+                        <peers>
+                            <port>port23</port>
+                            <simple-int3>456</simple-int3>
+                            <core-size>44</core-size>
+                        </peers>
+                        <testing-dep>
+                            <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:test">prefix:testing</type>
+                            <name>ref_dep</name>
+                        </testing-dep>
+                    </impl-netconf>
                 </module>
 
                 <module>
@@ -86,10 +95,12 @@
                         test-impl:impl-netconf
                     </type>
                     <name>test2</name>
-                    <testing-dep>
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:test">prefix:testing</type>
-                        <name>ref_dep</name>
-                    </testing-dep>
+                    <impl-netconf xmlns="urn:opendaylight:params:xml:ns:yang:controller:test:impl">
+                        <testing-dep>
+                            <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:test">prefix:testing</type>
+                            <name>ref_dep</name>
+                        </testing-dep>
+                    </impl-netconf>
                 </module>
             </modules>
 
@@ -98,17 +109,18 @@
                     <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>/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>/config/modules/module[name='impl-netconf']/instance[name='test1']
+                        <provider>
+                            /modules/module[type='impl-netconf'][name='test1']
                         </provider>
                     </instance>
                 </service>