controller.git
9 years agoBUG 2412 remove CompositeNode from RestconfImpl codeBase 29/16629/8
Jan Hajnar [Wed, 18 Mar 2015 16:27:51 +0000 (17:27 +0100)]
BUG 2412 remove CompositeNode from RestconfImpl codeBase

* remove all references for CompositeNode from Restconf codeBase
* remove all depricated classes from Restconf
* remove all tests which have worked with CompositeNode
 * we would like to fix tests and move to correct place (in yangtools
and controller integration test for JerseyTest suite)

Note: The removed tests are still in git history. A fixes for Test
suite will be realized ASAP (expectation: in next couple of weeks).

Change-Id: I66b423c92e5ff5b34882b92aece54c5f641c070c
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
Signed-off-by: Jan Hajnar <jhajnar@cisco.com>
9 years agoBug 868: Removed use of CompositeNode Binding Codecs. 35/16835/2
Tony Tkacik [Thu, 19 Mar 2015 14:25:34 +0000 (15:25 +0100)]
Bug 868: Removed use of CompositeNode Binding Codecs.

Change-Id: Iaaf22bd8bc788f26814e06873b483bf0424ceaf2
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "BUG 2799: Migration of Message Bus from deprecated Helium MD-SAL APIs to Lithi...
Tony Tkacik [Thu, 19 Mar 2015 15:54:25 +0000 (15:54 +0000)]
Merge "BUG 2799: Migration of Message Bus from deprecated Helium MD-SAL APIs to Lithium API (copyrights corrected)"

9 years agoMerge "Renamed Binding DOM Adapters to share same naming convention."
Ed Warnicke [Thu, 19 Mar 2015 15:31:32 +0000 (15:31 +0000)]
Merge "Renamed Binding DOM Adapters to share same naming convention."

9 years agoMerge "Bug 868: Binding MD-SAL exports new codec factory."
Ed Warnicke [Thu, 19 Mar 2015 15:02:00 +0000 (15:02 +0000)]
Merge "Bug 868: Binding MD-SAL exports new codec factory."

9 years agoMerge "BUG-2673: deprecate ListenerNode,Tree and Walker"
Tony Tkacik [Thu, 19 Mar 2015 14:34:55 +0000 (14:34 +0000)]
Merge "BUG-2673: deprecate ListenerNode,Tree and Walker"

9 years agoMerge "Remove RuntimeGeneratedMappingService from config-manager"
Tony Tkacik [Thu, 19 Mar 2015 12:26:19 +0000 (12:26 +0000)]
Merge "Remove RuntimeGeneratedMappingService from config-manager"

9 years agoRenamed Binding DOM Adapters to share same naming convention. 72/16772/2
Tony Tkacik [Wed, 18 Mar 2015 14:26:04 +0000 (15:26 +0100)]
Renamed Binding DOM Adapters to share same naming convention.

Renamed Forwarded* classes to BindingDOM*Adapter which
better describes what implementations are doing.

These are implementation classes and are not part of public
API contract outside of sal-binding-broker-impl, so this
should not affect any users.

Change-Id: I1c3b5f275daa38c82215ca3ba8b8170990e9ac43
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoBug 868: Binding MD-SAL exports new codec factory. 71/16771/2
Tony Tkacik [Wed, 18 Mar 2015 14:21:09 +0000 (15:21 +0100)]
Bug 868: Binding MD-SAL exports new codec factory.

Migrated MD-SAL to export BindingCodecTreeFactory,
which provides access to new codecs, which allows
us to migrate users without need to change initial
configuration.

Change-Id: Icb741dd73e3b22f64f5f538236d36a99e9c05b4e
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoBUG-2673: deprecate ListenerNode,Tree and Walker 63/16663/7
Robert Varga [Mon, 16 Mar 2015 18:42:26 +0000 (19:42 +0100)]
BUG-2673: deprecate ListenerNode,Tree and Walker

All of these have been superseded by RegistrationTree and related
classes. Those should offer better performance due to not instantiating
intermediate Optional nodes when searching for nodes.

Change-Id: I1e16bcb045ca5c97ca7f245e44d94d133bbf4eac
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "fixed restconf notification subscription parsing."
Tony Tkacik [Thu, 19 Mar 2015 08:16:32 +0000 (08:16 +0000)]
Merge "fixed restconf notification subscription parsing."

9 years agoMerge "Reenable netconf-notifications-impl xml tests"
Tony Tkacik [Thu, 19 Mar 2015 08:16:13 +0000 (08:16 +0000)]
Merge "Reenable netconf-notifications-impl xml tests"

9 years agoBUG 2799: Migration of Message Bus from deprecated Helium MD-SAL APIs 40/16140/13
Igor Bartak [Wed, 18 Mar 2015 17:00:13 +0000 (18:00 +0100)]
BUG 2799: Migration of Message Bus from deprecated Helium MD-SAL APIs
to Lithium API (copyrights corrected)

Change-Id: I2206b4b532e4feead26c166b793966b077f0f26f
Signed-off-by: Igor Bartak <ibartak@cisco.com>
9 years agoRemove RuntimeGeneratedMappingService from config-manager 66/16766/3
Maros Marsalek [Wed, 18 Mar 2015 11:01:28 +0000 (12:01 +0100)]
Remove RuntimeGeneratedMappingService from config-manager

Replace with BindingRuntimeContext

Change-Id: I8e3ef881898f6ea7b9c3922a3bfaf3094667c644
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoMerge "Bug 2841: Fixed missing output element in Restconf RPCs"
Ed Warnicke [Wed, 18 Mar 2015 16:08:55 +0000 (16:08 +0000)]
Merge "Bug 2841: Fixed missing output element in Restconf RPCs"

9 years agoBug 2841: Fixed missing output element in Restconf RPCs 84/16684/4
Tony Tkacik [Tue, 17 Mar 2015 11:12:09 +0000 (12:12 +0100)]
Bug 2841: Fixed missing output element in Restconf RPCs

JAXRS Body Writers reused root data container writeout
for RPC outputs, which differed and writed "data"
container instead of rpc "output", refactored writeTo
method, to do this special handling.

Change-Id: Ia6acf671b760c9aa578a02ce803c99a389030260
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "Add config classifier to netconf-mdsal-config jar"
Tony Tkacik [Wed, 18 Mar 2015 08:45:43 +0000 (08:45 +0000)]
Merge "Add config classifier to netconf-mdsal-config jar"

9 years agoMerge "BUG-2836 Workaround"
Tony Tkacik [Tue, 17 Mar 2015 17:49:55 +0000 (17:49 +0000)]
Merge "BUG-2836 Workaround"

9 years agoBug 868: Introduced DOM ForwardingSession utility classes. 05/16705/2
Tony Tkacik [Tue, 17 Mar 2015 14:58:37 +0000 (15:58 +0100)]
Bug 868: Introduced DOM ForwardingSession utility classes.

Introduced DOM ForwardingSession abstract classes,
in order to migrate AAA from CompositeNode interfaces,
since they were using it only to forward calls to backing
implementation.

Change-Id: If5ed1a5dadc02c0d7433fd9652a4af9b586a9be7
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoBUG-2836 Workaround 95/16695/1
Maros Marsalek [Tue, 17 Mar 2015 13:33:09 +0000 (14:33 +0100)]
BUG-2836 Workaround

Change-Id: Ibcec955562ed72946100512d8f1db294c2cb4ccd
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoMerge "BUG-2673: make IMDS implement DOMStoreTreeChangePublisher"
Tony Tkacik [Tue, 17 Mar 2015 11:30:27 +0000 (11:30 +0000)]
Merge "BUG-2673: make IMDS implement DOMStoreTreeChangePublisher"

9 years agoMerge "BUG-2673: Introduce AbstractDOMStoreTreeChangePublisher"
Tony Tkacik [Tue, 17 Mar 2015 11:28:27 +0000 (11:28 +0000)]
Merge "BUG-2673: Introduce AbstractDOMStoreTreeChangePublisher"

9 years agoMerge "BUG-2673: Create AbstractRegistrationTree and related classes"
Tony Tkacik [Tue, 17 Mar 2015 11:27:43 +0000 (11:27 +0000)]
Merge "BUG-2673: Create AbstractRegistrationTree and related classes"

9 years agoAdd config classifier to netconf-mdsal-config jar 83/16683/1
Maros Marsalek [Tue, 17 Mar 2015 10:14:28 +0000 (11:14 +0100)]
Add config classifier to netconf-mdsal-config jar

The jar was included in the features without the config classifier, which caused
the distributions to fail to install md-sal netconf config file (in case the
local m2 repo did not contain pre-built artifacts from controller project)

Change-Id: I1cc3d8f02e55ae9fd30abac706645b879753b2da
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoBUG-2673: make IMDS implement DOMStoreTreeChangePublisher 62/16662/2
Robert Varga [Mon, 16 Mar 2015 17:54:39 +0000 (18:54 +0100)]
BUG-2673: make IMDS implement DOMStoreTreeChangePublisher

This patch makes use of the AbstractDOMStoreTreeChangePublisher to do all
the registration wrangling and forwards all notifications towards a
dedicated publisher. Notifications are offloaded to the background
executor, just as normal DataChangeNotifications are. This initial
implementation does not close the registration listener race also
present in the data change notifications, as the notification manager
lacks the APIs to do that.

Change-Id: I36220b52a7a67df1f340b2b8bf32918de025920b
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-2673: Introduce AbstractDOMStoreTreeChangePublisher 49/16649/5
Robert Varga [Mon, 16 Mar 2015 12:21:24 +0000 (13:21 +0100)]
BUG-2673: Introduce AbstractDOMStoreTreeChangePublisher

This is a base class, reusable for various DOMStore implementations,
which want to implement the DOMStoreTreeChangePublisher interface.

Change-Id: I77f2488f3b99d9e9e34c97772df5a157c245f8c7
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-2673: Create AbstractRegistrationTree and related classes 32/16632/3
Robert Varga [Mon, 16 Mar 2015 09:41:44 +0000 (10:41 +0100)]
BUG-2673: Create AbstractRegistrationTree and related classes

This is a generalization of ListenerTree, useful for reusing the
infrastructure for multiple types of registrations.

Change-Id: I715b876d932d0a14ab9a479b1f1d39509a67e30b
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-2713 Extract capability implementations into util 34/16634/3
Maros Marsalek [Mon, 16 Mar 2015 12:22:03 +0000 (13:22 +0100)]
BUG-2713 Extract capability implementations into util

Identical implementations all over the place are now in 2 classes in
netconf-util

Change-Id: Ibc2aa78edb581654da1ac890d109d2f32cf94738
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoReenable netconf-notifications-impl xml tests 38/16638/1
Maros Marsalek [Mon, 16 Mar 2015 13:20:02 +0000 (14:20 +0100)]
Reenable netconf-notifications-impl xml tests

The tests were disabled due to improper configuration for XMLUtil.
The configuration is fine now.

Change-Id: I59fe1081ac927596fc55079e62088cceb5b52811
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoBUG-2839: remove dependencies on commons-io 25/16625/1
Robert Varga [Fri, 13 Mar 2015 12:11:50 +0000 (13:11 +0100)]
BUG-2839: remove dependencies on commons-io

Replaces uses of IOUtils methods with guava/JDK equivalents.

Change-Id: I16ece0feec2f4dc84c3be91ec675a0294cffcffb
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge changes I8ad04406,I3ea2166c
Tony Tkacik [Sat, 14 Mar 2015 10:12:31 +0000 (10:12 +0000)]
Merge changes I8ad04406,I3ea2166c

* changes:
  BUG-2314 Fix (no-input)rpcs serialization in netconf connector
  Fix Already initialized exception from netconf-connector

9 years agoBUG-2314 Fix (no-input)rpcs serialization in netconf connector 85/16485/1
Maros Marsalek [Fri, 13 Mar 2015 14:12:55 +0000 (15:12 +0100)]
BUG-2314 Fix (no-input)rpcs serialization in netconf connector

Rpcs with no input were not wrapped in rpc element correctly

Change-Id: I8ad0440681e83dd3a04a8ba38f49b2d7c4976caa
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoFix Already initialized exception from netconf-connector 77/16477/1
Maros Marsalek [Fri, 13 Mar 2015 12:49:07 +0000 (13:49 +0100)]
Fix Already initialized exception from netconf-connector

Netconf-connector called initialization code and cleanup code (after capability
changed notification was received) in wrong order. This caused the cleanup

Change-Id: I3ea2166c912e2b6775bf9493a95102d66b5ae8a2
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoMerge "BUG-2596 Workaround for scheduled-threadpool module"
Tony Tkacik [Fri, 13 Mar 2015 12:28:31 +0000 (12:28 +0000)]
Merge "BUG-2596 Workaround for scheduled-threadpool module"

9 years agoMerge "Change in AbstractRaftBehavior#performSnapshotWithoutCapture"
Moiz Raja [Fri, 13 Mar 2015 11:50:50 +0000 (11:50 +0000)]
Merge "Change in AbstractRaftBehavior#performSnapshotWithoutCapture"

9 years agoBUG-2596 Workaround for scheduled-threadpool module 72/16472/1
Maros Marsalek [Fri, 13 Mar 2015 10:39:28 +0000 (11:39 +0100)]
BUG-2596 Workaround for scheduled-threadpool module

Register the scheduled-threadpool as all available service types in initial
config.

Change-Id: If7929fbb9996f0ea8902d50e2c71875d343f229f
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoMerge "Refactor ShardTest"
Moiz Raja [Fri, 13 Mar 2015 10:31:26 +0000 (10:31 +0000)]
Merge "Refactor ShardTest"

9 years agoMerge "Reduce/enhance logging in AbstractLeader"
Moiz Raja [Fri, 13 Mar 2015 10:29:13 +0000 (10:29 +0000)]
Merge "Reduce/enhance logging in AbstractLeader"

9 years agoMerge "Purge in-memory log when install snapshot is done"
Moiz Raja [Fri, 13 Mar 2015 10:28:37 +0000 (10:28 +0000)]
Merge "Purge in-memory log when install snapshot is done"

9 years agoMerge "Use static Procedure callback for ApplyJournalEntries"
Moiz Raja [Fri, 13 Mar 2015 10:26:21 +0000 (10:26 +0000)]
Merge "Use static Procedure callback for ApplyJournalEntries"

9 years agoMerge "Changes in RaftActor#handleCaptureSnapshotReply"
Moiz Raja [Fri, 13 Mar 2015 10:26:02 +0000 (10:26 +0000)]
Merge "Changes in RaftActor#handleCaptureSnapshotReply"

9 years agoMerge "Change fields in ShardStats to non-volatile"
Moiz Raja [Fri, 13 Mar 2015 10:25:41 +0000 (10:25 +0000)]
Merge "Change fields in ShardStats to non-volatile"

9 years agoMerge "BUG-2314 Expose inventory mountpoint on proper path"
Tony Tkacik [Fri, 13 Mar 2015 09:23:39 +0000 (09:23 +0000)]
Merge "BUG-2314 Expose inventory mountpoint on proper path"

9 years agoBug 2845: Temporarily ignore RestPutOperationTest 09/16509/1
Tom Pantelis [Fri, 13 Mar 2015 03:49:03 +0000 (23:49 -0400)]
Bug 2845: Temporarily ignore RestPutOperationTest

RestPutOperationTest is frequently failing the verify builds so
setting to Ignore until the issue is fixed.

Change-Id: I134a6d73930cd104225a27880e87867026f35f03
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
9 years agoBug 2834: Fix Restconf POST to wait for completion 92/16492/8
Ryan Goulding [Fri, 13 Mar 2015 15:15:32 +0000 (11:15 -0400)]
Bug 2834: Fix Restconf POST to wait for completion

This changeset introduces a blocking mechanism for Restconf POST to ensure that
the transaction completes before a response is returned, as is consistent with
Restconf PUT behavior.  checkedGet() is utilized to ensure write transaction
completion.

Change-Id: I74f68b883f6037ec62644a468d3cbb9370d8d25f
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
9 years agoFix bug 2821 - restconf RPC parsing returns http status 500 22/16322/11
Vaclav Demcak [Wed, 11 Mar 2015 13:13:22 +0000 (14:13 +0100)]
Fix bug 2821 - restconf RPC parsing returns http status 500

Note: RpcDefinition is a direct child of SchemaNode and we are not able to
use it as DataSchemaNode or SchemaContext. In next RpcDefinition hasn't any
child except Input & Output ContainerNodes. So we are using RpcDefinition
for SchemaNode as a marker in InstanceIdentfierContext.

* json input read @Provider has to change RpcDefinition SchemaNode
to Input ContainerSchemaNode for a correct parsing RPC input data from stream

* no-payload Rpc - Rpc Call could be without payload, but jersey always does
to parse empty stream to NormalizedNode so we add check for stream.available
before start parsing input NormalizedNode from stream and return NNContext
with null data. All checks for data exist have to be implemented for every
method with NormalizedNodeContext.

* fix RpcOutput NormalzidNodeContext in RestconfImpl - we expect to have
RpcDefinition as reultNodeSchema and data are payloaded inside as Output obj.

* fix NormalizedNodeJsonBodyWriter and NormalizedNodeXmlBodyWriter for RpcDefinition
- RpcDefinition has no child elements so RpcDefinition.output has to be a root
DataSchemaNode for json parser

* add JsonBodyReader/Writer test suite
* add Xml rpc Writer parser test suite

Change-Id: I31273bee937f57fa1551a33fcc4d6c81b984afb6
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
9 years agoAdd missing union type builder 04/16404/2
Robert Varga [Thu, 12 Mar 2015 16:48:45 +0000 (17:48 +0100)]
Add missing union type builder

This type was missing and should not be generated over and over again.

Change-Id: Ife3e97c2c639e29ca2115429b53e6dec62440db7
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-2314 Expose inventory mountpoint on proper path 98/16398/1
Maros Marsalek [Thu, 12 Mar 2015 15:38:53 +0000 (16:38 +0100)]
BUG-2314 Expose inventory mountpoint on proper path

The path is updated according to the Normalized nodes API

Change-Id: Ibeb8b98016d0056a703eb97f6e31c6a5507a21ea
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoMerge "BUG-2343 Report sideloaded models for nc correctly"
Tony Tkacik [Thu, 12 Mar 2015 11:58:32 +0000 (11:58 +0000)]
Merge "BUG-2343 Report sideloaded models for nc correctly"

9 years agoMerge "BUG-2314 Allow rpcs with no input in netconf connector"
Tony Tkacik [Thu, 12 Mar 2015 11:57:36 +0000 (11:57 +0000)]
Merge "BUG-2314 Allow rpcs with no input in netconf connector"

9 years agoMerge "Quick fix nullable RPC input"
Tony Tkacik [Thu, 12 Mar 2015 11:04:09 +0000 (11:04 +0000)]
Merge "Quick fix nullable RPC input"

9 years agoBUG-2314 Allow rpcs with no input in netconf connector 32/16332/3
Maros Marsalek [Wed, 11 Mar 2015 15:30:47 +0000 (16:30 +0100)]
BUG-2314 Allow rpcs with no input in netconf connector

Change-Id: I81b05c98032c8bda7b34608c33ddcb5a0888ba67
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoBUG-2343 Report sideloaded models for nc correctly 80/16380/2
Maros Marsalek [Thu, 12 Mar 2015 09:57:00 +0000 (10:57 +0100)]
BUG-2343 Report sideloaded models for nc correctly

The sideloading of models behaved as a merge operation but was reported as
replace. Report the resulting models as a merge.

Change-Id: Id44d077e72ae0ce5f202c5178d5c7e5b825d6deb
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agofixed restconf notification subscription parsing. 17/16317/4
Jan Hajnar [Wed, 11 Mar 2015 10:56:37 +0000 (11:56 +0100)]
fixed restconf notification subscription parsing.

Change-Id: I7cf7f6fcbe4c45e5a462be6da61907712c4c7784
Signed-off-by: Jan Hajnar <jhajnar@cisco.com>
9 years agoChange fields in ShardStats to non-volatile 86/16386/3
Tom Pantelis [Sun, 8 Mar 2015 12:16:07 +0000 (08:16 -0400)]
Change fields in ShardStats to non-volatile

Most if the fields in ShardStats are volatile or AtomicLong counters.
While volatile guarantees immediate thread visibility, we can live with
eventual consistency to avoid the overhead of volatile writes on the
fast path as reads via JMX will be infrequent.

All of the counters except 1 are updated by Shard so concurrent updates
won't occur. failedReadTransactionsCount is updated by ShardTransaction
so we need to keep that as AtomicLong as it will be updated concurrently.
But it's a failure counter so will be updated infrequently.

Change-Id: I6a0f748bd595379243e0ea31d84f6c8d0989003a
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
9 years agoMerge "Add sal-akka-raft test-jar dependency to sal-distributed-store pom"
Moiz Raja [Thu, 12 Mar 2015 01:33:51 +0000 (01:33 +0000)]
Merge "Add sal-akka-raft test-jar dependency to sal-distributed-store pom"

9 years agoUse static Procedure callback for ApplyJournalEntries 70/16370/2
Tom Pantelis [Thu, 12 Mar 2015 00:12:42 +0000 (20:12 -0400)]
Use static Procedure callback for ApplyJournalEntries

Optimization in RaftActor to reuse a static Procedure callback instance
when persisting ApplyJournalEntries.

Change-Id: Id4b799b847191f9d7b31aca54d9926638407410e
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
9 years agoChanges in RaftActor#handleCaptureSnapshotReply 68/16368/3
Tom Pantelis [Wed, 11 Mar 2015 23:30:59 +0000 (19:30 -0400)]
Changes in RaftActor#handleCaptureSnapshotReply

captureSnapshot.getReplicatedToAllIndex() is usually -1 (in fact I
haven't yet been able to come with a test scenario where it isn't) and
we shouldn't reset the behavior's replicatedToAllIndex history when
we snapshot due to memory threshold exceeded. This prevents log trimming
when a lagging follower is caught up via install snapshot. Eventually
log trimming would catch up on subsequent replicates but I don't see a
reason why we should reset it to -1.

Also made a couple other logging changes.

Change-Id: I6b9eafc84455a88c3bc1fc91608fe257c03b4093
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
9 years agoChange in AbstractRaftBehavior#performSnapshotWithoutCapture 69/16369/1
Tom Pantelis [Thu, 12 Mar 2015 00:00:06 +0000 (20:00 -0400)]
Change in AbstractRaftBehavior#performSnapshotWithoutCapture

If tempMin isn't present in the log and tempMin is grater
than the current replicatedToAllIndex, then update replicatedToAllIndex
to tempMin. Details are in the code comments.

Change-Id: I373d5c4b7ce9fd2504f2a4fa996b49a6d9ffe5b6
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
9 years agoReduce/enhance logging in AbstractLeader 66/16366/1
Tom Pantelis [Wed, 11 Mar 2015 22:31:25 +0000 (18:31 -0400)]
Reduce/enhance logging in AbstractLeader

If you turn on debug logging for Shard, the "Checking sendAppendEntries
for follower..." message is logged by sendUpdatesToFollower on every
AppendEntriesReply heartbeat even when no data was sent to the follower.
This bombards the karaf.log. To avoid this, we need this only logged if
something changed for the follower. So, I changed the FollwerLogInformation
setMatchIndex and setNextIndex methods to return a boolean if changed
which handleAppendEntriesReply checks to see if either were updated. If
neither changed, it passes true to sendUpdatesToFollower for isHeartbeat
so the message isn't logged.

I also made a few other minor logging changes.

Change-Id: Ib1f2109092b3656c3cc3dfdd2cd7b4641a3f890b
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
9 years agoPurge in-memory log when install snapshot is done 64/16364/1
Tom Pantelis [Wed, 11 Mar 2015 22:11:33 +0000 (18:11 -0400)]
Purge in-memory log when install snapshot is done

In AbstractLeader#handleInstallSnapshotReply, after the last snapshot
chunk has been sent and acknowledged by the follower and, since install
snapshot *should* only happen for a lagging follower, the follower
is most likely caught up at this point so we can be greedy and try
to trim the log and advance replicatedToAllIndex.

Change-Id: Id22dfbcb6e459e3d3f6801d1c6c850bdd42989fa
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
9 years agoAdd sal-akka-raft test-jar dependency to sal-distributed-store pom 55/16355/1
Tom Pantelis [Wed, 11 Mar 2015 21:11:22 +0000 (17:11 -0400)]
Add sal-akka-raft test-jar dependency to sal-distributed-store pom

So we can use the test utilities in sal-akka-raft.

Change-Id: Ibb28522ed49c61c53d3b3296b38c898c7ea5129b
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
9 years agoMerge "Fixed testool performance bottleneck due to testtool using NetconfMonitoring...
Tony Tkacik [Wed, 11 Mar 2015 19:28:01 +0000 (19:28 +0000)]
Merge "Fixed testool performance bottleneck due to testtool using NetconfMonitoring from ODL. Added a dummy NetconfMonitoring implementation for testtool."

9 years agoMerge "Changed NetconfDeviceDatastoreAdapter and NetconfDeviceTopologyAdapter to...
Tony Tkacik [Wed, 11 Mar 2015 19:27:46 +0000 (19:27 +0000)]
Merge "Changed NetconfDeviceDatastoreAdapter and NetconfDeviceTopologyAdapter to use TransactionChains instead of Transactions to prevent race condition between init and update when a device is created."

9 years agoMerge "Remove duplicate dependency declarations"
Tony Tkacik [Wed, 11 Mar 2015 19:27:13 +0000 (19:27 +0000)]
Merge "Remove duplicate dependency declarations"

9 years agoMerge "Fixed failing tests due to different attribute handling in mdsal netconf north...
Tony Tkacik [Wed, 11 Mar 2015 19:27:07 +0000 (19:27 +0000)]
Merge "Fixed failing tests due to different attribute handling in mdsal netconf northbound."

9 years agoMerge "Make logger final"
Tony Tkacik [Wed, 11 Mar 2015 19:25:45 +0000 (19:25 +0000)]
Merge "Make logger final"

9 years agoMerge changes Ic1abe2f7,I9b4bc3ad,If347c979
Tony Tkacik [Wed, 11 Mar 2015 19:25:10 +0000 (19:25 +0000)]
Merge changes Ic1abe2f7,I9b4bc3ad,If347c979

* changes:
  Remove empty javadocs and make strings constant
  Remove unused logger
  Use an ImmutableMap

9 years agoMake logger final 15/16315/2
Robert Varga [Wed, 11 Mar 2015 10:18:33 +0000 (11:18 +0100)]
Make logger final

The logger should be marked as final and also be called LOG, not
_logger.

Change-Id: I75f675eec1ee54d659d93aef3e39204a1f7cc920
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoRemove empty javadocs and make strings constant 14/16314/2
Robert Varga [Wed, 11 Mar 2015 10:17:50 +0000 (11:17 +0100)]
Remove empty javadocs and make strings constant

Cleans up malformed an empty javadocs and also make string constants
really constant.

Change-Id: Ic1abe2f7c2cb6e6327fde7095742fc0a96ca2e02
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoRemove unused logger 13/16313/2
Robert Varga [Wed, 11 Mar 2015 10:16:47 +0000 (11:16 +0100)]
Remove unused logger

Removes the logger, which is not used anyway. Fixes an eclipse warning.

Change-Id: I9b4bc3ad88107b2b2ba0cd999b89e3105b2b3b65
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoUse an ImmutableMap 12/16312/2
Robert Varga [Wed, 11 Mar 2015 10:10:03 +0000 (11:10 +0100)]
Use an ImmutableMap

ImmutableMap has better lookup characteristics, so use that instead of
wrapping a regular hashmap.

Change-Id: If347c9790640f9802f438d5fa225978a56186805
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoQuick fix nullable RPC input 30/16330/3
Vaclav Demcak [Wed, 11 Mar 2015 15:06:10 +0000 (16:06 +0100)]
Quick fix nullable RPC input

* DOMRpcService is declaring a method invokeRpc like
invokeRpc(@Nonnull SchemaPath type, @Nullable NormalizedNode<?, ?> input)

* add check to null for input in BindingRpcImplementationAdapter and
BindingDOMRpcImplementationAdapter because they are trying to deserialze
input automaticly withou any null check before. It produces next exception
for nopayload rpc:

at com.google.common.base.Preconditions.checkState(Preconditions.java:158)
at org.opendaylight.yangtools.binding.data.codec.impl.ContainerNodeCodecContext
.dataFromNormalizedNode(ContainerNodeCodecContext.java:23)
at org.opendaylight.yangtools.binding.data.codec.impl.BindingNormalizedNodeCodecRegistry
.fromNormalizedNodeRpcData(BindingNormalizedNodeCodecRegistry.java:197)
at org.opendaylight.controller.md.sal.binding.impl.BindingRpcImplementationAdapter
.deserilialize(BindingRpcImplementationAdapter.java:79)
at org.opendaylight.controller.md.sal.binding.impl.BindingRpcImplementationAdapter
.invokeRpc(BindingRpcImplementationAdapter.java:69)

Change-Id: I3970564b9645473eee6c01ab1ea632f323de959a
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
9 years agoRemove duplicate dependency 16/16316/2
Robert Varga [Wed, 11 Mar 2015 11:00:30 +0000 (12:00 +0100)]
Remove duplicate dependency

Fixes a maven warning about duplicate artifacts.

Change-Id: Iccd64ce946ddfbff5b158780d9b29fca7c142521
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Migrate to using odlparent:features-test"
Tony Tkacik [Wed, 11 Mar 2015 16:18:35 +0000 (16:18 +0000)]
Merge "Migrate to using odlparent:features-test"

9 years agoDisable unstable netconf-notifications tests 27/16327/1
Maros Marsalek [Wed, 11 Mar 2015 14:30:58 +0000 (15:30 +0100)]
Disable unstable netconf-notifications tests

Comment out unreliable lassertions for XML payload comparison.
Proper fix needs to be provided.

Change-Id: I6e32eefb0ccf95e616dd9c236338593f49ff0af3
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoMerge "Use default SchemaCtx for base netconf ops(if not available)"
Tony Tkacik [Wed, 11 Mar 2015 12:28:39 +0000 (12:28 +0000)]
Merge "Use default SchemaCtx for base netconf ops(if not available)"

9 years agoUse default SchemaCtx for base netconf ops(if not available) 10/16310/1
Maros Marsalek [Wed, 11 Mar 2015 10:34:27 +0000 (11:34 +0100)]
Use default SchemaCtx for base netconf ops(if not available)

If remote device does not expose yang model for base netconf operations, use a
default, pre built schema context for these operations e.g. Lock, unlock

Change-Id: I33e89adaa9a151cc236586e75264a907bf45a5df
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoBUG-1513: migrate users to ChoiceSchemaNode 08/16308/1
Robert Varga [Wed, 11 Mar 2015 09:59:11 +0000 (10:59 +0100)]
BUG-1513: migrate users to ChoiceSchemaNode

This migrates all users to the new interface name, cleaning them up as
the data.api and model.api name clash is resolved.

Change-Id: Ibdc317d5ff86c6a895cccdacf6dfea1fb005d9b6
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoRemove duplicate dependency declarations 43/16243/2
Robert Varga [Tue, 10 Mar 2015 08:52:48 +0000 (09:52 +0100)]
Remove duplicate dependency declarations

These are declared twice, producing a maven warning. Remove duplicities.

Change-Id: Ica73b9220c5815e45591cd1d4a7600b432adee5d
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMigrate to using odlparent:features-test 29/16229/2
Robert Varga [Tue, 10 Mar 2015 07:47:40 +0000 (08:47 +0100)]
Migrate to using odlparent:features-test

yangtools features-test is going away, migrate away from it.

Change-Id: Idcf27275fd57868ee1e56656854365ac2dcab907
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Bug 2412: Expose Mountpoints on proper path"
Tony Tkacik [Wed, 11 Mar 2015 06:13:38 +0000 (06:13 +0000)]
Merge "Bug 2412: Expose Mountpoints on proper path"

9 years agoMerge "BUG 2805 - Fixed Restconf RPC calls and POST to create data"
Tony Tkacik [Wed, 11 Mar 2015 06:13:12 +0000 (06:13 +0000)]
Merge "BUG 2805 - Fixed Restconf RPC calls and POST to create data"

9 years agoMerge "Bug 2364: Migrated Binding MD-SAL to not use composites nodes"
Tony Tkacik [Wed, 11 Mar 2015 06:12:48 +0000 (06:12 +0000)]
Merge "Bug 2364: Migrated Binding MD-SAL to not use composites nodes"

9 years agoBug 2412: Expose Mountpoints on proper path 79/16279/2
Maros Marsalek [Tue, 10 Mar 2015 16:14:08 +0000 (17:14 +0100)]
Bug 2412: Expose Mountpoints on proper path

Lists such as topology, node were not doubled
in the YANG Instance Identifier used as a key for mountpoints,
which prevented Binding compontents from accessing
them.

This patch fixes also bug in restconf, which was
also producing incorrect instance identifiers.

Change-Id: I3122163d00d4c23fcccc4bbffdf3d0113744c98d
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoMerge "Add netconf-ssh as dependency to features-mdsal"
Ed Warnicke [Tue, 10 Mar 2015 21:40:34 +0000 (21:40 +0000)]
Merge "Add netconf-ssh as dependency to features-mdsal"

9 years agoBUG 2805 - Fixed Restconf RPC calls and POST to create data 36/16136/8
Maros Marsalek [Tue, 10 Mar 2015 10:19:33 +0000 (11:19 +0100)]
BUG 2805 - Fixed Restconf RPC calls and POST to create data

RPCs now works again with JSON and XML
POST works with data store.

AbstractIdentifierAwareJaxRsProvider and its derivates,
provides InstanceIdentifierContext as was parsed from
RESTCONF URI, along with parsed NormalizedNode.

If operation is create, then parsed NormalizedNode
is used along with InstanceIdentifier context to compute
full InstanceIdentifier for data to be created
and works with these data.

This actually simplified flow in codecs.

Change-Id: I5b12965f35d946087cc57f19a28425b27eb27755
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoModify ChainedTransactionProxy to override sending of FindPrimaryShard 59/16159/3
Tom Pantelis [Sun, 8 Mar 2015 02:16:37 +0000 (21:16 -0500)]
Modify ChainedTransactionProxy to override sending of FindPrimaryShard

Previously, ChainedTransactionProxy overrode the sendCreateTransaction
method from TransactionProxy to intercept the sending of the
CreateTransaction message in order to asynchronously wait for the
previous
transaction's ready Futures to complete before sending the message.

To facilitate write-only transaction optimizations which will not create
a separate transaction actor, we need to intercept the FindPrimaryShard
message instead. Thus a new overridden method,
sendFindPrimaryShardAsync, was added the same as sendCreateTransaction
except it sends the FindPrimaryShard message..

Change-Id: I5d0a3de0b9530a538e2425147fad8ace823763f3
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
9 years agoMerge "Refactor LegacyTransactionConntextImpl"
Moiz Raja [Tue, 10 Mar 2015 18:27:15 +0000 (18:27 +0000)]
Merge "Refactor LegacyTransactionConntextImpl"

9 years agoMerge "Handle FollowerInitialSyncStatus message in Shard/ShardManager"
Tom Pantelis [Tue, 10 Mar 2015 16:58:08 +0000 (16:58 +0000)]
Merge "Handle FollowerInitialSyncStatus message in Shard/ShardManager"

9 years agoBug 2364: Migrated Binding MD-SAL to not use composites nodes 61/16261/4
Tony Tkacik [Sun, 8 Mar 2015 15:30:27 +0000 (16:30 +0100)]
Bug 2364: Migrated Binding MD-SAL to not use composites nodes

Bidning MD-SAL is fully migrated to be adapter on top
of NormalizedNode MD-SAL. This migration once all legacy
classes are removed will provide easier-to-read more
maintanable code of Binding MD-SAL.

Change-Id: I1df6cda4bd6035ac5e01e1285f8aab4201dcc86d
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoFixed failing tests due to different attribute handling in mdsal netconf northbound. 72/16272/1
Tomas Cere [Tue, 10 Mar 2015 14:49:38 +0000 (15:49 +0100)]
Fixed failing tests due to different attribute handling in mdsal netconf northbound.

Change-Id: I4f3723b9094f953307982ee25019e3736c9d24de
Signed-off-by: Tomas Cere <tcere@cisco.com>
9 years agoAdd netconf-ssh as dependency to features-mdsal 66/16266/1
Thanh Ha [Tue, 10 Mar 2015 14:49:54 +0000 (10:49 -0400)]
Add netconf-ssh as dependency to features-mdsal

This should fix our issue with autorelease-lithium build failing due to
missing netconf-ssh which happens occassionally.

Change-Id: I655290e1110203195934bfac1adf47d6d08f60db
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix netconf operation serialization in nc 57/16257/3
Maros Marsalek [Tue, 10 Mar 2015 12:29:27 +0000 (13:29 +0100)]
Fix netconf operation serialization in nc

For delete operation, the netconf operation attribute was not added to the
normalizedNode structure.

Change-Id: Idbe65ff3a6eee6fa24d96c68f8ce59da03f4c91d
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoAdd SchemaContext to NormalizedNode parser in NETCONF 24/16024/9
Maros Marsalek [Wed, 4 Mar 2015 14:43:23 +0000 (15:43 +0100)]
Add SchemaContext to NormalizedNode parser in NETCONF

Change-Id: Id674dc60eba84cb5cb37b6f170654ae7333f91b6
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoMigrate users of AnyXml node to DOMSource 37/16137/9
Maros Marsalek [Fri, 6 Mar 2015 13:37:57 +0000 (14:37 +0100)]
Migrate users of AnyXml node to DOMSource

AnyXml node used to wrap Node<?> but now wraps a DOMSource

Change-Id: If4f5845e5a0611d5fe38951dd6afe73d0a6f95bc
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoFixed testool performance bottleneck due to testtool using NetconfMonitoring from... 87/16187/4
Tomas Cere [Mon, 9 Mar 2015 09:23:56 +0000 (10:23 +0100)]
Fixed testool performance bottleneck due to testtool using NetconfMonitoring from ODL.
Added a dummy NetconfMonitoring implementation for testtool.

Change-Id: I4d2eaf955ccac78de135749bd8c2bda3e3d6f35b
Signed-off-by: Tomas Cere <tcere@cisco.com>
9 years agoMerge "Bug 2260: Reduce overhead of unused TransactionProxy instances"
Tom Pantelis [Mon, 9 Mar 2015 23:57:47 +0000 (23:57 +0000)]
Merge "Bug 2260: Reduce overhead of unused TransactionProxy instances"

9 years agoMerge "Performance optimizations for simple transactions"
Tom Pantelis [Mon, 9 Mar 2015 23:51:39 +0000 (23:51 +0000)]
Merge "Performance optimizations for simple transactions"

9 years agoBug 2260: Reduce overhead of unused TransactionProxy instances 59/15859/7
Tom Pantelis [Sun, 1 Mar 2015 02:21:10 +0000 (21:21 -0500)]
Bug 2260: Reduce overhead of unused TransactionProxy instances

Moved constructon of the operationLimiter and operationCompleter to the
throtteOperation method lazily. Added a volatile initialized boolean for
the lazy check and to "piggy-back" synchronize the updates to
operationLimiter and operationCompleter as well.

In TransactionProxy#ready, if no operations were performed then the
txFutureCallbackMap will be empty so returned a static
NoOpDOMStoreThreePhaseCommitCohort in that case.

The only remaining overhead in the constructor is the
TransactionIdentifier instance. The Builder seemed extraneous here so I
removed it to reduce the overhead from 2 object allocations to 1.

Change-Id: I083d4176c880055938bbf1f21c00da3859d66af6
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>