git.opendaylight Code Review - yangtools.git/commit

author	Jan Hajnar <jhajnar@cisco.com>
	Thu, 7 May 2015 15:09:37 +0000 (17:09 +0200)
committer	Tony Tkacik <ttkacik@cisco.com>
	Mon, 8 Jun 2015 07:09:15 +0000 (07:09 +0000)
commit	3aeb76da594293aa97caa1d7a55f12770ef78033
tree	8ed33a448e4dd97f91a188220df78f45483dce7e	tree \| snapshot
parent	b5e401ff016deea8ba92ac151ac6991a94fb1ac7	commit \| diff

Bug 3224 - Parsing data with choice in case via augmentation results in
incorrect parsing

* added tests for multiple choices from augmentation parsing
for json, xml and bindinging aware context
* modified json parsing tests
* fixed choice augmentation resolution in ChoiceNodeCodecContext
and CompositeNodeDataWithSchema
* moved findCorrespondingAugment to SchemaUtils since it is useful for
multiple Classes
* replaced getNodeIdentifierForAugmentation code in SchemaUtils with
the one from CompositeNodeDataWithSchema.

Change-Id: Ibf57a771b92de14ecb70dcbbe250d7c559066882
Signed-off-by: Jan Hajnar <jhajnar@cisco.com>
(cherry picked from commit a8f512b80e661dac1ff85db6c16c72bfbf7f5891)

12 files changed:

code-generator/binding-data-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/ChoiceNodeCodecContext.java		diff \| blob \| history
code-generator/binding-data-codec/src/test/java/org/opendaylight/yangtools/binding/data/codec/test/NormalizedNodeSerializeDeserializeTest.java		diff \| blob \| history
code-generator/binding-test-model/src/main/yang/opendaylight-yangtools-augment-test.yang		diff \| blob \| history
yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/CompositeNodeDataWithSchema.java		diff \| blob \| history
yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonStreamToNormalizedNodeTest.java		diff \| blob \| history
yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestingNormalizedNodeStructuresCreator.java		diff \| blob \| history
yang/yang-data-codec-gson/src/test/resources/complexjson/multiple-choice-augmentation-in-container.json	[new file with mode: 0644]	blob
yang/yang-data-codec-gson/src/test/resources/complexjson/yang/complexjson.yang		diff \| blob \| history
yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaUtils.java		diff \| blob \| history
yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java		diff \| blob \| history
yang/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/schema/augment_choice_hell.yang		diff \| blob \| history
yang/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/schema/augment_choice_hell_ok3.xml	[new file with mode: 0644]	blob

OpenDaylight YANG Tools

RSS Atom