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

Bump yang tools version to 2.4

Browse Source 
Change-Id: I7fada36e6ecd93d761c41ba70f057ce3a62b842b
This commit is contained in:
Ray Milkey 2018-02-09 11:21:32 -08:00
parent 8ee2be9f85
commit 5193cb736c
7 changed files with 50 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/yang/src/main/java/org/onosproject/yang/impl/YangRuntimeManager.java
View File

@ -26,6 +26,7 @@ import org.onosproject.core.CoreService;
import org.onosproject.yang.YangClassLoaderRegistry;
import org.onosproject.yang.model.ModelConverter;
import org.onosproject.yang.model.ModelObjectData;
import org.onosproject.yang.model.ModelObjectId;
import org.onosproject.yang.model.NodeKey;
import org.onosproject.yang.model.ResourceData;
import org.onosproject.yang.model.ResourceId;
@ -163,7 +164,8 @@ public class YangRuntimeManager implements YangModelRegistry,
}
@Override
public void registerAnydataSchema(Class id, Class id1) {
public void registerAnydataSchema(ModelObjectId arg0, ModelObjectId arg1)
throws IllegalArgumentException {
throw new UnsupportedOperationException("registerAnydataSchema() needs to be implemented");
}

21
drivers/microsemi/src/test/java/org/onosproject/yang/MockYangRuntimeManager.java
View File

@ -23,6 +23,7 @@ import org.onosproject.core.CoreService;
import org.onosproject.drivers.netconf.MockCoreService;
import org.onosproject.yang.model.ModelConverter;
import org.onosproject.yang.model.ModelObjectData;
import org.onosproject.yang.model.ModelObjectId;
import org.onosproject.yang.model.NodeKey;
import org.onosproject.yang.model.ResourceData;
import org.onosproject.yang.model.ResourceId;
@ -109,17 +110,17 @@ public class MockYangRuntimeManager implements YangModelRegistry,
return modelRegistry.getModels();
}
@Override
public YangModel getModel(String s) {
return modelRegistry.getModel(s);
}
@Override
public YangModel getModel(String s) {
return modelRegistry.getModel(s);
}
@Override
public YangModule getModule(YangModuleId yangModuleId) {
return modelRegistry.getModule(yangModuleId);
}
@Override
public YangModule getModule(YangModuleId yangModuleId) {
return modelRegistry.getModule(yangModuleId);
}
@Override
@Override
public void registerSerializer(YangSerializer ys) {
serializerRegistry.registerSerializer(ys);
}
@ -130,7 +131,7 @@ public class MockYangRuntimeManager implements YangModelRegistry,
}
@Override
public void registerAnydataSchema(Class id, Class id1) {
public void registerAnydataSchema(ModelObjectId arg0, ModelObjectId arg1) {
throw new UnsupportedOperationException("registerAnydataSchema() needs to be implemented");
}

50
lib/BUCK
View File

@ -1,4 +1,4 @@
# ***** This file was auto-generated at Fri, 9 Feb 2018 12:32:20 GMT. Do not edit this file manually. *****
# ***** This file was auto-generated at Fri, 9 Feb 2018 19:42:50 GMT. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
pass_thru_pom(
@ -1340,55 +1340,55 @@ remote_jar (
remote_jar (
name = 'onos-yang-model',
out = 'onos-yang-model-2.3.1.jar',
url = 'mvn:org.onosproject:onos-yang-model:jar:2.3.1',
sha1 = 'ffe8a79368ae816220a47bb9cad39e2d48ae415d',
maven_coords = 'org.onosproject:onos-yang-model:2.3.1',
out = 'onos-yang-model-2.4.jar',
url = 'mvn:org.onosproject:onos-yang-model:jar:2.4',
sha1 = '1afb955024cbb8db15d30e7b4e0b1bb9ad20b712',
maven_coords = 'org.onosproject:onos-yang-model:2.4',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'onos-yang-compiler-api',
out = 'onos-yang-compiler-api-2.3.1.jar',
url = 'mvn:org.onosproject:onos-yang-compiler-api:jar:2.3.1',
sha1 = '11edae3442f9fc8b4cb69aec2004203189fb3034',
maven_coords = 'org.onosproject:onos-yang-compiler-api:2.3.1',
out = 'onos-yang-compiler-api-2.4.jar',
url = 'mvn:org.onosproject:onos-yang-compiler-api:jar:2.4',
sha1 = '1457d2f9c509155fd249d042b9c1200bd74c2669',
maven_coords = 'org.onosproject:onos-yang-compiler-api:2.4',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'onos-yang-runtime',
out = 'onos-yang-runtime-2.3.1.jar',
url = 'mvn:org.onosproject:onos-yang-runtime:jar:2.3.1',
sha1 = 'b5da218f5841a39787aff51a58d154a76f07d249',
maven_coords = 'org.onosproject:onos-yang-runtime:2.3.1',
out = 'onos-yang-runtime-2.4.jar',
url = 'mvn:org.onosproject:onos-yang-runtime:jar:2.4',
sha1 = 'c422d7f87c5baa79edf0a322bdfe40aff1530ef4',
maven_coords = 'org.onosproject:onos-yang-runtime:2.4',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'onos-yang-serializers-json',
out = 'onos-yang-serializers-json-2.3.1.jar',
url = 'mvn:org.onosproject:onos-yang-serializers-json:jar:2.3.1',
sha1 = '8f101d36ebcb14176121ddfddd15599c07967138',
maven_coords = 'org.onosproject:onos-yang-serializers-json:2.3.1',
out = 'onos-yang-serializers-json-2.4.jar',
url = 'mvn:org.onosproject:onos-yang-serializers-json:jar:2.4',
sha1 = '9b22a27c27912e7df8721268f23639312c21d361',
maven_coords = 'org.onosproject:onos-yang-serializers-json:2.4',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'onos-yang-serializers-xml',
out = 'onos-yang-serializers-xml-2.3.1.jar',
url = 'mvn:org.onosproject:onos-yang-serializers-xml:jar:2.3.1',
sha1 = '58090e77105c6f0cbf594b7130263056d4f9a473',
maven_coords = 'org.onosproject:onos-yang-serializers-xml:2.3.1',
out = 'onos-yang-serializers-xml-2.4.jar',
url = 'mvn:org.onosproject:onos-yang-serializers-xml:jar:2.4',
sha1 = '02e3155af7326fabe268048ab970267f2047f487',
maven_coords = 'org.onosproject:onos-yang-serializers-xml:2.4',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'onos-yang-serializers-utils',
out = 'onos-yang-serializers-utils-2.3.1.jar',
url = 'mvn:org.onosproject:onos-yang-serializers-utils:jar:2.3.1',
sha1 = '58d6d3a6b10e236b1b65230a02cd7c2389478645',
maven_coords = 'org.onosproject:onos-yang-serializers-utils:2.3.1',
out = 'onos-yang-serializers-utils-2.4.jar',
url = 'mvn:org.onosproject:onos-yang-serializers-utils:jar:2.4',
sha1 = 'a4e7f6f87ebf17b9f5f800765dcc562a40c2c08c',
maven_coords = 'org.onosproject:onos-yang-serializers-utils:2.4',
visibility = [ 'PUBLIC' ],
)

12
lib/deps.json
View File

@ -248,12 +248,12 @@
"guava20": "mvn:com.google.guava:guava:20.0",
// Note: update BVER in tools/dev/bin/patch-yang-libs
"onos-yang-model":"mvn:org.onosproject:onos-yang-model:2.3.1",
"onos-yang-compiler-api":"mvn:org.onosproject:onos-yang-compiler-api:2.3.1",
"onos-yang-runtime":"mvn:org.onosproject:onos-yang-runtime:2.3.1",
"onos-yang-serializers-json":"mvn:org.onosproject:onos-yang-serializers-json:2.3.1",
"onos-yang-serializers-xml":"mvn:org.onosproject:onos-yang-serializers-xml:2.3.1",
"onos-yang-serializers-utils":"mvn:org.onosproject:onos-yang-serializers-utils:2.3.1",
"onos-yang-model":"mvn:org.onosproject:onos-yang-model:2.4",
"onos-yang-compiler-api":"mvn:org.onosproject:onos-yang-compiler-api:2.4",
"onos-yang-runtime":"mvn:org.onosproject:onos-yang-runtime:2.4",
"onos-yang-serializers-json":"mvn:org.onosproject:onos-yang-serializers-json:2.4",
"onos-yang-serializers-xml":"mvn:org.onosproject:onos-yang-serializers-xml:2.4",
"onos-yang-serializers-utils":"mvn:org.onosproject:onos-yang-serializers-utils:2.4",
"org.apache.servicemix.bundles.dom4j":"mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j:1.6.1_5",
"plexus-utils": "mvn:org.codehaus.plexus:plexus-utils:3.0.24",
"sshd-core": "mvn:org.apache.sshd:sshd-core:1.4.0",

2
lib/pom.xml
View File

@ -40,7 +40,7 @@
<netty4.version>4.1.8.Final</netty4.version>
<openflowj.version>3.2.0.onos</openflowj.version>
<onos-maven-plugin.version>1.11</onos-maven-plugin.version>
<onos-yang-tools.version>2.3.1</onos-yang-tools.version>
<onos-yang-tools.version>2.4</onos-yang-tools.version>
<osgi.version>5.0.0</osgi.version>
<karaf.version>3.0.8</karaf.version>
<jersey.version>2.25.1</jersey.version>

4
tools/build/onos-buck
View File

@ -5,8 +5,8 @@
set -e
BUCK_URL="http://repo1.maven.org/maven2/org/onosproject/onos-buck/v2018.01.17.01/buck-v2018.01.17.01.zip"
BUCK_SHA="4a70a84ef40a06762a7248db25590696e80af9fe"
BUCK_URL="http://repo1.maven.org/maven2/org/onosproject/onos-buck/v2018.02.09.01/buck-v2018.02.09.01.zip"
BUCK_SHA="45d8bd28f441991257babf89f7a317edb3a2b536"
[ "-U" = "$1" ] && shift && FORCE_UPDATE=True

4
tools/dev/bin/patch-yang-libs
View File

@ -3,8 +3,8 @@
# Patches lib/BUCK file to use locally built YANG tools.
# -----------------------------------------------------------------------------
BVER=2.3.1
SVER=2.4-SNAPSHOT
BVER=2.4
SVER=2.5-SNAPSHOT
YANG_TOOLS_ROOT=${YANG_TOOLS_ROOT:-~/onos-yang-tools}