netconf.git
5 years agoBump versions by x.y.(z+1) 43/71943/1 stable/nitrogen
jenkins-releng [Thu, 10 May 2018 23:34:39 +0000 (23:34 +0000)]
Bump versions by x.y.(z+1)

Change-Id: I8d92d69131d32196bf7b2958a7d08b1ca3970b59
Signed-off-by: jenkins-releng <jenkins-releng@opendaylight.org>
5 years agoMerge "Bump to odlparent 2.0.7" into stable/nitrogen
JakubToth [Mon, 30 Apr 2018 08:07:17 +0000 (08:07 +0000)]
Merge "Bump to odlparent 2.0.7" into stable/nitrogen

5 years agoBump to odlparent 2.0.7 87/71387/2
Stephen Kitt [Thu, 26 Apr 2018 09:34:10 +0000 (11:34 +0200)]
Bump to odlparent 2.0.7

Change-Id: I2768ac0231ff23aced9160f7a9e5f46d1a243627
Signed-off-by: Stephen Kitt <skitt@redhat.com>
6 years agoNETCONF-526 : edit-config payload default-operation needs to be set to default-value 97/70997/1
Balaji Varadaraju [Wed, 14 Mar 2018 06:40:46 +0000 (01:40 -0500)]
NETCONF-526 : edit-config payload default-operation needs to be set to default-value

For the PUT/POST calls right now default-operation tag in the edit-config is set to
"none". As per RFC with this value devices can reject a config operation when
elements present in the request whose structure is not already present in the tree.
For example a nested parent-child structure where parent structure does not yet exist
yet in the tree may result in an error based on implementation.
We should  leave this field out ( which will default to merge) and let the device make
the right decision.

Change-Id: I8b85ef072785381897a19724dc94003b8f315bd4
Signed-off-by: Balaji Varadaraju <bvaradar@luminanetworks.com>
(cherry picked from commit 011fbb4e78b64748c4be16c43b3deb46a5c3b23c)

6 years agoMerge "Add local MultivaluedHashMap implementation" into stable/nitrogen
Jakub Morvay [Tue, 27 Mar 2018 16:20:38 +0000 (16:20 +0000)]
Merge "Add local MultivaluedHashMap implementation" into stable/nitrogen

6 years agoRestconf 8040 should return 204 for delete and put 89/68989/1
Tom Pantelis [Wed, 28 Feb 2018 19:13:38 +0000 (14:13 -0500)]
Restconf 8040 should return 204 for delete and put

restconf was returning 200 Ok but according to RCF8040, for put,
"If an existing resource is modified, a "204 No Content"
status-line is returned."" and for delete, "If the DELETE request
succeeds, a "204 No Content" status-line is returned.".

Change-Id: I7133cdd747c1869d6b640c873bbcdccd437e8900
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoNETCONF-514: Use exists instead of read for PUT 88/68988/1
Tom Pantelis [Mon, 26 Feb 2018 19:19:01 +0000 (14:19 -0500)]
NETCONF-514: Use exists instead of read for PUT

The PUT operation needs to check if the path already exists
in order to return the proper response code according to the RFC
however calling exists instead of read is more efficient on the
back end.

Change-Id: Ibd7e99324c6a151aae91083e0c90bdf877161dee
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoNETCONF-512: Add cases for missing NormalizedNode types 32/68832/2
Tom Pantelis [Sat, 24 Feb 2018 01:17:02 +0000 (20:17 -0500)]
NETCONF-512: Add cases for missing NormalizedNode types

ReadDataTransactionUtil.prepareData was missing cases for
LeafSetNode, OrderedLeafSetNode, OrderedMapNode and UnkeyedListNode.

Change-Id: Iaf44ce9b24044584e37d524835ec4a51843acd32
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit c7e371eb1e23ba3b86747a27172acca78a449706)

6 years agoDon't include stacktraces in REST responses 72/68272/3
Evan Zeller [Mon, 22 Jan 2018 20:12:38 +0000 (12:12 -0800)]
Don't include stacktraces in REST responses

OWASP best practices recommend user facing error messages should not
contain stack traces or line numbers. The full stack trace should still be available in karaf.log.

Change-Id: Ia8ffed91ecdbf8a1d299c90c33882bbc18d55b50
Signed-off-by: Evan Zeller <evanrzeller@gmail.com>
6 years agoMerge "NETCONF-509: no-input RPCs should use RestconfDocumentedException" into stable...
JakubToth [Sun, 25 Feb 2018 01:24:50 +0000 (01:24 +0000)]
Merge "NETCONF-509: no-input RPCs should use RestconfDocumentedException" into stable/nitrogen

6 years agoFix root data node QName equality check 75/68375/2
Igor Foltin [Fri, 16 Feb 2018 16:43:24 +0000 (17:43 +0100)]
Fix root data node QName equality check

This fixes the http error status 500 when trying to read
the whole mounted datastore using the new restconf
implementation based on RFC8040.

When serializing a NormalizedNode that represents
the data root we need to serialize only its children.

Change-Id: Ibd7bd71fe6f36674f62b9d974c85045c359cc6b1
Signed-off-by: Igor Foltin <igor.foltin@pantheon.tech>
6 years agoAdd local MultivaluedHashMap implementation 40/68440/3
Sai MarapaReddy [Tue, 20 Feb 2018 19:09:39 +0000 (11:09 -0800)]
Add local MultivaluedHashMap implementation

Corresponding Carbon patch - https://git.opendaylight.org/gerrit/#/c/63054/

The JSONRestconfService implementation contains a local UriInfo
implementation, SimpleUriInfo, that uses a MultivaluedHashMap
implementation from javax.ws.rs.core. This class is provided by
the dependency used at compile time however, the runtime bundle
that provides the javax.ws.rs.core interfaces doesn't provide
MultivaluedHashMap. Therefore I added our own local MultivaluedHashMap
class based on the external one.

Change-Id: I4f260f27684659fd734581617f6fa2002a6cd78c
Author:     Sai MarapaReddy <sai.marapareddy@gmail.com>
Signed-off-by: Sai MarapaReddy <sai.marapareddy@gmail.com>
6 years agoNETCONF-509: no-input RPCs should use RestconfDocumentedException 25/68325/2
Evan Zeller [Wed, 14 Feb 2018 23:15:41 +0000 (15:15 -0800)]
NETCONF-509: no-input RPCs should use RestconfDocumentedException

When invoked with an "input" value currently the implementation throws
IllegalStateException up to the servlet container which results in the
ugly jetty default error page and reveals stack trace information.
Provide a clear message that the invoked RPC should not take any input values.

Change-Id: Id13499b80bed9a2ea7666a3aa6d775da341055ab
Signed-off-by: Evan Zeller <evanrzeller@gmail.com>
(cherry picked from commit 914a50cc793909ffa813e60f9ac6c73b0cfbb5bc)

6 years agoBump versions by x.y.(z+1) 80/68580/1
Thanh Ha [Fri, 23 Feb 2018 21:20:39 +0000 (16:20 -0500)]
Bump versions by x.y.(z+1)

Change-Id: I3554e752845919513d6d92af3aaf37b5b1420bc7
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
6 years agoMerge "Close nested JSON writers" into stable/nitrogen
JakubToth [Thu, 8 Feb 2018 10:15:38 +0000 (10:15 +0000)]
Merge "Close nested JSON writers" into stable/nitrogen

6 years agoNETCONF-494: use RFC7951 JSON codecs 30/68030/1
Robert Varga [Wed, 7 Feb 2018 17:38:54 +0000 (18:38 +0100)]
NETCONF-494: use RFC7951 JSON codecs

RFC8040 requires us to use a different codec for encoding instance
identifiers. Update the RFC8040 northbound to select this codec.

Also update the bierman02 northbound to explicitly bind to
the legacy LHOTKA codec.

Change-Id: I436e17b7c7695aaf75a27e7967b1bcfaf4815686
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoClose nested JSON writers 68/67868/4
Stephen Kitt [Fri, 2 Feb 2018 15:57:30 +0000 (16:57 +0100)]
Close nested JSON writers

With I9c597fe96937867cffdcbeeddd4b1507de20f2ee,
JSONNormalizedNodeStreamWriter.createNestedWriter() leaves it up to
the caller to close the provided JsonWriter. This patch ensures that
that is the case.

Change-Id: If20a596db06e40d1636de168dd11677372964364
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoNETCONF-506: fix YII deserialization in FilterContentValidator 42/67742/1
Marek Gradzki [Tue, 30 Jan 2018 19:27:17 +0000 (20:27 +0100)]
NETCONF-506: fix YII deserialization in FilterContentValidator

Treat leafref keys in the same way as indentityref keys.
Follows https://git.opendaylight.org/gerrit/#/c/53996/

See also NETCONF-384.

Change-Id: I36a67b12e23c7da43f4e5c6002de8ae031d18e6a
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
6 years agoNETCONF-505: fix decoding of URLs with external leafref 22/67722/2
Marek Gradzki [Tue, 30 Jan 2018 11:45:07 +0000 (12:45 +0100)]
NETCONF-505: fix decoding of URLs with external leafref

Use mount point schema rather than global.

Change-Id: Id386bc462961b42103cf0e3f2e984f4e034bba76
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
6 years agoSet schemas to global context 77/67277/1
Miroslav Macko [Thu, 18 Jan 2018 10:24:33 +0000 (11:24 +0100)]
Set schemas to global context

- onGlobalContextUpdated schemas need to be set to the global context

Change-Id: I86c898d8b70c0f1a7fcc61be1cb0b542c8f05096
Signed-off-by: Miroslav Macko <miroslav.macko@pantheon.tech>
6 years agoAdd missing 'Path' annotation in jax-rs implementations for REST 51/66851/1
Jakub Toth [Wed, 3 Jan 2018 09:17:40 +0000 (10:17 +0100)]
Add missing 'Path' annotation in jax-rs implementations for REST
services

Change-Id: I655cd3112a9674457013411de1cf62a74b7fef40
Signed-off-by: Jakub Toth <jakub.toth@pantheon.tech>
6 years agoManual cherrypicks from oxygen 67/66267/1
Jakub Toth [Wed, 6 Dec 2017 10:12:45 +0000 (11:12 +0100)]
Manual cherrypicks from oxygen

  * Fix hardcoded port
    * https://git.opendaylight.org/gerrit/#/c/65872/2
  * Add update method of handlers for rest services
    * https://git.opendaylight.org/gerrit/#/c/65458/
  * NPE when try get schema as yang
    * https://git.opendaylight.org/gerrit/#/c/65804/

Change-Id: Ifc7fe98b4abcbf29e00bdddf2072045acc3222ca
Signed-off-by: Jakub Toth <jakub.toth@pantheon.tech>
6 years agoMerge "Add missing flush() on buffered writer." into stable/nitrogen
Tomas Cere [Thu, 30 Nov 2017 15:00:05 +0000 (15:00 +0000)]
Merge "Add missing flush() on buffered writer." into stable/nitrogen

6 years agoFix KeyPairProvider initialization in NetconfSshServerProvider 11/65711/2
Marek Gradzki [Thu, 9 Nov 2017 12:49:00 +0000 (13:49 +0100)]
Fix KeyPairProvider initialization in NetconfSshServerProvider

As a side offect of https://git.opendaylight.org/gerrit/#/c/60138,
RSA private key is stored unencrypted on disk.

Without additional countermeasures this might not be a good idea.

This patch sets DEFAULT_PRIVATE_KEY_PATH to null which disables
key pair serialization.

Change-Id: Ibbf51f702bc47d768db16d6a3f406a1b2ec906fb
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
(cherry picked from commit f01da36f40cdcc21a88c40330b43334d3eb06a84)

6 years agoBump versions by x.y.(z+1) 75/65975/1
jenkins-releng [Tue, 28 Nov 2017 03:49:04 +0000 (03:49 +0000)]
Bump versions by x.y.(z+1)

Change-Id: Ia4aa58a813a19e8891e279edf38e612a37c2d3c3
Signed-off-by: jenkins-releng <jenkins-releng@opendaylight.org>
6 years agoExtra superfluous edit-config RPC sent - Netconf-482 81/65281/3
Atul Gosain [Tue, 7 Nov 2017 01:57:51 +0000 (17:57 -0800)]
Extra superfluous edit-config RPC sent - Netconf-482

Extra superfluous edit-config RPC sent just prior to correct edit-config RPC for top-level lists
POST & PUT to certain top-level lists in a mounted device's model returns a 500 error via Restconf,
although in some cases (device-dependent) the config appears to have committed.
This problem first appeared in Boron-SR3, and continues in Carbon SR-1.

Change-Id: I473e6e1f34d6f2bb9aa63f12b90fc479e4a8e3cd
Signed-off-by: Atul Gosain <agosain@luminanetworks.com>
6 years agoAdd missing flush() on buffered writer. 89/65289/1
Andrej Záň [Mon, 23 Oct 2017 14:02:07 +0000 (16:02 +0200)]
Add missing flush() on buffered writer.

Missing flush caused, that backing ByteArrayOutputStream was empty
and thus mounted resources was not showing up in apidoc.

Change-Id: I14445b9f85cea1918321e59519129e21cb37dd81
Signed-off-by: Andrej Záň <andrej.zan@pantheon.tech>
(cherry picked from commit a2c0fda6b15dbf6717e2405bab868cda2fc209a3)

6 years agoTransition ListenerAdapter to ClusteredDOMDataTreeListener 02/64402/1
Josh [Tue, 19 Sep 2017 07:42:39 +0000 (10:42 +0300)]
Transition ListenerAdapter to ClusteredDOMDataTreeListener

Solves this: https://bugs.opendaylight.org/show_bug.cgi?id=9147
This is in general an issue with ListenerAdapter which does not
currently work in a clustered deployment.

ListenerAdapterTest needed to be adjusted for two reasons:
1. There was a bug in ListenerAdapter where if leafNodesOnly
was set the leafNodesOnly logic was not applied in delete
notifications. The new ListenerAdapter code fixes that so
ListenerAdapterTest needed to be adjusted.
2. In DomDataTreeEtc, merge operations cause the key node
to count as "WRITE"-en for notifications even if it was not
changed. ListenerAdapterTest was adjusted accordingly. Bug
for this here: https://bugs.opendaylight.org/show_bug.cgi?id=9179

Change-Id: I3c40e02551d8f04354489e5ffb8c66f111bb3b96
Signed-off-by: Josh <jhershbe@redhat.com>
6 years agoAdd unit tests for ListenerAdapter 01/64401/1
Josh [Sun, 17 Sep 2017 12:16:51 +0000 (15:16 +0300)]
Add unit tests for ListenerAdapter

Test that json generated by ListenerAdapter is correct
for regular notifications and "leaf nodes only" notifications.

Change-Id: I62fa22b1e30ca6a8632b3d2614558e9ced0abf54
Signed-off-by: Josh <jhershbe@redhat.com>
6 years agoBug 9256: Add websocket server config knob for ip 42/64242/1
Tomas Cere [Tue, 10 Oct 2017 08:50:57 +0000 (10:50 +0200)]
Bug 9256: Add websocket server config knob for ip

Also cleans up a couple of ugly NPE catches.

Change-Id: Ifd164aa76c406cc2082d603df8732d636f6e06a1
Signed-off-by: Tomas Cere <tcere@cisco.com>
6 years agoBUG 9112: NPE in karaf cli when device is still connecting 90/64190/1
Tomas Cere [Fri, 6 Oct 2017 13:07:13 +0000 (15:07 +0200)]
BUG 9112: NPE in karaf cli when device is still connecting

Change-Id: I753e1870ce5b86535163e43acd4a20b5f4d83df5
Signed-off-by: Tomas Cere <tcere@cisco.com>
(cherry picked from commit 55c1160cd84f71bec76d4f57a3adcc5c8280ba52)

6 years agoRemove aaa version declarations 42/63842/1
Robert Varga [Fri, 29 Sep 2017 10:23:18 +0000 (12:23 +0200)]
Remove aaa version declarations

These are now properly published, no need to repeat them here.

Change-Id: I80b472da4186bf8df48e4933a914bb9b56981a92
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoBUG-9218: fix features to not duplicate upstream bundles 41/63841/1
Robert Varga [Fri, 29 Sep 2017 09:53:39 +0000 (11:53 +0200)]
BUG-9218: fix features to not duplicate upstream bundles

Restructures dependencies to pull in upstream features which
provide the bundles we need.

Change-Id: I7e1cf306abd100a1a50cc4248de78d85dc91df9c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoMerge "BUG-9132: don't provide a value for restconf/streams/events" into stable/nitrogen
Tomas Cere [Fri, 29 Sep 2017 08:17:40 +0000 (08:17 +0000)]
Merge "BUG-9132: don't provide a value for restconf/streams/events" into stable/nitrogen

6 years agoBUG-9132: don't provide a value for restconf/streams/events 29/63729/1
Evan Zeller [Thu, 28 Sep 2017 01:15:31 +0000 (18:15 -0700)]
BUG-9132: don't provide a value for restconf/streams/events

The yang type of events leaf is 'type empty', meaning there should be no value.
As of Carbon performing a GET on restconf/streams causes a cast
exception due to the empty string value here. See EmptyJSONCodec in
yangtools.

Change-Id: If0501b9c5459f4255096a4f070968c87a749407e
Signed-off-by: Evan Zeller <evanrzeller@gmail.com>
6 years agoBump odlparent 2.0.4 to 2.0.5 72/63672/1
Stephen Kitt [Wed, 27 Sep 2017 13:34:28 +0000 (15:34 +0200)]
Bump odlparent 2.0.4 to 2.0.5

Change-Id: I8ec7b8adcc7f2805e0a214ac3aee64368df40291
Signed-off-by: Stephen Kitt <skitt@redhat.com>
(cherry picked from commit 6eb1e5e601c5fa9f6638f6e33b9d079e92979732)

6 years agoMerge "Minor cleanup of blueprint config" into stable/nitrogen
Jakub Morvay [Wed, 27 Sep 2017 13:42:17 +0000 (13:42 +0000)]
Merge "Minor cleanup of blueprint config" into stable/nitrogen

6 years agoMerge "Bug 8989 - Create just one DS for each test-tool's simulated netconf device...
Tomas Cere [Wed, 27 Sep 2017 10:55:53 +0000 (10:55 +0000)]
Merge "Bug 8989 - Create just one DS for each test-tool's simulated netconf device" into stable/nitrogen

6 years agoBump versions by x.y.(z+1) 61/63561/1
Thanh Ha [Tue, 26 Sep 2017 21:13:09 +0000 (17:13 -0400)]
Bump versions by x.y.(z+1)

Change-Id: I777c0c69f2ae3d4639e98bd8e24da4fddff58e69
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
6 years agoMinor cleanup of blueprint config 62/63462/1
Atul Gosain [Tue, 22 Aug 2017 00:46:01 +0000 (17:46 -0700)]
Minor cleanup of blueprint config

The path for private file was left here due to which the netconf module
looks for the private key file and shows error in the log which is a false alarm.
Cleaning up the configuration

Change-Id: Ied9cc137ab67cab158318a6c2f34da19dc174fe0
Signed-off-by: Atul Gosain <atul.gosain@gmail.com>
Signed-off-by: Atul Gosain <agosain@brocade.com>
6 years agoMerge "Bug 8988 - Check for empty payload properly" into stable/nitrogen
Thanh Ha [Tue, 12 Sep 2017 18:43:12 +0000 (18:43 +0000)]
Merge "Bug 8988 - Check for empty payload properly" into stable/nitrogen

6 years agoBug 8988 - Check for empty payload properly 48/63048/1
Jakub Morvay [Tue, 12 Sep 2017 14:48:23 +0000 (16:48 +0200)]
Bug 8988 - Check for empty payload properly

Do not use InputStream#avalaible method to check for empty payload's
input streams in our implementations of MessageBodyReader interface.
InputStream#avalaible method returns an estimate of the number of bytes
that can be read from input stream without blocking. We cannot be sure
the stream is actually empty, even if this method returns 0.

Wrap the payload's input stream in PushbackInputStream and try to read
and unread from it instead.

Change-Id: I43b3a8d837f3dc4bc59d7cc2db29ffa06786844f
Signed-off-by: Jakub Morvay <jmorvay@cisco.com>
6 years agoBug 9092: revert to org.json temporarily 49/62849/1
Stephen Kitt [Thu, 7 Sep 2017 09:05:48 +0000 (11:05 +0200)]
Bug 9092: revert to org.json temporarily

This patch reverts to org.json to convert the XML notification to JSON
in ListenerAdapter. The appropriate fix (coming later) is to serialize
the notification to JSON directly, without going through XML, but in
the mean time this unblocks the release.

Change-Id: I184ea21c49c255fa26fa1eaa57bc3f4548764118
Signed-off-by: Stephen Kitt <skitt@redhat.com>
6 years agoRPC for netconf node addition. Supports encrypt option for password encryption. 82/62682/5
Atul Gosain [Fri, 21 Jul 2017 04:44:33 +0000 (21:44 -0700)]
RPC for netconf node addition. Supports encrypt option for password encryption.

Change-Id: I34beb880cbe2ccc6a3fe8e5f6cd4253f7e1938f4
Signed-off-by: Atul Gosain <atul.gosain@gmail.com>
Signed-off-by: Atul Gosain <agosain@brocade.com>
6 years agoEnable public key based authentication for netconf 81/62681/3
Atul Gosain [Tue, 27 Jun 2017 02:13:26 +0000 (19:13 -0700)]
Enable public key based authentication for netconf

Change-Id: Icca97924515537b670688767d41ddd4bd6e1bbf6
Signed-off-by: Atul Gosain <agosain@brocade.com>
6 years agoBUG 8839: Revert "Make netconf utilize encrypted passwords only" 80/62680/2
Tomas Cere [Tue, 11 Jul 2017 14:57:59 +0000 (14:57 +0000)]
BUG 8839: Revert "Make netconf utilize encrypted passwords only"

This reverts commit 1867bf17d781f21473dabcde2ad3f85b9b1defc6.

Change-Id: Ia5d97c118d805bdeff9e47f466a9ec64b58c03ca
Signed-off-by: Tomas Cere <tcere@cisco.com>
6 years agoBug 8989 - Create just one DS for each test-tool's simulated netconf device 42/62642/1
Jakub Morvay [Fri, 18 Aug 2017 08:28:03 +0000 (10:28 +0200)]
Bug 8989 - Create just one DS for each test-tool's simulated netconf device

When using netconf test-tool with option --md-sal set to true, we expect
that each test-tool's simulated netconf device will have its own md-sal
persistent datastore. However, current implementation creates own
datastore for each netconf session.

Map newly created simulated device's datastore to its server socket
instead of netconf session's socket.

Change-Id: I2d5a0295c8cbff6d29baafa36bdbbe6aba8119c6
Signed-off-by: Jakub Morvay <jmorvay@cisco.com>
(cherry picked from commit c65ab49a8a2f72446e13e0bb0f8395722c455c6b)

6 years agoBug 8977 - Failed on binary key type 28/61928/2
Jakub Toth [Tue, 15 Aug 2017 15:07:14 +0000 (17:07 +0200)]
Bug 8977 - Failed on binary key type

  * fix validating of uri with input data for binary key type
  * tests

Change-Id: I70ac6e10f9999bc0feca2ba600124fa639eef842
Signed-off-by: Jakub Toth <jakub.toth@pantheon.tech>
6 years agoUpdate .gitreview to stable/nitrogen 49/61649/1
Thanh Ha [Mon, 14 Aug 2017 16:24:00 +0000 (12:24 -0400)]
Update .gitreview to stable/nitrogen

Change-Id: Id226e9a7947e3502b256c6a605bacfd1402b2db8
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
6 years agoMerge "Remove explicit version declaration"
Jakub Morvay [Fri, 11 Aug 2017 07:08:49 +0000 (07:08 +0000)]
Merge "Remove explicit version declaration"

6 years agoMerge "Bug 8939: Extract MapEntryNode from MapNode result of XML parsing"
Jakub Morvay [Thu, 10 Aug 2017 10:47:24 +0000 (10:47 +0000)]
Merge "Bug 8939: Extract MapEntryNode from MapNode result of XML parsing"

6 years agoBug 8939: Extract MapEntryNode from MapNode result of XML parsing 33/61333/7
Igor Foltin [Wed, 9 Aug 2017 13:24:53 +0000 (15:24 +0200)]
Bug 8939: Extract MapEntryNode from MapNode result of XML parsing

Originally, XmlNormalizedNodeBodyReader expected a MapEntryNode
as the result of parsing an XML input with a root list element.

However, after migrating to the new XML parser, the result of parsing
such an XML input is a MapNode with one MapEntryNode inside.

Therefore, extract this MapEntryNode and use it as the result of parsing.

Change-Id: I778bf8036d7b90f75d2d5028c5a9e31ae4db995e
Signed-off-by: Igor Foltin <igor.foltin@pantheon.tech>
Signed-off-by: Jakub Morvay <jmorvay@cisco.com>
Signed-off-by: Jakub Toth <jakub.toth@pantheon.tech>
6 years agoBUG-8923: Bump odlparent to 2.0.4 72/61272/4
Robert Varga [Mon, 7 Aug 2017 12:05:35 +0000 (14:05 +0200)]
BUG-8923: Bump odlparent to 2.0.4

Adopts changes to netty packaging.

Change-Id: Ibbaebf94838641752cc391c38199c5a597415588
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Stephen Kitt <skitt@redhat.com>
6 years agoRemove explicit version declaration 11/60911/2
Robert Varga [Sat, 29 Jul 2017 12:28:46 +0000 (14:28 +0200)]
Remove explicit version declaration

odlparent provides a declaration, no need to override versions.

Change-Id: Id627c79a80a1ca420a40ff9cee0c1280d8524246
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoMerge "Avoid null Optional parameter"
Jakub Morvay [Tue, 8 Aug 2017 10:34:40 +0000 (10:34 +0000)]
Merge "Avoid null Optional parameter"

6 years agoMerge "Avoid returning null Optional"
Jakub Morvay [Mon, 7 Aug 2017 19:45:29 +0000 (19:45 +0000)]
Merge "Avoid returning null Optional"

6 years agoBUG-8923: eliminate another reference to bcprov 73/61273/1
Robert Varga [Mon, 7 Aug 2017 12:15:27 +0000 (14:15 +0200)]
BUG-8923: eliminate another reference to bcprov

bouncy castle is provided by the platform, we should not be pulling
it in.

Change-Id: Icdce53c7b876b9ef834c194c3263ca2268c674a4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoBUG-8923: do not install bouncycastle 75/61175/2
Robert Varga [Fri, 4 Aug 2017 14:17:06 +0000 (16:17 +0200)]
BUG-8923: do not install bouncycastle

These bundles are provided by odlparent's substrate, hence we should
not be mentioning them.

Change-Id: I4435629686d31cf7d84c8bd768389dc518193fe5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoAvoid null Optional parameter 62/61162/1
Stephen Kitt [Fri, 4 Aug 2017 10:53:01 +0000 (12:53 +0200)]
Avoid null Optional parameter

Change-Id: Ice847bc899b920da1f6fe1b354a7d5e7773b78ae
Signed-off-by: Stephen Kitt <skitt@redhat.com>
6 years agoAvoid returning null Optional 61/61161/1
Stephen Kitt [Fri, 4 Aug 2017 10:50:38 +0000 (12:50 +0200)]
Avoid returning null Optional

Optional references should never be null, this patch uses
Optional.absent() instead and cleans up the caller.

Change-Id: Iac1888abf60785a3d3f0f1493bbd71751dd0fbc9
Signed-off-by: Stephen Kitt <skitt@redhat.com>
6 years agoMerge changes from topic 'protocol-framework'
Jakub Morvay [Wed, 2 Aug 2017 08:44:41 +0000 (08:44 +0000)]
Merge changes from topic 'protocol-framework'

* changes:
  Activate protocol-framework artifacts
  Cleanup build system

6 years agoMerge "Bug 5825: Migrate restconf to the new XML parser #2"
Jakub Morvay [Wed, 2 Aug 2017 08:07:21 +0000 (08:07 +0000)]
Merge "Bug 5825: Migrate restconf to the new XML parser #2"

6 years agoMerge "Bug 5824: Migrate netconf to the new XML parser #2"
Jakub Morvay [Wed, 2 Aug 2017 08:06:08 +0000 (08:06 +0000)]
Merge "Bug 5824: Migrate netconf to the new XML parser #2"

6 years agoAvoid spurious WARN in NetconfClientConfiguration 01/61001/1
Vratko Polak [Tue, 1 Aug 2017 14:48:18 +0000 (16:48 +0200)]
Avoid spurious WARN in NetconfClientConfiguration

Change-Id: I7b010183de605f207451de975fb1cde238460d1e
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
6 years agoBump all Odlparent dependencies to 2.0.2 92/60992/1
Vratko Polak [Tue, 1 Aug 2017 13:13:18 +0000 (15:13 +0200)]
Bump all Odlparent dependencies to 2.0.2

Change-Id: I1b51dce8036333ca4562219e7f586048c98e9b8a
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
6 years agoBug 5825: Migrate restconf to the new XML parser #2 66/60566/3
Igor Foltin [Wed, 19 Jul 2017 13:06:31 +0000 (15:06 +0200)]
Bug 5825: Migrate restconf to the new XML parser #2

Migrate restconf components to the new XML parser from YANG tools

Change-Id: I2011904cb30f69fdb798f735292a8383049cda6b
Signed-off-by: Igor Foltin <igor.foltin@pantheon.tech>
6 years agoBUG-7891: Remove odl-netconf-ssh feature prerequisites 15/60915/1
Luis Gomez [Sat, 29 Jul 2017 21:17:56 +0000 (14:17 -0700)]
BUG-7891: Remove odl-netconf-ssh feature prerequisites

This works in my setup. After removing the prerequisite dependency
I do not see anymore the server unhealthy issue.

Change-Id: I54eac80cd987474747ea47f652414245a893470c
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
6 years agoBug 5824: Migrate netconf to the new XML parser #2 06/60906/1
Igor Foltin [Sat, 29 Jul 2017 11:45:55 +0000 (13:45 +0200)]
Bug 5824: Migrate netconf to the new XML parser #2

Migrate netconf components to the new XML parser from YANG tools.

Change-Id: I0cd30ea671239fad986d173bd4be845701d6e968
Signed-off-by: Igor Foltin <igor.foltin@pantheon.tech>
6 years agoActivate protocol-framework artifacts 02/60902/4
Robert Varga [Sat, 29 Jul 2017 09:48:45 +0000 (11:48 +0200)]
Activate protocol-framework artifacts

This adds protocol-framework to compilation

Change-Id: I979961389495d1c7ea0ac045f94576307a170697
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoCleanup build system 01/60901/4
Robert Varga [Sat, 29 Jul 2017 08:28:05 +0000 (10:28 +0200)]
Cleanup build system

Clean up pom.xmls, to eliminate dupliciate aggragator
functions, properly import upstream artifacts and correct
relativePath declarations.

Change-Id: I0786e5fdf207ad544a7bb5c72e035be78b867b5e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoRemove logback related stuff 53/60853/1
Michael Vorburger [Fri, 28 Jul 2017 06:34:12 +0000 (12:04 +0530)]
Remove logback related stuff

as discussed on https://lists.opendaylight.org/pipermail/odlparent-dev/2017-July/001262.html

tools/netconf-testtool doesn't seem to really require logback-config

netconf-it appears to be completely broken anyway, and is not in build

Change-Id: Ia7fde3529b3b4f5940fe2d143d35230a12b072af
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
6 years agoCleanup unused config subsystem dependencies 69/60669/3
Tom Pantelis [Sun, 23 Jul 2017 17:20:37 +0000 (13:20 -0400)]
Cleanup unused config subsystem dependencies

Change-Id: I25816dd6ed2b0dd11b40d6dd68549a061380a6ae
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoMore migration to odlparent 2.0.2 39/60639/1
Stephen Kitt [Fri, 21 Jul 2017 11:48:10 +0000 (13:48 +0200)]
More migration to odlparent 2.0.2

Some odlparent artifacts were missed in the original migration to
odlparent 2, and were still on 1.9.0. This patch fixes that.

Change-Id: I2a74a7f7b97135e9f149896dbd13e5ab6c7e19d9
Signed-off-by: Stephen Kitt <skitt@redhat.com>
6 years agoAdd 'features/protocol-framework/' from commit 'cb42405784db97d0ce2c5991d12a89b46d185949'
Thanh Ha [Thu, 20 Jul 2017 22:03:37 +0000 (18:03 -0400)]
Add 'features/protocol-framework/' from commit 'cb42405784db97d0ce2c5991d12a89b46d185949'

Change-Id: I60f397e609aa0f26dbb39c4c5bab17a6b0d8b447
git-subtree-dir: features/protocol-framework
git-subtree-mainline: 6d7e12bf3ef64e5004703a1d540e7e26f30a9595
git-subtree-split: cb42405784db97d0ce2c5991d12a89b46d185949
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
6 years agoAdd 'protocol-framework/' from commit '5d015c2c5f800d136406c15fcb64fd531d4ffc26'
Thanh Ha [Thu, 20 Jul 2017 21:50:00 +0000 (17:50 -0400)]
Add 'protocol-framework/' from commit '5d015c2c5f800d136406c15fcb64fd531d4ffc26'

Change-Id: I206dca66b860abaa9bc25615d42703c638bf5b3f
git-subtree-dir: protocol-framework
git-subtree-mainline: 21588aadb96699b6f4f87e2cbbbb08fe1e38ed78
git-subtree-split: 5d015c2c5f800d136406c15fcb64fd531d4ffc26
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
6 years agoMerge changes I6575ddd8,I4b78f51d,I0a0441e6
Jakub Morvay [Thu, 20 Jul 2017 15:31:38 +0000 (15:31 +0000)]
Merge changes I6575ddd8,I4b78f51d,I0a0441e6

* changes:
  Cleanup Precondtions in singleton
  Cleanup Throwable catches
  Cleanup NetconfDevice

6 years agoCleanup Precondtions in singleton 77/60477/3
Tomas Cere [Mon, 17 Jul 2017 11:32:13 +0000 (13:32 +0200)]
Cleanup Precondtions in singleton

Use Verify when appropirate.
Use Assert in UT.

Change-Id: I6575ddd8d4292a0e2b71048a9939abb420aeccba
Signed-off-by: Tomas Cere <tcere@cisco.com>
6 years agoCleanup Throwable catches 76/60476/2
Tomas Cere [Mon, 17 Jul 2017 11:25:46 +0000 (13:25 +0200)]
Cleanup Throwable catches

Change-Id: I4b78f51d13b5cd027451f1a62ff90642ed39ef0f
Signed-off-by: Tomas Cere <tcere@cisco.com>
6 years agoCleanup NetconfDevice 75/60475/2
Tomas Cere [Mon, 17 Jul 2017 11:07:34 +0000 (13:07 +0200)]
Cleanup NetconfDevice

Change-Id: I0a0441e662ca78e8d6d6841cc48279b293422d1b
Signed-off-by: Tomas Cere <tcere@cisco.com>
6 years agoMerge "Bug 5824: Migrate netconf to the new XML parser"
Tomas Cere [Wed, 19 Jul 2017 10:43:40 +0000 (10:43 +0000)]
Merge "Bug 5824: Migrate netconf to the new XML parser"

6 years agoMerge "Bug 8745: Migrate EditConfig to the new XML parser"
Tomas Cere [Wed, 19 Jul 2017 10:42:36 +0000 (10:42 +0000)]
Merge "Bug 8745: Migrate EditConfig to the new XML parser"

6 years agoBug 5825: Migrate restconf to the new XML parser 86/60286/4
Igor Foltin [Thu, 13 Jul 2017 13:16:01 +0000 (15:16 +0200)]
Bug 5825: Migrate restconf to the new XML parser

Migrate restconf components to the new XML parser from YANG tools

Change-Id: I87aa8df157ca5cba953852415c49806f2c61ff7b
Signed-off-by: Igor Foltin <igor.foltin@pantheon.tech>
6 years agoBug 5824: Migrate netconf to the new XML parser 50/60250/4
Igor Foltin [Wed, 12 Jul 2017 15:13:19 +0000 (17:13 +0200)]
Bug 5824: Migrate netconf to the new XML parser

Migrate netconf components to the new XML parser from YANG tools.

Change-Id: I42899d4d07cb2f917c50fa862cd6453bb0a8764d
Signed-off-by: Igor Foltin <igor.foltin@pantheon.tech>
6 years agoBug 8745: Migrate EditConfig to the new XML parser 14/60014/7
Igor Foltin [Thu, 6 Jul 2017 10:50:09 +0000 (12:50 +0200)]
Bug 8745: Migrate EditConfig to the new XML parser

Switch EditConfig class to use the new XML parser from YANG tools.

Introduce EditOperationNormalizedNodeStreamWriter as a replacement
of the old XML parser extension EditOperationStrategyProvider which
has been used for tracking edit-config data tree operations defined
in the parsed XML source.

Remove EditOperationStrategyProvider as it is not needed anymore.

Change-Id: I737b134805120368a352568fde3f19517a9871df
Signed-off-by: Igor Foltin <igor.foltin@pantheon.tech>
6 years agoBug 8824 - NETCONF request hangs when rpc-rply has invalid xml 34/60334/2
Alexis de Talhouët [Fri, 7 Jul 2017 17:00:43 +0000 (13:00 -0400)]
Bug 8824 - NETCONF request hangs when rpc-rply has invalid xml

The decoder handler is blindly throwing the SAXException but
nobody is there to intercept it. Also, as we're in the netty
world, to be able to propagate the exception, we're using the
NetconfMessage POJO.
That latest has been modified to accept either the decoded message
or an exception, if exception is thrown.

Change-Id: I62af5a885cc4e9f459c4aa71871b7d9331c4b946
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
6 years agoBug 8832 - rpc-error in keepalive rpc-reply shouldn't bounce the session 29/60329/1
Alexis de Talhouët [Mon, 10 Jul 2017 17:30:10 +0000 (13:30 -0400)]
Bug 8832 - rpc-error in keepalive rpc-reply shouldn't bounce the session

Change-Id: I2ef4153b5910e56c3401c08d57465741f1002691
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
6 years agoDo not pull in yang-maven-plugin 96/60296/1
Robert Varga [Thu, 13 Jul 2017 16:06:13 +0000 (18:06 +0200)]
Do not pull in yang-maven-plugin

This plugin is not used and pollutes the build environment with
incorrect version.

Change-Id: I55512253dc8a034274c79b095906b017190f0dfa
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoRemove JSON restconf-service config yang and Module classes 33/59633/2
Tom Pantelis [Wed, 28 Jun 2017 16:48:43 +0000 (12:48 -0400)]
Remove JSON restconf-service config yang and Module classes

The module provides a service but it isn't widely used and most
likely any consumers have been converted to blueprint. Otherwise
a consumer still using CSS would need to be converted to
blueprint which is the future direction anyway.

Change-Id: I7e821df7e7a3efb48e75cea9d6ead3d45929c9b7
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoMerge "Remove rest-connector config yang and Module classes"
Tomas Cere [Tue, 11 Jul 2017 11:22:24 +0000 (11:22 +0000)]
Merge "Remove rest-connector config yang and Module classes"

6 years agoMerge "Add JSONRestconfService impl for the restconf Draft18 impl"
Tomas Cere [Tue, 11 Jul 2017 10:43:11 +0000 (10:43 +0000)]
Merge "Add JSONRestconfService impl for the restconf Draft18 impl"

6 years agoMerge "Remove <Embed-Dependency> in netconf-config pom"
Tomas Cere [Tue, 11 Jul 2017 08:16:18 +0000 (08:16 +0000)]
Merge "Remove <Embed-Dependency> in netconf-config pom"

6 years agoRemove rest-connector config yang and Module classes 32/59632/3
Tom Pantelis [Wed, 28 Jun 2017 16:38:42 +0000 (12:38 -0400)]
Remove rest-connector config yang and Module classes

The rest-connector has been converted to blueprint so the config
yang is no longer needed.

Change-Id: I1fb107c7eec3699b53eb2109afb6d13573c14b88
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoRemove <Embed-Dependency> in netconf-config pom 46/60146/1
Tom Pantelis [Mon, 10 Jul 2017 16:12:32 +0000 (12:12 -0400)]
Remove <Embed-Dependency> in netconf-config pom

The pom embeds the threadpool-config-impl dependency. Not sure exactly
why this was done but I suspect as a work around for the java imports from
the blueprint XML not being included in <Import-Package>. We should not
embed the dependency. The maven-bundle-plugin can scan blueprint XML files
but there is an issue with using it so we can instead add the necessary
packages to <Import-Package>.

Change-Id: Ice33dd0e7b7f75f9d277d83ab05e6c8303867ed4
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoUpgrade to odlparent 2.0.2 92/60092/3
Stephen Kitt [Fri, 7 Jul 2017 15:50:31 +0000 (17:50 +0200)]
Upgrade to odlparent 2.0.2

Change-Id: I9660748964bf09f3db84481c62e7cce7843ef7bd
Signed-off-by: Stephen Kitt <skitt@redhat.com>
6 years agoSimplify RC4 removal 39/60139/2
Tomas Cere [Mon, 10 Jul 2017 14:12:07 +0000 (16:12 +0200)]
Simplify RC4 removal

Change-Id: Ib26c8c7a7bad5e156f33c444593db0c161af0b59
Signed-off-by: Tomas Cere <tcere@cisco.com>
6 years agoUse RSA for ssh server 38/60138/2
Tomas Cere [Mon, 10 Jul 2017 14:02:19 +0000 (16:02 +0200)]
Use RSA for ssh server

The bouncy-castle bump increased the default size of DSA to 2048 which
some clients can choke on. We shouldn't use DSA anyhow so switch it up
to 4096 RSA everywhere.

Change-Id: I936eb240a534367fff550d25dcedc3de069c6654
Signed-off-by: Tomas Cere <tcere@cisco.com>
6 years agoUpgrade to odlparent 2.0.2
Stephen Kitt [Fri, 7 Jul 2017 15:47:55 +0000 (17:47 +0200)]
Upgrade to odlparent 2.0.2

Change-Id: I748830e39c108056ecd81809a0556e8c43d251f4
Signed-off-by: Stephen Kitt <skitt@redhat.com>
6 years agoUpgrade to odlparent 2.0.2
Stephen Kitt [Fri, 7 Jul 2017 15:47:55 +0000 (17:47 +0200)]
Upgrade to odlparent 2.0.2

Change-Id: I748830e39c108056ecd81809a0556e8c43d251f4
Signed-off-by: Stephen Kitt <skitt@redhat.com>
6 years agoMerge "Bug 8725: Remove netconf device mounting via the config system"
Tomas Cere [Fri, 7 Jul 2017 10:08:02 +0000 (10:08 +0000)]
Merge "Bug 8725: Remove netconf device mounting via the config system"

6 years agoMerge "Skip SFT in features-netconf-connector"
Tomas Cere [Fri, 7 Jul 2017 08:53:00 +0000 (08:53 +0000)]
Merge "Skip SFT in features-netconf-connector"