netconf.git
6 years agoBug 9256: Add websocket server config knob for ip 09/64109/2
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 agoMerge "Directly inject CredentialAuth dependency"
Tomas Cere [Fri, 6 Oct 2017 11:50:43 +0000 (11:50 +0000)]
Merge "Directly inject CredentialAuth dependency"

6 years agoDirectly inject CredentialAuth dependency 16/61716/13
Ryan Goulding [Mon, 14 Aug 2017 19:48:46 +0000 (15:48 -0400)]
Directly inject CredentialAuth dependency

In today's blueprint-oriented OSGi DI, it is more efficient to
express the dependency on AAA's CredentialAuth API rather than to
spin waiting for a ServiceReference using a ServiceTracker.  This
change specifies direct injection of AAA's CredentialAuth Service
through blueprint wiring.

Change-Id: Iec02f8acc4763922505881a772ff128f1f9d9986
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoBUG-9218: fix features to not duplicate upstream bundles 45/63845/3
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>
(cherry picked from commit ccce725613d3078a0ad18f3f8fbfa5e1d9aea68c)

6 years agoBUG-9132: don't provide a value for restconf/streams/events 54/63854/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 22/63622/2
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>
6 years agoBump netconf to use yangtools 1.2.0 62/63762/7
Anil Belur [Thu, 28 Sep 2017 07:40:31 +0000 (17:40 +1000)]
Bump netconf to use yangtools 1.2.0

Also reverts I1914426b96029d7d2377f77b9f7df8beb14e607a to downgrade
yangtools properly.

Jira: releng-485
Change-Id: Ie344af870af6a85e859b1e35ca268f5bf988b00b
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoMerge "Adjust test-tool to yangtools changes"
Tomas Cere [Wed, 27 Sep 2017 16:15:25 +0000 (16:15 +0000)]
Merge "Adjust test-tool to yangtools changes"

6 years agoAdjust test-tool to yangtools changes 18/63618/1
Jakub Morvay [Wed, 27 Sep 2017 13:10:47 +0000 (15:10 +0200)]
Adjust test-tool to yangtools changes

yang-maven-plugin adds revision to packaged yang file name. Netconf
test-tool should register yang resources with valid filenames, i.e
name@revision.yang, when preparing for assembly of its schema context.

Change-Id: I1914426b96029d7d2377f77b9f7df8beb14e607a
Signed-off-by: Jakub Morvay <jmorvay@cisco.com>
6 years agoAdd local MultivaluedHashMap implementation 53/63053/3
Tom Pantelis [Tue, 12 Sep 2017 16:03:00 +0000 (12:03 -0400)]
Add local MultivaluedHashMap implementation

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 class. I also refactored SimpleUriInfo into
it's own class as it's used by both JSONRestconfService implementations.

Change-Id: I1af0771327d46c72e55facf14c41038fd583e0ed
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoMinor cleanup of blueprint config 00/63500/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 agoRPC for netconf node addition. Supports encrypt option for password encryption. 78/62678/8
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 agoMerge "Bug 8988 - Check for empty payload properly"
Tomas Cere [Thu, 21 Sep 2017 08:56:56 +0000 (08:56 +0000)]
Merge "Bug 8988 - Check for empty payload properly"

6 years agoEnable public key based authentication for netconf 77/62677/5
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" 76/62676/5
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 8988 - Check for empty payload properly 55/63055/4
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 agoAdjust tests for yangtools changes 02/63302/2
Jakub Morvay [Tue, 19 Sep 2017 20:57:23 +0000 (22:57 +0200)]
Adjust tests for yangtools changes

yang-maven-plugin now adds revision to the packaged yang file name.
This is introduced in https://git.opendaylight.org/gerrit/#/c/62706/.
Adjust NetconfMappingTest and NetconfMDSalMappingTest to that.

https://git.opendaylight.org/gerrit/#/c/62731/ enforces revisions to be
in valid yyyy-MM-dd format. Adjust Restconf tests to this change.

Change-Id: I00372ee98b15d3194c8a8567a041f24f161d7276
Signed-off-by: Jakub Morvay <jmorvay@cisco.com>
6 years agoSplit Restconf implementations (draft02 and RFC) - features 20/62920/8
Jakub Toth [Fri, 8 Sep 2017 16:27:32 +0000 (18:27 +0200)]
Split Restconf implementations (draft02 and RFC) - features

  * remove restconf rfc8040 implemetation from bierman02
  * add features for restconf-nb-rfc8040

Change-Id: I96110d0721c39acdc88332e748f81de07fd5663d
Signed-off-by: Jakub Toth <jakub.toth@pantheon.tech>
6 years agoSplit Restconf implementations (draft02 and RFC) - Application 19/62919/9
Jakub Toth [Fri, 8 Sep 2017 12:02:11 +0000 (14:02 +0200)]
Split Restconf implementations (draft02 and RFC) - Application

  * add blueprint + web.xml for restconf-nb-rfc8040

Change-Id: Ifd8ea387ace5580ddd36dde59000b7cd69515272
Signed-off-by: Jakub Toth <jakub.toth@pantheon.tech>
6 years agoSplit Restconf implementations (draft02 and RFC) - providers tests 72/62872/7
Jakub Toth [Thu, 7 Sep 2017 22:26:11 +0000 (00:26 +0200)]
Split Restconf implementations (draft02 and RFC) - providers tests

Change-Id: If8c26aa059508763e4730d69d9b64f594ec9e302
Signed-off-by: Jakub Toth <jakub.toth@pantheon.tech>
6 years agoSplit Restconf implementations (draft02 and RFC) - move providers 71/62871/6
Jakub Toth [Thu, 7 Sep 2017 21:49:11 +0000 (23:49 +0200)]
Split Restconf implementations (draft02 and RFC) - move providers

Change-Id: Iab075f8d91001a646783f35aa5fe1550d811d01b
Signed-off-by: Jakub Toth <jakub.toth@pantheon.tech>
6 years agoSplit Restconf implementations (draft02 and RFC) - tests 55/62855/7
Jakub Toth [Thu, 7 Sep 2017 16:27:41 +0000 (18:27 +0200)]
Split Restconf implementations (draft02 and RFC) - tests

Change-Id: I4e20a07ed96e63a1238ade12c7fc3377853ec211
Signed-off-by: Jakub Toth <jakub.toth@pantheon.tech>
6 years agoSplit Restconf implementations (draft02 and RFC) - move 54/62854/6
Jakub Toth [Thu, 7 Sep 2017 08:28:14 +0000 (10:28 +0200)]
Split Restconf implementations (draft02 and RFC) - move
sal-rest-connector

  * move Patch parts, RestUtil, RestconfSchemaUtil,
    RestconfValidationUtils, IdentityValuesDTO to common module
  * move packages from bierman02 to rfc8040:
    * /restconf/base/services/ ->
        /restconf/nb/rfc8040/services/simple
    * /restconf/common/wrapper/services ->
        /restconf/nb/rfc8040/services/wrapper
    * /restconf/common/references/ ->
        /restconf/nb/rfc8040/references
    * /restconf/handlers -> /restconf/nb/rfc8040/handlers
    * /restconf/parser -> /restconf/nb/rfc8040/utils/parser
    * /restconf/restful -> /restconf/nb/rfc8040/rests
    * /restconf/utils -> /restconf/nb/rfc8040/utils

Change-Id: I8259d69ab2378a25ddcf41d0b6f14dd65afc2507
Signed-off-by: Jakub Toth <jakub.toth@pantheon.tech>
6 years agoSplit Restconf implementations (draft02 and RFC) - move restconf 91/62791/5
Jakub Toth [Wed, 6 Sep 2017 16:12:09 +0000 (18:12 +0200)]
Split Restconf implementations (draft02 and RFC) - move restconf
errors to common part of restconf

Change-Id: If8786352d59e013aa8da5b22790ee125e23b771b
Signed-off-by: Jakub Toth <jakub.toth@pantheon.tech>
6 years agoSplit Restconf implementations (draft02 and RFC) - base api 79/62779/9
Jakub Toth [Wed, 6 Sep 2017 15:19:49 +0000 (17:19 +0200)]
Split Restconf implementations (draft02 and RFC) - base api

  * create common module for both implemetations
    * move common classes
  * move base api services to restconf-nb-rfc8040

Change-Id: I31d084c5d19da515337f79562bafa520c57a087d
Signed-off-by: Jakub Toth <jakub.toth@pantheon.tech>
6 years agoSplit Restconf implementations (draft02 and RFC) - Rfc8040 04/62704/10
Jakub Toth [Tue, 5 Sep 2017 14:31:10 +0000 (16:31 +0200)]
Split Restconf implementations (draft02 and RFC) - Rfc8040

  *move Rfc8040 to the new module restconf-nb-rfc8040

Change-Id: Ica52f23791e8326f20f8449d0e39273b7db8f5c5
Signed-off-by: Jakub Toth <jakub.toth@pantheon.tech>
6 years agoSplit Restconf implementations (draft02 and RFC) - Prepare modules 02/62602/11
Jakub Toth [Mon, 4 Sep 2017 08:15:10 +0000 (10:15 +0200)]
Split Restconf implementations (draft02 and RFC) - Prepare modules

  * rename sal-rest-connector module to restconf-nb-bierman02
  * prepared new module restconf-nb-rfc8040

Change-Id: I401a7fc595251dfd2ae08074096a4a16707c6527
Signed-off-by: Jakub Toth <jakub.toth@pantheon.tech>
6 years agoMerge "Bug 9092: revert to org.json temporarily"
Jakub Morvay [Tue, 12 Sep 2017 16:30:47 +0000 (16:30 +0000)]
Merge "Bug 9092: revert to org.json temporarily"

6 years agoBug 9092: revert to org.json temporarily 11/62811/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 agoAdjust for mdsal-binding-dom-codec movement 21/62621/4
Robert Varga [Mon, 4 Sep 2017 12:08:43 +0000 (14:08 +0200)]
Adjust for mdsal-binding-dom-codec movement

The codec is moveing its package, adjust for that.

Change-Id: Ia938c381cfa6a689e04c1dbadfac930c14670f9b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoMerge "Convert NetconfEventSourceManager to DataTreeChangeListener"
Jakub Morvay [Wed, 6 Sep 2017 10:06:35 +0000 (10:06 +0000)]
Merge "Convert NetconfEventSourceManager to DataTreeChangeListener"

6 years agoDo not use NamedInputStream 44/62744/1
Robert Varga [Wed, 6 Sep 2017 08:33:46 +0000 (10:33 +0200)]
Do not use NamedInputStream

NamedInputStream is going away, as it is useless. Use a proper
File-based schemacontext utility instead.

Change-Id: Ifefaf9d33c683656a571ba7613940bce6787dd24
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoMerge "Convert callhome DCLs to DTCLs"
Jakub Morvay [Tue, 5 Sep 2017 15:55:23 +0000 (15:55 +0000)]
Merge "Convert callhome DCLs to DTCLs"

6 years agoMerge "Fix failed test - tested string of '..was[n']t..' to '..was[ no]t..'"
Jakub Morvay [Tue, 5 Sep 2017 12:14:50 +0000 (12:14 +0000)]
Merge "Fix failed test - tested string of '..was[n']t..' to '..was[ no]t..'"

6 years agoMerge "Bug 8989 - Create just one DS for each test-tool's simulated netconf device"
Jakub Morvay [Mon, 4 Sep 2017 17:02:01 +0000 (17:02 +0000)]
Merge "Bug 8989 - Create just one DS for each test-tool's simulated netconf device"

6 years agoFix failed test - tested string of '..was[n']t..' to '..was[ no]t..' 09/62609/3
Jakub Toth [Mon, 4 Sep 2017 11:24:53 +0000 (13:24 +0200)]
Fix failed test - tested string of '..was[n']t..' to '..was[ no]t..'

Change-Id: I2e49e3d4ce72dfd161807736f9afc9b2a5af3edb
Signed-off-by: Jakub Toth <jakub.toth@pantheon.tech>
6 years agoConvert NetconfEventSourceManager to DataTreeChangeListener 60/62460/2
Tom Pantelis [Wed, 30 Aug 2017 18:01:33 +0000 (14:01 -0400)]
Convert NetconfEventSourceManager to DataTreeChangeListener

DataChangeListener has been deprecated since Carbon with possible removal
in Oxygen so convert to DataTreeChangeListener.

Change-Id: I23e4318a9973a7cffcaa95c42ac6df7449b59b61
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoConvert callhome DCLs to DTCLs 59/62459/1
Tom Pantelis [Wed, 30 Aug 2017 17:51:20 +0000 (13:51 -0400)]
Convert callhome DCLs to DTCLs

DataChangeListener has been deprecated since Carbon with possible removal
in Oxygen so convert to DataTreeChangeListener.

Change-Id: I5fa84fd609eb7aa145756a5cc3839ed544b77456
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoMerge "Simplify boolean expressions"
Jakub Morvay [Wed, 23 Aug 2017 08:40:31 +0000 (08:40 +0000)]
Merge "Simplify boolean expressions"

6 years agoMerge "Remove unused singleton code"
Jakub Morvay [Wed, 23 Aug 2017 08:16:04 +0000 (08:16 +0000)]
Merge "Remove unused singleton code"

6 years agoMerge "Bug 8977 - Failed on binary key type"
Jakub Morvay [Tue, 22 Aug 2017 12:58:36 +0000 (12:58 +0000)]
Merge "Bug 8977 - Failed on binary key type"

6 years agoBug 8977 - Failed on binary key type 30/61930/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 agoRemove unused singleton code 14/61714/3
Ryan Goulding [Mon, 14 Aug 2017 19:02:02 +0000 (15:02 -0400)]
Remove unused singleton code

CredentialServiceAuthProvider is not a singleton.  This removes
the INSTANCE Map since it is unused and confusing.

Change-Id: Ie20d923e7257991bbf97739fc067fd21d26790f5
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoBug 8989 - Create just one DS for each test-tool's simulated netconf device 80/61980/2
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>
6 years agoBUG-2389: remove references to XmlDocumentUtils 10/61910/1
Robert Varga [Thu, 17 Aug 2017 09:28:14 +0000 (11:28 +0200)]
BUG-2389: remove references to XmlDocumentUtils

This class is going away, do not use it. Also speed up transformation
by sharing XMLOutputFactory. Also fixes NetconfUtil to refer to writer
at its new place.

Change-Id: I1fbd1385cbe4da314923d1f33b1bc64fa2182996
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoSimplify boolean expressions 67/61167/4
Stephen Kitt [Fri, 4 Aug 2017 13:15:12 +0000 (15:15 +0200)]
Simplify boolean expressions

* Drop explicit “? true : false” (or the reverse).
* Simplify “if (...) return true; else return false;”.
* Simplify tail “if (...) return false; return true;”.
* Simplify explicit comparisons with true or false.

This was mostly done automatically by IntelliJ.

Change-Id: Ib252f58f2feb2fe6e05e89ad90ab11f85b5e3289
Signed-off-by: Stephen Kitt <skitt@redhat.com>
6 years agoBug 7176 - Netconf MD-SAL connector is treating prefixed XML as invalid 83/48483/15
Alexis de Talhouët [Fri, 18 Nov 2016 14:59:00 +0000 (09:59 -0500)]
Bug 7176 - Netconf MD-SAL connector is treating prefixed XML as invalid

Change-Id: I107b8f8076b106016069bec48a25738b08380a2a
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
6 years agoBug 8968: Convert sal-rest-docgen to blueprint 54/61454/5
Ryan Goulding [Wed, 9 Aug 2017 19:46:39 +0000 (15:46 -0400)]
Bug 8968: Convert sal-rest-docgen to blueprint

Removes BundleActivator and corresponding ServiceTracker implementation
in favor of utilizing blueprint DI.

Change-Id: I4030253db94f1c79423f41c87c6c75493d5b53d4
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoBump versions by x.(y+1).z for next dev cycle 91/61691/1
Thanh Ha [Mon, 14 Aug 2017 17:31:13 +0000 (13:31 -0400)]
Bump versions by x.(y+1).z for next dev cycle

Change-Id: Ic822853db53a9f174ae65fa17c0c03f662f36eb4
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"