From 5eae7cfca353e8559ad8bb7129915b3233b0d65e Mon Sep 17 00:00:00 2001
From: Tomas Cere <tcere@cisco.com>
Date: Tue, 10 Mar 2015 15:49:38 +0100
Subject: [PATCH] Fixed failing tests due to different attribute handling in
 mdsal netconf northbound.

Change-Id: I4f3723b9094f953307982ee25019e3736c9d24de
Signed-off-by: Tomas Cere <tcere@cisco.com>
---
 .../connector/ops/NetconfMDSalMappingTest.java |  8 +++-----
 .../mapping/editConfig_create_n1_control.xml   | 18 ++++++++++++++++++
 ...editConfig_merge_multiple_after_replace.xml |  2 +-
 3 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 opendaylight/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfig_create_n1_control.xml

diff --git a/opendaylight/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/controller/netconf/mdsal/connector/ops/NetconfMDSalMappingTest.java b/opendaylight/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/controller/netconf/mdsal/connector/ops/NetconfMDSalMappingTest.java
index b5c26400c6..6b94251531 100644
--- a/opendaylight/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/controller/netconf/mdsal/connector/ops/NetconfMDSalMappingTest.java
+++ b/opendaylight/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/controller/netconf/mdsal/connector/ops/NetconfMDSalMappingTest.java
@@ -29,7 +29,6 @@ import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.XMLUnit;
 import org.custommonkey.xmlunit.examples.RecursiveElementNameAndTextQualifier;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.opendaylight.controller.cluster.datastore.ConcurrentDOMDataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
@@ -184,7 +183,6 @@ public class NetconfMDSalMappingTest {
 
     }
 
-    @Ignore("Xml is not similar")
     @Test
     public void testMoreComplexEditConfigs() throws Exception {
 
@@ -243,12 +241,12 @@ public class NetconfMDSalMappingTest {
         }
     }
 
-    @Ignore("Xml is not similar")
     @Test
     public void testEditWithCreate() throws Exception {
 
         verifyResponse(edit("messages/mapping/editConfig_create.xml"), RPC_REPLY_OK);
-        verifyResponse(getConfigCandidate(), XmlFileLoader.xmlFileToDocument("messages/mapping/editConfig_merge_n1_control.xml"));
+        verifyResponse(getConfigCandidate(), XmlFileLoader.xmlFileToDocument("messages/mapping/editConfig_create_n1_control.xml"));
+
 
         try {
             edit("messages/mapping/editConfig_create.xml");
@@ -301,7 +299,7 @@ public class NetconfMDSalMappingTest {
         assertEmptyDatastore(getConfigRunning());
     }
 
-    private void verifyResponse(Document response, Document template) {
+    private void verifyResponse(Document response, Document template){
         DetailedDiff dd = new DetailedDiff(new Diff(response, template));
         dd.overrideElementQualifier(new RecursiveElementNameAndTextQualifier());
         assertTrue(dd.similar());
diff --git a/opendaylight/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfig_create_n1_control.xml b/opendaylight/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfig_create_n1_control.xml
new file mode 100644
index 0000000000..a0f4d5e088
--- /dev/null
+++ b/opendaylight/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfig_create_n1_control.xml
@@ -0,0 +1,18 @@
+<!--
+  ~ Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
+  ~
+  ~ This program and the accompanying materials are made available under the
+  ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+  ~ and is available at http://www.eclipse.org/legal/epl-v10.html
+  -->
+
+<rpc-reply a="64" id="a" message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlnx="a:b:c:d">
+    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+        <mapping-nodes xmlns:a="urn:ietf:params:xml:ns:netconf:base:1.0" a:operation="create" xmlns="urn:opendaylight:mdsal:mapping:test">
+            <mapping-node>
+                <id>node1-put</id>
+                <content>put content</content>
+            </mapping-node>
+        </mapping-nodes>
+    </data>
+</rpc-reply>
\ No newline at end of file
diff --git a/opendaylight/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfig_merge_multiple_after_replace.xml b/opendaylight/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfig_merge_multiple_after_replace.xml
index fcece32a53..35593309ae 100644
--- a/opendaylight/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfig_merge_multiple_after_replace.xml
+++ b/opendaylight/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfig_merge_multiple_after_replace.xml
@@ -8,7 +8,7 @@
 
 <rpc-reply a="64" id="a" message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlnx="a:b:c:d">
 <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-    <mapping-nodes xmlns="urn:opendaylight:mdsal:mapping:test">
+    <mapping-nodes xmlns:a="urn:ietf:params:xml:ns:netconf:base:1.0" a:operation="replace" xmlns="urn:opendaylight:mdsal:mapping:test">
         <mapping-node>
             <id>new-node7</id>
             <content>new node content</content>
-- 
2.36.6