Add SchemaContext to NormalizedNode parser in NETCONF

Change-Id: Id674dc60eba84cb5cb37b6f170654ae7333f91b6
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>

diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfStateSchemas.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfStateSchemas.java
index aa0897e021cdd2402ae539bd0536fc89fda3c270..942e4bbaeb3339485f68798974552d7ffdff800a 100644 (file)
--- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfStateSchemas.java
+++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfStateSchemas.java
@@ -188,13 +188,8 @@ public final class NetconfStateSchemas {
             QName childNode = NetconfMessageTransformUtil.IETF_NETCONF_MONITORING_SCHEMA_FORMAT;
 
             String formatAsString = getSingleChildNodeValue(schemaNode, childNode).get();
-            //This is HotFix for situations where format statement in netconf-monitoring might be passed with prefix.
-            if (formatAsString.contains(":")) {
-                final String[] prefixedString = formatAsString.split(":");
-                //FIXME: might be good idea to check prefix against model namespace
-                formatAsString = prefixedString[1];
-            }
-            if(formatAsString.equals(Yang.QNAME.getLocalName()) == false) {
+
+            if(formatAsString.equals(Yang.QNAME.toString()) == false) {
                 LOG.debug("{}: Ignoring schema due to unsupported format: {}", id, formatAsString);
                 return Optional.absent();
             }

diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java
index 1ce56e0cd39edf4f8131bf66b495cf21fb9c3617..a103bbb9f0e4992957a524ba4e938590f537b8c3 100644 (file)
--- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java
+++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java
@@ -26,6 +26,7 @@ import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
 import org.opendaylight.controller.sal.connect.netconf.util.NetconfMessageTransformUtil;
 import org.opendaylight.controller.sal.connect.util.RemoteDeviceId;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.Yang;
 import org.opendaylight.yangtools.util.concurrent.ExceptionMapper;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
@@ -72,7 +73,7 @@ public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSource
 
         final QName formatQName = QName.cachedReference(QName.create(NetconfMessageTransformUtil.GET_SCHEMA_QNAME, "format"));
         final YangInstanceIdentifier.NodeIdentifier formatId = new YangInstanceIdentifier.NodeIdentifier(formatQName);
-        final LeafNode<String> format = Builders.<String>leafBuilder().withNodeIdentifier(formatId).withValue("yang").build();
+        final LeafNode<QName> format = Builders.<QName>leafBuilder().withNodeIdentifier(formatId).withValue(Yang.QNAME).build();
 
         final DataContainerNodeAttrBuilder<YangInstanceIdentifier.NodeIdentifier, ContainerNode> builder = Builders.containerBuilder();
 

diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java
index ccda6d1b19fcbe1b26184e45f24834bddc283d67..4fdf5e584c28c10cdfe30bf6b35a02bbac211824 100644 (file)
--- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java
+++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java
@@ -65,7 +65,6 @@ public class NetconfMessageTransformer implements MessageTransformer<NetconfMess
 
     private static final Logger LOG= LoggerFactory.getLogger(NetconfMessageTransformer.class);
 
-    private static final DomToNormalizedNodeParserFactory NORMALIZED_NODE_PARSER_FACTORY = DomToNormalizedNodeParserFactory.getInstance(XmlUtils.DEFAULT_XML_CODEC_PROVIDER);
 
     private static final Function<SchemaNode, QName> QNAME_FUNCTION = new Function<SchemaNode, QName>() {
         @Override
@@ -99,10 +98,12 @@ public class NetconfMessageTransformer implements MessageTransformer<NetconfMess
     private final MessageCounter counter;
     private final Map<QName, RpcDefinition> mappedRpcs;
     private final Multimap<QName, NotificationDefinition> mappedNotifications;
+    private final DomToNormalizedNodeParserFactory parserFactory;
 
     public NetconfMessageTransformer(final SchemaContext schemaContext) {
         this.counter = new MessageCounter();
         this.schemaContext = schemaContext;
+        parserFactory = DomToNormalizedNodeParserFactory.getInstance(XmlUtils.DEFAULT_XML_CODEC_PROVIDER, schemaContext);
 
         mappedRpcs = Maps.uniqueIndex(schemaContext.getOperations(), QNAME_FUNCTION);
         mappedNotifications = Multimaps.index(schemaContext.getNotifications(), QNAME_NOREV_FUNCTION);
@@ -129,7 +130,7 @@ public class NetconfMessageTransformer implements MessageTransformer<NetconfMess
 
         // We wrap the notification as a container node in order to reuse the parsers and builders for container node
         final ContainerSchemaNode notificationAsContainerSchemaNode = NetconfMessageTransformUtil.createSchemaForNotification(next);
-        return NORMALIZED_NODE_PARSER_FACTORY.getContainerNodeParser().parse(Collections.singleton(stripped.getDomElement()), notificationAsContainerSchemaNode);
+        return parserFactory.getContainerNodeParser().parse(Collections.singleton(stripped.getDomElement()), notificationAsContainerSchemaNode);
     }
 
     // FIXME move somewhere to util
@@ -219,7 +220,7 @@ public class NetconfMessageTransformer implements MessageTransformer<NetconfMess
         if (NetconfMessageTransformUtil.isDataRetrievalOperation(rpc.getLastComponent())) {
             final Element xmlData = NetconfMessageTransformUtil.getDataSubtree(message.getDocument());
             final ContainerSchemaNode schemaForDataRead = NetconfMessageTransformUtil.createSchemaForDataRead(schemaContext);
-            final ContainerNode dataNode = NORMALIZED_NODE_PARSER_FACTORY.getContainerNodeParser().parse(Collections.singleton(xmlData), schemaForDataRead);
+            final ContainerNode dataNode = parserFactory.getContainerNodeParser().parse(Collections.singleton(xmlData), schemaForDataRead);
 
             normalizedNode = Builders.containerBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(NetconfMessageTransformUtil.NETCONF_RPC_REPLY_QNAME))
                     .withChild(dataNode).build();
@@ -234,7 +235,7 @@ public class NetconfMessageTransformer implements MessageTransformer<NetconfMess
                         "Unexpected content in response of rpc: %s, %s", rpcDefinition.getQName(), message);
                 normalizedNode = null;
             } else {
-                normalizedNode = NORMALIZED_NODE_PARSER_FACTORY.getContainerNodeParser().parse(documentElement, rpcDefinition.getOutput());
+                normalizedNode = parserFactory.getContainerNodeParser().parse(documentElement, rpcDefinition.getOutput());
             }
         }
         return new DefaultDOMRpcResult(normalizedNode);

diff --git a/opendaylight/md-sal/sal-netconf-connector/src/test/java/org/opendaylight/controller/sal/connect/netconf/NetconfStateSchemasTest.java b/opendaylight/md-sal/sal-netconf-connector/src/test/java/org/opendaylight/controller/sal/connect/netconf/NetconfStateSchemasTest.java
index 405579e85ce9d61060c560124d12b1c233ea9c1f..e4f7fab6f062ae254c2fe6e0ceefb9645960f4d8 100644 (file)
--- a/opendaylight/md-sal/sal-netconf-connector/src/test/java/org/opendaylight/controller/sal/connect/netconf/NetconfStateSchemasTest.java
+++ b/opendaylight/md-sal/sal-netconf-connector/src/test/java/org/opendaylight/controller/sal/connect/netconf/NetconfStateSchemasTest.java
@@ -27,7 +27,7 @@ public class NetconfStateSchemasTest {
         final DataSchemaNode schemasNode = ((ContainerSchemaNode) NetconfDevice.INIT_SCHEMA_CTX.getDataChildByName("netconf-state")).getDataChildByName("schemas");
 
         final Document schemasXml = XmlUtil.readXmlToDocument(getClass().getResourceAsStream("/netconf-state.schemas.payload.xml"));
-        final ToNormalizedNodeParser<Element, ContainerNode, ContainerSchemaNode> containerNodeParser = DomToNormalizedNodeParserFactory.getInstance(XmlUtils.DEFAULT_XML_CODEC_PROVIDER).getContainerNodeParser();
+        final ToNormalizedNodeParser<Element, ContainerNode, ContainerSchemaNode> containerNodeParser = DomToNormalizedNodeParserFactory.getInstance(XmlUtils.DEFAULT_XML_CODEC_PROVIDER, NetconfDevice.INIT_SCHEMA_CTX).getContainerNodeParser();
         final ContainerNode compositeNodeSchemas = containerNodeParser.parse(Collections.singleton(schemasXml.getDocumentElement()), (ContainerSchemaNode) schemasNode);
         final NetconfStateSchemas schemas = NetconfStateSchemas.create(new RemoteDeviceId("device", new InetSocketAddress(99)), compositeNodeSchemas);
 

diff --git a/opendaylight/md-sal/sal-netconf-connector/src/test/java/org/opendaylight/controller/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java b/opendaylight/md-sal/sal-netconf-connector/src/test/java/org/opendaylight/controller/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java
index ee32a596184684bc572efcbf0009fcd12ed06cc8..35a6df8304fd930342048e56ec2ffeb5665bcfeb 100644 (file)
--- a/opendaylight/md-sal/sal-netconf-connector/src/test/java/org/opendaylight/controller/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java
+++ b/opendaylight/md-sal/sal-netconf-connector/src/test/java/org/opendaylight/controller/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java
@@ -37,6 +37,7 @@ import java.util.List;
 import java.util.Map;
 import javax.xml.transform.dom.DOMSource;
 import org.custommonkey.xmlunit.Diff;
+import org.custommonkey.xmlunit.ElementNameAndAttributeQualifier;
 import org.custommonkey.xmlunit.XMLUnit;
 import org.hamcrest.CoreMatchers;
 import org.junit.Before;
@@ -97,7 +98,7 @@ public class NetconfMessageTransformerTest {
                 NetconfRemoteSchemaYangSourceProvider.createGetSchemaRequest("module", Optional.of("2012-12-12")));
         assertSimilarXml(netconfMessage, "<rpc message-id=\"m-0\" xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n" +
                 "<get-schema xmlns=\"urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring\">\n" +
-                "<format>yang</format>\n" +
+                "<format xmlns:x=\"urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring\">x:yang</format>\n" +
                 "<identifier>module</identifier>\n" +
                 "<version>2012-12-12</version>\n" +
                 "</get-schema>\n" +
@@ -135,7 +136,7 @@ public class NetconfMessageTransformerTest {
                 "<schema>\n" +
                 "<identifier>module</identifier>\n" +
                 "<version>2012-12-12</version>\n" +
-                "<format>yang</format>\n" +
+                "<format xmlns:x=\"urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring\">x:yang</format>\n" +
                 "</schema>\n" +
                 "</schemas>\n" +
                 "</netconf-state>\n" +
@@ -223,7 +224,7 @@ public class NetconfMessageTransformerTest {
                 "<schema>\n" +
                 "<identifier>module</identifier>\n" +
                 "<version>2012-12-12</version>\n" +
-                "<format>yang</format>\n" +
+                "<format xmlns:x=\"urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring\">x:yang</format>\n" +
                 "</schema>\n" +
                 "</schemas>\n" +
                 "</netconf-state>\n" +
@@ -234,6 +235,7 @@ public class NetconfMessageTransformerTest {
 
     private void assertSimilarXml(final NetconfMessage netconfMessage, final String xmlContent) throws SAXException, IOException {
         final Diff diff = XMLUnit.compareXML(netconfMessage.getDocument(), XmlUtil.readXmlToDocument(xmlContent));
+        diff.overrideElementQualifier(new ElementNameAndAttributeQualifier());
         assertTrue(diff.toString(), diff.similar());
     }
 

diff --git a/opendaylight/md-sal/sal-netconf-connector/src/test/resources/netconf-state.schemas.payload.xml b/opendaylight/md-sal/sal-netconf-connector/src/test/resources/netconf-state.schemas.payload.xml
index 649ecb76a4c5010c32af9e761c485fcd414e1686..0213415f8d2f003c04e3df55138a161df1cda48f 100644 (file)
--- a/opendaylight/md-sal/sal-netconf-connector/src/test/resources/netconf-state.schemas.payload.xml
+++ b/opendaylight/md-sal/sal-netconf-connector/src/test/resources/netconf-state.schemas.payload.xml
@@ -3,161 +3,161 @@
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:threadpool</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>threadpool</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-04-09</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:logback:config</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>config-logging</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-07-16</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:model:statistics:types</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-statistics-types</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+        <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-09-25</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:config-dom-store</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-config-dom-datastore</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2014-06-17</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:flow:table:statistics</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-flow-table-statistics</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-12-15</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:meter:service</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>sal-meter</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-09-18</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:config:toaster-provider:impl</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>toaster-provider-impl</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2014-01-31</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:table:types</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-table-types</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-10-26</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:table:service</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>sal-table</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-10-26</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:shutdown</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>shutdown</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-12-18</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:port:service</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>sal-port</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-11-07</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:netty:eventexecutor</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>netty-event-executor</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-11-12</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:md:sal:remote</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>sal-remote</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2014-01-14</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:model:topology:view</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-topology-view</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-10-30</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:netty:threadgroup</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>threadgroup</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-11-07</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:TBD:params:xml:ns:yang:network-topology</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>network-topology</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-07-12</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:threadpool:impl:fixed</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>threadpool-impl-fixed</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-12-01</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-sal-binding-broker-impl</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-10-28</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:ietf:params:xml:ns:yang:ietf-restconf</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>ietf-restconf</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-10-19</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:node:error:service</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>node-error</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2014-04-10</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:flow:errors</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>flow-errors</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-11-16</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:flow:service</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>sal-flow</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-08-19</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:ietf:params:xml:ns:yang:rpc-context</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>rpc-context</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-06-17</ncm:version>
     </ncm:schema>
     <ncm:schema>
@@ -165,350 +165,350 @@
         </ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-operational-dom-datastore</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2014-06-17</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:flow:types:queue</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-queue-types</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-09-25</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>ietf-netconf-monitoring</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2010-10-04</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:netconf-node-inventory</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>netconf-node-inventory</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2014-01-08</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:ietf:params:xml:ns:yang:ietf-yang-types</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>ietf-yang-types</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-07-15</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:meter:statistics</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-meter-statistics</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-11-11</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:flow:inventory</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>flow-node-inventory</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-08-19</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>odl-sal-netconf-connector-cfg</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-10-28</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:threadpool:impl:scheduled</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>threadpool-impl-scheduled</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-12-01</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:TBD:params:xml:ns:yang:network-topology</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>network-topology</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-10-21</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>http://netconfcentral.org/ns/toaster</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>toaster</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2009-11-20</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:config:netconf</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>odl-netconf-cfg</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2014-04-08</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:meter:types</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-meter-types</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-09-18</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-sal-dom-broker-impl</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-10-28</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:flow:topology:discovery</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>flow-topology-discovery</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-08-19</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:yang:extension:yang-ext</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>yang-ext</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-07-09</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:threadpool:impl</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>threadpool-impl</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-04-05</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:flow:types:port</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-port-types</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-09-25</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-md-sal-binding</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-10-28</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:packet:service</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>packet-processing</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-07-09</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:threadpool:impl:flexible</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>threadpool-impl-flexible</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-12-01</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:queue:service</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>sal-queue</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-11-07</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:ietf:params:xml:ns:yang:ietf-inet-types</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>ietf-inet-types</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2010-09-24</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:md:sal:rest:connector</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-rest-connector</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2014-07-24</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:flow:transaction</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>flow-capable-transaction</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-11-03</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:flow:statistics</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-flow-statistics</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-08-19</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:protocol:framework</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>protocol-framework</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2014-03-13</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:model:match:types</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-match-types</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-10-26</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:ietf:params:xml:ns:yang:ietf-yang-types</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>ietf-yang-types</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2010-09-24</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:group:service</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>sal-group</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-09-18</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:inmemory-datastore-provider</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-inmemory-datastore-provider</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2014-06-17</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:netty:timer</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>netty-timer</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-11-19</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:group:statistics</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-group-statistics</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-11-11</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:config</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>config</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-04-05</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:config:netconf:client:dispatcher</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>odl-netconfig-client-cfg</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2014-04-08</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:l2:types</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-l2-types</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-08-27</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:action:types</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-action-types</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-11-12</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-md-sal-dom</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-10-28</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:md:sal:common</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-md-sal-common</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-10-28</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:group:types</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-group-types</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-10-18</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring-extension</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>ietf-netconf-monitoring-extension</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-12-10</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:inventory</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-inventory</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-08-19</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:netty</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>netty</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-11-19</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:model:topology:general</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-topology</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-10-30</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:port:statistics</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-port-statistics</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version></ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:queue:statistics</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-queue-statistics</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-12-16</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:config:kitchen-service:impl</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>kitchen-service-impl</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2014-01-31</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:flow:types</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-flow-types</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-10-26</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:params:xml:ns:yang:controller:shutdown:impl</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>shutdown-impl</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-12-18</ncm:version>
     </ncm:schema>
     <ncm:schema>
         <ncm:namespace>urn:opendaylight:model:topology:inventory</ncm:namespace>
         <ncm:location>NETCONF</ncm:location>
         <ncm:identifier>opendaylight-topology-inventory</ncm:identifier>
-        <ncm:format>yang</ncm:format>
+                <ncm:format xmlns:prefix="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">prefix:yang</ncm:format>
         <ncm:version>2013-10-30</ncm:version>
     </ncm:schema>
 </ncm:schemas>
\ No newline at end of file