commit 8953445c86ff6e18ee35cf3f8d605f5eea9622d1
author Thomas Vachuska <tom@opennetworking.org> Fri Jul 28 10:20:12 2017 -0700
committer Thomas Vachuska <tom@opennetworking.org> Fri Jul 28 19:49:29 2017 +0000
tree c762c7fdfae2367aa445631cccd4d2ef4202f11b
parent 288b273cf338c8bdda4874e5370f20e73347e5d6

Bumping ONOS to point to ONOS YANG Tools 2.2.0-b2

Change-Id: I23b2ed67ed0fb5ef4ec0731a37dcd8b058102298

drivers/microsemi/src/test/java/org/onosproject/yang/MockMicrosemiRegistrator.java

diff --git a/drivers/microsemi/src/test/java/org/onosproject/yang/MockMicrosemiRegistrator.java b/drivers/microsemi/src/test/java/org/onosproject/yang/MockMicrosemiRegistrator.java
index cdf53d0..268320f 100644
--- a/drivers/microsemi/src/test/java/org/onosproject/yang/MockMicrosemiRegistrator.java
+++ b/drivers/microsemi/src/test/java/org/onosproject/yang/MockMicrosemiRegistrator.java
@@ -17,11 +17,9 @@
 
 import org.onosproject.drivers.microsemi.yang.MicrosemiModelRegistrator;
 import org.onosproject.yang.compiler.datamodel.YangNode;
-import org.onosproject.yang.compiler.datamodel.utils.DataModelUtils;
 import org.onosproject.yang.runtime.DefaultModelRegistrationParam;
 import org.onosproject.yang.runtime.ModelRegistrationParam;
 import org.onosproject.yang.runtime.YangModelRegistry;
-import org.onosproject.yang.runtime.helperutils.YangApacheUtils;
 import org.onosproject.yang.runtime.impl.DefaultYangModelRegistry;
 
 import java.io.File;
@@ -29,6 +27,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.onosproject.yang.compiler.tool.YangCompilerManager.deSerializeDataModel;
+import static org.onosproject.yang.compiler.tool.YangCompilerManager.getYangNodes;
+import static org.onosproject.yang.compiler.tool.YangCompilerManager.processYangModel;
+
 public class MockMicrosemiRegistrator extends MicrosemiModelRegistrator {
     private static final String FS = File.separator;
     private static final String PATH = System.getProperty("user.dir") +
@@ -45,9 +47,9 @@
         modelRegistry = new DefaultYangModelRegistry();
         List<YangNode> nodes = new ArrayList<>();
         try {
-            nodes.addAll(DataModelUtils.deSerializeDataModel(META_PATH));
+            nodes.addAll(getYangNodes(deSerializeDataModel(META_PATH)));
 
-            model = YangApacheUtils.processYangModel(META_PATH, nodes);
+            model = processYangModel(META_PATH, nodes, "test", false);
             ModelRegistrationParam.Builder b =
                     DefaultModelRegistrationParam.builder().setYangModel(model);
             b.setYangModel(model);