From 5ca341c3b43701b5d0ff67340b5a60bb6cfbd669 Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Fri, 14 Jun 2013 14:29:39 +0200 Subject: [PATCH] Bumped version of YANG tools to 0.5.2-SNAPSHOT Change-Id: I4151e59cfb51ff934ce3c3c18090a30fb4a4179e Signed-off-by: Tony Tkacik --- .../maven-yang-plugin-it/pom.xml | 2 +- .../test/resources/AdditionalConfig/pom.xml | 6 +- .../src/test/resources/Correct/pom.xml | 6 +- .../src/test/resources/GenerateTest1/pom.xml | 4 +- .../src/test/resources/GenerateTest2/pom.xml | 6 +- .../src/test/resources/Generator/pom.xml | 4 +- .../test/resources/MissingYangInDep/pom.xml | 4 +- .../src/test/resources/NoGenerators/pom.xml | 4 +- .../src/test/resources/NoOutputDir/pom.xml | 4 +- .../src/test/resources/NoYangFiles/pom.xml | 4 +- .../test/resources/UnknownGenerator/pom.xml | 4 +- .../test/resources/YangRootNotExist/pom.xml | 2 +- .../code-generator/maven-yang-plugin/pom.xml | 2 +- .../code-generator/maven-yang/pom.xml | 2 +- .../sal/yang-prototype/code-generator/pom.xml | 2 +- .../samples/modeling-sample/pom.xml | 116 ++++++++++++++++++ .../modeling-sample/src/main/yang/sample.yang | 62 ++++++++++ .../yang-model-parser-api/pom.xml | 2 +- .../yang-model-parser-impl/pom.xml | 2 +- opendaylight/sal/yang-prototype/yang/pom.xml | 2 +- .../yang-prototype/yang/yang-binding/pom.xml | 2 +- .../yang-prototype/yang/yang-common/pom.xml | 2 +- .../yang-prototype/yang/yang-data-api/pom.xml | 2 +- .../yang/yang-data-util/pom.xml | 2 +- .../yang/yang-model-api/pom.xml | 2 +- .../yang/yang-model-util/pom.xml | 2 +- 26 files changed, 215 insertions(+), 37 deletions(-) create mode 100644 opendaylight/sal/yang-prototype/code-generator/samples/modeling-sample/pom.xml create mode 100644 opendaylight/sal/yang-prototype/code-generator/samples/modeling-sample/src/main/yang/sample.yang diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/pom.xml index 8d846a13e6..2e406da497 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/pom.xml @@ -4,7 +4,7 @@ yang org.opendaylight.controller - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT ../../yang/pom.xml yang-maven-plugin-it diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/AdditionalConfig/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/AdditionalConfig/pom.xml index 8bd2289b11..3ac7ec6eee 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/AdditionalConfig/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/AdditionalConfig/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT @@ -19,7 +19,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT @@ -56,7 +56,7 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT test-jar diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct/pom.xml index ce9389f64b..a397cf7512 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT @@ -19,7 +19,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT @@ -43,7 +43,7 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT test-jar diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest1/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest1/pom.xml index e1591b5733..07b69878a9 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest1/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest1/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT @@ -35,7 +35,7 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT test-jar diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest2/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest2/pom.xml index ed1fbf7c56..e094aed92a 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest2/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest2/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.controller generator-test1 - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT system ${project.basedir}/../GenerateTest1/target/generator-test1-0.5.1-SNAPSHOT.jar @@ -22,7 +22,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT @@ -49,7 +49,7 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT test-jar diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Generator/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Generator/pom.xml index c64a857c1e..dd98fea4cd 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Generator/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Generator/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT @@ -40,7 +40,7 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT test-jar diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/MissingYangInDep/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/MissingYangInDep/pom.xml index 1b73c76bb7..aa0db753d7 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/MissingYangInDep/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/MissingYangInDep/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT @@ -49,7 +49,7 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT test-jar diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoGenerators/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoGenerators/pom.xml index 9a43e893b5..8333b02ffc 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoGenerators/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoGenerators/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT @@ -39,7 +39,7 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT test-jar diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoOutputDir/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoOutputDir/pom.xml index 54bace053c..eea103cf4e 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoOutputDir/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoOutputDir/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT @@ -36,7 +36,7 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT test-jar diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoYangFiles/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoYangFiles/pom.xml index b2eeb6f66a..54056d5ca4 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoYangFiles/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoYangFiles/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT @@ -39,7 +39,7 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT test-jar diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/UnknownGenerator/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/UnknownGenerator/pom.xml index 96a75b969c..65ea6aa68e 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/UnknownGenerator/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/UnknownGenerator/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT @@ -47,7 +47,7 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT test-jar diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/YangRootNotExist/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/YangRootNotExist/pom.xml index 09df6ab23d..08c0e7b3ca 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/YangRootNotExist/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/YangRootNotExist/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/pom.xml index 5afd588541..297b8b49de 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/pom.xml @@ -4,7 +4,7 @@ yang org.opendaylight.controller - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT ../../yang/pom.xml diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang/pom.xml index ae24c1848e..bb6de3f3c7 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang/pom.xml @@ -4,7 +4,7 @@ yang org.opendaylight.controller - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT ../../yang/pom.xml yang-maven-plugin-spi diff --git a/opendaylight/sal/yang-prototype/code-generator/pom.xml b/opendaylight/sal/yang-prototype/code-generator/pom.xml index 9edca3cd22..eb30ea3b3b 100644 --- a/opendaylight/sal/yang-prototype/code-generator/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/pom.xml @@ -17,7 +17,7 @@ UTF-8 - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT diff --git a/opendaylight/sal/yang-prototype/code-generator/samples/modeling-sample/pom.xml b/opendaylight/sal/yang-prototype/code-generator/samples/modeling-sample/pom.xml new file mode 100644 index 0000000000..260303ef9e --- /dev/null +++ b/opendaylight/sal/yang-prototype/code-generator/samples/modeling-sample/pom.xml @@ -0,0 +1,116 @@ + + 4.0.0 + + binding-generator + org.opendaylight.controller + 0.5.1-SNAPSHOT + + modeling-sample + + + + + org.opendaylight.controller + yang-maven-plugin + 0.5.1-SNAPSHOT + + + + generate-sources + + + src/main/yang + + + + org.opendaylight.controller.maven.sal.api.gen.plugin.CodeGeneratorImpl + + + target/generated-sources/sal + + + + false + + + + + + + org.opendaylight.controller + maven-sal-api-gen-plugin + 0.5.1-SNAPSHOT + jar + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + generate-sources + + add-source + + + + target/generated-sources/sal + + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.opendaylight.controller + + + yang-maven-plugin + + + [0.5,) + + + + generate-sources + + + + + + + + + + + + + + + + + org.opendaylight.controller + yang-binding + + + org.opendaylight.controller + yang-common + + + \ No newline at end of file diff --git a/opendaylight/sal/yang-prototype/code-generator/samples/modeling-sample/src/main/yang/sample.yang b/opendaylight/sal/yang-prototype/code-generator/samples/modeling-sample/src/main/yang/sample.yang new file mode 100644 index 0000000000..3ecdc0a3ce --- /dev/null +++ b/opendaylight/sal/yang-prototype/code-generator/samples/modeling-sample/src/main/yang/sample.yang @@ -0,0 +1,62 @@ +module sample { + yang-version 1; + namespace "sample"; + prefix "s"; + + revision 2013-06-13 { + description "Initial demo"; + } + + + + // Simple Type definition + + typedef foo-name { + type string; + } + + // Storage / data structure + + container topologies { + list topology { + leaf foo-name { + type string; + } + } + } + + + // Notification / Event + + notification packet-in { + leaf node { + type string; + } + leaf port { + type uint16; + } + leaf content { + type binary; + } + } + + // RPC + + rpc packet-out { + input { + leaf node { + type string; + } + leaf port { + type uint16; + } + leaf content { + type binary; + } + } + output { + + } + } + +} \ No newline at end of file diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-api/pom.xml b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-api/pom.xml index 547d83adc8..53ca931406 100644 --- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-api/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-api/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.controller yang - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT ../../yang/pom.xml yang-model-parser-api diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/pom.xml b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/pom.xml index 16a746905e..b83d63f9b0 100644 --- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.controller yang - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT ../../yang/pom.xml yang-model-parser-impl diff --git a/opendaylight/sal/yang-prototype/yang/pom.xml b/opendaylight/sal/yang-prototype/yang/pom.xml index e79e70028b..4e15f8d47c 100644 --- a/opendaylight/sal/yang-prototype/yang/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/pom.xml @@ -6,7 +6,7 @@ yang-prototype 0.5-SNAPSHOT - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT yang pom diff --git a/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml index f7df24f53f..6362eb9acc 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.controller yang - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT yang-binding \ No newline at end of file diff --git a/opendaylight/sal/yang-prototype/yang/yang-common/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-common/pom.xml index 987b9b11a1..7f55386925 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-common/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-common/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.controller yang - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT yang-common diff --git a/opendaylight/sal/yang-prototype/yang/yang-data-api/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-data-api/pom.xml index 749c9c66f4..02562172e8 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-data-api/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-data-api/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.controller yang - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT yang-data-api diff --git a/opendaylight/sal/yang-prototype/yang/yang-data-util/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-data-util/pom.xml index 15b391f5b8..bce9e91346 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-data-util/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-data-util/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.controller yang - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT yang-data-util diff --git a/opendaylight/sal/yang-prototype/yang/yang-model-api/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-model-api/pom.xml index 3eabd7ff9f..fc601e32b4 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-model-api/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-model-api/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.controller yang - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT yang-model-api diff --git a/opendaylight/sal/yang-prototype/yang/yang-model-util/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-model-util/pom.xml index 3390837be9..d95b23957b 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-model-util/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-model-util/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.controller yang - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT yang-model-util -- 2.36.6