commit d24dc981388c18ff719ca727b2e674f00fd60de8
author Aaron Kruglikov <aaron@onlab.us> Thu Mar 23 18:48:58 2017 -0700
committer Thomas Vachuska <tom@onlab.us> Fri Mar 24 17:27:55 2017 +0000
tree e6180ce546e49c627af8886d4cc55e76c12d288e
parent 0439fd701ab5ed748b7b525847cdc88c128f2b48

Fixing issue with acquiring yang schema context.
@ONOS-6182

Change-Id: I55117a1048323bc7cab0ee815eeab32ed8917063

apps/netconf/client/src/main/java/org/onosproject/netconf/client/impl/NetconfTranslatorImpl.java

diff --git a/apps/netconf/client/src/main/java/org/onosproject/netconf/client/impl/NetconfTranslatorImpl.java b/apps/netconf/client/src/main/java/org/onosproject/netconf/client/impl/NetconfTranslatorImpl.java
index 500d1eb..6e38729 100644
--- a/apps/netconf/client/src/main/java/org/onosproject/netconf/client/impl/NetconfTranslatorImpl.java
+++ b/apps/netconf/client/src/main/java/org/onosproject/netconf/client/impl/NetconfTranslatorImpl.java
@@ -28,18 +28,18 @@
 import org.onosproject.yang.model.KeyLeaf;
 import org.onosproject.yang.model.ListKey;
 import org.onosproject.yang.model.LeafListKey;
+import org.onosproject.yang.model.SchemaContext;
+import org.onosproject.yang.model.SchemaContextProvider;
 import org.onosproject.yang.model.SchemaId;
 import org.onosproject.yang.model.DataNode;
 import org.onosproject.yang.model.NodeKey;
 import org.onosproject.yang.model.ResourceId;
 import org.onosproject.yang.model.InnerNode;
 import org.onosproject.yang.model.LeafNode;
-import org.onosproject.yang.model.SchemaContext;
 
 import org.onosproject.yang.runtime.DefaultCompositeData;
 import org.onosproject.yang.runtime.DefaultRuntimeContext;
 import org.onosproject.yang.runtime.YangRuntimeService;
-import org.onosproject.yang.runtime.YangModelRegistry;
 import org.onosproject.yang.runtime.DefaultCompositeStream;
 import org.onosproject.yang.runtime.CompositeStream;
 import org.onosproject.yang.runtime.DefaultAnnotatedNodeInfo;
@@ -128,7 +128,7 @@
     protected YangRuntimeService yangRuntimeService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected YangModelRegistry yangModelRegistry;
+    protected SchemaContextProvider schemaContextProvider;
 
     @Activate
     public void activate(ComponentContext context) {
@@ -164,10 +164,11 @@
     public boolean editDeviceConfig(DeviceId deviceId, ResourceData resourceData,
                                     NetconfTranslator.OperationType operationType) throws IOException {
         NetconfSession session = getNetconfSession(deviceId);
+        SchemaContext context = schemaContextProvider
+                .getSchemaContext(ResourceId.builder().addBranchPointSchema("/", null).build());
         ResourceData modifiedPathResourceData = getResourceData(resourceData.resourceId(),
                                                   resourceData.dataNodes(),
-                                                       new DefaultYangSerializerContext(
-                                                               (SchemaContext) yangModelRegistry, null));
+                                                       new DefaultYangSerializerContext(context, null));
         DefaultCompositeData.Builder compositeDataBuilder = DefaultCompositeData
                 .builder()
                 .resourceData(modifiedPathResourceData);
@@ -310,7 +311,7 @@
                 dbr = ((InnerNode.Builder) dbr).addNode(node);
             }
         }
-/*FIXME this can be uncommented for use with versions of onos-yang-tools newer than 1.12.0-b6 */
+/*FIXME this can be uncommented for use with versions of onos-yang-tools newer than 1.12.0-b6*/
 //        while (dbr.parent() != null) {
 //            dbr = SerializerHelper.exitDataNode(dbr);
 //        }