8 years agoMerge "Fix to karaf-parent to copy in dependencies."
Moiz Raja [Wed, 4 Mar 2015 22:11:49 +0000 (22:11 +0000)]
Merge "Fix to karaf-parent to copy in dependencies."

8 years agoMerge "Dynamically update DatastoreContext properties"
Moiz Raja [Wed, 4 Mar 2015 18:47:25 +0000 (18:47 +0000)]
Merge "Dynamically update DatastoreContext properties"

8 years agoFix to karaf-parent to copy in dependencies. 35/16035/1
Ed Warnicke [Wed, 4 Mar 2015 18:34:28 +0000 (10:34 -0800)]
Fix to karaf-parent to copy in dependencies.

Change-Id: I43602045be0f88d7f825f95d9e986adba136563f
Signed-off-by: Ed Warnicke <>
8 years agoMerge changes Ida315250,I90171a8b
Tony Tkacik [Wed, 4 Mar 2015 09:17:20 +0000 (09:17 +0000)]
Merge changes Ida315250,I90171a8b

* changes:
  BUG-2637: migration final - cleanup
  BUG-2637: migration consequence - fix unit test

8 years agoBUG 2768 : Make election timeout factor 20 by default 13/15813/2
Moiz Raja [Fri, 27 Feb 2015 03:26:20 +0000 (19:26 -0800)]
BUG 2768 : Make election timeout factor 20 by default

We may need a follow up patch to make shards in a single node cluster
Leader by default.

For now this fix will delay Shard startup by 10 seconds in a single node cluster.

Change-Id: I5524c622f6eaeba2739d4cfe574f4ead759b8e10
Signed-off-by: Moiz Raja <>
8 years agoMerge "Introduce a mechanism for a Follower to signal it's sync up status"
Tom Pantelis [Wed, 4 Mar 2015 01:22:39 +0000 (01:22 +0000)]
Merge "Introduce a mechanism for a Follower to signal it's sync up status"

8 years agoIntroduce a mechanism for a Follower to signal it's sync up status 54/15954/2
Moiz Raja [Tue, 3 Mar 2015 03:49:41 +0000 (19:49 -0800)]
Introduce a mechanism for a Follower to signal it's sync up status

This patch introduces a new message FollowerInitialSyncUpStatus. The
purpose of the message is to inform the RaftActor or a sub-class thereof
whether the Follower's commitIndex is now atleast at the same level
as the Leader was when it first sent a heartbeat to the Follower.

This will hopefully be useful in a rolling upgrade scenario where
we may have just brought up a new node and need to wait for it to be
synced with the current leader before we bring down and upgrade another
node in the cluster.

Change-Id: If19e4d98c2be708fc6a35823ca92cfac7ca87394
Signed-off-by: Moiz Raja <>
8 years agoMerge "Switch opendaylight-karaf-empty to using karaf-parent"
Moiz Raja [Tue, 3 Mar 2015 22:04:08 +0000 (22:04 +0000)]
Merge "Switch opendaylight-karaf-empty to using karaf-parent"

8 years agoBUG-2637: migration final - cleanup 69/15969/4
Michal Rehak [Fri, 23 Jan 2015 21:12:26 +0000 (22:12 +0100)]
BUG-2637: migration final - cleanup

 - remove migrated features (feature-flow, odl-adsal-compatibility)
 - remove migrated apps (model-flow*, sal-compatibility, sm, im, tp, frm)
 - remove temporary fix in toaster-it

Change-Id: Ida315250f0035e09aa2e2afd0f8df076d9770861
Signed-off-by: Michal Rehak <>
8 years agoBUG-2637: migration consequence - fix unit test 68/15968/3
Michal Rehak [Tue, 3 Mar 2015 13:08:01 +0000 (14:08 +0100)]
BUG-2637: migration consequence - fix unit test

 - fixed unit test in sal-binding-broker
 - temporary fix of toaster-it

Change-Id: I90171a8b1d15cde70946a95c8246f34f0e255f35
Signed-off-by: Michal Rehak <>
8 years agoMerge "Exception when creating new DOMNotificationRouter"
Tony Tkacik [Tue, 3 Mar 2015 09:16:38 +0000 (09:16 +0000)]
Merge "Exception when creating new DOMNotificationRouter"

8 years agoFix Bug #2777 : Unable to deploy controller to a cluster - Adding missing config... 51/15951/1
Vamsi Devaki [Tue, 3 Mar 2015 00:09:09 +0000 (16:09 -0800)]
Fix Bug #2777 : Unable to deploy controller to a cluster - Adding missing config file to features

Change-Id: I400824a4618d00a97e7008f2ff349aa1d57c3a29
Signed-off-by: Vamsi Devaki <>
8 years agoMerge "Bug 2769: Fix issues with ApplyLogEntries"
Moiz Raja [Mon, 2 Mar 2015 22:16:17 +0000 (22:16 +0000)]
Merge "Bug 2769: Fix issues with ApplyLogEntries"

8 years agoSwitch opendaylight-karaf-empty to using karaf-parent 33/15933/1
Ed Warnicke [Mon, 2 Mar 2015 18:05:49 +0000 (10:05 -0800)]
Switch opendaylight-karaf-empty to using karaf-parent

This is important to make sure the correct piece are in place to
use opendaylight-karaf-empty as a basis for karaf integration tests.

Change-Id: I404b78bb9a46162b0393d495bc5d46977e2140a9
Signed-off-by: Ed Warnicke <>
8 years agoBug 2763: Fixed JSON serialization of root of mount point 20/15720/3
Tony Tkacik [Wed, 25 Feb 2015 13:13:20 +0000 (14:13 +0100)]
Bug 2763: Fixed JSON serialization of root of mount point

Upgrade of yang-data-codec-gson library to use GSON
for streaming and serialization of JSON broke
one special-case which was reading of mount point

This patch migrates NormalizedNodeJsonCodec to
use proper APIs, which allows more explicit control
of how stream is processed.

Change-Id: I0f57e8ef99114a08b1bceb51c47efbcb0546af73
Signed-off-by: Tony Tkacik <>
8 years agoBug 2769: Fix issues with ApplyLogEntries 01/15901/4
Tom Pantelis [Sun, 1 Mar 2015 13:16:28 +0000 (08:16 -0500)]
Bug 2769: Fix issues with ApplyLogEntries

ApplyLogEntries defines toIndex as an int which is inconsistent with
everything else that stores journal indexes as long. In addition this
would cause an insiduous bug if an index was greater than max-int.

To maintain backwards compatibility, we can't change the type in
ApplyLogEntries so I created a new class, ApplyJournalEntries, that
defines toIndex as a long and deprecated ApplyLogEntries.

Also, the serialVersionUID for ApplyLogEntries was previously added in
Lithium however this would cause de-serialization failures when
recovering a pre-Lithium journal from persistence. So I removed the

Change-Id: I7c5fe3a2ef8de292224a1a278abe53fc774a79d8
Signed-off-by: Tom Pantelis <>
8 years agoException when creating new DOMNotificationRouter 77/15777/2
Jan Hajnar [Thu, 26 Feb 2015 13:49:41 +0000 (14:49 +0100)]
Exception when creating new DOMNotificationRouter

* method after(eventHandler) was called on EventHandler that was not started.
* added missing disruptor.handleEventsWith() call before handler chaining

documentation for 'after()' method:
class Disruptor, method after()

Change-Id: Icb5390114000d3f1bf1ea4096263ded633d9f123
Signed-off-by: Jan Hajnar <>
8 years agoBUG-2739 Fixed leftover data when removing NETCONF device from topology 68/15768/2
Tomas Cere [Thu, 26 Feb 2015 09:07:10 +0000 (10:07 +0100)]
BUG-2739 Fixed leftover data when removing NETCONF device from topology

Change-Id: I73c8a5e27b8bf72f2aecf29699ce54ed872ad348
Signed-off-by: Tomas Cere <>
8 years agoBUG 2762 : Fix issues found in previous patch 12/15812/1
Moiz Raja [Fri, 27 Feb 2015 02:51:00 +0000 (18:51 -0800)]
BUG 2762 : Fix issues found in previous patch

Comments from

Change-Id: Iba4ec3950dd1726827d4a69bd4d75469d805898d
Signed-off-by: Moiz Raja <>
8 years agoBUG 2762 : Compute rate limit based on a more lenient algorithm 98/15798/3
Moiz Raja [Thu, 26 Feb 2015 20:50:02 +0000 (12:50 -0800)]
BUG 2762 : Compute rate limit based on a more lenient algorithm

Calculate the rate limit by looking at each percentile tenth instead of
a single value. This provides a more accurate limit.

Change-Id: Ic71476613ab966c716c203768f3ff395cb251ed0
Signed-off-by: Moiz Raja <>
8 years agoFixed compilation breakage in Netconf CLI 86/15786/1
Tony Tkacik [Thu, 26 Feb 2015 16:44:15 +0000 (17:44 +0100)]
Fixed compilation breakage in Netconf CLI

Change-Id: I59380b25f50304c18e724ca435a290cba1ddc3c0
Signed-off-by: Tony Tkacik <>
8 years agoMerge "Remove neutron post project split"
Tony Tkacik [Wed, 25 Feb 2015 15:25:44 +0000 (15:25 +0000)]
Merge "Remove neutron post project split"

8 years agoMerge "Startup arch - add odlparent to root pom."
Tony Tkacik [Wed, 25 Feb 2015 09:56:13 +0000 (09:56 +0000)]
Merge "Startup arch - add odlparent to root pom."

8 years agoRemove neutron post project split 64/15264/5
Ryan Moats [Fri, 13 Feb 2015 16:19:49 +0000 (10:19 -0600)]
Remove neutron post project split

Now that neutron code has been split into own repo, clean up here

Change-Id: I6529bedf160c1e1d0ba2c35a37a9b01284fe03a3
Signed-off-by: Ryan Moats <>
8 years agoMerge "BUG 2412 - restconf @GET getModule(identifier,uri) method migration"
Tony Tkacik [Wed, 25 Feb 2015 09:29:54 +0000 (09:29 +0000)]
Merge "BUG 2412 - restconf @GET getModule(identifier,uri) method migration"

8 years agoMerge "BUG 2412 - restconf @GET getModule(identifier,uri) method migration"
Tony Tkacik [Wed, 25 Feb 2015 09:29:26 +0000 (09:29 +0000)]
Merge "BUG 2412 - restconf @GET getModule(identifier,uri) method migration"

8 years agoMerge "BUG 2412 - restconf @GET getModule(uri) method migration"
Tony Tkacik [Wed, 25 Feb 2015 09:28:42 +0000 (09:28 +0000)]
Merge "BUG 2412 - restconf @GET getModule(uri) method migration"

8 years agoMerge "Removing { } from NormalizedNodeJsonBodyWriter"
Tony Tkacik [Wed, 25 Feb 2015 08:04:44 +0000 (08:04 +0000)]
Merge "Removing { } from NormalizedNodeJsonBodyWriter"

8 years agoBUG 2412 - restconf @GET getModule(identifier,uri) method migration 71/14971/7
Vaclav Demcak [Fri, 6 Feb 2015 13:14:09 +0000 (14:14 +0100)]
BUG 2412 - restconf @GET getModule(identifier,uri) method migration

    * migration to new faster Infrastructure API and Codecs for method
    @GET getModules(String,UriInfo) on @Path {/modules/module/identifier}

    New faster Infrastructure API works with NormizedNodeContext and
    we are replacing first method getModule(URI) from RestconfService
    to use NormalizedNodeContext.

Change-Id: I7ae36a13ce4533598bbc3abf73d9090e1922abdb
Signed-off-by: Vaclav Demcak <>
8 years agoBUG 2412 - restconf @GET getModule(identifier,uri) method migration 70/14970/9
Vaclav Demcak [Fri, 6 Feb 2015 13:01:30 +0000 (14:01 +0100)]
BUG 2412 - restconf @GET getModule(identifier,uri) method migration

* migration to new faster Infrastructure API and Codecs for method
@GET getModules(String,UriInfo) on @Path {/modules/identifier}

New faster Infrastructure API works with NormizedNodeContext and
we are replacing first method getModule(URI) from RestconfService
to use NormalizedNodeContext.

* add yang models for fix tests (mountpoint tests - TestUtility
loads modules from local directory only)

Change-Id: I394d6d31f650e086ce302a0ba973f1e4a4599ef8
Signed-off-by: Vaclav Demcak <>
8 years agoBUG 2412 - restconf @GET getModule(uri) method migration 69/14969/11
Vaclav Demcak [Tue, 24 Feb 2015 16:34:02 +0000 (17:34 +0100)]
BUG 2412 - restconf @GET getModule(uri) method migration

    * migration to new faster Infrastructure API and Codecs for method
    @GET getModules(UriInfo) on @Path {/modules}

    New faster Infrastructure API works with NormizedNodeContext and
    we are replacing first method getModule(URI) from RestconfService
    to use NormalizedNodeContext.

Change-Id: I9327badeac38a82c9e50721dc47338fc7ae164a1
Signed-off-by: Vaclav Demcak <>
8 years agoBUG 2412 - Restconf migration - marking deprecated classes 67/15667/1
Vaclav Demcak [Tue, 24 Feb 2015 13:33:44 +0000 (14:33 +0100)]
BUG 2412 - Restconf migration - marking deprecated classes

* mark basic deprecated classes and functionality which has to
be overwirte by this commit chain.

New faster Infrastructure API works with NormizedNodeContext
and it provides read/write REST msg body (JSON & XML) direct
to NormalizedNodeContext. So we have to replace all places
where we use StructuredData, CompositeNode, NodeWrapper and
all relevant REST codecs (e.g. XmlToCompositeNodeProvider...)

Change-Id: I33ff24e5a8de2876dfdb6ea263fc9cb659fc3db8
Signed-off-by: Vaclav Demcak <>
8 years agoBug 2365: YIN Schema download support for Restconf 26/13126/3
Vaclav Demcak [Tue, 24 Feb 2015 12:27:55 +0000 (13:27 +0100)]
Bug 2365: YIN Schema download support for Restconf

Implementation of Restconf 03 Draft Schema download
functionality with additional support for downloading
runtime-generated YIN schema and mount points.

Introduced new endpoints which are:


For downloading supplied YANG module in YIN format (default)
or YANG format if Accept header contains application/yang

depends on:
yangtools -

patch set 3:
 * SchemaExportContentYniBodyWriter : fix reference YinUtils
to YinExportUtils
 * create RestconfValidationUtils + move validation from
 * pom.xml - add private package

Change-Id: Ibd2956472ad35d13cb65e305df377f98518b4738
Signed-off-by: Vaclav Demcak <>
8 years agoFix a race in PingPong transaction scheduling 36/15636/3
Robert Varga [Mon, 23 Feb 2015 22:56:38 +0000 (23:56 +0100)]
Fix a race in PingPong transaction scheduling

We have failed to re-check inflighTx after taking the lock, which meant
that completion and readiness may have raced resulting in warnings about
transaction being submitted while there are others in-flight.

Fix also the shutdown case, which could trigger an unexpected warnings
if there is an inflight transaction.

Change-Id: Ie3a3845335754860a831070d5a73dbc9a4d67d3c
Signed-off-by: Robert Varga <>
8 years agoMerge "Bug 2697: Improvement wrong response handling, missing message"
Tony Tkacik [Tue, 24 Feb 2015 09:39:47 +0000 (09:39 +0000)]
Merge "Bug 2697: Improvement wrong response handling, missing message"

8 years agoMerge "Bug 2731: Discard changes only when transaction exist."
Tony Tkacik [Tue, 24 Feb 2015 09:39:34 +0000 (09:39 +0000)]
Merge "Bug 2731: Discard changes only when transaction exist."

8 years agoMerge "Sharded implementation of DOMDataTreeService"
Tony Tkacik [Tue, 24 Feb 2015 09:36:11 +0000 (09:36 +0000)]
Merge "Sharded implementation of DOMDataTreeService"

8 years agoMerge "Fix race condition in get/get-config netconf rpcs for config subsystem"
Tony Tkacik [Tue, 24 Feb 2015 08:50:15 +0000 (08:50 +0000)]
Merge "Fix race condition in get/get-config netconf rpcs for config subsystem"

8 years agoSharded implementation of DOMDataTreeService 99/15199/13
Robert Varga [Thu, 12 Feb 2015 14:09:54 +0000 (15:09 +0100)]
Sharded implementation of DOMDataTreeService

This patch adds a simplistic implementation of a DOMDataTreeService and
a DOMDataTreeShardingService.

Change-Id: Ibb76c99d0fa842b1034a2b747c4ec57816f99c7d
Signed-off-by: Robert Varga <>
8 years agoMerge "Make DOMDataTreeIdentifier implement Comparable"
Tony Tkacik [Tue, 24 Feb 2015 08:27:55 +0000 (08:27 +0000)]
Merge "Make DOMDataTreeIdentifier implement Comparable"

8 years agoMerge "Pass down a collection of cohorts"
Tony Tkacik [Tue, 24 Feb 2015 08:27:33 +0000 (08:27 +0000)]
Merge "Pass down a collection of cohorts"

8 years agoMerge "Startup archetype - move impl under 'impl' namespace to prevent exporting."
Tony Tkacik [Tue, 24 Feb 2015 08:26:34 +0000 (08:26 +0000)]
Merge "Startup archetype - move impl under 'impl' namespace to prevent exporting."

8 years agoMerge "Startup arch - Add scm section to root pom."
Tony Tkacik [Tue, 24 Feb 2015 08:26:20 +0000 (08:26 +0000)]
Merge "Startup arch - Add scm section to root pom."

8 years agoMerge "Startup arch - feature cleanup"
Tony Tkacik [Tue, 24 Feb 2015 08:26:05 +0000 (08:26 +0000)]
Merge "Startup arch - feature cleanup"

8 years agoMerge "Skip install and deploy of karaf artifact."
Tony Tkacik [Tue, 24 Feb 2015 08:25:49 +0000 (08:25 +0000)]
Merge "Skip install and deploy of karaf artifact."

8 years agoMake DOMDataTreeIdentifier implement Comparable 34/15634/3
Robert Varga [Mon, 23 Feb 2015 21:45:52 +0000 (22:45 +0100)]
Make DOMDataTreeIdentifier implement Comparable

We can easily define total ordering on this class, which is useful for
maintaining order so that we can find the longest-prefix match easily by
iterating over the keys in the natural ordering.

Change-Id: Ie2f83ea494fe278df4acc1cb6059dae440ef8f37
Signed-off-by: Robert Varga <>
8 years agoPass down a collection of cohorts 24/15624/3
Robert Varga [Mon, 23 Feb 2015 17:30:31 +0000 (18:30 +0100)]
Pass down a collection of cohorts

Rather than using an iterable, use a Collection. This saves a bit of
code and makes the size available wherever the collection goes.

Change-Id: I7ab9fa594676c221c8a4a0b3e227625af462c338
Signed-off-by: Robert Varga <>
8 years agoMerge "BUG 2676 : Use notification-dispatcher for DataChangeListener actors"
Tom Pantelis [Tue, 24 Feb 2015 00:47:32 +0000 (00:47 +0000)]
Merge "BUG 2676 : Use notification-dispatcher for DataChangeListener actors"

8 years agoMerge "BUG 2676 : Use transaction-dispatcher for ShardTransaction"
Tom Pantelis [Tue, 24 Feb 2015 00:47:19 +0000 (00:47 +0000)]
Merge "BUG 2676 : Use transaction-dispatcher for ShardTransaction"

8 years agoMerge "BUG 2676 : Use shard-dispatcher for ShardManager and Shard actors"
Tom Pantelis [Tue, 24 Feb 2015 00:47:03 +0000 (00:47 +0000)]
Merge "BUG 2676 : Use shard-dispatcher for ShardManager and Shard actors"

8 years agoMerge "BUG 2676 : Use custom client-dispatcher when configured"
Tom Pantelis [Tue, 24 Feb 2015 00:46:52 +0000 (00:46 +0000)]
Merge "BUG 2676 : Use custom client-dispatcher when configured"

8 years agoMerge "BUG 2676 : Introduce API for accessing akka dispatchers"
Tom Pantelis [Mon, 23 Feb 2015 23:13:35 +0000 (23:13 +0000)]
Merge "BUG 2676 : Introduce API for accessing akka dispatchers"

8 years agoMerge "BUG 2718 : Create a diagnostic utility to track append entries replies"
Tom Pantelis [Mon, 23 Feb 2015 23:11:02 +0000 (23:11 +0000)]
Merge "BUG 2718 : Create a diagnostic utility to track append entries replies"

8 years agoMerge "BUG 2741 : Fix issue with real snapshotting when replicatedToAllIndex=-1"
Tom Pantelis [Mon, 23 Feb 2015 19:20:51 +0000 (19:20 +0000)]
Merge "BUG 2741 : Fix issue with real snapshotting when replicatedToAllIndex=-1"

8 years agoStartup archetype - move impl under 'impl' namespace to prevent exporting. 28/15128/3
Nathan Harmon [Wed, 11 Feb 2015 01:07:50 +0000 (17:07 -0800)]
Startup archetype - move impl under 'impl' namespace to prevent exporting.

Change-Id: I2767080af78569a2af8d0c1114d1471a62cbc302
Signed-off-by: Nathan Harmon <>
8 years agoMerge "Bug 2673: Binding cursor-based data change API"
Ed Warnicke [Mon, 23 Feb 2015 18:42:41 +0000 (18:42 +0000)]
Merge "Bug 2673: Binding cursor-based data change API"

8 years agoStartup arch - add odlparent to root pom. 26/15626/1
Nathan Harmon [Mon, 23 Feb 2015 18:07:43 +0000 (10:07 -0800)]
Startup arch - add odlparent to root pom.

Change-Id: I50b9a58aee797f6821816f19984005e9e347c3d9
Signed-off-by: Nathan Harmon <>
8 years agoStartup arch - Add scm section to root pom. 29/15429/3
Nathan Harmon [Tue, 17 Feb 2015 18:45:42 +0000 (10:45 -0800)]
Startup arch - Add scm section to root pom.

Change-Id: Ie20d9f6f0e2201c0c1f7995e451c583c085e689c
Signed-off-by: Nathan Harmon <>
8 years agoStartup arch - feature cleanup 27/15127/2
Nathan Harmon [Wed, 11 Feb 2015 01:32:02 +0000 (17:32 -0800)]
Startup arch - feature cleanup

Change-Id: I8a6c19cb8bfdb21dfa7bab8b427d8b7922fc9a9c
Signed-off-by: Nathan Harmon <>
8 years agoMerge "Re-enable running of SingleFeaturesTest"
Tony Tkacik [Mon, 23 Feb 2015 16:52:26 +0000 (16:52 +0000)]
Merge "Re-enable running of SingleFeaturesTest"

8 years agoSkip install and deploy of karaf artifact. 64/14864/3
Nathan Harmon [Wed, 4 Feb 2015 22:21:23 +0000 (14:21 -0800)]
Skip install and deploy of karaf artifact.

Change-Id: Ib96201b9408216c58b3d573c593a523ef65eafd0
Signed-off-by: Nathan Harmon <>
8 years agoMerge "Startup archetype: remove 'Impl' from config subsystem Module name."
Tony Tkacik [Mon, 23 Feb 2015 16:14:16 +0000 (16:14 +0000)]
Merge "Startup archetype: remove 'Impl' from config subsystem Module name."

8 years agoMerge "Startup archetype: Add basic unit tests for impl."
Tony Tkacik [Mon, 23 Feb 2015 16:14:06 +0000 (16:14 +0000)]
Merge "Startup archetype: Add basic unit tests for impl."

8 years agoMerge "Startup arch - remove artifactId prefix from dir names."
Tony Tkacik [Mon, 23 Feb 2015 16:12:47 +0000 (16:12 +0000)]
Merge "Startup arch - remove artifactId prefix from dir names."

8 years agoMerge "Cleanup root pom "name"."
Tony Tkacik [Mon, 23 Feb 2015 16:08:58 +0000 (16:08 +0000)]
Merge "Cleanup root pom "name"."

8 years agoMerge "Serialize capabilities for notification properly"
Tony Tkacik [Mon, 23 Feb 2015 11:18:23 +0000 (11:18 +0000)]
Merge "Serialize capabilities for notification properly"

8 years agoMerge "BUG-2600 Proper reset caching of notifications upon disconnect"
Tony Tkacik [Mon, 23 Feb 2015 11:18:02 +0000 (11:18 +0000)]
Merge "BUG-2600 Proper reset caching of notifications upon disconnect"

8 years agoMerge "BUG-2635 Netconf monitoring for md-sal netconf northbound"
Tony Tkacik [Mon, 23 Feb 2015 11:17:50 +0000 (11:17 +0000)]
Merge "BUG-2635 Netconf monitoring for md-sal netconf northbound"

8 years agoMerge "DOMDataTree APIs"
Tony Tkacik [Mon, 23 Feb 2015 11:12:25 +0000 (11:12 +0000)]
Merge "DOMDataTree APIs"

8 years agoMerge "Update JMX generator"
Tony Tkacik [Mon, 23 Feb 2015 10:46:08 +0000 (10:46 +0000)]
Merge "Update JMX generator"

8 years agoMerge "xsql should pull junit directly"
Tony Tkacik [Mon, 23 Feb 2015 10:45:09 +0000 (10:45 +0000)]
Merge "xsql should pull junit directly"

8 years agoSerialize capabilities for notification properly 55/15555/2
Maros Marsalek [Fri, 20 Feb 2015 14:13:03 +0000 (15:13 +0100)]
Serialize capabilities for notification properly

Added and removed capabilities in capabilities change notification were serialized as QName.toString but should be na Uri

Change-Id: Id9783c060ecf45d3a7f506cf605051c779a6d21a
Signed-off-by: Maros Marsalek <>
8 years agoBUG-2600 Proper reset caching of notifications upon disconnect 29/15529/4
Maros Marsalek [Fri, 20 Feb 2015 09:40:12 +0000 (10:40 +0100)]
BUG-2600 Proper reset caching of notifications upon disconnect

Change-Id: I9269aef2fee21138b30552ffb0762d73ba98d4be
Signed-off-by: Maros Marsalek <>
8 years agoBUG-2635 Netconf monitoring for md-sal netconf northbound 68/15468/5
Maros Marsalek [Wed, 18 Feb 2015 16:31:39 +0000 (17:31 +0100)]
BUG-2635 Netconf monitoring for md-sal netconf northbound

Monitoring for mdsal's netconf stores all available monitoring data in the datastore and provides get-schema operation

Change-Id: I573c5d57e5cf25d7688f3355b602327c7af75c65
Signed-off-by: Maros Marsalek <>
8 years agoMerge "Migrate JMX plugin's use of BindingGeneratorUtil"
Tony Tkacik [Mon, 23 Feb 2015 10:44:52 +0000 (10:44 +0000)]
Merge "Migrate JMX plugin's use of BindingGeneratorUtil"

8 years agoMerge "Migrate deprecated guava methods"
Tony Tkacik [Mon, 23 Feb 2015 10:43:45 +0000 (10:43 +0000)]
Merge "Migrate deprecated guava methods"

8 years agoMerge "Do not override artifact versions"
Tony Tkacik [Mon, 23 Feb 2015 10:43:27 +0000 (10:43 +0000)]
Merge "Do not override artifact versions"

8 years agoMerge "Use Preconditions"
Tony Tkacik [Mon, 23 Feb 2015 10:43:13 +0000 (10:43 +0000)]
Merge "Use Preconditions"

8 years agoMerge "Do not override jsr305 version"
Tony Tkacik [Mon, 23 Feb 2015 10:43:00 +0000 (10:43 +0000)]
Merge "Do not override jsr305 version"

8 years agoFix race condition in get/get-config netconf rpcs for config subsystem 54/15554/3
Maros Marsalek [Fri, 20 Feb 2015 13:21:26 +0000 (14:21 +0100)]
Fix race condition in get/get-config netconf rpcs for config subsystem

The read and transformation of modules from config subsystem is performed in a couple of steps. Each step queried the config subsystem on its own so it was possible to cause inconsistencies among these steps if get/get-config was executed while another transaction was being committed. This race condition, if hit, caused the rpcs to fail with an exception of a missing MBean.

After recent introduction of "optional reconnect after capability changed" feature into sal-netconf-connector, this race condition caused get rpc invoked by the connector to fail.
odl-netconf-connector-all is installed,
after the loopback is connected any other feature with configuration is installed e.g. odl-restconf-all,
loopback connector reconnects and as it comes back executes get rpc (to query ietf-netconf-monitoring)
get rpc in config-netconf-connector fails to transform the modules into xml due to mentioned race condition as the initial config file for restconf has been pushed

Now the get/get-config read the data from a dedicated transaction started just for the read.
Note: get rpc reads the runtime beans that are part of no transaction, so there is still possibility for this race condition regarding runtime beans.

Change-Id: I0822bc48745f9f680b116095693052dff752dee3
Signed-off-by: Maros Marsalek <>
8 years agoBug 2731: Discard changes only when transaction exist. 04/15504/5
Marian Dubai [Thu, 19 Feb 2015 16:18:14 +0000 (17:18 +0100)]
Bug 2731: Discard changes only when transaction exist.

Change-Id: I2aef83475092e75cc87d3a5edcb37e985ef132f6
Signed-off-by: Marian Dubai <>
8 years agoDOMDataTree APIs 98/14998/12
Robert Varga [Thu, 5 Feb 2015 17:30:28 +0000 (18:30 +0100)]
DOMDataTree APIs

This patch introduces the end-user visible API model for interacting
with the conceptual data tree. Unlike our previous APIs, these revolve
around applications explicitly binding their inputs (former data change
listeners) and outputs (former explicit writes). This allows efficient
inter-datastore interactions to be maintained by understanding what
sort of output applications make and what sort of indexes are required
to feed them the data they require. Beryllium evolution will see the
DOMDataTreeListener being subscribed to an XQuery expression, thus
providing a dense definition of what data the applciation actually
extracts out of the subtree.

Change-Id: I11446ce7f8dbd7cf61540f72e463460b483ff15f
Signed-off-by: Robert Varga <>
8 years agoBUG-2635 Prepare netconf monitoring service for md-sal monitoring. 54/15254/8
Maros Marsalek [Fri, 13 Feb 2015 12:32:17 +0000 (13:32 +0100)]
BUG-2635 Prepare netconf monitoring service for md-sal monitoring.

So that the monitoring service provides all the information in one place.

Also move get-schema rpc into netconf-monitoring from netconf-impl.

Change-Id: Ia7dc47ea4997df417795f079a7c045709dbaaf47
Signed-off-by: Maros Marsalek <>
8 years agoRemove required source element from Get operation for MDSAL 96/15496/4
Maros Marsalek [Thu, 19 Feb 2015 12:53:38 +0000 (13:53 +0100)]
Remove required source element from Get operation for MDSAL

Change-Id: I2c1495dfac8ecad00605f4df98b310b3d99ac4ed
Signed-off-by: Maros Marsalek <>
8 years agoMerge "Make reconnect on capability changed truly optional"
Tony Tkacik [Mon, 23 Feb 2015 08:50:12 +0000 (08:50 +0000)]
Merge "Make reconnect on capability changed truly optional"

8 years agoMerge "Prevent multiple config pushers"
Tony Tkacik [Mon, 23 Feb 2015 08:49:48 +0000 (08:49 +0000)]
Merge "Prevent multiple config pushers"

8 years agoBUG 2741 : Fix issue with real snapshotting when replicatedToAllIndex=-1 04/15604/2
Moiz Raja [Sun, 22 Feb 2015 18:17:44 +0000 (10:17 -0800)]
BUG 2741 : Fix issue with real snapshotting when replicatedToAllIndex=-1

Change-Id: I59b236fd88a329021365f204077170ca260e0b32
Signed-off-by: Moiz Raja <>
8 years agoDynamically update DatastoreContext properties 71/15571/6
tpantelis [Thu, 19 Feb 2015 21:00:38 +0000 (16:00 -0500)]
Dynamically update DatastoreContext properties

Added a ConfigurationListener to the DatastoreContextConfigAdminOverlay
that is registered as an OSGi service to receive ConfigurationEvents
from the Config Admin when the
org.opendaylight.controller.cluster.datastore.cfg file is modified.

The DistributedDataStore registers as a listener to the
DatastoreContextConfigAdminOverlay to get updated when the
DatastoreContext instance changes due to a ConfigurationEvent. The
DistributedDataStore sets the new DatastoreContext instance in the
ActorContext which updates its cached instance and properties and
sends the DistributedDataStore instance as a message to the ShardManager.
The ShardManager simply sends it out to all the Shards which update
their cached DatastoreContext state.

The Shard also updates the new ConfigParams instance in the base RaftActor
which sets it in its RaftActorContext. There was one place in
FollowerLogInformationImpl where it had a local cache of a property
obtained from the ConfigParams so I changed the ctor to pass the
RaftActorContext instead and obtain the property each time from the

A slight downside to this is that we'll have to be cognizant of not caching
DatastoreContext/ConfigParams properties and assuming they're static. Or
if we do cache we need to handle updates.

I toyed around with trying to restart the DistributedDataStore with a
new DatastoreContext and ActorContext and killing the previous
ShardManager and Shard actors and creating new ones. However recreating
the Shards without being disruptive to clients is tricky and risky, eg handling
infight transactions, and I didn't see a clean way to do it without
possibly causing inflight transactions to fail. .So I went with the simpler
approach of just pushing an updated DatastoreContext to the actors.

Change-Id: Ie608f61da36ac58a806208925a3c4277968c2f5b
Signed-off-by: Tom Pantelis <>
8 years agoUse Config Admin to overlay datastore properties 85/15485/11
tpantelis [Wed, 18 Feb 2015 12:37:53 +0000 (07:37 -0500)]
Use Config Admin to overlay datastore properties

Added functionality to configure DatastoreContext settings via a
properties file, org.opendaylight.controller.cluster.datastore.cfg, in the karaf
etc dir. The properties are overlayed onto the DatastoreContext that is
initialized via the config yang XML file. This allows for separation of
the wiring in the config yang XML from the user-facing config settings
to facilitate preserving the user-facing config settings on upgrade
while applying wiring changes.

The DatastoreContextIntrospector class is responsible for applying the
property key/values obtained from the Config Admin Configuration to the
current DatastoreContext.

The DatastoreContextConfigAdminOverlay class interfaces with the
ConfigurationAdmin OSGi service to obtain the configuration and calls
into the DatastoreContextIntrospector.

Modified DatastoreContext.Builder to support loading from an existing
DatastoreContext instance and applying changes to it to yield a new
instance on build.

Added a DatastoreConfigurationMXBean that reports the DatastoreContext
settings via JXM. This is useful to see what settings are currently

Most of the other changes were to wire the new classes from the Module
class to the DistributedDatastore.

Added new unit tests to cover the new code.

Change-Id: I9427907dac576bd416bad677a56fa8259af59a09
Signed-off-by: Tom Pantelis <>
8 years agoMerge "Bug 2597: Batch modification operations in TransactionProxy"
Moiz Raja [Wed, 25 Feb 2015 00:52:17 +0000 (00:52 +0000)]
Merge "Bug 2597: Batch modification operations in TransactionProxy"

8 years agoMerge "Create odl-nsf-service feature, which excludes neutron feature"
Ed Warnicke [Tue, 24 Feb 2015 20:00:10 +0000 (20:00 +0000)]
Merge "Create odl-nsf-service feature, which excludes neutron feature"

8 years agoFix spurious failures in RaftActorTest due to RecoveryComplete 99/15599/2
tpantelis [Fri, 20 Feb 2015 10:23:09 +0000 (05:23 -0500)]
Fix spurious failures in RaftActorTest due to RecoveryComplete

testSaveSnapshotSuccessCallsDataPersistence fails sporadically due
to RecoveryComplete interfering with the test. In
handleCaptureSnapshotReply it sets replicatedToAllIndex in the
behavior. On RecoveryCompleted, it initializes the behavior which
creates a new Follower with replicatedToAllIndex initialized to -1.
Recovery is done asyn so if RecoveryCompleted occurs after
CaptureSnapshotReply, the test fails because replicatedToAllIndex
isn't the expected value.

We need to call waitForInitializeBehaviorComplete after creating the
MockRaftActor so recovery and behavior initialization is complete before
starting the tests.

Change-Id: I3176afbf7ac937550c33bdb57d14d6968dbc2514
Signed-off-by: tpantelis <>
8 years agoMerge "Fix RaftActorTest.testRaftRoleChangeNotifier failure"
Moiz Raja [Sat, 21 Feb 2015 21:45:00 +0000 (21:45 +0000)]
Merge "Fix RaftActorTest.testRaftRoleChangeNotifier failure"

8 years agoBUG 2733 : Leader should always schedule heartbeats 76/15476/5
Moiz Raja [Wed, 18 Feb 2015 20:33:53 +0000 (12:33 -0800)]
BUG 2733 : Leader should always schedule heartbeats

This ensures that lagging or new followers are not starved as this
can potentially destabilize the cluster

Change-Id: Ic83d9d595a1222550286f3eb29d4cdef7bf1bccd
Signed-off-by: Moiz Raja <>
8 years agoBug 2597: Batch modification operations in TransactionProxy 95/15095/7
tpantelis [Sun, 8 Feb 2015 17:17:16 +0000 (12:17 -0500)]
Bug 2597: Batch modification operations in TransactionProxy

Modified TransactionContextImpl to batch write, merge, delete modification
operations into a single BatchedModifications message and send the batch when a
count threshold is reached.

Instead of using the current WriteData, MergeData, DeleteData message classes
in BatchedModifications, I reused the Modification classes that are used
as the payload for peristence and replication. BatchedModifications
derives from MutableCompositeModification.

The ShardWriteTransaction now simply transfers the Modification
instances in the BatchedModifications instance to its internal
MutableCompositeModification and applies the Modifications to its

The Modification classes were refactored a little wrt to versioning.
The Write/Merge/DeleteModifications no longer read/write the version
from the stream. The version is read/written by MutableCompositeModification
so it's redundant to also do so in the data Modification classes.

The WriteData, MergeData, DeleteData and associated reply classes were
deprecated. I did refactor them a little (along with ReadDataReply) as I
was originally going to use them. The VersionedSerializableMessage interface
was removed as I realized it makes more sense to pass the version in the WriteData,
MergeData, DeleteData constructors instead of passing the version via
toSerializable. This made it easier in TransactionContextImpl to transition it
to use BatchedModifications. I created a VersionedExternalizableMessage
base class that reads/write the version.

To handle backwards compatibility with Helium, I derived a
LegacyTransactionContextImpl class from TransactionContextImpl that overrides
writeData, mergeData and deleteData to send WriteData, MergeData,
DeleteData messages. TransactionProxy creates this instance if the
remote tx versions is < Lithium version.

Change-Id: I28df1f89e97667eaca114b991355a6e9d0160a59
Signed-off-by: tpantelis <>
8 years agoBUG 2676 : Use notification-dispatcher for DataChangeListener actors 96/15596/1
Moiz Raja [Sat, 21 Feb 2015 17:59:06 +0000 (09:59 -0800)]
BUG 2676 : Use notification-dispatcher for DataChangeListener actors

Change-Id: I154e1598a3058a978902fd6db5512d51dff36a62
Signed-off-by: Moiz Raja <>
8 years agoBUG 2676 : Use transaction-dispatcher for ShardTransaction 95/15595/1
Moiz Raja [Sat, 21 Feb 2015 17:19:14 +0000 (09:19 -0800)]
BUG 2676 : Use transaction-dispatcher for ShardTransaction

Change-Id: If70e141ff4e0eae0bd41ba70d4b0c126eb752fa1
Signed-off-by: Moiz Raja <>
8 years agoBUG 2676 : Use shard-dispatcher for ShardManager and Shard actors 94/15594/1
Moiz Raja [Sat, 21 Feb 2015 17:00:42 +0000 (09:00 -0800)]
BUG 2676 : Use shard-dispatcher for ShardManager and Shard actors

Change-Id: Ib6aed392eb861bb1da16d4780f08b27fad6d17db
Signed-off-by: Moiz Raja <>
8 years agoBUG 2676 : Use custom client-dispatcher when configured 93/15593/1
Moiz Raja [Sat, 21 Feb 2015 16:43:33 +0000 (08:43 -0800)]
BUG 2676 : Use custom client-dispatcher when configured

Use a client dispatcher for all code which originates at the client
end and requires a dispatcher for completion of a Future that was
created by an ask

Change-Id: If2c1fa064e368152539ad21622985cc044f305d3
Signed-off-by: Moiz Raja <>
8 years agoRe-enable running of SingleFeaturesTest 90/15590/1
Ed Warnicke [Sat, 21 Feb 2015 16:41:33 +0000 (09:41 -0700)]
Re-enable running of SingleFeaturesTest

For reasons I have not yet figured out, depending on the
yangtools version of features-test causes features tests
to no longer run.  This patch changes controller
to depending on the features-tests from odlparent

Change-Id: I45397f042cc367addde2ada74a27aba98fc98126
Signed-off-by: Ed Warnicke <>