Tony Tkacik [Tue, 26 Aug 2014 14:19:50 +0000 (14:19 +0000)]
Merge "BUG-869: description field in BitsType made static"
Tony Tkacik [Tue, 26 Aug 2014 14:07:21 +0000 (14:07 +0000)]
Merge "BUG-865: removed UnknownType class"
Tony Tkacik [Tue, 26 Aug 2014 14:06:56 +0000 (14:06 +0000)]
Merge "BUG-869: avoid unused constructor parameter namespace in YangModelDependencyInfo.ModuleDependencyInfo"
Tony Tkacik [Tue, 26 Aug 2014 14:06:46 +0000 (14:06 +0000)]
Merge "BUG-869: simplified if expressions as suggested by Sonar."
Tony Tkacik [Tue, 26 Aug 2014 14:06:22 +0000 (14:06 +0000)]
Merge "BUG-869: fixed code style violations in TypeProviderImpl reported by Sonar"
Martin Vitez [Tue, 26 Aug 2014 13:22:25 +0000 (13:22 +0000)]
Merge "Fix for features - added missing dependency"
Ed Warnicke [Tue, 26 Aug 2014 12:02:12 +0000 (07:02 -0500)]
Fix for features - added missing dependency
There was a missing dependency in the features/pom.xml
In some circumstances, it was causing downstream breakage.
This patch fixes that.
Change-Id: I8d2c98b4812084dd131055bcecbb57a4871c09ba
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Martin Vitez [Tue, 26 Aug 2014 09:23:47 +0000 (11:23 +0200)]
BUG-869: description field in BitsType made static
Change-Id: Idbd7886fd641ff2a2fdc8fa7f6921e3f0e0c7db2
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Martin Vitez [Tue, 26 Aug 2014 10:33:42 +0000 (12:33 +0200)]
BUG-869: fixed code style violations in TypeProviderImpl reported by Sonar
Change-Id: Ica2e34c2157c48f44227f66042fff444fd56105a
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Martin Vitez [Tue, 26 Aug 2014 10:17:19 +0000 (12:17 +0200)]
BUG-866: improved test resource loading
Change-Id: I479299cacf0b2070fac6325a0d0165362ee0d0fa
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Martin Vitez [Tue, 26 Aug 2014 09:18:45 +0000 (11:18 +0200)]
BUG-865: removed UnknownType class
UnknownType class is no longer used in yangtools.
Change-Id: I726db6d1b26a7c552967a9ffc5dd5dd1cfe0e93b
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Martin Vitez [Tue, 26 Aug 2014 08:16:14 +0000 (10:16 +0200)]
BUG-869: avoid unused constructor parameter namespace in YangModelDependencyInfo.ModuleDependencyInfo
Change-Id: Id50accca7f7c6ba1259007d6b6a6c5816bcc7f9e
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Martin Vitez [Tue, 26 Aug 2014 07:53:58 +0000 (09:53 +0200)]
BUG-869: simplified if expressions as suggested by Sonar.
Change-Id: I8f79d9c8d7bf381fe089f7bba1e1fa77462f83c6
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Tony Tkacik [Tue, 26 Aug 2014 07:38:00 +0000 (07:38 +0000)]
Merge ".equals() should check for null"
Robert Varga [Mon, 25 Aug 2014 20:07:06 +0000 (22:07 +0200)]
Improve InstanceIdentifierCodecImpl performance
Instead of key iterator and lookup, use entrySet(), just as suggested by
Sonar.
Change-Id: Idada8d9a01a92b4398589df593f96b39748394a9
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Mon, 25 Aug 2014 20:04:11 +0000 (22:04 +0200)]
.equals() should check for null
This fixes a sonar warning.
Change-Id: Ia33f58ffa0668d1eae811b9dc9d2848a7c7ec96e
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Mon, 25 Aug 2014 19:17:01 +0000 (19:17 +0000)]
Merge "BUG-1589 Exclude xml* prefixes from RandomPrefix"
Tony Tkacik [Mon, 25 Aug 2014 14:23:05 +0000 (16:23 +0200)]
Allow empty augmentations in Yang modules.
Change-Id: I39d2ca5457461357c9834568e81e2b06608717d0
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Tony Tkacik [Mon, 25 Aug 2014 13:08:10 +0000 (15:08 +0200)]
Fixed breakage of uses generation in Binding
Change-Id: I0913de13f426906ca8fd2f5e131b022444194648
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Tony Tkacik [Mon, 25 Aug 2014 10:35:48 +0000 (10:35 +0000)]
Merge "BUG-576: fixed text file loading in test."
Tony Tkacik [Mon, 25 Aug 2014 10:33:47 +0000 (10:33 +0000)]
Merge "BUG-1514: fixed bug in module sort."
Tony Tkacik [Mon, 25 Aug 2014 10:32:33 +0000 (10:32 +0000)]
Merge "BUG-1537: improved YangModuleInfo."
Tony Tkacik [Mon, 25 Aug 2014 10:25:30 +0000 (10:25 +0000)]
Merge changes If1e9a750,Ib530560c,Id01393c3,I2d375382,Id60447ef,I350611fb,I0dbd80db
* changes:
BUG-1611: make sure runtime components create short comments
BUG-1611: force maven plugin generating verbose comments
BUG-1611: make verbose comments optional
BUG-1611: use CharMatcher to remove characters
BUG-1611: drop a FIXME for thread-safety
BUG-1611: do not instantiate splitters needlessly
BUG-1611: fix SimpleDateFormat
Tony Tkacik [Mon, 25 Aug 2014 10:19:38 +0000 (10:19 +0000)]
Merge "BUG-576: fixed grammar to handle union type with only one type definition."
Tony Tkacik [Mon, 25 Aug 2014 10:19:22 +0000 (10:19 +0000)]
Merge "BUG-576: fixed javadoc warnings."
Tony Tkacik [Mon, 25 Aug 2014 10:18:57 +0000 (10:18 +0000)]
Merge "BUG-576: if replaced with else-if in enterImport_stmt method."
Tony Tkacik [Mon, 25 Aug 2014 10:17:37 +0000 (10:17 +0000)]
Merge "BUG-997: Fix URLSchemaContextResolver"
Maros Marsalek [Mon, 25 Aug 2014 09:50:32 +0000 (11:50 +0200)]
BUG-1589 Exclude xml* prefixes from RandomPrefix
Change-Id: Ief1807e0124a1d54ff737dd1c24fcea21f0574ed
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Martin Vitez [Mon, 25 Aug 2014 09:20:25 +0000 (11:20 +0200)]
BUG-576: fixed grammar to handle union type with only one type definition.
Change-Id: I5a26c7a0e15de5333fa8ce3d7a17e0fb3aa8ca50
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Tony Tkacik [Mon, 25 Aug 2014 08:17:10 +0000 (10:17 +0200)]
Bug 1572: Fixed duplicate and inconsistent allocation of Version
After switching from numeric version objects to non-numeric Version
modifications based on modifications was broken due to duplicate
allocation of versions - one when derived modification
was allocated and other one when modification was commited,
this make all writes effectivelly conflicting, since
same node was seen with two different versions.
Change-Id: I366f77a96b74db3aa13a2f374d9437e7cfeb2da5
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Martin Vitez [Mon, 25 Aug 2014 09:12:02 +0000 (11:12 +0200)]
BUG-576: fixed text file loading in test.
Change-Id: Iff660142345ba292d9492b06a1199db1e11dd265
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Tony Tkacik [Mon, 25 Aug 2014 07:19:47 +0000 (09:19 +0200)]
Bug 1604: Fixed incorrect check in Normalized Node Writer startOrderedMapNode
Check which was used in startOrderedMapNode was meant to be part
of startMapEntry. Check for startOrderedMapNode should be
same as for startMapEntry, only used builder should be different.
Change-Id: I0062f184cc33ee6d1fd6783933f1f4c845f1c4d4
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Martin Vitez [Wed, 20 Aug 2014 08:32:19 +0000 (10:32 +0200)]
BUG-576: fixed javadoc warnings.
Change-Id: Iec42e1c310267c2df09a66b3c49c5d94948d8b58
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Martin Vitez [Wed, 20 Aug 2014 08:12:19 +0000 (10:12 +0200)]
BUG-576: if replaced with else-if in enterImport_stmt method.
Change-Id: Ibf1257d542261c2f96091cd38897351ef315b2bc
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Martin Vitez [Mon, 18 Aug 2014 10:45:49 +0000 (12:45 +0200)]
BUG-1514: fixed bug in module sort.
Change-Id: If8e2848ebd45ca6d51201e46928d3b2c0b9426c9
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Tony Tkacik [Mon, 25 Aug 2014 07:59:36 +0000 (07:59 +0000)]
Merge "BUG 1440 - json stream to normalized node stream writer"
Tony Tkacik [Mon, 25 Aug 2014 07:59:30 +0000 (07:59 +0000)]
Merge "BUG-1605: Fixup yang-data-api interface"
Tony Tkacik [Mon, 25 Aug 2014 07:59:24 +0000 (07:59 +0000)]
Merge "BUG-1605: Fix yang-binding interfaces"
Tony Tkacik [Mon, 25 Aug 2014 07:56:22 +0000 (07:56 +0000)]
Merge "Fix javadocs a bit"
Tony Tkacik [Mon, 25 Aug 2014 07:52:34 +0000 (07:52 +0000)]
Merge "BUG-997: fix InMemorySchemaSourceCache interface"
Robert Varga [Sun, 24 Aug 2014 20:12:09 +0000 (22:12 +0200)]
BUG-1611: make sure runtime components create short comments
The two instantiations here are performance-critical at runtime, and the
comments in them get discarded. Let us not waste time generating them.
Change-Id: If1e9a7507dac5b07011d3a9bcc75e42fbff340e1
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sun, 24 Aug 2014 20:07:36 +0000 (22:07 +0200)]
BUG-1611: force maven plugin generating verbose comments
This just makes sure we are explicit about what we are creating.
Change-Id: Ib530560c11e7f529345085eecf43a9f6f2e6d1a6
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sun, 24 Aug 2014 20:03:35 +0000 (22:03 +0200)]
BUG-1611: make verbose comments optional
Make sure the yang snippets are completely optional. The default still
includes them.
Change-Id: Id01393c384add733c42baf6c02a153ef388bb628
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sun, 24 Aug 2014 19:44:32 +0000 (21:44 +0200)]
BUG-1611: use CharMatcher to remove characters
Instead of compiling the patterns, use a CharMatcher, which is much
faster.
Change-Id: I2d3753824c63d3dece7af6f051f09c644cfdbf34
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sun, 24 Aug 2014 19:40:00 +0000 (21:40 +0200)]
BUG-1611: drop a FIXME for thread-safety
Caching a module means the class is not safe for use from multiple
threads.
Change-Id: Id60447efe4dbae4b65748b99870bd75b70b6fcc8
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sun, 24 Aug 2014 19:33:34 +0000 (21:33 +0200)]
BUG-1611: do not instantiate splitters needlessly
The two splitters can be easily shared -- so do that instead of
instantiating them.
Change-Id: I350611fb5985b4336018562012526ca1910bb9a2
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sun, 24 Aug 2014 19:32:35 +0000 (21:32 +0200)]
BUG-1611: fix SimpleDateFormat
The format used is incirrect and it makes no sense to instantiate the
utility all over again. Use the yang-common utility instead.
Change-Id: I0dbd80db6726aeb80e6666a330964d58bc08455c
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sun, 24 Aug 2014 17:55:35 +0000 (19:55 +0200)]
BUG-997: Fix URLSchemaContextResolver
The new URLSchemaContextResolver contained a few bugs which prevented it
from working correctly. Fix patches fixes it up.
Change-Id: Ica34f4b8f9e2bb50fe5107f35f987d2bf0891a14
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sun, 24 Aug 2014 17:54:34 +0000 (19:54 +0200)]
BUG-997: fix InMemorySchemaSourceCache interface
It turns out it was impossible to instantiate this class reasonably. Add
a static factory method to alleviate.
Change-Id: Id7ed4976db6ca6303752392c9aded444491edd08
Signed-off-by: Robert Varga <rovarga@cisco.com>
Ed Warnicke [Sat, 23 Aug 2014 19:56:17 +0000 (14:56 -0500)]
Bug 1514: Correctly handle ModuleOrModuleBuilder in ModuleDependencySort
ModuleDependencySort.processDependencies(...)
Turns out allNS.get(ns) can return objects of type ModuleOrModuleBuilder
(not just Module or ModuleBuilder types).
Now we check for that case, and unpack it to a Module or ModuleBuilder.
The rest of the logic then continues as normal.
Also added a log for getting a module with no name so as to catch
similar issues in the future.
Change-Id: I956c334c5dd10b51bec01d409f2433229d05f767
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Jozef Gloncak [Thu, 21 Aug 2014 13:00:10 +0000 (15:00 +0200)]
BUG 1440 - json stream to normalized node stream writer
JsonParserStream contains implementation of read method in which there
is gradually constructed structure of NodeDataWithSchema nodes.
NodeDataWithSchema is similar to SchemaNode but contains only reference to
children which really exists in JSON input and concrete values for nodes
of type leaf or leaf list.
It was necessary to firstly load JSON to NodeDataWitchSchema structure
because for some types (composite keys of list, all nodes belonging to one
augment, all nodes belonging to one choice) it isn't possible to do
sequential processing (it means to call concrete opening and closing
methods of NormalizedNodeStreamWriter interface).
JsonParserStream constructor requires schema context as input parameter.
If data behind mount point should be parsed then schema context of mount
point is required.
Change-Id: I28c1d3193792feb875ec2ceda0035ca56bfa5d42
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Fri, 22 Aug 2014 17:27:48 +0000 (19:27 +0200)]
BUG-1605: Fixup yang-data-api interface
Now that the binding interface is ready to handle IOExceptions, adjust
the data-api interface and implementations. At the same time we update
the binding world to forward calls to flush().
Change-Id: I8a4cff13123d618634dcd61587a2432d3d49ae8b
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Fri, 22 Aug 2014 17:42:23 +0000 (19:42 +0200)]
BUG-1605: Fix yang-binding interfaces
This is the frontend piece visible from Binding world. The
implementation relies of the data.api mechanics, so it needs to be
prepared first.
Change-Id: I4694f74e993bbfa9c84578dee04fdd49b87453b7
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Fri, 22 Aug 2014 17:34:53 +0000 (19:34 +0200)]
Fix javadocs a bit
Change-Id: Ib7c43ca661dcfa105f9a41e0ebeecdbb4f05a655
Signed-off-by: Robert Varga <rovarga@cisco.com>
Martin Vitez [Thu, 21 Aug 2014 13:14:41 +0000 (15:14 +0200)]
BUG-1537: improved YangModuleInfo.
YangModuleInfo is generated also for submodules in form as inner class in YangModuleInfo class of
module to which it belongs. Method YangModuleInfo.getImportedModules() returns also YangModuleInfo
classes of submodules which this module includes.
Added getSubmodules() method to Module interface.
Added test.
Change-Id: Id949835d960eee3197d249f7a83be2975a63d6b3
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Tony Tkacik [Fri, 22 Aug 2014 08:33:16 +0000 (10:33 +0200)]
Use xml.bind Base64 decoder instead of Guava
As it turned out Guava Base64 decoder is not
compatible with XML encoding, since it is much
stricter and throws error on new lines which
are pretty common in XMLs with Base64 encoded
data.
javax.xml.bind package provides same static
method for parsing string into bytes,
but with XSD semantics for Base64 encoding
which are compatible with XML way
of encoding data.
Change-Id: I5ef4c0b2ba521472b8caacdff1f44ff17d660eb3
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Tony Tkacik [Thu, 21 Aug 2014 13:45:11 +0000 (13:45 +0000)]
Merge "Fix ordering fields in generated type builder"
Tony Tkacik [Thu, 21 Aug 2014 13:41:54 +0000 (13:41 +0000)]
Merge "BUG-1425: fix LazyDataObject.toString()"
Martin Vitez [Thu, 21 Aug 2014 13:11:17 +0000 (13:11 +0000)]
Merge "Bug 1586: Fixed missing processing of single qouted strings."
Tony Tkacik [Thu, 21 Aug 2014 12:05:18 +0000 (14:05 +0200)]
Bug 1586: Fixed missing processing of single qouted strings.
Change-Id: I72a4c8608b8f1f64287a7199430f4f31af6f67c9
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Tony Tkacik [Thu, 21 Aug 2014 11:45:04 +0000 (11:45 +0000)]
Merge "Update feature to carry binding-data-codec"
Robert Varga [Thu, 21 Aug 2014 11:09:54 +0000 (13:09 +0200)]
Update feature to carry binding-data-codec
Change-Id: I4a1835574c1cfdfbba3dba4a6779ee85157b894e
Signed-off-by: Robert Varga <rovarga@cisco.com>
Lukas Sedlak [Thu, 21 Aug 2014 09:40:51 +0000 (09:40 +0000)]
Merge "add new tests BindingTypesTest, BaseYangTypesTest"
Robert Varga [Thu, 21 Aug 2014 09:24:23 +0000 (09:24 +0000)]
Merge "BUG-1382: eliminate QName.getPrefix() from GeneratorImpl.xtend"
Tony Tkacik [Thu, 21 Aug 2014 07:22:50 +0000 (07:22 +0000)]
Merge "Bug 1391 - New DataBroker unexpected behaviour"
Robert Varga [Tue, 12 Aug 2014 05:32:07 +0000 (07:32 +0200)]
BUG-1425: fix LazyDataObject.toString()
A major usability improvement is skipping of null fields, as dumping
them adds quite a bit of verbosity to logs.
Change-Id: I94c030f11505718ee48b0e3f4556587a85f8f4e4
Signed-off-by: Robert Varga <rovarga@cisco.com>
Tony Tkacik [Wed, 20 Aug 2014 08:55:10 +0000 (10:55 +0200)]
Bug 1443: Fixed incorrect throw of IllegalArgumentException in getAugmentation
Change-Id: If58292afba9c634fb4368f70d541d4a7cdf02cf6
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Martin Vitez [Wed, 20 Aug 2014 09:58:55 +0000 (11:58 +0200)]
BUG-1382: eliminate QName.getPrefix() from GeneratorImpl.xtend
Change-Id: Ie5fdaf7fc7389c13af8aa591bf9531ed26cb11a9
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Peter Bandzi [Tue, 19 Aug 2014 08:37:53 +0000 (10:37 +0200)]
add new tests BindingTypesTest, BaseYangTypesTest
Signed-off-by: Peter Bandzi <pbandzi@cisco.com>
Change-Id: I289a15eb735c12d4664ff68e73c6e2fc830c6f20
Robert Varga [Wed, 20 Aug 2014 08:50:13 +0000 (08:50 +0000)]
Merge "Add scope compile to features pom for xtend-lib"
Martin Vitez [Wed, 20 Aug 2014 07:48:26 +0000 (09:48 +0200)]
BUG-1578: fixed NPE caused by invalid import statement.
If parser can't found imported module it throws YangParseException with error info about root cause.
Change-Id: I3ca81fc46ca57d36b770b3846c10d422d415ac37
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Ed Warnicke [Tue, 19 Aug 2014 23:00:05 +0000 (18:00 -0500)]
Add scope compile to features pom for xtend-lib
Else, tests downstream can and will fail if its
not already in their local .m2
Change-Id: I2be472c66e4828f19169118d84ae03f714c9ec68
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Robert Varga [Tue, 19 Aug 2014 11:14:19 +0000 (11:14 +0000)]
Merge "Bug 1531: Fixed incorrect use of leaf types in BindingGeneratorImpl"
Tony Tkacik [Tue, 19 Aug 2014 09:39:45 +0000 (11:39 +0200)]
Bug 1531: Fixed incorrect use of leaf types in BindingGeneratorImpl
Change-Id: Id420d1e2b8aadcf0061fcf87910b749e9be89c04
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Martin Vitez [Tue, 19 Aug 2014 09:11:41 +0000 (11:11 +0200)]
BUG-1382: eliminate QName.getPrefix() from binding-generator-impl.
Change-Id: Idce1e0efe18c6034ec036794007ea2716799d889
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Tony Tkacik [Tue, 19 Aug 2014 07:14:04 +0000 (07:14 +0000)]
Merge "BUG-1555: skip choices which are not valid in a particular context"
Robert Varga [Mon, 18 Aug 2014 15:15:06 +0000 (15:15 +0000)]
Merge "Enabled feature-test for features-yangtools."
Robert Varga [Mon, 18 Aug 2014 15:14:54 +0000 (15:14 +0000)]
Merge "features-test to test that features load correctly."
Ed Warnicke [Sun, 17 Aug 2014 22:51:41 +0000 (17:51 -0500)]
Enabled feature-test for features-yangtools.
Note: We were randomly getting surefire version
2.12.4 because no surefire version was specified.
${maven.surefire.version} is set in odlparent
but we need to apply it in the yang parent pom
because 'dependenciesToScan' is only available
starting in 2.15.
Change-Id: I3d72c845d7f75afc518956267802ea69afadd0c6
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Ed Warnicke [Sun, 17 Aug 2014 21:24:17 +0000 (16:24 -0500)]
features-test to test that features load correctly.
Change-Id: Ieacf7182fa7fe5d47c4696e164680716836f8293
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Lukas Sedlak [Mon, 18 Aug 2014 11:45:01 +0000 (13:45 +0200)]
Bug 1559: Fixed resolving of used extensions.
This is hotfix in Yang Parser Grammar. As it turnded out Yang parser didn't count with
use of extensions outside of body statements. Now yang parser is capable to parse yang files with used
extensions outside of body statements. The recommendation for future is to completely rewrite yang parser
grammar in general.
Change-Id: I65e61ef712fb499fe543753404a805a4dd14cf85
Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
Robert Varga [Mon, 18 Aug 2014 11:44:43 +0000 (13:44 +0200)]
BUG-1555: skip choices which are not valid in a particular context
We are enumerating the use of a case in all the possible contexts, which
may partially fail. Instead of failing completely, just skip the
offending case.
Change-Id: Icbf137266784e0f469a258b2bb312db4e01bd8f6
Signed-off-by: Robert Varga <rovarga@cisco.com>
Martin Vitez [Mon, 18 Aug 2014 09:19:36 +0000 (09:19 +0000)]
Merge "Fix MapAdaptor logging"
Robert Varga [Thu, 14 Aug 2014 21:03:29 +0000 (23:03 +0200)]
Improve error message
This fixes the errors reported by default in the log by formatting the
message.
Change-Id: I5c971844ceb9f140ea62fda4472899971689c98f
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Thu, 14 Aug 2014 19:47:59 +0000 (21:47 +0200)]
Fix Precondition formatting
Preconditions need to be formatted just like String.format().
Change-Id: I4011a6cc6a5f5cb7b0460885d956f775ff45d97c
Signed-off-by: Robert Varga <rovarga@cisco.com>
Lukas Sedlak [Thu, 14 Aug 2014 12:50:00 +0000 (14:50 +0200)]
Bug 1515: Properly resolving prefix for submodule
Every Yang submodule contains belongs-to statement. Belongs-to statement contains
mandatory prefix statement. Now submodule prefix is resolved properly and set
as module prefix for parsed submodule.
Test models foo and subfoo were modified to cover bug scenario. In model foo there is typedef defined and called
in submodule subfoo.
Ordering test had to be modified accordingly.
Change-Id: I364337c724407ff9ad2c489968e17f1ed060f347
Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
Ladislav Borak [Fri, 8 Aug 2014 13:38:38 +0000 (15:38 +0200)]
Fix ordering fields in generated type builder
Methods is sorted alphabetically to make the order of evaluation
predictable.
Change-Id: Ie1171a78a17e6eab71b629411f0b0a1bb1807d7d
Signed-off-by: Ladislav Borak <lborak@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Wed, 13 Aug 2014 12:49:59 +0000 (14:49 +0200)]
Fix conflict on Object definition
The use of Object (in the java.lang sense) is not working with models
which contain a 'container object' or similar. The fix is to not use a
temporary variable.
Change-Id: I98b3bde9a04d5f33a51a0add107829ad92d35907
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Wed, 13 Aug 2014 10:00:47 +0000 (10:00 +0000)]
Merge "Check for null pointer when parsing identities."
Maros Marsalek [Wed, 13 Aug 2014 09:21:41 +0000 (11:21 +0200)]
Check for null pointer when parsing identities.
Change-Id: I5dba7506b83f145472f7327f92e47ffc17b74062
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Robert Varga [Wed, 13 Aug 2014 09:10:14 +0000 (09:10 +0000)]
Merge "Make buildModules() in YangParser behave same as other methods"
Lukas Sedlak [Fri, 8 Aug 2014 12:33:38 +0000 (14:33 +0200)]
Bugfix: Resolving of extension arguments.
Fixed methods parseQName and handleUnknownNode in YangParserListenerImpl class. Now if extension contains ":"
as argument value and string before ":" doesn't represent prefix for import the argument will be parsed as ordinary
string and will not throw exception.
Log level in parseQName has been changed from warn to debug.
Tests in yang-parser-impl has been modified since they're lacked of import definitions of extensions in yang modules.
Change-Id: I84debed2bef1a0694a7019c296433b8b089e6d80
Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
Maros Marsalek [Wed, 13 Aug 2014 07:05:20 +0000 (09:05 +0200)]
Make buildModules() in YangParser behave same as other methods
Submodules were not resolved
Change-Id: Ifaac3b7f95883f190874cf91f8837c697c6c33e7
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Robert Varga [Mon, 11 Aug 2014 21:39:36 +0000 (23:39 +0200)]
BUG-1425: fix builder's implementation of equals()
With the advent of LazyDataObject, we have two implementation which need
to compare as equal. LazyObject.equals(builderObject) already works, but
we need the revers to be true, too. This patch sets out to do exactly
that.
Change-Id: I931f66a9088451524a842f6a67e8492ac922fd3d
Signed-off-by: Robert Varga <rovarga@cisco.com>
Lukas Sedlak [Mon, 11 Aug 2014 14:23:29 +0000 (14:23 +0000)]
Merge "BUG-1425: fix toString() invocation on LazyObject"
Robert Varga [Mon, 11 Aug 2014 14:02:28 +0000 (16:02 +0200)]
BUG-1425: fix toString() invocation on LazyObject
When we are coming in from toString(), the proxy invocation does not
work. Extract getAugmentations() into a private method and use that
instead.
Change-Id: Ia851560b7703817f6d75887fa7e80037292e3fd1
Signed-off-by: Robert Varga <rovarga@cisco.com>
Milos Fabian [Mon, 11 Aug 2014 10:57:24 +0000 (12:57 +0200)]
Fixed missing "/" at begining of list.
Change-Id: I95cd9f2fc28bcf8ff46fba72a3c13339a5868078
Signed-off-by: Milos Fabian <milfabia@cisco.com>
Robert Varga [Sun, 10 Aug 2014 14:45:04 +0000 (16:45 +0200)]
Fix MapAdaptor logging
A typo prevented objects from being logged.
Change-Id: I93514dbb4dbf99fa0e3458a4643c24f41992242d
Signed-off-by: Robert Varga <rovarga@cisco.com>
Jan Hajnar [Tue, 29 Jul 2014 09:53:02 +0000 (11:53 +0200)]
Bug 1391 - New DataBroker unexpected behaviour
* deleted empty override for checkWriteApplicable() in
NormalizedNodeContainerModificationStrategy and added check for node
being created by another transaction in checkWriteApplicable()
in SchemaAwareApplyOperation.
* updated concurrency tests.
Change-Id: I0fd5fb230014f794897a30d1a45a86b61a3a8378
Signed-off-by: Jan Hajnar <jhajnar@cisco.com>
Ed Warnicke [Sun, 10 Aug 2014 19:49:06 +0000 (14:49 -0500)]
Fixes to yangtools feature.xml file
Change-Id: I54852269f3e42aeae7a9ef54e593ef29e48bfcbb
Signed-off-by: Ed Warnicke <eaw@cisco.com>