Robert Varga [Wed, 14 Oct 2020 10:47:41 +0000 (12:47 +0200)]
Upgrade restconf-nb-rfc8040 to use RFC8525
Ditch the old yang library and just use the new one instead.
JIRA: NETCONF-725
Change-Id: I99c9678146ef58d525dda626087a5e74b0e270e4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 12 May 2021 18:36:09 +0000 (20:36 +0200)]
Use schemaless builders in RestconfMappingNodeUtil
The code here is extremely flaky, relying very much on declared layout
of ietf-yang-library -- which is utterly wrong, as we should be using
effective model.
Schema-aware builders are going away anyway, so just use normal
builders, forgoing all the unneeded complexity.
JIRA: NETCONF-725
Change-Id: I2454a7872341fb2a977463513a5a1a6a3937c8d1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Jaroslav Tóth [Wed, 7 Apr 2021 06:53:43 +0000 (08:53 +0200)]
Added doc for fields filtering
- User guide - using fields query parameter to leverage NETCONF
subtree filtering with selected multiple subtrees.
- Developer guide - tutorial for using:
a. NetconfDOMDataBrokerFieldsExtension
b. NetconfDataTreeService with added methods
JIRA: NETCONF-735
Change-Id: I8fed93dc45b626ddc99447f0656e671890ad8f17
Signed-off-by: Jaroslav Tóth <jtoth@frinx.io>
mhurban [Wed, 25 Nov 2020 19:02:01 +0000 (20:02 +0100)]
Integration of RESTCONF fields to NETCONF filters
Added:
- NETCONF subtree filtering aware parser (ParserFieldsParameter)
- check if get request is for mountpoint data (ReadDataTransactionUtil)
- new mountpoint fields parameter (WriterParameters)
JIRA: NETCONF-735
Change-Id: I293993958893df866908fa5f16992bf38bd6b085
Signed-off-by: mhurban <mar.hurban@gmail.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Jaroslav Tóth <jtoth@frinx.io>
Robert Varga [Wed, 12 May 2021 10:40:38 +0000 (12:40 +0200)]
Rework mdsal-netconf-yang-library
The primary intent here is elimination of blueprint, but while we
are at it, we also remove duplicated code and unify the two exporters
into a single class.
JIRA: NETCONF-770
Change-Id: I70bba28b1776001d6c71e367b10d87d59399c13a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 12 May 2021 09:00:14 +0000 (11:00 +0200)]
Merge OSGiCredentialServiceAuthProvider
We now have OSGi R7, hence we can safely use constructor injection,
eliminating the need for an extra class.
Change-Id: I41a1bc06d6aec1be89979327e9b530952cd673ce
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Illia [Mon, 15 Feb 2021 21:19:41 +0000 (23:19 +0200)]
Update testtool arguments
1. Remove edit-content argument. Instead of using node config template
in form of file node config will be created, modified by corresponding
Java models and than converted to request body string with GSON.
2. Split auth argument to controller-auth-username,
controller-auth-password. Add default value(admin) for them.
3. Split controller-destination argument to controller-ip,
controller-port.
JIRA: NETCONF-758
Change-Id: Iccf19c9482727b88d3f21a85008d13f554a8da08
Signed-off-by: Illia <illia.ihushev@pantheon.tech>
Illia [Mon, 15 Feb 2021 18:03:51 +0000 (20:03 +0200)]
Add GSON models for device registration
Intention is to use the PATCH method for node registration(no matter if
that's a single node registration or multiple nodes).
JIRA: NETCONF-758
Change-Id: Ia624cfe2f953f6f5dc7a4ebd0d7cfbb0c0185f1a
Signed-off-by: Illia <illia.ihushev@pantheon.tech>
Iaroslav [Wed, 10 Feb 2021 10:31:08 +0000 (12:31 +0200)]
EndToEnd test tool
Added EndToEnd test tool for adding routes to test device using REST.
Part of feature: features-netconf-testing.
Test tool implements endpoint from ncmount.yang, finds device from
provided payload, transforms and sent routes from payload to target device.
Write route processing provides by REST endpoint:
/rests/operations/ncmount:write-routes
with a payload which contains the device name and route.
JIRA: NETCONF-759
Change-Id: Iba141c91a315b3d13d1890b8315dd17bb899cda9
Signed-off-by: Iaroslav <iaroslav.kholiavko@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Jaroslav Tóth [Mon, 22 Feb 2021 08:04:13 +0000 (09:04 +0100)]
Use Optional.isEmpty()
Java 11 introduced Optional.isEmpty(), which allows us to convert
!Optional.isPresent() callsites. Perform this conversion across the
entire repostitory.
Change-Id: I515a550bb6aa56b6d89cea020f5399ca27884833
Signed-off-by: Jaroslav Tóth <jtoth@frinx.io>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 11 May 2021 11:35:20 +0000 (13:35 +0200)]
Use ReadOperations.exists() to check existence
There is no point transferring all the data, just invoke the exists()
operation instead.
Change-Id: I54db6026ee641703196b6a8120245c4e60a60aa2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sun, 9 May 2021 20:25:49 +0000 (22:25 +0200)]
Migrate javax.inject artifact references
We are using GuicedEE instead of the ancient (and broken) javax.inject
jar. Migrate references.
Change-Id: I262c155b97aefced7a834de3db0efd839cf45fbf
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sun, 9 May 2021 20:24:19 +0000 (22:24 +0200)]
Migrate osgi.core references
OSGi R7's core artifact has been renamed, use that as the dependency.
Change-Id: Idbf50537a9e2f9ea9a486d2bb76f37752caa496e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sun, 9 May 2021 08:08:40 +0000 (10:08 +0200)]
Deprecate JSONRestconfService
This service is type-unsafe and does not have users in OpenDaylight
proper. The contract is actively hurtful as it seeks to steer users
towards opaque blobs, not expressing their service and data
dependencies. Furthermore the implementation structure forces an ugly
interface on the actual RESTCONF services, preventing reasonable
refactors.
Deprecate the service for removal, so that we can get rid of this burden
in the next major release.
Change-Id: I96d3fd86ba773fa8986454d1ac4825723b15152d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sun, 9 May 2021 05:47:39 +0000 (07:47 +0200)]
Bump MRI upstreams
Adopt following versions:
- odlparent-8.1.2
- infrautils-1.9.8
- yangtools-6.0.6
- mdsal-7.0.7
- controller-3.0.8
- aaa-0.13.3
Change-Id: Ib48792875c6c54a1f328e466a5de47d7d2af8850
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Mon, 26 Apr 2021 11:05:43 +0000 (13:05 +0200)]
Use project.version for all artifact declarations
We have a coordinated version for all artifacts, hence we can use a
simple project.version -- making things a tad more consistent.
Change-Id: I16f07a512bcf2facd33a2272f8397539a9480407
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Iaroslav [Tue, 29 Sep 2020 09:05:03 +0000 (12:05 +0300)]
Binary data shall be emitted in the form of hexa numbers.
Added converter character->to HEX in AsyncSshHandlerWriter class logging.
JIRA: NETCONF-135
Change-Id: I462baf94eecbc67221ca349f2b900eedf80ea483
Signed-off-by: Iaroslav <iaroslav.kholiavko@pantheon.tech>
Iaroslav [Tue, 29 Sep 2020 09:43:41 +0000 (12:43 +0300)]
Stream name should be used instead of BASE_STREAM_NAME
Refactored onNotification method to use stream parameter instead of "BASE_STREAM_NAME".
Fix ConcurrentModificationException while closing listeners/publishers.
JIRA: NETCONF-306
Change-Id: I3f08a294adf53e34c31dd23ca8d9627a46fb585c
Signed-off-by: Iaroslav <iaroslav.kholiavko@pantheon.tech>
Signed-off-by: Vladyslav Marchenko <vladyslav.marchenko@pantheon.tech>
Iaroslav [Mon, 1 Mar 2021 11:06:02 +0000 (13:06 +0200)]
Reduce memory usage of perf-client
Moved payload creation from test tool start to message send. It will
prevent store huge amount of the objects and reduce memory usage.
JIRA: NETCONF-762
Change-Id: I4932f259391af5770edf8d941f9dc27f022f2277
Signed-off-by: Iaroslav <iaroslav.kholiavko@pantheon.tech>
Iaroslav [Mon, 22 Feb 2021 16:33:17 +0000 (18:33 +0200)]
Missing notification model.
In case server provides schema it should check if notifications
supported by the remote session. According to this it should provide schema
with notifications or without.
JIRA: NETCONF-754
Change-Id: Ifc37ebded7051aabf9150f9f49ecadaf81746261
Signed-off-by: Iaroslav <iaroslav.kholiavko@pantheon.tech>
Robert Varga [Mon, 8 Mar 2021 20:24:13 +0000 (21:24 +0100)]
Bump versions to 1.13.2-SNAPSHOT
THis starts the next development iteration.
Change-Id: I49f970edb50f658cc5f1534c09351d9dae584f7a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Oleksii Mozghovyi [Wed, 10 Mar 2021 10:47:55 +0000 (12:47 +0200)]
Add diffie-hellman-group14-sha1 to the list of default key exchange algorithms
The list of key exchange algorithms enabled by default has been changed
with a Mina SSHD uplift to the version of 2.6.0, leaving some of the
SHA1 algorithms disabled by default. Some the devices might still use
this algorithm, so this change brings back the
'diffie-hellman-group14-sha1' algorithm to the list.
JIRA: NETCONF-765
Change-Id: Iea58448981e19f1632799d05dbda8784415ebf1f
Signed-off-by: Oleksii Mozghovyi <oleksii.mozghovyi@pantheon.tech>
Oleksii Mozghovyi [Wed, 24 Feb 2021 20:11:04 +0000 (22:11 +0200)]
Fix lock/unlock/commit issues for the NetconfRestconfTransactions
- Fix the problem when one transaction could suddenly remove
configuration-lock created by another one.
- Fix the problem when transaction without successful lock operation
could execute edit-config operations
- Fix the problem when failure to acquire a lock on a candidate could
lead to unexpected unlocking of the running configuration
- Fix the problem when commit didn't take into account results of
previous operations
- Execute operation futures in a chain to guarantee the correct order of
operations inside the transaction
- Fix the problem when commit operation was executed for yang-patch even
if some operations failed (JIRA: NETCONF-746)
JIRA: NETCONF-705
Change-Id: I588c6e2788983aef20b92726463930038abde3c9
Signed-off-by: Oleksii Mozghovyi <oleksii.mozghovyi@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Oleksii Mozghovyi [Wed, 24 Feb 2021 21:41:34 +0000 (23:41 +0200)]
Fix permanent lock on the running configuration via RESTconf
This resolves the issue when the NETCONF device with both
:writable-running and :candidate capabilities gets permanently
locked after the commit happens via RESTconf.
JIRA: NETCONF-705
Change-Id: I90c6ec104a9309dd25fc66cd74f469c2f033ee5f
Signed-off-by: Oleksii Mozghovyi <oleksii.mozghovyi@pantheon.tech>
Robert Varga [Fri, 26 Feb 2021 15:18:30 +0000 (16:18 +0100)]
Bump MRI upstreams
Adopt following versions:
- odlparent-8.1.1
- infrautils-1.9.6
- yangtools-6.0.5
- mdsal-7.0.6
- controller-3.0.7
- aaa-0.13.2
Change-Id: Id8e35132aeb7eb902514e3373ef14c6d2b26cd18
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sun, 21 Feb 2021 15:55:05 +0000 (16:55 +0100)]
Use java.nio.file for file operations
java.nio.file is more expressive than java.io.File, use it to
perform reads and atomic renames.
Also clean up constant use and assertions a bit.
JIRA: NETCONF-756
Change-Id: Ia42c61f8cca4253a7db297e188053fcf2b63ec35
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Oleksii Mozghovyi [Tue, 23 Feb 2021 16:06:05 +0000 (18:06 +0200)]
Fix futures handling in the NetconfRestconfTransaction
This change solves the problem when the NetconfDataTreeService.lock()
returns an immutable list of futures, and the NetconfRestconfTransaction
wrapper can't change items on the list.
JIRA: NETCONF-705
Change-Id: Ie98f23382660683e269d3c1cdad6419be72545e5
Signed-off-by: Oleksii Mozghovyi <oleksii.mozghovyi@pantheon.tech>
Robert Varga [Sun, 21 Feb 2021 18:16:42 +0000 (19:16 +0100)]
Bump versions to 0.13.1-SNAPSHOT
This starts the next development iteration.
Change-Id: I0802546c10d5c845869a19bb7b150fe8c823aa21
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 20 Aug 2019 18:16:15 +0000 (20:16 +0200)]
Add feature-parent
This centralizes a feature-parent pom.xml for reuse in single
feature artifacts.
Change-Id: I7153166a86721dea9d732e5a13174f82865e24c4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sun, 21 Feb 2021 16:56:25 +0000 (17:56 +0100)]
Bump project version
This bumps project version to 1.13.0-SNAPSHOT in preparation for unifying
artifact versions.
Change-Id: I4a230e8e0cadb23e34ba57ed77c365ae302cea6b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Jaroslav Tóth [Mon, 25 Jan 2021 15:00:20 +0000 (16:00 +0100)]
Fixed reading whole list/leaf-list using GET/GET-CONFIG RPC
- The source of the issue was in skipping of empty list/leaf-list
nodes in XMLStreamNormalizedNodeStreamWriter - the NETCONF
filter structure was created correctly, but it wasn't correctly
serialized into XML. However, in NETCONF, it is valid to read
whole list/leaf-list - we must be able to build NormalizedNode
structure from subtree-filter which "ends" by list/leaf-list.
- Fixed by introduction EmptyListXmlWriter which is responsible
for serialization of empty list/leaf-list. Other operations
are delegated to XMLStreamNormalizedNodeStreamWriter
implementation.
JIRA: NETCONF-744
Change-Id: Id4b665aa45a397ab25a53e12f4eb7c1a6539d428
Signed-off-by: Jaroslav Tóth <jtoth@frinx.io>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Jaroslav Tóth [Sun, 25 Oct 2020 18:31:56 +0000 (19:31 +0100)]
Added schemaless creation of filter structure
- Added procedure for creation of filter structure for schemaless
mountpoints.
- Added two unit tests that cover most of the cases.
JIRA: NETCONF-735
Change-Id: Ib276ddaf79e5306ff6c2193a03a8b0f57f005991
Signed-off-by: Jaroslav Tóth <jtoth@frinx.io>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Jaroslav Tóth [Sun, 25 Oct 2020 07:43:08 +0000 (08:43 +0100)]
Explicit reading of list keys using subtree filtering
- According to RFC-6241, section 6.2.5, NETCONF server doesn't
have to provide values of list keys, if NETCONF client doesn't
ask for these fields; see following statement:
o If any sibling nodes of the selection node are instance
identifier components for a conceptual data structure (e.g.,
list key leaf), then they MAY also be included
in the filter output.
JIRA: NETCONF-735
Change-Id: I9bb048010578fd89190f616664e2175c3d3326ae
Signed-off-by: Jaroslav Tóth <jtoth@frinx.io>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Jaroslav Tóth [Mon, 19 Oct 2020 07:28:13 +0000 (09:28 +0200)]
Implement subtree filtering using fields
- Fields are used for selection of specific subtrees under
parent path - this way it is possible to limit requested
data to specific entities without the necessity to send
multiple get/get-config RPCs.
- Look at added unit tests to understand the functionality.
JIRA: NETCONF-735
Change-Id: I17cd364e11f8c8e61e5537fcff71a7ecedefdba3
Signed-off-by: Jaroslav Tóth <jtoth@frinx.io>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Iaroslav [Wed, 10 Feb 2021 09:47:03 +0000 (11:47 +0200)]
File should be closed before rename
Rename file will make clone of file with new name and remove initial
file. This file not closed while removing so it will make impossible
file deletion on Windows due to default locking.
JIRA: NETCONF-756
Change-Id: I0f81507285811607a7ee8d40c0b50018603dd557
Signed-off-by: Iaroslav Kholiavko <iaroslav.kholiavko@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Oleksii Mozghovyi [Wed, 27 Jan 2021 12:37:19 +0000 (14:37 +0200)]
Add tool to measure southbound notification performance
This is an updated version of the tool existed in coretutorials project,
aligned with the latest API changes
- Tool is packaged into a new feature odl-netconf-test-tools
- For the testing purposes models from the original coretutorials
project are used
- Tool listens for mounted devices with prefix "perf-"
- Notification counter is only applied for devices that end with the following
pattern '*-notif-([0-9]+)', and the number after notif suffix indicates
how many notifications should be counted
- Once the mounted device is ready tool invokes create subscription
request towards device, and counts incoming notifications
JIRA: NETCONF-759
Change-Id: I5a584032dca9a40e90dec23186562543f8752bad
Signed-off-by: Oleksii Mozghovyi <oleksii.mozghovyi@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Iaroslav [Tue, 2 Feb 2021 14:31:46 +0000 (16:31 +0200)]
Upgrade sshd to 2.6.0
Upgrade sshd to version 2.6.0
JIRA: NETCONF-752
Change-Id: Iaf6fd1ab232458aeb58636590bc84d3d8d2036f6
Signed-off-by: Iaroslav <iaroslav.kholiavko@pantheon.tech>
Iaroslav [Tue, 12 Jan 2021 10:31:59 +0000 (12:31 +0200)]
Return correct code 503 when a mountpoint is not mounted.
In case of mount point not mounted status code should be 503 and error
tag 'resource-denied-transport'
JIRA: NETCONF-341
Change-Id: I290b29e23952d30196c6d83d7984d5ebee4690a1
Signed-off-by: Iaroslav Kholiavko <iaroslav.kholiavko@pantheon.tech>
Jaroslav Tóth [Thu, 15 Oct 2020 06:17:25 +0000 (08:17 +0200)]
Add fields-aware NETCONF DOM API
- Added option to specify fields that are read from NETCONF device.
Currently it is possible to only read one whole subtree
using get/get-config NETCONF RPC. However, NETCONF RFC allows
more complex subtree filtering including multiple subtrees
in single RPC.
- It is implemented as:
1) DOMDataBroker extension - option to create customized
read-only, read-write transactions, and transaction chains.
2) NetconfDataTreeService methods - using get(..) and
getConfig(..) calls.
JIRA: NETCONF-735
Change-Id: I584bb9740f3ba6756ce283067198f9b344c75f9c
Signed-off-by: Jaroslav Tóth <jtoth@frinx.io>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Fri, 19 Feb 2021 09:44:07 +0000 (10:44 +0100)]
Refactor NetconfDataTreeServiceImpl
Rather than using boolean dispatch, create three specific
implementations to drive the logic behind the calls.
JIRA: NETCONF-705
Change-Id: I5c394ca78f7a98853fd99b8060a36d0db86d443d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Fri, 19 Feb 2021 06:07:23 +0000 (07:07 +0100)]
Deprecate messagebus-netconf
messagebus-netconf is not used by anyone and has a good number
of deficiencies -- in its implementation as well as in the
framework (from controller).
Deprecate it for removal in the next release.
JIRA: NETCONF-761
Change-Id: I852b23fc30362c4ae609f04da9145580d887eca9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
mhurban [Fri, 5 Feb 2021 10:42:04 +0000 (11:42 +0100)]
Unwanted commit to non candidate device fix
- netconf is sending commits to non candidate devices
while editing their running config which results into
NetconfDocumentedException: Unknown element "commit".
JIRA: NETCONF-755
Signed-off-by: mhurban <mar.hurban@gmail.com>
Change-Id: I536b43394269c4dd5223e4322ae830b813016ff0
(cherry picked from commit
bf199d0da1729e4e68ad4059cfa8089d70d1932f)
Vladyslav Marchenko [Tue, 10 Nov 2020 11:47:34 +0000 (13:47 +0200)]
Fix unstable test for NetconfDeviceCommunicator
The root cause of the issue is that this test requires more time for
verification on Windows-type OS, and sometimes that was a reason for
test failure.
JIRA: NETCONF-760
Change-Id: I7aab0f89fe4c466e2cdf772afffe3d54eb0f19df
Signed-off-by: Vladyslav Marchenko <vladyslav.marchenko@pantheon.tech>
Signed-off-by: Oleksii Mozghovyi <oleksii.mozghovyi@pantheon.tech>
Michal Banik [Wed, 10 Feb 2021 20:07:36 +0000 (21:07 +0100)]
Generate new jax-rs Response for every /.well-known/* request
Generate new javax.ws.rs.core.Response every single time when
request on `/.well-known/*` is processed, so the new output-stream
will be used for every response.
javax.ws.rs.core.Response.status(Status.OK) creates new
OutboundMessageContext with CommittingOutputStream, which is
closed during the process of sending the response to client.
Closed output-stream caused
`java.lang.IllegalStateException: The output stream has already
been closed.` when `/.well-known/*` endpoint was requesting
multiple times, which made the endpoint working only once.
JIRA: NETCONF-757
Change-Id: Id8759602261333976337b11aa2c0fbfd1d3b04b9
Signed-off-by: Michal Banik <michal.banik@pantheon.tech>
Oleksii Mozghovyi [Tue, 2 Feb 2021 20:41:34 +0000 (22:41 +0200)]
Adopt akka-2.6.x
Adopt following upstreams to enable akka-2.6.x:
- controller-3.0.6
- aaa-0.13.1
Change-Id: Ib0ab4cb2f631559714383d4a4bae0ad672bf4e42
Signed-off-by: Oleksii Mozghovyi <oleksii.mozghovyi@pantheon.tech>
Robert Varga [Mon, 1 Feb 2021 16:46:19 +0000 (17:46 +0100)]
Fix AAA feature references
We should be depending on version ranges for AAA dependencies,
add the corresponding overrides. Also remove a mistake in
features-netconf: it should not be depending on any AAA features
directly.
Change-Id: Ie27dcfa829ef14046ed5d746c6ff7ecd512d3845
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sat, 30 Jan 2021 19:13:48 +0000 (20:13 +0100)]
Depend on AAA 0.13.0 release
Reflect the fact upstream has a release, dropping the -SNAPSHOT
suffix.
Change-Id: I4d4041f9f828070a9d9bb45059f7aba61e304d3f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sat, 30 Jan 2021 09:10:11 +0000 (10:10 +0100)]
Require odlparent-8.1 features
We really want to make sure we are using 8.1.x series features,
express that in feature.xmls.
Change-Id: Id5b2b34437835c1c2ddef76bc3e094aeff71e212
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 21 Jan 2021 16:51:33 +0000 (17:51 +0100)]
Bump upstream versions
Adopt following upstreams:
- odlparent-8.1.0
- infrautils-1.9.5
- yangtools-6.0.4
- mdsal-7.0.5
- controller-3.0.5
Change-Id: Ib063b72e30f405155a1c07d6cb853494d1991513
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Konstantin.Nosach [Wed, 27 Jan 2021 15:31:54 +0000 (17:31 +0200)]
Fix authentication mechanism in RESTconf(rfc8040 northbound)
Issue raised after https://git.opendaylight.org/gerrit/c/netconf/+/89419
JIRA: NETCONF-753
Change-Id: I50c13c3bf7d23f97f569fb53f45c315d0a3b72fe
Signed-off-by: Kostiantyn Nosach <kostiantyn.nosach@pantheon.tech>
Jaroslav Tóth [Fri, 22 May 2020 11:42:22 +0000 (13:42 +0200)]
Fixing errors check in RestconfDocumentedExceptionMapper
- Added check for number of errors that should not equal to 0;
otherwise warning logs are generated.
Change-Id: I5e173d6389c0b17b278aae8abb0d585cb45e21d1
Signed-off-by: Jaroslav Tóth <jtoth@frinx.io>
Robert Varga [Mon, 11 Jan 2021 12:13:47 +0000 (13:13 +0100)]
Remove netconf-topology-singleton's NetconfConnectorDTO
This DTO is readily available from netconf.topology.spi, remove
code duplication and fix source registration leak -- allowing
modernizer to be enabled.
Change-Id: If5e619f74d451856d87f8d52500325166d2f6279
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Mon, 11 Jan 2021 11:56:15 +0000 (12:56 +0100)]
Fix a raw type warning
Add proper wildcards to silence warnings.
Change-Id: I6749df25c37d4ce67f73a8740783f1590ee25fd0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Mon, 11 Jan 2021 11:53:36 +0000 (12:53 +0100)]
Enable modernizer in restconf-nb-bierman02
Clean up violations and flip the switch.
Change-Id: I63f315fe0aad67e0591c830ff0dff75069e4e18f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sat, 9 Jan 2021 08:12:36 +0000 (09:12 +0100)]
Fix restconf-nb-rfc8040 mocking
The structure of SchemaNode lookup has changed, migrate mocking
to the proper method.
Change-Id: I6edbcbfde6fea66a5f92f63692f39fb736e6b8ff
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Fri, 8 Jan 2021 20:44:42 +0000 (21:44 +0100)]
Bump MRI upstreams
Adopt following versions:
- odlparent-8.0.3
- infrautils-1.9.4
- yangtools-6.0.3
- mdsal-7.0.4
- controller-3.0.4
Change-Id: Iddd6126700561b6875a6893a841755785559888b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 7 Jan 2021 16:31:23 +0000 (17:31 +0100)]
Remove commented-out code
This got past review, fix it up.
JIRA: NETCONF-471
Change-Id: Ie9643a7765f267bdee5492a6d6e4a7a6677c765b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 7 Jan 2021 16:39:56 +0000 (17:39 +0100)]
Use java.util.Optional
This is the last real place where we use Guava's Optional, migrate
it.
Change-Id: Iba87bc765af007a2db13cc68bf386b8931c0ff05
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 5 Jan 2021 17:12:49 +0000 (18:12 +0100)]
Enable modernizer in where no errors are present
There are no violations present, flip enforcement on ensuring
it stays that way.
Change-Id: Id2a6aa1ca22eb1d92d95a2235095ef3454340b0b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Mon, 4 Jan 2021 12:59:26 +0000 (13:59 +0100)]
Cleanup warnings
Migrate isFoo() callers to use getFoo() and add @NonNull annotations
to constants so as to reduce Eclipse warnings.
Change-Id: I4f9ee7181d90f7573ca0c5056512b38b15da8eeb
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sat, 26 Dec 2020 17:20:02 +0000 (18:20 +0100)]
Lower org.json exposure
osg.json package is now used only by bierman02 and unit tests,
adjust dependencies accordingly.
JIRA: NETCONF-471
Change-Id: Ifcefd3728ff349acfcbe52c47d1563d6f682ccbd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 10 Dec 2020 12:41:41 +0000 (13:41 +0100)]
Bump MRI upstreams
Adopt following versions:
- odlparent-8.0.2
- infrautils-1.9.3
- yangtools-6.0.2
- mdsal-7.0.3
- controller-3.0.3
Change-Id: Ib0a37fff00f4d85dcab90fe606d5a0ab7184addd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 17 Dec 2020 00:32:19 +0000 (01:32 +0100)]
Integrate NetconfTopologyRPCProvider
This splits off NetconfTopologyRPCProvider into baseline topolocy
providets, hence it gets stood up automatically when the component
starts up.
JIRA: NETCONF-750
Change-Id: I01855370b397b172ae7bec9e07d2d8be5cdf1c71
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Maros Marsalek [Tue, 10 Sep 2019 08:29:11 +0000 (10:29 +0200)]
Fixed domain-name usage in NETCONF southbound
- 'host' in the NETCONF mount request is described by union
type - it accepts both IP address and domain-name.
- This domain-name wasn't considered as option during creation
of connector to remote device - it ended with NPE.
Change-Id: I0f064aced76de3465da88376fcb6c6b589ed545f
Signed-off-by: Maros Marsalek <mmarsalek@frinx.io>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
wsx25289 [Tue, 28 Apr 2020 07:58:36 +0000 (03:58 -0400)]
Implement RESTCONF Extensibility (discovery)
Added Root Resource Discovery mechanism according to RFC8040,
serving host-meta documents.
The copyright headers are the best we could back-engineer, as it
seems original code used copy&paste templating.
JIRA: NETCONF-499
Change-Id: I414ebda7e34db7cd468fb0e488bcac457d7cf7ff
Signed-off-by: Wsx25289 <10200860@zte.com.cn>
Signed-off-by: Iaroslav <iaroslav.kholiavko@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 16 Dec 2020 23:39:22 +0000 (00:39 +0100)]
Hide NetconfTopologyRPCProvider.encryptPassword()
This method is exposed for testing, move its correspoding test
to the same package, reducing the method's visibility.
Change-Id: I1bdb2d893e8343e16e96797c95e59f27e43aa7bb
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Oleksii Mozghovyi [Tue, 15 Dec 2020 13:55:16 +0000 (15:55 +0200)]
Fix NETCONF session(channel) activation for the CallHome(over TLS)
This patch fixes an issue when activation always fails with a message
saying that "Session is already activated". The root cause is the behavior
of the compareAndExchange method(returns the witness value, which will
be the same as the expected value if successful).
JIRA: NETCONF-5
Change-Id: Ib9b0acead1091c8e881330c22b99c9138605e1f1
Signed-off-by: Oleksii Mozghovyi <oleksii.mozghovyi@pantheon.tech>
Robert Varga [Fri, 11 Dec 2020 14:43:24 +0000 (15:43 +0100)]
Fix checkstyle
Upgraded checkstyle is catching a few errors, fix them up.
Change-Id: Icae05de3e623523025f0b9f2a1635b9c923a49ca
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 15 Dec 2020 19:00:20 +0000 (20:00 +0100)]
Remove jaxb-api dependency
We need just a simple java.util.Base64 encoder, not the entire API.
Change-Id: I3ff7388bbf8f2cb3bf97c6141bb182483027578c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 17 Nov 2020 20:01:31 +0000 (21:01 +0100)]
Refactor KeepaliveSalFacade time tracking
This is very simple state tracking, but unfortunately it is utterly
convoluted. Essentially want to be sending keepalives as long as there
is not something outstanding already.
JIRA: NETCONF-717
Change-Id: I4ee045b4d3395572a59167948ea8843bcac584ce
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Mon, 16 Nov 2020 12:37:00 +0000 (13:37 +0100)]
Ditch blueprint from netconf-util
We do not need manual blueprint, just use OSGi DS.
Change-Id: I8f7a3884e9b1dc3b826d358fa722003539065335
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 14 Oct 2020 21:42:04 +0000 (23:42 +0200)]
Split transaction lifecycle
Change-Id: I0ec27e3720e23639b379f8ae594cb84dfb814516
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Vladyslav Marchenko <vladyslav.marchenko@pantheon.tech>
Tomas Cere [Wed, 18 Nov 2020 10:33:57 +0000 (11:33 +0100)]
Switch default namespace for data-changed-notifications
Oversight in the original patch, this namespace needs to be present
on the data-changed-notification element.
Close xml writer at the end.
Rename "data-changed-event" to "data-change-event".
JIRA: NETCONF-743
Change-Id: Ia53c04bd0ef9f608804d0f884dac1f2180240343
Signed-off-by: Tomas Cere <tomas.cere@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Vladyslav Marchenko <vladyslav.marchenko@pantheon.tech>
Robert Varga [Wed, 18 Nov 2020 09:51:26 +0000 (10:51 +0100)]
Lower NotificationListenerAdapter
We do not want to flood logs here, drop the message to debug.
Change-Id: I7711beabe083ac2c75cd742d4423b1482a80d8a9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 18 Nov 2020 09:49:14 +0000 (10:49 +0100)]
Zero-out canceled transactions
We may end up picking the transaction in read path, make sure we
null it away when closing.
JIRA: NETCONF-743
Change-Id: I537bace43a407a8a5f1adf5d6a7e8bbcb78e7da4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Mon, 9 Nov 2020 17:30:34 +0000 (18:30 +0100)]
Convert aaa-authn-odl-plugin to OSGi DS
There is no point in keeping blueprint here, remove it.
Change-Id: I3819739d7042cd3d2fdee06b3457dc8bd3cd7ce5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Martin Sunal [Thu, 21 Nov 2019 17:21:51 +0000 (18:21 +0100)]
Fixed handling of identityref type in list key
- There was not covered a case when key was leafref to
the node which has type identityref.
- Handling failed parsing of identityref value - throwing
RestconfDocumentedException with better description.
Change-Id: I4aa296cbb1a62b6f607323cb5e944d70e67ba3ff
Signed-off-by: Martin Sunal <msunal@frinx.io>
Signed-off-by: Jaroslav Tóth <jtoth@frinx.io>
Robert Varga [Tue, 3 Nov 2020 13:45:09 +0000 (14:45 +0100)]
Correct operations input/output media types
We do not produce/consume raw yang-data, add the missing XML
qualifier.
JIRA: NETCONF-741
Change-Id: I2978527125c80ae142af1f0b307c3b99adbe3ba9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Tomas Cere [Thu, 25 Jun 2020 09:00:47 +0000 (11:00 +0200)]
Make ListenerAdapter serialize JSON directly
Change websocket notification serialization to serialize
to json directly instead of first serializing to xml and
subsequently converting to json.
While we are here fixup the websocket notification format
so it actually conforms to the sal-remote.yang model and
encode namespaces according to the json-ietf standard
instead of bundling an xmlns node in the json ouptut.
JIRA: NETCONF-471
Change-Id: I1b90c99980c0692b217523640bd6f67050f21e14
Signed-off-by: Tomas Cere <tomas.cere@pantheon.tech>
Vladyslav Marchenko [Tue, 15 Sep 2020 10:29:46 +0000 (13:29 +0300)]
Eliminate unnecessary blocking checks
According to RFC6241:
1) "delete" operation must first check if the configuration data
currently exists in the configuration datastore.
2) "create" operation must first check if the configuration data does
not already exist in the configuration datastore.
3) "replace" operation replaces any related configuration in the
configuration datastore. If no such configuration data exists in
the configuration datastore, it is created.
If request goes via NetconfRestconfStrategy, we do not need to check
existence on the controller side, as the implied checks are part of
the underlyig behavior.
If request goes via MdsalRestconfStrategy, first we need to do
"if exists" check. Read requests in this case are collected in a batch
and then collecting the results.
JIRA: NETCONF-403
Change-Id: I6354c345d099017c1e82878af36ac37bbf5662c9
Signed-off-by: Vladyslav Marchenko <vladyslav.marchenko@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Cmarada, Michal [Tue, 27 Oct 2020 13:30:10 +0000 (14:30 +0100)]
fix example string generation for types with isBasicLatin pattern
Generex generator fails to create example if pattern contains
{isBasicLatin} condition. The issue is fixed by replacing original
condition by range of allowed basic latin characters (0x00 - 0x7F).
JIRA: NETCONF-737
Signed-off-by: Cmarada, Michal <michal.cmarada@pantheon.tech>
Change-Id: I7bc5bf3621a40804122acd4604cfe8c132ffff24
Vladyslav Marchenko [Thu, 15 Oct 2020 14:53:22 +0000 (17:53 +0300)]
Add new revision for odl-netconf-callhome-server.yang
JIRA: NETCONF-5
Change-Id: If5c9ca2045f7a13074da839b0c55d7484ac6a650
Signed-off-by: Vladyslav Marchenko <vladyslav.marchenko@pantheon.tech>
Oleksii Mozghovyi [Wed, 24 Jun 2020 00:59:20 +0000 (03:59 +0300)]
Identify Call-Home device connected over TLS by the provided certificate
JIRA: NETCONF-5
Change-Id: Ie5008ac806e875902e1b28bc3aa94f6f7d3d466b
Signed-off-by: Oleksii Mozghovyi <oleksii.mozghovyi@pantheon.tech>
Signed-off-by: Vladyslav Marchenko <vladyslav.marchenko@pantheon.tech>
Jakub Toth [Thu, 13 Apr 2017 11:49:03 +0000 (13:49 +0200)]
Test JSONRestconfServiceModule
Change-Id: Ida7cc08713224fcab39ab743952ba66bd7598b1a
Signed-off-by: Jakub Toth <jatoth@cisco.com>
Vladyslav Marchenko [Mon, 19 Oct 2020 10:27:31 +0000 (13:27 +0300)]
Split error messages
If there are more than one error message, we will split them by space
JIRA: NETCONF-403
Change-Id: I0136c8579916ccdf9fe06dc031f371ec17d8ee11
Signed-off-by: Vladyslav Marchenko <vladyslav.marchenko@pantheon.tech>
Oleksii Mozghovyi [Mon, 15 Jun 2020 20:07:04 +0000 (23:07 +0300)]
Add Call-Home implementation for the TLS secure-transport
This is a quick implementation of TLS transport. There are a few
wiring issues, which will need a follow up.
JIRA: NETCONF-5
Change-Id: I666444b7c187d2afbc8869a32331cba4a1393add
Signed-off-by: Oleksii Mozghovyi <oleksii.mozghovyi@pantheon.tech>
Signed-off-by: Vladyslav Marchenko <vladyslav.marchenko@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Vladyslav Marchenko [Tue, 27 Oct 2020 14:21:23 +0000 (16:21 +0200)]
Do not use org.opendaylight.controller.sal.common.util.NoopAutoCloseable
NoopAutoCloseable hards back to Java 7 days and is an anachronism
with advent of lambdas. Replace its use with no-op lambdas.
As this is the last class used from sal-common-util in both components,
remove that dependency as well.
A quick follow-up audit shows we can remove the dependency from two
other artifacts, leaving rest-nb-bierman02 the only artifact still
needing it for AbstractMXBean.
Change-Id: Id97d3cdf110047778248e21021db39a6da2c3a5b
Signed-off-by: Vladyslav Marchenko <vladyslav.marchenko@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Vladyslav Marchenko [Mon, 26 Oct 2020 12:42:56 +0000 (14:42 +0200)]
Use @RunWith(MockitoJUnitRunner.StrictStubs.class)
MockitoAnnotations.initMocks(this) is replaced with @RunWith(MockitoJUnitRunner.StrictStubs.class)
Remove unnecessary Mockito stubbings
Change-Id: If775073f721a312e1126084aaabbf6ee22d2a77b
Signed-off-by: Vladyslav Marchenko <vladyslav.marchenko@pantheon.tech>
Robert Varga [Tue, 27 Oct 2020 22:36:33 +0000 (23:36 +0100)]
Update infrautils to 1.9.1
We have 1.9.0 integrated, but downstreams are using 1.9.1. Align
versions.
Change-Id: I7be3481999d55abb314e256838dd5517140c504e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Tibor Král [Mon, 26 Oct 2020 03:03:02 +0000 (04:03 +0100)]
Add workaround for SSH connection issue related to SSHD-1028
Provide custom version of Nio2Session which overrides the
bugged method.
JIRA: NETCONF-736
Change-Id: I0ef091680a9bdbe6bcab889335bb5ff48e91b703
Signed-off-by: Tibor Král <tibor.kral@pantheon.tech>
(cherry picked from commit
28925cdfe32f72ebcd034c9c7c9c107f176ca452)
Jakub Toth [Thu, 13 Apr 2017 12:44:20 +0000 (14:44 +0200)]
Test SchemaExportContentYangBodyWriter
Change-Id: Ib40451621d5f20731186003ab88f4054e98546e7
Signed-off-by: Jakub Toth <jatoth@cisco.com>
Robert Varga [Thu, 15 Oct 2020 10:46:24 +0000 (12:46 +0200)]
Remove Jakub Morvay from committers
Jakub's last contribution was on 29.3.2019, i.e. more than
18 months ago. Remove him from committers due to inactivity.
Change-Id: I18fba8ba6456b9a74b1edc327725001d5e72e80a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 14 Oct 2020 15:58:33 +0000 (17:58 +0200)]
Add an explicit constants for WithDefaults parameter
RFC8040 explicitly enumerates allowed values, make sure we validate
them accordingly. Also fix the bug of ignoring unknown values.
JIRA: NETCONF-733
Change-Id: I5e4a19061c2c082563385a32ba574ddf97a8c967
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Vladyslav Marchenko [Fri, 23 Oct 2020 10:02:48 +0000 (13:02 +0300)]
Fixes from modernizer maven plugin in rfc8040 module
Remove some legacy APIs
Change-Id: I689190caf9be2357b2ffb2d2197783ebaba694d9
Signed-off-by: Vladyslav Marchenko <vladyslav.marchenko@pantheon.tech>
Vladyslav Marchenko [Tue, 20 Oct 2020 13:01:59 +0000 (16:01 +0300)]
Fix for enum constant
Now correct method name is calling
JIRA: NETCONF-403
Change-Id: Ia7b7531ab937fa346562fc4367c5e01aecbbb598
Signed-off-by: Vladyslav Marchenko <vladyslav.marchenko@pantheon.tech>
Robert Varga [Mon, 19 Oct 2020 19:24:16 +0000 (21:24 +0200)]
Bump to mdsal-7.0.1/controller-3.0.1
Pick up mdsal fixes and improvements.
Change-Id: Ic26b38d79cba583b496080ae2f3c0b8316e68470
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Sun, 18 Oct 2020 12:26:28 +0000 (14:26 +0200)]
Remove dependency on MavenProjectAware
We will be deprecating this interface, so that everyone codegen
can work in other build systems. This plugin is not using, hence
the removal.
Change-Id: If20e9a8a503d85f950a9d2c6ca294210373a1405
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Oleksii Mozghovyi [Tue, 30 Jun 2020 09:16:01 +0000 (12:16 +0300)]
Add TLS data to call-home yang-models
The configuration model for callhome-server does not allow TLS to
be configured -- i.e. we are blindly assuming the devices will be
connecting via SSH.
Rectify this by deprecating the old configuration leaf and adding
the option to configure authentication on a per-transport basis.
JIRA: NETCONF-5
Change-Id: I56f14ad9472b5e87836be326a02c6663c229fb32
Signed-off-by: Oleksii Mozghovyi <oleksii.mozghovyi@pantheon.tech>
Signed-off-by: Vladyslav Marchenko <vladyslav.marchenko@pantheon.tech>
Robert Varga [Thu, 8 Oct 2020 08:00:28 +0000 (10:00 +0200)]
Use SchemaPath->Absolute bridge methods
SchemaPath allows for easy transformation to ease migration, use
the methods as they improve readability.
Change-Id: I4b92ef9681e4bb722d2d9f4e6d4c5ac21d2368f3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Wed, 7 Oct 2020 12:33:02 +0000 (14:33 +0200)]
Bump upstreams for Silicon
Adopt the following upstream versions:
- odlparent-8.0.0
- yangtools-6.0.0
- mdsal-7.0.0
- controller-3.0.0
- infrautils-1.9.0
Since mdsal's testing infrastructure now operates on binding packaging,
we ditch multiple testing copies of models, as we can now reuse already
existing packaging.
Change-Id: Iafa5e702e1e84fa9980a1168ec8d53b4f152b823
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>