mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-05 12:16:13 +02:00
Code Issues Projects Releases Wiki Activity

Fix for Microsemi Unit tests

Browse Source 
Change-Id: I1e94c85d19de53f82eb7fc657fff42535dafd9f5
This commit is contained in:
Sean Condon 2017-11-28 17:29:30 +00:00 committed by Ray Milkey
parent b68fe7e441
commit cf2751f673
5 changed files with 53 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/yang/src/main/java/org/onosproject/yang/AbstractYangModelRegistrator.java
View File

@ -44,7 +44,7 @@ public abstract class AbstractYangModelRegistrator {
protected final Logger log = LoggerFactory.getLogger(getClass());
private final Class<?> loaderClass;
private Map<YangModuleId, AppModuleInfo> appInfo;
protected Map<YangModuleId, AppModuleInfo> appInfo;
protected YangModel model;
private ModelRegistrationParam registrationParam;

7
drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/yang/impl/IetfSystemManager.java
View File

@ -156,10 +156,9 @@ public class IetfSystemManager extends AbstractYangServiceImpl
rpc.append("xmlns:sysms=\"http://www.microsemi.com/microsemi-edge-assure/msea-system\">");
rpc.append("<platform>");
rpc.append("<os-release/>");
//FIXME: This has been commented out until the augment of common models issue with onos-yang-tools is sorted
// rpc.append("<sysms:device-identification>");
// rpc.append("<sysms:serial-number/>");
// rpc.append("</sysms:device-identification>");
rpc.append("<sysms:device-identification>");
rpc.append("<sysms:serial-number/>");
rpc.append("</sysms:device-identification>");
rpc.append("</platform>");
rpc.append("<clock>");
rpc.append("<current-datetime/>");

13
drivers/microsemi/src/test/java/org/onosproject/yang/MockMicrosemiRegistrator.java
View File

@ -15,9 +15,12 @@
*/
package org.onosproject.yang;
import com.google.common.collect.ImmutableMap;
import org.onosproject.models.microsemi.MicrosemiModelRegistrator;
import org.onosproject.yang.compiler.datamodel.YangNode;
import org.onosproject.yang.compiler.tool.YangNodeInfo;
import org.onosproject.yang.model.YangModuleId;
import org.onosproject.yang.runtime.AppModuleInfo;
import org.onosproject.yang.runtime.DefaultModelRegistrationParam;
import org.onosproject.yang.runtime.ModelRegistrationParam;
import org.onosproject.yang.runtime.YangModelRegistry;
@ -26,7 +29,9 @@ import org.onosproject.yang.runtime.impl.DefaultYangModelRegistry;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.junit.Assert.fail;
import static org.onosproject.yang.compiler.tool.YangCompilerManager.deSerializeDataModel;
@ -66,6 +71,14 @@ public class MockMicrosemiRegistrator extends MicrosemiModelRegistrator {
}
}
public void addAppInfo(Map<YangModuleId, AppModuleInfo> map) {
Map<YangModuleId, AppModuleInfo> appInfoCopy = new HashMap<>();
appInfoCopy.putAll(appInfo);
appInfoCopy.putAll(map);
appInfo = ImmutableMap.copyOf(appInfoCopy);
}
public YangModelRegistry registry() {
return modelRegistry;
}

29
drivers/microsemi/src/test/java/org/onosproject/yang/MockYangRegistrator.java Normal file
View File

@ -0,0 +1,29 @@
/*
* Copyright 2017-present Open Networking Foundation
*
* 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;
import org.onosproject.models.common.YangModelRegistrator;
import org.onosproject.yang.model.YangModuleId;
import org.onosproject.yang.runtime.AppModuleInfo;
import java.util.Map;
public class MockYangRegistrator extends YangModelRegistrator {
public Map<YangModuleId, AppModuleInfo> getAppInfo() {
return appInfo;
}
}

10
drivers/microsemi/src/test/java/org/onosproject/yang/serializers/xml/MockYangSerializerContext.java
View File

@ -16,6 +16,7 @@
package org.onosproject.yang.serializers.xml;
import org.onosproject.yang.MockMicrosemiRegistrator;
import org.onosproject.yang.MockYangRegistrator;
import org.onosproject.yang.model.SchemaContext;
import org.onosproject.yang.runtime.Annotation;
import org.onosproject.yang.runtime.DefaultAnnotation;
@ -27,19 +28,22 @@ import java.util.List;
public class MockYangSerializerContext implements YangSerializerContext {
private static MockMicrosemiRegistrator schemaProvider =
private static MockMicrosemiRegistrator schemaProviderMicrosemi =
new MockMicrosemiRegistrator();
private static MockYangRegistrator schemaProviderYang =
new MockYangRegistrator();
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();
schemaProviderMicrosemi.addAppInfo(schemaProviderYang.getAppInfo());
schemaProviderMicrosemi.activate();
}
@Override
public SchemaContext getContext() {
DefaultYangModelRegistry registry = (DefaultYangModelRegistry) schemaProvider.registry();
DefaultYangModelRegistry registry = (DefaultYangModelRegistry) schemaProviderMicrosemi.registry();
return registry;
}