Bug 3934: Websockets: Scope ONE doesn't work correctly

Make sure data in data-change-event is wrapped in data element
per sal-remote.yang specification

Change-Id: Iaac2005a249f53664824ebe99bcfff02fbdd3097
Signed-off-by: Martin Ciglan <mciglan@cisco.com>

diff --git a/opendaylight/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/listeners/ListenerAdapter.java b/opendaylight/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/listeners/ListenerAdapter.java
index 9599dbbd88f3f277dbfc0901c17c3cc7dd6ff712..9b9b559b9243d9d48d2e774c9955c0e711223d54 100644 (file)
--- a/opendaylight/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/listeners/ListenerAdapter.java
+++ b/opendaylight/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/listeners/ListenerAdapter.java
@@ -391,7 +391,9 @@ public class ListenerAdapter implements DOMDataChangeListener {
             final DOMResult domResult = writeNormalizedNode((NormalizedNodeContainer<?,?,?>) entry.getValue(), path,
                     schemaContext, dataSchemaContextTree);
             final Node result = doc.importNode(domResult.getNode().getFirstChild(), true);
-            dataChangeEventElement.appendChild(result);
+            final Element dataElement = doc.createElement("data");
+            dataElement.appendChild(result);
+            dataChangeEventElement.appendChild(dataElement);
         } catch (IOException e) {
             LOG.error("Error in writer ", e);
         } catch (XMLStreamException e) {
@@ -406,7 +408,7 @@ public class ListenerAdapter implements DOMDataChangeListener {
             IOException, XMLStreamException {
         final XMLOutputFactory XML_FACTORY = XMLOutputFactory.newFactory();
         final Document doc = XmlDocumentUtils.getDocument();
-        final DOMResult result = new DOMResult(doc, "data");
+        final DOMResult result = new DOMResult(doc);
         NormalizedNodeWriter normalizedNodeWriter = null;
         NormalizedNodeStreamWriter normalizedNodeStreamWriter = null;
         XMLStreamWriter writer = null;