Bug fix in how onos-yang-tools are used in unit tests
Change-Id: I00514139e246e8bd8502a77ad6f51811f9e7b1c1
diff --git a/drivers/microsemi/src/test/java/org/onosproject/yang/serializers/xml/MockYangSchemaNodeProvider.java b/drivers/microsemi/src/test/java/org/onosproject/yang/serializers/xml/MockYangSchemaNodeProvider.java
deleted file mode 100644
index dab269d..0000000
--- a/drivers/microsemi/src/test/java/org/onosproject/yang/serializers/xml/MockYangSchemaNodeProvider.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright 2017-present Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.yang.serializers.xml;
-
-
-import org.onosproject.yang.compiler.datamodel.YangNode;
-import org.onosproject.yang.compiler.datamodel.YangSchemaNode;
-import org.onosproject.yang.model.YangModel;
-import org.onosproject.yang.runtime.AppModuleInfo;
-import org.onosproject.yang.runtime.DefaultAppModuleInfo;
-import org.onosproject.yang.runtime.DefaultModelRegistrationParam;
-import org.onosproject.yang.runtime.ModelRegistrationParam;
-import org.onosproject.yang.runtime.YangModelRegistry;
-import org.onosproject.yang.runtime.impl.DefaultYangModelRegistry;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.onosproject.yang.compiler.datamodel.utils.DataModelUtils;
-import org.onosproject.yang.compiler.utils.UtilConstants;
-import org.onosproject.yang.compiler.utils.io.impl.YangIoUtils;
-import org.onosproject.yang.runtime.helperutils.YangApacheUtils;
-import org.onosproject.yang.runtime.RuntimeHelper;
-
-public class MockYangSchemaNodeProvider {
-
- private static final String FS = File.separator;
- private static final String PATH = System.getProperty("user.dir") +
- FS + "buck-out" + FS + "gen" +
- FS + "models" + FS + "microsemi" + FS + "onos-models-microsemi-schema" + FS;
- private static final String SER_FILE_PATH = "yang" + FS + "resources" +
- FS + "YangMetaData.ser";
- private static final String META_PATH =
- PATH.replace("drivers/microsemi", "")
- + SER_FILE_PATH;
- private static final String TEMP_FOLDER_PATH = PATH + UtilConstants.TEMP;
- private YangModelRegistry reg = new DefaultYangModelRegistry();
- private List<YangNode> nodes = new ArrayList<>();
-
- /**
- * Creates an instance of mock bundle context.
- */
- public MockYangSchemaNodeProvider() {
- }
-
- /**
- * Process YANG schema node for a application.
- */
- public void processSchemaRegistry() {
- try {
- //Need to deserialize generated meta data file for unit tests.
- Set<YangNode> appNode = DataModelUtils.deSerializeDataModel(META_PATH);
- RuntimeHelper.addLinkerAndJavaInfo(appNode);
- nodes.addAll(appNode);
- reg.registerModel(prepareParam(nodes));
- YangIoUtils.deleteDirectory(TEMP_FOLDER_PATH);
- } catch (IOException e) {
- throw new IllegalArgumentException("YangMetaData.ser could not " +
- "be loaded from " + META_PATH, e);
- }
- }
-
- /**
- * Unregister given nodes from runtime service.
- *
- * @param nodes list of nodes
- */
- public void unRegister(List<YangNode> nodes) {
- reg.unregisterModel(prepareParam(nodes));
- }
-
- /**
- * Prepares model registration parameter.
- *
- * @param nodes list of nodes
- * @return model registration parameter
- */
- private ModelRegistrationParam prepareParam(List<YangNode> nodes) {
- //Process loading class file.
- String appName;
- ClassLoader classLoader = getClass().getClassLoader();
-
- //Create model registration param.
- ModelRegistrationParam.Builder b =
- DefaultModelRegistrationParam.builder();
-
- //create a new YANG model
- YangModel model = YangApacheUtils.processYangModel(META_PATH, nodes);
- //set YANG model
- b.setYangModel(model);
-
- Iterator<YangNode> it = nodes.iterator();
- while (it.hasNext()) {
- YangSchemaNode node = it.next();
-
- //If service class is not generated then use
- // interface file to load this class.
- appName = RuntimeHelper.getInterfaceClassName(node);
- Class<?> cls;
- try {
- cls = classLoader.loadClass(appName);
- } catch (ClassNotFoundException e) {
- continue;
- }
-
- //generate app info.
- AppModuleInfo info = new DefaultAppModuleInfo(cls, null);
- b.addAppModuleInfo(YangApacheUtils.processModuleId((YangNode) node), info);
- }
- return b.build();
- }
-
- /**
- * Returns schema registry.
- *
- * @return schema registry
- */
- public DefaultYangModelRegistry registry() {
- return (DefaultYangModelRegistry) reg;
- }
-}
diff --git a/drivers/microsemi/src/test/java/org/onosproject/yang/serializers/xml/MockYangSerializerContext.java b/drivers/microsemi/src/test/java/org/onosproject/yang/serializers/xml/MockYangSerializerContext.java
index cfe7b9b..b6edbb4 100644
--- a/drivers/microsemi/src/test/java/org/onosproject/yang/serializers/xml/MockYangSerializerContext.java
+++ b/drivers/microsemi/src/test/java/org/onosproject/yang/serializers/xml/MockYangSerializerContext.java
@@ -15,6 +15,7 @@
*/
package org.onosproject.yang.serializers.xml;
+import org.onosproject.yang.MockMicrosemiRegistrator;
import org.onosproject.yang.model.SchemaContext;
import org.onosproject.yang.runtime.Annotation;
import org.onosproject.yang.runtime.DefaultAnnotation;
@@ -26,17 +27,19 @@
public class MockYangSerializerContext implements YangSerializerContext {
- private static MockYangSchemaNodeProvider schemaProvider =
- new MockYangSchemaNodeProvider();
+ private static MockMicrosemiRegistrator schemaProvider =
+ new MockMicrosemiRegistrator();
private static final String NETCONF_NS =
"urn:ietf:params:xml:ns:netconf:base:1.0";
private static final String XMNLS_NC = "xmlns:xc";
+ public MockYangSerializerContext() {
+ schemaProvider.activate();
+ }
@Override
public SchemaContext getContext() {
- schemaProvider.processSchemaRegistry();
- DefaultYangModelRegistry registry = schemaProvider.registry();
+ DefaultYangModelRegistry registry = (DefaultYangModelRegistry) schemaProvider.registry();
return registry;
}