Tomas Cere [Tue, 25 Aug 2015 08:39:09 +0000 (10:39 +0200)]
Rename netconf-impl packages to org.opendaylight.netconf
Change-Id: I8dad162c0f519420a80fc58099b6f6f4a92f819b
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Tue, 25 Aug 2015 08:32:11 +0000 (10:32 +0200)]
Rename netconf-client packages to org.opendaylight.netconf
Change-Id: I6c7a99491200c1c41098a83cd1aed02f33d3840d
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Tue, 25 Aug 2015 08:19:11 +0000 (10:19 +0200)]
Rename netconf-auth packages to org.opendaylight.netconf
Change-Id: Ibd646282c633dbed92ec003cf7b1b0f0517e283b
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Mon, 24 Aug 2015 14:40:05 +0000 (16:40 +0200)]
Rename netconf-api packages to org.opendaylight.netconf
Change-Id: I396100af615b71f3f1cae49fc9a418d27dac5a7f
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Mon, 24 Aug 2015 14:38:13 +0000 (16:38 +0200)]
Rename messagebus-netconf packages to org.opendaylight.netconf
Change-Id: I9827617094c847cb5206eaa65d70d9f47c37c591
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Mon, 24 Aug 2015 14:36:09 +0000 (16:36 +0200)]
Rename mdsal-netconf-monitoring packages to org.opendaylight.netconf
Change-Id: I77b1d4704d19650091ae25c44b60b5814cda91c6
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Mon, 24 Aug 2015 14:29:43 +0000 (16:29 +0200)]
Rename mdsal-netconf-connector packages to org.opendaylight.netconf
Change-Id: Ib5b3dace1dc9bb568b36e5d895966fdc2eb0b35a
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Mon, 24 Aug 2015 14:27:29 +0000 (16:27 +0200)]
Rename config-netconf-connector packages to org.opendaylight.netconf
Change-Id: I960ca48cd1942a2e101c12238630a06a39ff0f82
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Mon, 24 Aug 2015 13:39:52 +0000 (15:39 +0200)]
Fix sal-netconf-connector feature version
Make sal-netconf-connector preserve md-sal version.
Make features-netconf-connector inherit netconf project version
Change-Id: Iae701ee92912eb3229c586a0293ac15467b33fa6
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Fri, 21 Aug 2015 07:09:41 +0000 (09:09 +0200)]
Add missing odl-config-netty feature into odl-netconf-mdsal
Change-Id: Ifd077a881311517471cb0f39b24db4a6d11ea08c
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Fri, 21 Aug 2015 07:07:49 +0000 (09:07 +0200)]
Add karaf distribution
Change-Id: I8e451d76741ab60f05082ab1e3d7d71285b0a11a
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Thu, 20 Aug 2015 08:36:00 +0000 (10:36 +0200)]
Create restconf-artifacts
Change-Id: I7aa99cd8ab914e4c9a96822b7b893dbda5a3fc1b
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Mon, 24 Aug 2015 06:42:28 +0000 (08:42 +0200)]
Fix license header violation
Change-Id: I1606a869c0e10cdc8f289492a83668421df50831
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Thu, 20 Aug 2015 08:20:55 +0000 (10:20 +0200)]
Add rest connector config
sal-rest-connector-config was forgotten in controller
Change-Id: Id4004d02325ea306b29b4b51e7f85cf1217ce0e2
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Wed, 19 Aug 2015 14:44:26 +0000 (16:44 +0200)]
Change groupId and versions of netconf artifacts
Change-Id: Id961c524aa338d0c1d553b6c3937b0e0a8c7d0f4
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Wed, 19 Aug 2015 11:45:44 +0000 (13:45 +0200)]
Add restconf features
Unify netconf/restconf features into single directory
Change-Id: Ia92659b3de2af9df0764181f309f32a0c96f2456
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Mon, 17 Aug 2015 11:07:02 +0000 (13:07 +0200)]
Cleanup project structure and dependencies
Add restconf-parent pom
Add parent dependencies/build plugins and properties to restconf/netconf parent poms
Rename md-sal dir to restconf since restconf is no longer part of md-sal
Change-Id: I3874d514ec969c1710b2fe173db4c53781387d4f
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Tue, 7 Jul 2015 13:32:11 +0000 (15:32 +0200)]
Add .gitignore
Change-Id: I9a1435c847ea3a563afa9f29f743bb91a7c419e9
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Tue, 18 Aug 2015 08:47:34 +0000 (10:47 +0200)]
Add base netconf pom
Cleanup bad imports that were failing checkstyle
Change-Id: I5026d2075426ccea415e31a7ef913668a7a4a10e
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Thu, 13 Aug 2015 09:06:22 +0000 (11:06 +0200)]
Decouple message bus from netconf connector
Change-Id: I6a143e868adc1e5c7a9b114798e7009bb6ef8675
Signed-off-by: Maros Marsalek <[email protected]>
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Thu, 13 Aug 2015 09:06:54 +0000 (11:06 +0200)]
Decouple config and netconf subsystems.
Extract a common mapping for config pusher and config subsystem netconf
Add a ConfigPersisterFacade for XML that allows reads/writes from/to config
subsystem using XML format
Push notifications from YangStoreService to NetconfNotificationManager instead
of using custom listeners
Migrate netconf features from controller features, untangle features
Change-Id: I71e4ca6e0258e0b1f0d6c19119f93eb9d68b7bca
Signed-off-by: Tomas Cere <[email protected]>
Signed-off-by: Maros Marsalek <[email protected]>
Signed-off-by: Ed Warnicke <[email protected]>
Thanh Ha [Sun, 9 Aug 2015 01:22:15 +0000 (21:22 -0400)]
Fix license header violations in sal-rest-docgen
Change-Id: I03c4b7ef9397224d649e9387ed895bca74672ec9
Signed-off-by: Thanh Ha <[email protected]>
Thanh Ha [Sun, 9 Aug 2015 01:09:32 +0000 (21:09 -0400)]
Fix license header violations in sal-rest-connector
Change-Id: I2dfda9fe6b3185d20386cc9f6078c0b53f7be40b
Signed-off-by: Thanh Ha <[email protected]>
Thanh Ha [Sat, 8 Aug 2015 06:12:29 +0000 (02:12 -0400)]
Fix license header violations in netconf
Change-Id: Ie5c541b03a342bec33257b13b985b89e9ca835a0
Signed-off-by: Thanh Ha <[email protected]>
Thanh Ha [Thu, 6 Aug 2015 05:23:10 +0000 (01:23 -0400)]
Clean up pom.xml file
- Remove unnecessary commented code
Change-Id: Id4ceca0174ba5883059c52cbcee11aafb67c74ea
Signed-off-by: Thanh Ha <[email protected]>
Maros Marsalek [Wed, 15 Jul 2015 13:20:08 +0000 (15:20 +0200)]
Add config subsystem binding to netconf-auth API
Change-Id: Ie04d9a7cb72bfcbeae6c7ca7dc0dbb2bdeadef0d
Signed-off-by: Maros Marsalek <[email protected]>
Jakub Toth [Wed, 27 May 2015 09:41:45 +0000 (11:41 +0200)]
Bug 2358 - Remove tests cnsn to json and add tests nn to json
Tests of codecs are included in codecs yangtools yang-data-codec-gson and yang-data-impl but
we test codec on input data and also with presentation of Rest path.
* remove CnSnToJsonNotExistingLeafTypeTest.java test
* add NnToJsonNotExistingLeafTypeTest.java to nn/to/json/test/
* test with not existing leaf type
Change-Id: Id7a1256b42a3a754e13343613dcad7059a2316c4
Signed-off-by: Jakub Toth <[email protected]>
(cherry picked from commit
1fa839d51563b9588bf7502e86a5e9c2425fab2f)
Jakub Toth [Wed, 27 May 2015 10:44:31 +0000 (12:44 +0200)]
Bug 2358 - Remove tests cnsn to json and add tests nn to json
Tests of codecs are included in codecs yangtools yang-data-codec-gson and yang-data-impl but
we test codec on input data and also with presentation of Rest path.
* remove CnSnToJsonWithAugmentTest test
* add NnToJsonWithAugmentTest to nn/to/json/test/
* positive test for test augmented elements
Change-Id: I4c8b92e828ade1d43a5af5384ec7938854fda9ce
Signed-off-by: Jakub Toth <[email protected]>
(cherry picked from commit
6b97753fc17bb2d9d73047038105754fcebe029d)
ary [Wed, 29 Apr 2015 10:09:41 +0000 (12:09 +0200)]
Bug 2358 - Remove tests json to cnsn and add tests json to nn
Tests of codecs are included in codecs yangtools yang-data-codec-gson and yang-data-impl but
we test codec on input data and also with presentation of Rest path.
* remove all tests json to composite node and simple node
* rewrite json leafref input tests from comp and simple node to normalized node
* we're testing REST provider URI path translator with payload
* add test for test data in json with identityref to normalized node
* positive test
* test data in builded normalized node with data in json
* used identityref type to reference an existing identity
* add test for test data in json with leafref to normalized node
* positive test
* test data in builded normalized node with data in json
* used leafref type to reference particular leaf instance in the data tree
* add test for test data in json with more type of nodes and values
* positive tests
* test normalized node from json with:
* simple data in list
* simple data in container
* multiple items in leaf-list
* multiple items in list
* empty leaf
* augmented data
* negative tests
* test fail on bad top level elements
* contains 3 situations
* test fail for null data
* empty leaf-list
* leaf without any value
* test on build normalized node with blank json
* test fail with different namespaces
* test fail because of unsupported format of json
* test on invalid URI character
Change-Id: Icb5ff5d11843123c79859a0c75d7df7bad8a0b44
Signed-off-by: Jakub Toth <[email protected]>
(cherry picked from commit
a3fd2b66c8121a8603d684b97c1fb7076d933d99)
Maros Marsalek [Tue, 14 Jul 2015 12:26:15 +0000 (14:26 +0200)]
Remove deprecated constructors from RemoteDeviceId
Change-Id: I26d48930a16213d2264de964f60103e67f80b9bd
Signed-off-by: Maros Marsalek <[email protected]>
Maros Marsalek [Mon, 8 Jun 2015 15:22:45 +0000 (17:22 +0200)]
Improve performance of notification emitting in netconf testtool
- pre-parse all notifications beforehand
- remove unwanted outputs
Change-Id: I6dd823786fd0d5f9ab04943633f8aa3b61a540e8
Signed-off-by: Maros Marsalek <[email protected]>
(cherry picked from commit
7392728edfe0b150833c7af47c3bc8d4b0ce101a)
Jan Hajnar [Wed, 1 Jul 2015 09:03:44 +0000 (11:03 +0200)]
Bug 3887 - Autogenerated API documentation doesn't show application/xml
as an option for RPC operations
* added xml input option for rpcs, put and post methods
Change-Id: I1f73bcb7d1127e4b4324d779aec40907ca627073
Signed-off-by: Jan Hajnar <[email protected]>
(cherry picked from commit
e57d9461b79dedd8ef9edf8f249b066540fd0e9d)
Maros Marsalek [Tue, 14 Jul 2015 08:56:59 +0000 (10:56 +0200)]
BUG-3963 Remove netconf-usermanager
This way of authentication relied on AD-SAL and thats deprecated/removed now
from ODL.
Change-Id: I0daeee09ff88b1c4677206c1b7216e972d34f01c
Signed-off-by: Maros Marsalek <[email protected]>
Jan Hajnar [Tue, 7 Jul 2015 09:38:33 +0000 (11:38 +0200)]
Bug 1500 - Null pointer exception when using mounted resources tab to
see the operations on mount point
* added check for when revision is null in modules comparator
Change-Id: I3bdc4ed798297d31ea25001d25918e298c8124bb
Signed-off-by: Jan Hajnar <[email protected]>
Tomas Cere [Tue, 23 Jun 2015 09:35:50 +0000 (11:35 +0200)]
Add netconf-mapping-api test for HandlingPriority
Change-Id: I29a6fdaab266acd42c5355101769bb82c14135fc
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Mon, 22 Jun 2015 12:57:09 +0000 (14:57 +0200)]
Add discardChanges branch to unit test
Add service instance deletion to NetconfMappingTest
Change-Id: I25d1ebefde86050c42a2d43ec445feaf8d5889de
Signed-off-by: Tomas Cere <[email protected]>
Maros Marsalek [Tue, 14 Jul 2015 08:41:56 +0000 (10:41 +0200)]
Remove yang-data-operations dependencies
Not used anymore
Change-Id: I692bdbc00efb38bb29d7f5c18ca042bc10eeb11f
Signed-off-by: Maros Marsalek <[email protected]>
Jan Hajnar [Wed, 10 Jun 2015 11:55:42 +0000 (13:55 +0200)]
Bug 868 - Continuous: remove deprecated APIs
* removed deprecated API from Bug3595Test
Change-Id: Ic8f987aeb000cfb150286ad44e478771e8a52384
Signed-off-by: Jan Hajnar <[email protected]>
(cherry picked from commit
e1b79358817f1202c50f7410b92746b0777d0642)
Jakub Toth [Wed, 20 May 2015 21:34:52 +0000 (23:34 +0200)]
Bug 2358 - Remove tests cnsn to json and add tests nn to json
Tests of codecs are included in codecs yangtools yang-data-codec-gson and yang-data-impl but
we test codec on input data and also with presentation of Rest path.
* add test NnToJsonLeafrefType to nn/to/json/test
* positive tests of leafref
* absolut path
* relative path
* leafref to not leaf
* from leaflist to leaf
* from leafref to leafref
* negative tests of leafref
* non existing Leaf
Change-Id: I652204071d874d6c7a2a65e100dd68c16a12af8f
Signed-off-by: Jakub Toth <[email protected]>
(cherry picked from commit
1f4b4062cbdd0cfadcf61e60bce9ee9e951c975c)
ary [Fri, 15 May 2015 13:25:08 +0000 (15:25 +0200)]
Bug 2358 - Remove tests cnsn to json and add tests nn to json
Tests of codecs are included in codecs yangtools yang-data-codec-gson and yang-data-impl but
we test codec on input data and also with presentation of Rest path.
* remove CnSnJsonChoiceCaseTest test
* add NnJsonChoiceCaseTest to nn/to/json/test/
* positive and negative tests for choice statement
Change-Id: I83d351bf0de9bb4a1c649c5851209ae472aaaa24
Signed-off-by: Jakub Toth <[email protected]>
(cherry picked from commit
33657892ea175d459184732b0fbc08eb7589e787)
Jakub Toth [Thu, 4 Jun 2015 12:45:53 +0000 (14:45 +0200)]
Bug 2358 - Fix resources for tests nn to json
yang's namespace fix
Change-Id: I4b31cde6d9dc56b8298877b50c21a551c39f645f
Signed-off-by: Jakub Toth <[email protected]>
(cherry picked from commit
de2844c54550a5a10f510e2c90fd14f8b8aa303c)
Jakub Toth [Mon, 1 Jun 2015 08:53:53 +0000 (10:53 +0200)]
Bug 2358 - Remove tests cnsn to xml and add tests nn to xml
Tests of codecs are included in codecs yangtools yang-data-codec-gson and yang-data-impl but
we test codec on input data and also with presentation of Rest path.
* remove CnSnToXmlWithDataFromSeveralModulesTest test
* add NnToXmlWithDataFromSeveralModulesTest to nn/to/xml/test/
* positive test for test more modules
Change-Id: I4f4eea89487e946b0a4a7edd75423d6bf551bd20
Signed-off-by: Jakub Toth <[email protected]>
(cherry picked from commit
adc820f5aaa84b67f08b76982b74c4f790c9ba7c)
Jakub Toth [Mon, 1 Jun 2015 07:34:50 +0000 (09:34 +0200)]
Bug 2358 - Remove tests cnsn to xml and add tests nn to xml
Tests of codecs are included in codecs yangtools yang-data-codec-gson and yang-data-impl but
we test codec on input data and also with presentation of Rest path.
* remove CnSnInstanceIdentifierToXmlTest test
* add NnInstanceIdentifierToXmlTest to nn/to/xml/test/
* positive test for instance identifier
Change-Id: Iceb73ed4d96f7686fca04047524716532297a2f8
Signed-off-by: Jakub Toth <[email protected]>
(cherry picked from commit
6c0c438071d2e85ef2f08070935cb310165f25cf)
Jakub Toth [Mon, 1 Jun 2015 08:15:54 +0000 (10:15 +0200)]
Bug 2358 - Remove tests cnsn to xml and add tests nn to xml
Tests of codecs are included in codecs yangtools yang-data-codec-gson and yang-data-impl but
we test codec on input data and also with presentation of Rest path.
* remove CnSnToXmlTest test
* add NnToXmlTest to nn/to/xml/test/
* positive tests for basic data types
Change-Id: Iac408dc8ce25c8d9c46a21863733b30390ea8c34
Signed-off-by: Jakub Toth <[email protected]>
(cherry picked from commit
bec0511bd378c069a2f51545736064a9821e44a7)
Jakub Toth [Mon, 1 Jun 2015 08:33:58 +0000 (10:33 +0200)]
Bug 2358 - Remove tests cnsn to xml and add tests nn to xml
Tests of codecs are included in codecs yangtools yang-data-codec-gson and yang-data-impl but
we test codec on input data and also with presentation of Rest path.
* remove CnSnToXmlWithChoiceTest test
* add NnToXmlWithChoiceTest to nn/to/xml/test/
* positive test for choice statement
Change-Id: Ie3fba1c51db57ef7621703812f7a98b6d417feca
Signed-off-by: Jakub Toth <[email protected]>
(cherry picked from commit
015b6436357637c6cbd29b72e931735ff2a34007)
Jakub Toth [Mon, 1 Jun 2015 08:24:40 +0000 (10:24 +0200)]
Bug 2358 - Remove tests cnsn to xml and add tests nn to xml
Tests of codecs are included in codecs yangtools yang-data-codec-gson and yang-data-impl but
we test codec on input data and also with presentation of Rest path.
* remove CnSnToXmlNotExistingLeafTypeTest test
* add NnToXmlNotExistingLeafTypeTest to nn/to/xml/test/
* negative test for not existing leaf type
Change-Id: I6f55fd82c40a03726aecb78cfc2ece9888cf9717
Signed-off-by: Jakub Toth <[email protected]>
(cherry picked from commit
0c957832fd6587f5cfe6fb8de215d97cd6fd9c24)
Tom Pantelis [Tue, 16 Jun 2015 21:15:51 +0000 (17:15 -0400)]
Bug 3782: Fix NPE in API doc explorer
Fixed NPE when a netconf mounted device has a yang file without a version.
Change-Id: Ie562c05772ecd5e9c7d82afc31d06aaf852308a5
Signed-off-by: Tom Pantelis <[email protected]>
(cherry picked from commit
d9cd9f52898f2705347fa9d6a30f054bdc751a98)
Maros Marsalek [Tue, 16 Jun 2015 11:36:30 +0000 (13:36 +0200)]
BUG-3625 Allow replace nested composite nodes in cfg-subsystem
Netconf-endpoint for config-subsystem now supports replace operation on nested
elements. Now it is possible to invoke PUT on nested composite attributes for
config-subsystem modules.
Change-Id: I5fde907c66c01a9c1bf58845daa868c7a141c998
Signed-off-by: Maros Marsalek <[email protected]>
(cherry picked from commit
eb4b35e5e1ea9fa86ec5277a95c0dc882c563862)
Jan Hajnar [Mon, 8 Jun 2015 15:28:12 +0000 (17:28 +0200)]
Bug 3595 - RESTCONF: GET operation on a node in a list, identified by
leaf-ref fails.
* added referenced type resolution for leafrefs in ControllerContext
Change-Id: Ic38b77038feb786a46a8bdd069448f006418d7bf
Signed-off-by: Jan Hajnar <[email protected]>
(cherry picked from commit
5af9027a8ce234f3dcc44ee0d1791036b7f0ed62)
Jan Hajnar [Tue, 2 Jun 2015 15:47:08 +0000 (17:47 +0200)]
BUG 2155 - depth parameter in URI
* added interface RestconfNormalizedNodeWriter
* added two implementations of RestconfNormalizedNodeWriter,
RestconfDelegatingNormalizedNodeWriter just calls normalized node
writer from yangtools and DepthAwareNormalizedNodeWriter is writer
implementation tha checks depth
* added CutDataToCorrectDepthTest (randomly failing, needs to be checked
or removed for now)
* added condition to xml and json normalized node writers to create
depth aware normalized node writer id depth is specified in writer parameters
Change-Id: I922942e24cbe505c2803644c25acd755fe4dfae7
Signed-off-by: Jozef Gloncak <[email protected]>
Signed-off-by: Jan Hajnar <[email protected]>
(cherry picked from commit
f94de91bba1210fa852aaab0490743f9f3553e99)
Thanh Ha [Wed, 24 Jun 2015 14:27:19 +0000 (10:27 -0400)]
Use Beryllium parent pom versions
- Sets poms to point to correct Beryllium parent pom version
- Also removes unnecessary <relativePath> declaration
Change-Id: I82315ce20dfe22bb7e67027dd5d93c3e0ab866b3
Signed-off-by: Thanh Ha <[email protected]>
Maros Marsalek [Fri, 19 Jun 2015 07:58:13 +0000 (09:58 +0200)]
Revert "BUG-2679 Workaround for wrong nagasena encode/decode with reused transmogrifier"
This reverts commit
8bedb6be52f21b52d6df08d1501cf46f8ddbdbdc.
Change-Id: I52d02ae6a980bae6798385636f9d779e3c80b72d
Signed-off-by: Maros Marsalek <[email protected]>
Signed-off-by: Tomas Cere <[email protected]>
Signed-off-by: Maros Marsalek <[email protected]>
Maros Marsalek [Fri, 19 Jun 2015 07:57:59 +0000 (09:57 +0200)]
BUG 2458: Bump nagasena version to 2.53.0
Change-Id: I77e21237355cee3973a05a37981ab49a05018bf9
Signed-off-by: Tomas Cere <[email protected]>
Signed-off-by: Maros Marsalek <[email protected]>
Tomas Cere [Thu, 18 Jun 2015 13:21:06 +0000 (15:21 +0200)]
Increase UnitTest coverage/refactor for MDsal Netconf.
Change-Id: I486565bec7bbce0a85ee2dfa389887ca0d3a2903
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Wed, 3 Jun 2015 14:22:00 +0000 (16:22 +0200)]
Remove commons-io dependency in netconf-ssh
Remove the replacement of File separators in key path,
windows can handle linux style paths, added a warning to config to use linux style paths.
Change-Id: I01d07fa65cd11dcc321cbf4d6f5aac0792922309
Signed-off-by: Tomas Cere <[email protected]>
Jan-Simon Möller [Wed, 3 Jun 2015 13:41:22 +0000 (15:41 +0200)]
[RFC][Fix] Fix for connection in pom.xml.
The connection value was wrong.
Apply values proposed by zxiiro.
Also fix sal-dom-xsql (wrong developerConnection).
This allows me to run mvn site
w/o failing due to the wrong entry.
Change-Id: I15d953647a40dde4b37246a78bae120552efb15b
Signed-off-by: Jan-Simon Möller <[email protected]>
Jan Hajnar [Thu, 21 May 2015 07:46:57 +0000 (09:46 +0200)]
Bug 2153 - pretty printer
NormalizedNodeJsonBodyWriter - added ability to create JsonWritter with
prettyPrint enabled
NormalizedNodeXmlBodyWriter - added IndentingXMLStreamWriter when
prettyPrint is enabled
NormalizedNodeContext - info about requirements on indentation (true |
false) was added
RestconfImpl - added pretty print parsing method and added pretty print
detection to GET methods and RPC call methods
Change-Id: I44cfa778279d67f7dc1bf1532cd7fc1087b492dc
Signed-off-by: Jozef Gloncak <[email protected]>
Signed-off-by: Jan Hajnar <[email protected]>
(cherry picked from commit
d40d77c862ece5276cee68073a13386bbc5a347a)
Maros Marsalek [Mon, 8 Jun 2015 15:20:40 +0000 (17:20 +0200)]
Set revisions for notification models in netconf
Change-Id: I83159f20250914c9e178b83dc526d9e9e14dce74
Signed-off-by: Maros Marsalek <[email protected]>
(cherry picked from commit
12d79e66e26bc7a521b0380e158dca5dd2b98abc)
ary [Wed, 29 Apr 2015 09:45:31 +0000 (11:45 +0200)]
Bug 2358 - Resources for tests json to nn
Tests of codecs are included in codecs yangtools yang-data-codec-gson and yang-data-impl but we test codec on input data and also with presentation of Rest path.
* fix and add yang files for tests
* fix json files
* rename base folder of json-to-cnsn to json-to-nn
Change-Id: Id0a23e655c3ddaaeb60f8652d57a7a5d1458063a
Signed-off-by: ary <[email protected]>
(cherry picked from commit
6047f7d9e4f6dbd22666718fcd2d62b91cd245d7)
Maros Marsalek [Tue, 9 Jun 2015 11:19:47 +0000 (13:19 +0200)]
Add a keepalive executor to controller config loopback connection.
Change-Id: Id4b93df4eb59a19dea2d00b348db3dd4866338cb
Signed-off-by: Tomas Cere <[email protected]>
Signed-off-by: Maros Marsalek <[email protected]>
Maros Marsalek [Thu, 11 Jun 2015 14:39:29 +0000 (16:39 +0200)]
BUG-3675 Support non-prefixed identityrefs in config subsystem
If a non prefixed but valid identityref was submitted as e.g. service type,
netconf connector for config subsystem failed.
Change-Id: I59dbb7dc83da9558db06118bdf1296f1ab9d782f
Signed-off-by: Maros Marsalek <[email protected]>
Moiz Raja [Thu, 11 Jun 2015 01:10:07 +0000 (18:10 -0700)]
BUG 3652 : GZip restconf response
Change-Id: I15161eb011185b3e477484ad15b90a701a2e08e7
Signed-off-by: Moiz Raja <[email protected]>
(cherry picked from commit
e267b7c507d570058b2feb488940cd3e89a78715)
Jan Hajnar [Tue, 9 Jun 2015 11:02:45 +0000 (13:02 +0200)]
Bug 3640 - RPC call error - impossible to call rpc
* disabled children search in post if request is rpc input
* fixed XmlNormalizedNodeBodyReader tests that were testing on wrong rpc
input data
Change-Id: I2602d34a4ab42169959b867acaffa988a11601f3
Signed-off-by: Jan Hajnar <[email protected]>
(cherry picked from commit
bc9579fb5cbb7db3b5ce071a9ce4a858c819caf7)
Robert Varga [Sat, 6 Jun 2015 19:45:12 +0000 (21:45 +0200)]
Migrate to MoreObjects
Objects is overloaded with JDK7, use the MoreObjects class.
Change-Id: I73f9ba24e990df8160b45b6fb0763a1b2ac231d6
Signed-off-by: Robert Varga <[email protected]>
Robert Varga [Sat, 6 Jun 2015 19:43:10 +0000 (21:43 +0200)]
Fix various netconf warnings
Overridden version, potentially static methods.
Change-Id: I54af7e8b48335b4b81594d4deeb0f75e21dbc932
Signed-off-by: Robert Varga <[email protected]>
(cherry picked from commit
2660b697228bb3e708a556b53e06a89d5ea00440)
Vaclav Demcak [Thu, 4 Jun 2015 16:13:48 +0000 (18:13 +0200)]
Bug 3039 - PUT augmentNode like last path element
* fixed JsonNormalizedNodeBodyReader error when PUT operation was used
and data were wrapped in augmentation or choice nodes
* fixed bug that allowed XmlNormalizedNodeBodyReader to parse PUT with
incorrect data (when PUT request was written as POST)
note: testet manualy describled scenario + CSIT OFP_test_suite
Change-Id: Ia25b6b45a1154866dea29c763be67cdb17fa0ce1
Signed-off-by: Jan Hajnar <[email protected]>
Signed-off-by: Vaclav Demcak <[email protected]>
Jan Hajnar [Tue, 2 Jun 2015 09:01:21 +0000 (11:01 +0200)]
Bug 568 - Websockets: Test & fix data change notifications
* changed WebSocketClient input parameter to accept "ws" protocol
instead of "http"
Change-Id: I2e1673707ca5231552195049024ebcb5e4964908
Signed-off-by: Jan Hajnar <[email protected]>
(cherry picked from commit
c0b35fcde6bd4dfda88eb8ee507bf20c77644aa3)
Jakub Toth [Thu, 4 Jun 2015 08:48:47 +0000 (10:48 +0200)]
Bug 2358 - Decrease Technical Debt
fix compilation eclipse ID error
Change-Id: I39398878338a9c02d6cc8219aa76d1c9e15c8e10
Signed-off-by: Jakub Toth <[email protected]>
(cherry picked from commit
d7b5e0619787f99844e19b9ef36f0a1793044f33)
Jakub Toth [Mon, 1 Jun 2015 07:19:22 +0000 (09:19 +0200)]
Bug 2358 - Resources for tests nn to xml
Tests of codecs are included in codecs yangtools yang-data-codec-gson and
yang-data-impl but we test codec on input data and also with presentation of Rest path.
* fix and add yang files for tests
* fix xmls files
* rename base folder of cnsn-to-xml to nn-to-xml
Change-Id: I6ad16f4e12c5f79089eda824d7b4879cdff14e6f
Signed-off-by: Jakub Toth <[email protected]>
(cherry picked from commit
cfdf1580b9a00e592ef79dc682ca234a97705413)
Vaclav Demcak [Fri, 29 May 2015 09:53:14 +0000 (11:53 +0200)]
Bug 3104 - fixed XmlNormalizedNodeBodyReader
Note: add missing key is relevant only for a POST scenario.
Change-Id: Ibe97f83de4411c0fa5e28ced192f69aa65454027
Signed-off-by: Vaclav Demcak <[email protected]>
(cherry picked from commit
37aa81d301af72a6ea4ddf5e51c3f26f53c66a3d)
Jan Hajnar [Thu, 28 May 2015 09:41:35 +0000 (11:41 +0200)]
Bug 3104 - fixed XmlNormalizedNodeBodyReader bug when data started at
MapEntryNode
Change-Id: I7b19e514846ecfe7a9a29254b6fade8c876247e5
Signed-off-by: Jan Hajnar <[email protected]>
(cherry picked from commit
f957b6bf9f120d6648b02b9a7624d43db9de7b7d)
ary [Thu, 7 May 2015 07:56:59 +0000 (09:56 +0200)]
Bug 2358 - Resources for tests nn to json
Tests of codecs are included in codecs yangtools yang-data-codec-gson and yang-data-impl
but we test codec on input data and also with presentation of Rest path.
* fix and add yang files for tests
* fix json and xml files
* rename base folder of csns-to-json to nn-to-json
Change-Id: Id1c88f069d259536d34438d7b68666dd3010adc4
Signed-off-by: Jakub Toth <[email protected]>
(cherry picked from commit
b0e9c2a7deb5a49e7f964ec1eee06198c0c15f5a)
Vaclav Demcak [Wed, 6 May 2015 13:10:14 +0000 (15:10 +0200)]
Bug 3017 - Error messages and logs missing for this or other RPC failures
Note: Restconf doesn't contain logs for more functionality (not only RPC)
so this patch adds better logging for Restconf (BrokerFacade and RestconfImpl).
Administrators are not able to pair user's reports and karaf log without better
logging information and it would help for better problem identify (e.g. bug 3080).
* BrokerFacade - add Logging for lev info for all extra state
* RestconfImpl - add Logging for lev warn for unexpected error state
- add Logging for lev debug for another extra state
Change-Id: I452dddd4fb9d75a7754be0bc1d92518dcb1eb786
Signed-off-by: Vaclav Demcak <[email protected]>
(cherry picked from commit
f0d174b75247700587557ea548c5638e12287fd1)
Jan Hajnar [Mon, 4 May 2015 14:57:49 +0000 (16:57 +0200)]
Bug 3104 - Sal Rest Connector: Data already exists for path when adding
new item to list in augmentation
* changed XmlNormalizedNodeBodyReader and JsonNormalizedNodeBodyReader
to return YangInstanceIdentifier pointing to root of payload data.
* changed BrokerFacade datastore functions for PUT and POST to use
returned path from reader without modifications
* modified rest connector tests according to new behavior and added
tests for POST when payload is from augment/choice
Change-Id: Iac6a9853ea4c4529d2f484c464bd27123f4fafa2
Signed-off-by: Jan Hajnar <[email protected]>
(cherry picked from commit
3d4dc18c01ebca47030284dde81988a44424d821)
ary [Wed, 29 Apr 2015 10:00:31 +0000 (12:00 +0200)]
Bug 2358 - Changed modifier of method in AbstractBodyReaderTest to protected
Tests of codecs are included in codecs yangtools yang-data-codec-gson and yang-data-impl but we test codec on input data and also with presentation of Rest path.
* changed modifier of method getMediaType() to protected
* fix tests with method getMediaType()
* remove additional assertions
Change-Id: I211c2dc43690b663cada31deb3942e10fcc95366
Signed-off-by: ary <[email protected]>
(cherry picked from commit
90aed8ac03ee3496178bdc3ec4b46f5c98dd78fc)
Maros Marsalek [Mon, 25 May 2015 10:37:34 +0000 (12:37 +0200)]
BUG-3335 Disable keepalives in netconf testtool
Change-Id: I607cd0b11555847a30ca57f339bb7d24fc79368e
Signed-off-by: Maros Marsalek <[email protected]>
(cherry picked from commit
1e15cd54715a29f17adb847664500a16470cd6a5)
Robert Varga [Fri, 22 May 2015 16:14:47 +0000 (18:14 +0200)]
Take advantage of YangInstanceIdentifier methods
YangInstanceIdentifier provides new, fast methods to acquire parent,
check if it empty and size of path arguments. Take advantage of them.
Change-Id: I527ff8cefb2799cb188ffe294c69e3b81a0d6909
Signed-off-by: Robert Varga <[email protected]>
(cherry picked from commit
ad7a6537b709a72e763835cae683b8cc12401ce1)
Maros Marsalek [Fri, 29 May 2015 12:39:06 +0000 (14:39 +0200)]
BUG-2150 Report errors for semantic issues with config snapshots
Change-Id: Ie8cf61e71649f64147a3cff6f92ae67b26454cb9
Signed-off-by: Maros Marsalek <[email protected]>
(cherry picked from commit
2763c33336189a88b1c7ae1cc1c5311709610ee2)
Vaclav Demcak [Tue, 2 Jun 2015 13:14:48 +0000 (15:14 +0200)]
Bug 2521 - Wrong return status code for non-existing mount-point
Note: MountpointService returns Optional object without mountpoint,
so this is the point where we would like to see error code 404.
Change-Id: Id7902e5c80786275c82e279ae0433a011fa486fc
Signed-off-by: Vaclav Demcak <[email protected]>
(cherry picked from commit
097cf9e9d96e6ad94ab91728ab84c49b0eba5f61)
Robert Varga [Sun, 31 May 2015 23:16:59 +0000 (01:16 +0200)]
Fix duplicate dependency declarations
Dumplicate dependencies trigger a maven warning, remove them.
Change-Id: I9eeff5900650e8781bc883f1dea2cc930403123a
Signed-off-by: Robert Varga <[email protected]>
Tomas Cere [Thu, 14 May 2015 15:31:09 +0000 (17:31 +0200)]
Http client for testing restconf
use --help to find out all suported args.
Change-Id: Ib9cae0479d672d4432bbc0fe87dc98a32f524784
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Wed, 20 May 2015 11:45:36 +0000 (13:45 +0200)]
Fix Subtree filter failing prefix lookup in element.
If element is f.ex a mac adress subtree filter would
try to match a nonexisting prefix.
Change-Id: Id23d78f6c7312f7c7b0b4f92f1cd99d97932de7f
Signed-off-by: Tomas Cere <[email protected]>
Tomas Cere [Wed, 3 Jun 2015 14:57:31 +0000 (16:57 +0200)]
BUG 3555: disable RC4 in mina-sshd
There are various security problems with RC4, this removes
RC4 from the ciphers used in the netconf ssh server.
Change-Id: I8973daf2dfb3670f0c77ffc9099eab2cc2a6cd05
Signed-off-by: Tomas Cere <[email protected]>
(cherry picked from commit
598345a6d62c4f0a2cfb55bfbc22b6ddd9c9bab7)
Maros Marsalek [Mon, 1 Jun 2015 11:47:37 +0000 (13:47 +0200)]
BUG-3436 Fix UNION type leaves resolution in config subsystem
The descriptions for comoposite open types were not included in a reconstructed
open type, which affected resolution of subsequent composite attributes with
leaves of type union. Union leaves rely on description in order to find the
artificial JMX attribute in order to pass union value as string.
Change-Id: If6222e25840cb854e565ae476509d21ebc19ab3c
Signed-off-by: Maros Marsalek <[email protected]>
(cherry picked from commit
10438f09cbbeb252e58a7fb381e9dd723cc14e2e)
Jan Hajnar [Thu, 28 May 2015 21:28:46 +0000 (23:28 +0200)]
Bug 3427 - Websockets: Cannot create stream if path contains predicates
or if target is a leaf
* fixed registration of path containing nodes with predicates
* added abillity to listen on leaves
Change-Id: I2e74aa6bbc50137187a5f7ece8de6ca288a1ebbf
Signed-off-by: Jan Hajnar <[email protected]>
(cherry picked from commit
2a5c10374e32ca292466c3a43a120bfc2df0de90)
Maros Marsalek [Mon, 25 May 2015 13:21:36 +0000 (15:21 +0200)]
Set revision of inet-types in ietf-netconf-monitoring
If users introduce new version of inet types into ODL, netconf-monitoring model
fails to load proper class.
Change-Id: I392f160a2fb2cd9ddea3c331b5715fb0694ba391
Signed-off-by: Maros Marsalek <[email protected]>
(cherry picked from commit
8a5dee49cac5e8560494e533b18c1fe7c4aff2a6)
Tomas Cere [Thu, 28 May 2015 07:56:12 +0000 (09:56 +0200)]
BUG 2610: Delete config:service instance via restconf
Adds support for removing service instances to config subsystem.
Change-Id: I92211a67d1e74ca4421bd0158f2c3600fabc18cc
Signed-off-by: Tomas Cere <[email protected]>
Jan Hajnar [Thu, 28 May 2015 14:22:36 +0000 (16:22 +0200)]
Bug 3414 - exposed location header in CORS setings
Change-Id: I74e5f363cb931b2b8a792447b5d5d2fa6e0aa5aa
Signed-off-by: Jan Hajnar <[email protected]>
(cherry picked from commit
c515ff7c42b487ac5baeb6e3361b6457d1c4b096)
Tomas Cere [Mon, 1 Jun 2015 14:58:20 +0000 (16:58 +0200)]
BUG 2596: Use base service name in service serialization.
Serialization of config was incorrectly using derived service name
instead of the name that was configured in xml.
Change-Id: Idf455f62b1ade06a3e52e4936227f485f74c8ef3
Signed-off-by: Tomas Cere <[email protected]>
Maros Marsalek [Tue, 26 May 2015 15:18:30 +0000 (17:18 +0200)]
BUG-2453 Enable nested enums in configuration
Nested enums could not be pushed due to an open type issue. Enums had a
composite open type, where the class name of the enum was stored. JMX was
not happy with this open type and expected a SimpleType.STRING.
After the enum is resolved, the open type is changed to SimpleType.
Change-Id: Ifce5bec70c8c3973f560260e93fadba2bd1119fa
Signed-off-by: Maros Marsalek <[email protected]>
(cherry picked from commit
7d4251f30d145d8b402e206a11fb4a2ff90ac351)
Maros Marsalek [Mon, 18 May 2015 14:11:57 +0000 (16:11 +0200)]
BUG-2976: Resolve clash between current and feature cfg pusher
Current config pusher now stores list of features present in karaf with the
config snapshot itself. Feature pusher now looks at the list and ignores
features listed in current config in the initial push.
A WARN log message is emitted for each ignored config file + feature.
Change-Id: I6e71e692e56d5219cf02cd704dd78215f4a7f5a2
Signed-off-by: Maros Marsalek <[email protected]>
(cherry picked from commit
fa8b972c6da7e3a24af396ea4bebe6d06f6a8d89)
Maros Marsalek [Wed, 20 May 2015 09:05:56 +0000 (11:05 +0200)]
BUG-1135 Improve error reporting in config pusher
Change-Id: I78e9550bf78cf5c5b3d929827f379e9009a4468f
Signed-off-by: Maros Marsalek <[email protected]>
Tomas Cere [Mon, 25 May 2015 13:07:19 +0000 (15:07 +0200)]
Fix deadlock in AsyncSshHandlerWriter
Ssh window resize would call write twice, while a write pending was in progress
causing a deadlock because the underlying channelSession was already locked.
Change-Id: I3a1498084327f12b2010744e570644259532b975
Signed-off-by: Tomas Cere <[email protected]>
Maros Marsalek [Mon, 11 May 2015 14:53:19 +0000 (16:53 +0200)]
BUG-2453 (De)Serialize enum values as defined in yang
Netconf endpoint for config subsystem did not (de)serialize enum values properly
It assumed the enum constants are identical in yang and in generated binding
Change-Id: If46c770a49653348201cd5d5c9303b5207048252
Signed-off-by: Maros Marsalek <[email protected]>
Tom Pantelis [Fri, 15 May 2015 17:21:13 +0000 (13:21 -0400)]
Fix intermittent ConfigPersisterTest failure
testSuccessConflictingVersionException fails intermittently on Jenkins
with different errors. I think the problem is that it sets up the
"workingService" which the ConfigPusher is accessing createService on
another thread. In reading Mockito FAQs, you may get strange intermittent
results with multi-threading wrt to stubbing. Mocks can be accessed from
multiple threads but it's recommended that you setup all the stubbed
methods ahead of time. So I changed
testSuccessConflictingVersionException to do so.
After the fix, I ran the ConfigPersisterTest 550 times w/o failure.
Change-Id: Ia22936cfad82416e317935bd40b0eb3ccbdb232c
Signed-off-by: Tom Pantelis <[email protected]>
(cherry picked from commit
e60d699bfe040f3ce570b4e634b0612eadeaca45)
Vaclav Demcak [Tue, 12 May 2015 08:56:04 +0000 (10:56 +0200)]
Bug 3216 - Restconf GET operations functionality are not supported yet
* missing list of all operations for all modules or for some module
Change-Id: I937890b83fe2bf3198278123373c5d3bad0aa927
Signed-off-by: Vaclav Demcak <[email protected]>
(cherry picked from commit
a59286ee063c90817958e9cef4836e15aec3c7a6)
Gwenael Lambrouin [Thu, 21 May 2015 13:32:35 +0000 (15:32 +0200)]
BUG-2838: Trim leading whitespaces from incoming NETCONF messages.
Some network devices (such as Cisco routers) send RPC replies with a leading
newline before the XML declaration. The OpenDaylight controller does not accept
those replies: the XML parsing fails.
This patch fixes the NETCONF messages before they are sent to the XML parser:
it removes all the spurious characters at the beginning of the messages.
Change-Id: Ibc6eb6dc5bad6252a3c9bed73d3db83814aff501
Signed-off-by: Gwenael Lambrouin <[email protected]>
Signed-off-by: Maros Marsalek <[email protected]>
Maros Marsalek [Mon, 18 May 2015 11:41:17 +0000 (13:41 +0200)]
Rename stress-client classifier in netconf-testtool
2 shaded jars with same classifier overwrite each other in nexus
Change-Id: If08d83ccda4c716ef12818fd8eb0da2ae37706b9
Signed-off-by: Maros Marsalek <[email protected]>
Maros Marsalek [Thu, 21 May 2015 13:21:10 +0000 (15:21 +0200)]
BUG-3301 Extract additional header properly on each OS
On Windows, the additional header in hello netconf message was no fully
extracted and it left \n byte in front on netconf xml hello message. This
is not allowed as long as the <?xml ... > declaration is present.
Change-Id: I611a5c689e86fb45065e6a9cd3b14cd5718af54f
Signed-off-by: Maros Marsalek <[email protected]>
Maros Marsalek [Tue, 19 May 2015 14:06:15 +0000 (16:06 +0200)]
BUG-2961 Disable auth and idle timeout for netconf connector
The timeouts appeared in the mina SSHD lib in version 14 and are not suitable
for netconf connector.
Change-Id: I05f0feb58ef30d12a29eefa53ec5ccf300cb3123
Signed-off-by: Maros Marsalek <[email protected]>