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

apps/yang/web/src/main/java/org/onosproject/yang/web/YangWebResource.java

diff --git a/apps/yang/web/src/main/java/org/onosproject/yang/web/YangWebResource.java b/apps/yang/web/src/main/java/org/onosproject/yang/web/YangWebResource.java
index 471e891..41830fc 100644
--- a/apps/yang/web/src/main/java/org/onosproject/yang/web/YangWebResource.java
+++ b/apps/yang/web/src/main/java/org/onosproject/yang/web/YangWebResource.java
@@ -25,6 +25,7 @@
 import org.onosproject.yang.compiler.api.YangCompilerService;
 import org.onosproject.yang.compiler.datamodel.YangNode;
 import org.onosproject.yang.compiler.tool.DefaultYangCompilationParam;
+import org.onosproject.yang.compiler.tool.YangCompilerManager;
 import org.onosproject.yang.model.YangModel;
 import org.onosproject.yang.runtime.DefaultModelRegistrationParam;
 import org.onosproject.yang.runtime.ModelRegistrationParam;
@@ -48,9 +49,9 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import static org.onosproject.yang.compiler.datamodel.utils.DataModelUtils.deSerializeDataModel;
+import static org.onosproject.yang.compiler.tool.YangCompilerManager.deSerializeDataModel;
+import static org.onosproject.yang.compiler.tool.YangCompilerManager.processYangModel;
 import static org.onosproject.yang.compiler.utils.io.impl.YangIoUtils.deleteDirectory;
-import static org.onosproject.yang.runtime.helperutils.YangApacheUtils.processYangModel;
 
 /**
  * Yang files upload resource.
@@ -141,39 +142,40 @@
 
     private YangCompilationParam createCompilationParam(List<File> inputFiles)
             throws IOException {
-        YangCompilationParam param = new DefaultYangCompilationParam();
+        DefaultYangCompilationParam.Builder builder = DefaultYangCompilationParam.builder();
         for (File file : inputFiles) {
             if (file.getName().endsWith(JAR_FILE_EXTENSION)
                     || file.getName().endsWith(ZIP_FILE_EXTENSION)) {
                 List<File> files = decompressFile(file);
 
                 for (File f : files) {
-                    param = addToParam(param, f);
+                    addToParam(builder, f);
                 }
             } else {
-                param = addToParam(param, file);
+                addToParam(builder, file);
             }
         }
-        param.setCodeGenDir(Paths.get(CODE_GEN_DIR));
-        param.setMetadataGenDir(Paths.get(YANG_RESOURCES));
-        return param;
+        builder.setCodeGenDir(Paths.get(CODE_GEN_DIR));
+        builder.setMetadataGenDir(Paths.get(YANG_RESOURCES));
+        return builder.build();
     }
 
-    private YangCompilationParam addToParam(YangCompilationParam param,
+    private void addToParam(DefaultYangCompilationParam.Builder builder,
                                             File file) {
         if (file.getName().endsWith(YANG_FILE_EXTENSION)) {
-            param.addYangFile(Paths.get(file.getAbsolutePath()));
+            builder.addYangFile(Paths.get(file.getAbsolutePath()));
         } else if (file.getName().endsWith(SER_FILE_EXTENSION)) {
-            param.addDependentSchema(Paths.get(file.getAbsolutePath()));
+            builder.addDependentSchema(Paths.get(file.getAbsolutePath()));
         }
-        return param;
     }
 
     private ModelRegistrationParam getModelRegParam() throws IOException {
         String metaPath = YANG_RESOURCES + SERIALIZED_FILE_NAME;
         List<YangNode> curNodes = getYangNodes(metaPath);
+        // FIXME: extract or derive the model id from the web request
+        String modelId = "unknown";
         if (curNodes != null && !curNodes.isEmpty()) {
-            YangModel model = processYangModel(metaPath, curNodes);
+            YangModel model = processYangModel(metaPath, curNodes, modelId, false);
             return DefaultModelRegistrationParam.builder()
                     .setYangModel(model).build();
         }
@@ -184,7 +186,7 @@
         List<YangNode> nodes = new LinkedList<>();
         File file = new File(path);
         if (file.getName().endsWith(SER_FILE_EXTENSION)) {
-            nodes.addAll(deSerializeDataModel(file.toString()));
+            nodes.addAll(YangCompilerManager.getYangNodes(deSerializeDataModel(file.toString())));
         }
         return nodes;
     }