controller.git
9 years agoBUG-868: do not instantiate SchemaPath directly 07/7807/2
Robert Varga [Sat, 7 Jun 2014 20:23:34 +0000 (22:23 +0200)]
BUG-868: do not instantiate SchemaPath directly

Switches over to the new APIs, which are more convenient to use and
provide optimization oportunities.

Change-Id: I1d78701ab7e291bc9792cbfc47391ac0608d265f
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Bug 1165: ContainerFlow boundary is not always enforced for vlans"
Giovanni Meo [Mon, 9 Jun 2014 06:41:31 +0000 (06:41 +0000)]
Merge "Bug 1165: ContainerFlow boundary is not always enforced for vlans"

9 years agoBUG-981: Fix XML serialization test 19/7819/2
Robert Varga [Sun, 8 Jun 2014 18:56:59 +0000 (20:56 +0200)]
BUG-981: Fix XML serialization test

Since commit 7624eedc495e85d12c2c2c56efb09dfd9406f977 changed XML
resolution rules such that XML namespace is required to properly
identify a node.

This broke serialization tests, which did not provide module/revision
identification -- which meant serialized data was being handled by
String encoder. The string encoder does not do the right thing for
arrays -- which broke the bits and binary encoding tests.

Fix the tests to specify module/revision, thus matching conforming to
schema.

Change-Id: I5cbee0e19b85ebe3a5cf181a0e2d2ca044bfe07e
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-1166: do not import BundleContext 98/7798/1
Robert Varga [Sat, 7 Jun 2014 07:53:51 +0000 (09:53 +0200)]
BUG-1166: do not import BundleContext

As it turns out, the entire import is only needed to get the canonical
class name. Replace the import with a static string, leaving the
dependency behind.

Change-Id: Ia300738b2d2351404eae1b2da20a0c6bc41ecd22
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBug 1165: ContainerFlow boundary is not always enforced for vlans 91/7791/2
Alessandro Boch [Fri, 6 Jun 2014 21:36:38 +0000 (14:36 -0700)]
Bug 1165: ContainerFlow boundary is not always enforced for vlans

- When a flow add is requested, ForwardingRulesmanager checks whether
  the requested flow complies with the ContainerFlow(s) for the current container.
  The check is performed by ContainerFlow.allowsFlow(Flow x).
  This function checks if the Match portion of the passed Flow does conflict with the
  container flow (which is a Match itself). It then checks whether the Flow's Actions
  are allowed by the container flow (this to avoid cross container redirection of traffic).
  In order to do so, it constructs a Match which summarizes the actions, then it checks if
  it conflicts with the container flow Match.
  BUG: During this last step, it misses to account the SetVlan actions.
  Because of the above bug  an app/user can install a flow which leaks traffic from one
  container to another, when the containers' flows specify vlan as boundary.

Change-Id: Id5a5e60c190b4353ed1fd76966e885a021ee4d2a
Signed-off-by: Alessandro Boch <aboch@cisco.com>
9 years agoMerge "BUG-614: split out RpcServiceMetadata"
Tony Tkacik [Fri, 6 Jun 2014 13:02:40 +0000 (13:02 +0000)]
Merge "BUG-614: split out RpcServiceMetadata"

9 years agoMerge "BUG-614: migrate RuntimeGeneratedInvokerPrototype"
Tony Tkacik [Fri, 6 Jun 2014 12:38:24 +0000 (12:38 +0000)]
Merge "BUG-614: migrate RuntimeGeneratedInvokerPrototype"

9 years agoMerge "BUG-614: sal-common-impl does not use xtend"
Tony Tkacik [Fri, 6 Jun 2014 12:37:46 +0000 (12:37 +0000)]
Merge "BUG-614: sal-common-impl does not use xtend"

9 years agoMerge changes I4174e4f9,I99fa044e,I07c80e2f
Tony Tkacik [Fri, 6 Jun 2014 12:37:23 +0000 (12:37 +0000)]
Merge changes I4174e4f9,I99fa044e,I07c80e2f

* changes:
  BUG-625: remove use of xtend plugin and libraries
  BUG-1089: migrate CompatibleSwitchManager
  BUG-1089: migrate ConfigurableSwitchManager

9 years agoMerge "Bug 1073: Added Transaction Chain support to InMemoryDataTreeModification."
Ed Warnicke [Fri, 6 Jun 2014 12:21:03 +0000 (12:21 +0000)]
Merge "Bug 1073: Added Transaction Chain support to InMemoryDataTreeModification."

9 years agoMerge "BUG-1079: reorder fields within get-schema"
Tony Tkacik [Fri, 6 Jun 2014 12:06:04 +0000 (12:06 +0000)]
Merge "BUG-1079: reorder fields within get-schema"

9 years agoBUG-614: split out RpcServiceMetadata 34/7734/4
Robert Varga [Thu, 5 Jun 2014 11:21:54 +0000 (13:21 +0200)]
BUG-614: split out RpcServiceMetadata

RpcServiceMetadata is just another holder, no reason to define it in
xtend.

Change-Id: Ic069a9698e47a347e634289c7a96fac20c2a3d3f
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-614: migrate RuntimeGeneratedInvokerPrototype 33/7733/4
Robert Varga [Thu, 5 Jun 2014 11:09:41 +0000 (13:09 +0200)]
BUG-614: migrate RuntimeGeneratedInvokerPrototype

Splits off RuntimeGeneratedInvokerPrototype DTO into java. There is no
reason it should be in xtend.

Change-Id: I625d44d398cfe72be21ac33d29986c736412970e
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-614: sal-common-impl does not use xtend 20/7720/4
Robert Varga [Wed, 4 Jun 2014 21:20:37 +0000 (23:20 +0200)]
BUG-614: sal-common-impl does not use xtend

This is a cleanup of sal-common-impl component -- it no longer uses
xtend, so there is no reason to depend on the maven plugin nor the
support library.

Change-Id: Ifa5d9934997f8f4d6a9d4f1b9db5f251b421713c
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-625: remove use of xtend plugin and libraries 19/7719/4
Robert Varga [Wed, 4 Jun 2014 21:19:38 +0000 (23:19 +0200)]
BUG-625: remove use of xtend plugin and libraries

This is a cleanup of compatibility component -- it no longer uses xtend,
so there is no reason to depend on the maven plugin nor the support
library.

Change-Id: I4174e4f9cce720615a985305071f4322dd79a218
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-1089: migrate CompatibleSwitchManager 18/7718/4
Robert Varga [Wed, 4 Jun 2014 21:16:24 +0000 (23:16 +0200)]
BUG-1089: migrate CompatibleSwitchManager

Migrates CompatibleSwitchManager from xtend to Java, finishing up the
bundle conversion.

Change-Id: I99fa044e7dad329d40aa11aa8759cab5f315238f
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-1089: migrate ConfigurableSwitchManager 17/7717/4
Robert Varga [Wed, 4 Jun 2014 21:08:41 +0000 (23:08 +0200)]
BUG-1089: migrate ConfigurableSwitchManager

Migrates defunct ConfigurableSwitchManager from xtend to java.

Change-Id: I07c80e2f7e84c797a4d154dc908d08f1bcc59c0e
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-1089: convert AdSalTopologyMapping 16/7716/4
Robert Varga [Wed, 4 Jun 2014 20:43:10 +0000 (22:43 +0200)]
BUG-1089: convert AdSalTopologyMapping

Converts AdSalTopologyMapping from xtend to Java, optimizing it in the
process.

Change-Id: I62b6c17240cf3588a051c8945769dd6ea8fa2af0
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-1089: convert CompatibleTopologyManager 15/7715/4
Robert Varga [Wed, 4 Jun 2014 20:24:07 +0000 (22:24 +0200)]
BUG-1089: convert CompatibleTopologyManager

Converts CompatibleTopologyManager from xtend to java.

Change-Id: I2df7cdcd9dcbe4a8decaa6d197045303fa05aeee
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-1089: migrate ConfigurableLinkManager 14/7714/4
Robert Varga [Wed, 4 Jun 2014 20:16:44 +0000 (22:16 +0200)]
BUG-1089: migrate ConfigurableLinkManager

ConfigurableLinkManager is utterly unused code, but still needs to be
migrated from xtend. This patch does just that.

Change-Id: If58b847d3adbe40270ce6b254d3e4c415abf9291
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-620: cleanup inventory mapping 13/7713/4
Robert Varga [Wed, 4 Jun 2014 19:38:00 +0000 (21:38 +0200)]
BUG-620: cleanup inventory mapping

Cleanup the previous xtend conversion by removing all xtendisms and
optimizing the logic.

Change-Id: Iaccc73d2f91f8184c241c79a21fcbe52ac8866bc
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-614: remove dependecy on xtend 12/7712/4
Robert Varga [Wed, 4 Jun 2014 17:05:20 +0000 (19:05 +0200)]
BUG-614: remove dependecy on xtend

There was an unused import of xtends' Exceptions helpers -- just remove
it and reformat the class to comply.

Change-Id: Ifb8f4993414d5abbb5c9b5030de1674ed78c5409
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-1089: use a string constant for "::::" 11/7711/4
Robert Varga [Wed, 4 Jun 2014 19:16:53 +0000 (21:16 +0200)]
BUG-1089: use a string constant for "::::"

This just makes sure the class is always consistent in naming things.

Change-Id: I442eec4204e9a5a7073e023bad7e392c2c56c1be
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-1089: migrate InventoryReader 90/7690/5
Robert Varga [Wed, 4 Jun 2014 16:48:46 +0000 (18:48 +0200)]
BUG-1089: migrate InventoryReader

Migrates InventoryReader from xtend to pure Java.

Change-Id: I285c3dcbae8f407ec75de03d2df3092f9fcab30f
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "BUG-1089: convert TopologyReader"
Tony Tkacik [Fri, 6 Jun 2014 09:49:23 +0000 (09:49 +0000)]
Merge "BUG-1089: convert TopologyReader"

9 years agoMerge "BUG-1089: migrate TopologyMapping"
Tony Tkacik [Fri, 6 Jun 2014 09:49:05 +0000 (09:49 +0000)]
Merge "BUG-1089: migrate TopologyMapping"

9 years agoMerge "BUG-625: migrate InventoryAndReadAdapter"
Tony Tkacik [Fri, 6 Jun 2014 09:48:52 +0000 (09:48 +0000)]
Merge "BUG-625: migrate InventoryAndReadAdapter"

9 years agoBUG-832 Fix rpcResult to xml translation to use schema for get/get-config. 72/7772/1
Maros Marsalek [Fri, 6 Jun 2014 09:34:44 +0000 (11:34 +0200)]
BUG-832 Fix rpcResult to xml translation to use schema for get/get-config.

The schema was never used since check if rpc qname is get/get-config was performed using == instead of equals. (Result of xtend -> java transform)

Change-Id: I057476f27b5c84b87ca9c81c51bde24990d17ff1
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoBUG-1041 Make rpc-request -> xml translation use schema context 32/7732/3
Maros Marsalek [Thu, 5 Jun 2014 12:03:07 +0000 (14:03 +0200)]
BUG-1041 Make rpc-request -> xml translation use schema context

Sal-netconf-connector now uses schema context if available to transform between rpc-request represented as DOM nodes to Xml.

This is crucial for e.g. identity-ref type leaves in edit-config.

Change-Id: I5b8602e7bf21e52c27b94daa3ac55213375641b5
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoMerge "Checkstyle maven plugin check - md-sal"
Tony Tkacik [Fri, 6 Jun 2014 08:19:54 +0000 (08:19 +0000)]
Merge "Checkstyle maven plugin check - md-sal"

9 years agoMerge "Checkstyle plugin check - config & netconf"
Tony Tkacik [Fri, 6 Jun 2014 08:19:33 +0000 (08:19 +0000)]
Merge "Checkstyle plugin check - config & netconf"

9 years agoMerge "BUG 624 - Make netconf TCP port optional."
Tony Tkacik [Fri, 6 Jun 2014 08:14:13 +0000 (08:14 +0000)]
Merge "BUG 624 - Make netconf TCP port optional."

9 years agoMerge "Fix unstable FixedThreadPoolConfigBeanTest"
Tony Tkacik [Fri, 6 Jun 2014 08:11:31 +0000 (08:11 +0000)]
Merge "Fix unstable FixedThreadPoolConfigBeanTest"

9 years agoFix unstable FixedThreadPoolConfigBeanTest 47/7747/2
Tomas Olvecky [Thu, 5 Jun 2014 16:03:17 +0000 (18:03 +0200)]
Fix unstable FixedThreadPoolConfigBeanTest

Test was failing because threads were not cleaned
up right after the thread pool was shut down. Test now
waits up to 60 seconds before failing on threads
that should have been destroyed.

Change-Id: Ie9ac856007772f39426dbcbb2af0fb66226fc2c0
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
9 years agoAdded move of branding jar to assembly 14/6914/6
Mathieu Lemay [Fri, 6 Jun 2014 01:49:50 +0000 (21:49 -0400)]
Added move of branding jar to assembly

Change-Id: I2fcef68141f977c662ba3d0d1e24250d03ab0dcc
Signed-off-by: Heath Kesler <hkesler@savoirtech.com>
Signed-off-by: Mathieu Lemay <mlemay@inocybe.com>
9 years agoAdded karaf branding. 64/6364/10
Mathieu Lemay [Tue, 6 May 2014 16:49:40 +0000 (12:49 -0400)]
Added karaf branding.

Change-Id: I05da9b3cc3804c5c5328004f3f814b44687d9467
Signed-off-by: Arash Eghtesadi <aeghtesadi@inocybe.ca>
Signed-off-by: Mathieu Lemay <mlemay@inocybe.com>
9 years agoBUG-1089: convert TopologyReader 89/7689/4
Robert Varga [Wed, 4 Jun 2014 13:26:43 +0000 (15:26 +0200)]
BUG-1089: convert TopologyReader

This converts TopologyReader from xtend to pure Java, optimizing it
while we're at it.

Change-Id: Ide991f0bc529db0cdeb3526d4b0d4e99d8ade3c7
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-1089: migrate TopologyMapping 82/7682/4
Robert Varga [Wed, 4 Jun 2014 12:51:06 +0000 (14:51 +0200)]
BUG-1089: migrate TopologyMapping

Simple transformation from xtend to Java, along with some optimizations.

Change-Id: I62b022671ed5b8746ca7ba8130d0b0bf018c9fde
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-625: migrate InventoryAndReadAdapter 81/7681/4
Robert Varga [Wed, 28 May 2014 15:13:50 +0000 (17:13 +0200)]
BUG-625: migrate InventoryAndReadAdapter

This patch migrates InventoryAndReadAdapte from xtend to Java, finishing
the conversion.

Change-Id: I9e810283ec96c8906b0aa029691ab49dc793ffe8
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdd getChecksum() to the AD-SAL TCP class 48/7748/2
Colin Dixon [Thu, 5 Jun 2014 16:41:24 +0000 (11:41 -0500)]
Add getChecksum() to the AD-SAL TCP class

Fixing Bug 1145

Change-Id: I62b29ecd0bb640632146b93c97250ba00afbe2fa
Signed-off-by: Colin Dixon <colin@colindixon.com>
9 years agoBUG-1079: reorder fields within get-schema 28/7428/3
Martin Volf [Mon, 26 May 2014 08:45:35 +0000 (10:45 +0200)]
BUG-1079: reorder fields within get-schema

Change-Id: I748ba14038ad8390e21415a0f60b39140cdcbe9e
Signed-off-by: Martin Volf <volf@cngroup.dk>
9 years agoMerge "Bug 762: Fix sal-rest-connector unit tests"
Ed Warnicke [Thu, 5 Jun 2014 16:06:54 +0000 (16:06 +0000)]
Merge "Bug 762: Fix sal-rest-connector unit tests"

9 years agoFixed missing javax.activation bundle in system folder of distribution 42/7742/1
Mathieu Lemay [Thu, 5 Jun 2014 14:55:26 +0000 (10:55 -0400)]
Fixed missing javax.activation bundle in system folder of distribution

Change-Id: I56b0d5c316db2236134affda4cf72ab3748894db
Signed-off-by: Mathieu Lemay <mlemay@inocybe.com>
9 years agoMerge "BUG-1120: improve notification queue"
Tony Tkacik [Thu, 5 Jun 2014 13:46:06 +0000 (13:46 +0000)]
Merge "BUG-1120: improve notification queue"

9 years agoMerge "Fixed Karaf Distribution javax.annotations conflicts with Jersey"
Ed Warnicke [Thu, 5 Jun 2014 13:36:44 +0000 (13:36 +0000)]
Merge "Fixed Karaf Distribution javax.annotations conflicts with Jersey"

9 years agoMerge "Provided OSGi Friendly version of Jersey2 as karaf feature"
Ed Warnicke [Thu, 5 Jun 2014 13:35:20 +0000 (13:35 +0000)]
Merge "Provided OSGi Friendly version of Jersey2 as karaf feature"

9 years agoMerge "Bug 1073: Implemented Transaction chain on InMemoryDOMDataStore level."
Ed Warnicke [Thu, 5 Jun 2014 13:19:27 +0000 (13:19 +0000)]
Merge "Bug 1073: Implemented Transaction chain on InMemoryDOMDataStore level."

9 years agoMerge "BUG-1132: upgrade netty to 4.0.19"
Ed Warnicke [Thu, 5 Jun 2014 13:18:56 +0000 (13:18 +0000)]
Merge "BUG-1132: upgrade netty to 4.0.19"

9 years agoCheckstyle maven plugin check - md-sal 10/7710/1
Milos Fabian [Wed, 4 Jun 2014 15:21:39 +0000 (17:21 +0200)]
Checkstyle maven plugin check - md-sal

    -violations do not fail build
    -rules defined in yangtools/common/checkstyle-logging
https://git.opendaylight.org/gerrit/#/c/7595/
https://git.opendaylight.org/gerrit/#/c/7108/

Change-Id: I5cc6f833be8d6d6ad61d63d38a2ee0fffe2d75f6
Signed-off-by: Milos Fabian <milfabia@cisco.com>
9 years agoCheckstyle plugin check - config & netconf 09/7709/1
Milos Fabian [Wed, 4 Jun 2014 14:13:04 +0000 (16:13 +0200)]
Checkstyle plugin check - config & netconf

-violations do not fail build
-rules defined in yangtools/common/checkstyle-logging:
https://git.opendaylight.org/gerrit/#/c/7595/
https://git.opendaylight.org/gerrit/#/c/7108/

Change-Id: I2b1c458c09068c4a520afe37b3adb26e503882ba
Signed-off-by: Milos Fabian <milfabia@cisco.com>
9 years agoBUG-1120: improve notification queue 75/7675/2
Robert Varga [Mon, 2 Jun 2014 21:57:06 +0000 (23:57 +0200)]
BUG-1120: improve notification queue

This is a slight improvement in that it uses a ForwardingBlockingQueue
instead of subclassing -- allowing for easy replacement (for an
ArrayBlockingQueue for example).

Another improvement is the use of RejectedExecutionException instead of
IllegalStateException -- allowing clients to cleanly recover from thread
interruption.

Change-Id: I80040846bb34a12da1eb1e0df62a538b0551239e
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoFixed Karaf Distribution javax.annotations conflicts with Jersey 07/7707/3
Mathieu Lemay [Thu, 5 Jun 2014 03:49:10 +0000 (23:49 -0400)]
Fixed Karaf Distribution javax.annotations conflicts with Jersey

Change-Id: If7fe0d0fc9671a1c53a66ad51545eb591b6607e6
Signed-off-by: Mathieu Lemay <mlemay@inocybe.com>
9 years agoMerge "Bug 1034 : Statistics request queue cleanup on node disconnection MD-SAL Stati...
Ed Warnicke [Thu, 5 Jun 2014 03:05:45 +0000 (03:05 +0000)]
Merge "Bug 1034 : Statistics request queue cleanup on node disconnection MD-SAL Statistics-manager was not removing the statistics request entries from request scheduler queue. So even if node is getting disconnected, request scheduler was sending the request down to the plugin and plugin was throwing IllegalArgumentException. With this fix, whenever node get disconnected its respective NodeStatisticsHandler clean up its pending statistics request from scheduler queue."

9 years agoBug 762: Fix sal-rest-connector unit tests 72/7372/8
tpantelis [Sun, 25 May 2014 04:04:21 +0000 (00:04 -0400)]
Bug 762: Fix sal-rest-connector unit tests

The cnsn-to-json/simple-data-types/xml/data.xml test file used by
CnSnToJsonBasicDataTypesTest actually contains some invalid union type data.
The tests currently pass because union type input data isn't currently
validated. Patch https://git.opendaylight.org/gerrit/#/c/7367/
in yangtools adds validation so the unit tests must be fixed before
that patch is merged.

In addition, the yangtools patch changes some static fields in
TypeDefinitionAwareCodec to private which breaks compilation of
CnSnToXmlTest. This patch modifies CnSnToXmlTest to not use the static
fields.

Change-Id: I020ffacd4a6c96265a191fa74f982de807e336a4
Signed-off-by: tpantelis <tpanteli@brocade.com>
9 years agoProvided OSGi Friendly version of Jersey2 as karaf feature 94/7694/1
Mathieu Lemay [Wed, 4 Jun 2014 18:01:21 +0000 (14:01 -0400)]
Provided OSGi Friendly version of Jersey2 as karaf feature

Change-Id: Ibc42daf8ddf8e82133d014b971d5fc17d4b136a3
Signed-off-by: Mathieu Lemay <mlemay@inocybe.com>
9 years agoBUG-1132: upgrade netty to 4.0.19 87/7687/2
Robert Varga [Wed, 4 Jun 2014 15:42:05 +0000 (17:42 +0200)]
BUG-1132: upgrade netty to 4.0.19

As per description in bugzilla, this bumps netty version to 4.0.19, such
that we get buffer pooling performance enhancements needed for
openflowjava.

Change-Id: I0fcb537c89dd4fce2bcc28c422993cb8980c5afa
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Do not use deprecated destroyConfigBean in config tests"
Tony Tkacik [Wed, 4 Jun 2014 14:25:52 +0000 (14:25 +0000)]
Merge "Do not use deprecated destroyConfigBean in config tests"

9 years agoDo not use deprecated destroyConfigBean in config tests 65/7665/1
Tomas Olvecky [Wed, 4 Jun 2014 09:32:54 +0000 (11:32 +0200)]
Do not use deprecated destroyConfigBean in config tests

Replace org.opendaylight.controller.config.util.ConfigTransactionJMXClient
destroyConfigBean with destroyModule in tests.
Test resource leaks in FixedThreadPoolConfigBeanTest.

Change-Id: If3847d3cb9211d9e830006400c258dad9e6ffb35
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
9 years agoBug 1034 : Statistics request queue cleanup on node disconnection 26/7526/2
Anil Vishnoi [Thu, 29 May 2014 20:05:29 +0000 (01:35 +0530)]
Bug 1034 : Statistics request queue cleanup on node disconnection
MD-SAL Statistics-manager was not removing the statistics request entries from request scheduler queue. So even if
node is getting disconnected, request scheduler was sending the request down to the plugin and plugin was throwing
IllegalArgumentException. With this fix, whenever node get disconnected its respective NodeStatisticsHandler clean up
its pending statistics request from scheduler queue.

Change-Id: Ie70544b11f660531312c29ff89bb868761104282
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
9 years agoMerge "BUG-1051: logback configuration loader proposal"
Ed Warnicke [Tue, 3 Jun 2014 19:27:01 +0000 (19:27 +0000)]
Merge "BUG-1051: logback configuration loader proposal"

9 years agoMerge "Bug 1100 - Invoking an RPC with no input should not throw 500 when expected"
Tony Tkacik [Tue, 3 Jun 2014 16:21:56 +0000 (16:21 +0000)]
Merge "Bug 1100 - Invoking an RPC with no input should not throw 500 when expected"

9 years agoMerge "Fix logging in NetconfDeviceSalFacade"
Tony Tkacik [Tue, 3 Jun 2014 13:29:53 +0000 (13:29 +0000)]
Merge "Fix logging in NetconfDeviceSalFacade"

9 years agoMerge "BUG-1120: optimize notification delivery fast path"
Tony Tkacik [Tue, 3 Jun 2014 07:58:50 +0000 (07:58 +0000)]
Merge "BUG-1120: optimize notification delivery fast path"

9 years agoMerge "BUG-1120: fold GenerationalListenerMap back"
Tony Tkacik [Tue, 3 Jun 2014 07:58:31 +0000 (07:58 +0000)]
Merge "BUG-1120: fold GenerationalListenerMap back"

9 years agoMerge "BUG-1120: introduce generations to ListenerMap"
Tony Tkacik [Tue, 3 Jun 2014 07:58:22 +0000 (07:58 +0000)]
Merge "BUG-1120: introduce generations to ListenerMap"

9 years agoMerge "TCP_Flag extension model additions for OFPXMC_NXM_1 class"
Ed Warnicke [Mon, 2 Jun 2014 16:42:32 +0000 (16:42 +0000)]
Merge "TCP_Flag extension model additions for OFPXMC_NXM_1 class"

9 years agoBug 1073: Added Transaction Chain support to InMemoryDataTreeModification. 08/7408/4
Tony Tkacik [Mon, 26 May 2014 21:29:53 +0000 (23:29 +0200)]
Bug 1073: Added Transaction Chain support to InMemoryDataTreeModification.

Added support for chaining transactions to underlying implementation.

Added test case testTransactionChain, which is documented
and illustrates basic behaviour of transaction chain -
local virtual memory, which allows to allocate new transactions
which provides view as-if previous transaction already happened.

Change-Id: I23f5622f9a6498356b3c54d53e0111f3fba33bf5
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoBug 1073: Implemented Transaction chain on InMemoryDOMDataStore level. 07/7407/4
Tony Tkacik [Mon, 26 May 2014 20:38:26 +0000 (22:38 +0200)]
Bug 1073: Implemented Transaction chain on InMemoryDOMDataStore level.

- Extracted Transactions implementations from InMemoryDOMDataStore
to separate classes
- implemented initial DOMStoreTransactionChain inside InMemoryDOMDataStore

Change-Id: I3033f26d2a4c141a32aaac6bc3a20e8c7ba1c28c
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoBUG-1120: optimize notification delivery fast path 94/7594/1
Robert Varga [Mon, 2 Jun 2014 14:11:20 +0000 (16:11 +0200)]
BUG-1120: optimize notification delivery fast path

Now that the interface contract is completely separated, our fast path
is as good as it gets, except it still allocates a few objects in the
lookup path. These are expected to be generally small, but we do now
they are constant while a particular generation is in place.

This means we can stategically place a LoadingCache, which will
eliminate the need to allocate the objects for notifications which are
often used -- thus the fast path really becomes a lookup by class into a
prepared iterable of listeners. For initial implementation we will place
an upper bound of 1000 entries and see where it leads us.

Change-Id: I2cf39f0d4681aa60afb9d517fb7beef99838bbab
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-1120: fold GenerationalListenerMap back 93/7593/1
Robert Varga [Mon, 2 Jun 2014 13:46:28 +0000 (15:46 +0200)]
BUG-1120: fold GenerationalListenerMap back

This moves needless indirection code form GenerationalListenerMap back
to NotificaitonBrokerImpl. Now the contract is directly between
NotificationBrokerImpl and ListenerMapGeneration

Change-Id: I0b401fa4b10e06afbc7206323d1c1f4afb19d422
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-1120: introduce generations to ListenerMap 92/7592/1
Robert Varga [Mon, 2 Jun 2014 11:58:22 +0000 (13:58 +0200)]
BUG-1120: introduce generations to ListenerMap

This removes the synchronized block in the fast path, biasing the
implementation heavily towards fast readers.

The readers need only to take a volatile reference (AtomicReference),
at which point they have an isolated read-only view of the map.

Writers on the other hand, though, are fully synchronized and are
required to perform a full copy operation, then do the modifications and
finally reinstate the read-only view through setting the atomic
reference.

Change-Id: I5d118177c1508199b66b9e26499c9fc628d3f65e
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG 624 - Make netconf TCP port optional. 85/7585/1
Tomas Olvecky [Tue, 27 May 2014 10:41:16 +0000 (12:41 +0200)]
BUG 624 - Make netconf TCP port optional.

Previously netconf-impl opened a TCP port with no authentication on
localhost, and netconf-ssh used it as a bridge to forward trafic
after processing authentication and encryption.

This patch creates new project netconf-tcp and modifies netconf-impl
to open the netconf server on LocalAddress. Both tcp and ssh modules
now communicate with this local server.
Config ini is modified so that the TCP port (8383) is not enabled
by default.

Change-Id: I74bded660f10b20d09535d32308aff5b2ae611d9
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
9 years agoBUG-1120: Rename to GenerationalListenerMap 91/7591/1
Robert Varga [Mon, 2 Jun 2014 12:01:12 +0000 (14:01 +0200)]
BUG-1120: Rename to GenerationalListenerMap

This name better captures the overall intent, so before we make changes
just do a rename, so it's easily reviewable.

Change-Id: I578edc26bcdc5dacbe3575dbb3ed3fe83694a9dd
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-1120: promote synchronization to all entrypoints 90/7590/1
Robert Varga [Mon, 2 Jun 2014 11:35:29 +0000 (13:35 +0200)]
BUG-1120: promote synchronization to all entrypoints

This is a temporary regression in performance: get rid of the
synchronized map at the cost of explicit synchronized methods.
Subsequent patches will remove the synchronization from the fast paths.

Change-Id: Ibe90e4e7ff99655a69b77c942ad50baec9df1ba2
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-1120: introduce NotificationListenerMap 89/7589/1
Robert Varga [Mon, 2 Jun 2014 11:26:47 +0000 (13:26 +0200)]
BUG-1120: introduce NotificationListenerMap

Introduces encapsulation of the set of listeners, such that
modifications and lookup are isolated fromt the rest of the
implementation -- thus clearly defining the entry points.

Also fixes a possible iteration failure if concurrent modification
happens while a interest listener is being added.

Change-Id: I96e0260d372425d261b352b229ae293e638c287c
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-868: disallow instantiation without executor 88/7588/1
Robert Varga [Mon, 2 Jun 2014 11:33:10 +0000 (13:33 +0200)]
BUG-868: disallow instantiation without executor

This clarifies the deprecated API. As it turns out, instantiation
without an executor should be removed, not the other way around.

Change-Id: I3a2738a4da18ef92d3e8c38d0c12f6df653bd74c
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoFix logging in NetconfDeviceSalFacade 84/7584/1
Tomas Olvecky [Mon, 2 Jun 2014 11:27:34 +0000 (13:27 +0200)]
Fix logging in NetconfDeviceSalFacade

Use correct logger name, make RPC warning log more granular.

Change-Id: Id9ec5aec64f1037411d2e105309e258aab411e24
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
9 years agoBUG-1120: fix race window in unregistration 67/7567/3
Robert Varga [Sun, 1 Jun 2014 14:33:52 +0000 (16:33 +0200)]
BUG-1120: fix race window in unregistration

This has the nice benefit of unifying the registration/unregistration
paths, too. This requires a supporting ehnancement in yangtools, which
has been submitted at https://git.opendaylight.org/gerrit/#/c/7568/

Change-Id: Ifd489d6eaf5b7feb4a6efaa09bd468d5818c24cc
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "BUG-832 Refactor netconf connector"
Tony Tkacik [Mon, 2 Jun 2014 08:50:39 +0000 (08:50 +0000)]
Merge "BUG-832 Refactor netconf connector"

9 years agoBUG-832 Refactor netconf connector 93/6793/13
Maros Marsalek [Tue, 29 Apr 2014 12:23:52 +0000 (14:23 +0200)]
BUG-832 Refactor netconf connector

- Extract general API for remote connectors
- Split NetconfDevice into more classes
- Make data operations over netconf device in inventory binding aware (fixes 969)
- Add dependency on binding-broker
- Make connector crash if schema is not present for device
- Improve logging

Change-Id: Idf4fa4994b3ac067bd69e9cd629b6d8c225d7b77
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoBUG-614: degrade NotifyTask to Runnable 64/7564/2
Robert Varga [Sun, 1 Jun 2014 09:00:48 +0000 (11:00 +0200)]
BUG-614: degrade NotifyTask to Runnable

The call() method always returned null anyway, so we might as well make it
Runnable.

Change-Id: I6be36490aba33ba1bf4b205ba4d9b0aa8160dbdf
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-614: do not use xtend's library 63/7563/2
Robert Varga [Sun, 1 Jun 2014 08:01:47 +0000 (10:01 +0200)]
BUG-614: do not use xtend's library

Convert from using xtendlib to using guava directly.

Change-Id: Ic72af54e0b1480658fb4067821969419bbab2e8e
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-614: No need to build a future list 62/7562/2
Robert Varga [Sun, 1 Jun 2014 07:52:44 +0000 (09:52 +0200)]
BUG-614: No need to build a future list

It is obvious that the constructed list of futures is never going to be
used, so let's not construct it at all.

Change-Id: I506e33da52c53b5e63088a5c8ae0bb206eb6a720
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-614: Remove xtendisms 61/7561/2
Robert Varga [Sun, 1 Jun 2014 06:09:06 +0000 (08:09 +0200)]
BUG-614: Remove xtendisms

Generated xtend code is quite verbose and sometimes the logic gets quite
obfuscated. This patch brings the code more in-line to what a programmer
might write.

Change-Id: I9a04012a2ba106082e9b1eef25bd9cb6958736cd
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-614: explicitly use old constructor 66/7566/1
Robert Varga [Sun, 1 Jun 2014 11:43:54 +0000 (13:43 +0200)]
BUG-614: explicitly use old constructor

This makes use of the legacy constructor until a concrete migration path
is selected.

Change-Id: I375504303c7e134f03bf649b360327e9076d2d08
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-614: Hide the executor and improve logging 60/7560/1
Robert Varga [Sun, 1 Jun 2014 06:01:21 +0000 (08:01 +0200)]
BUG-614: Hide the executor and improve logging

As part of the xtend->Java rewrite, we get rid of unnecessary
getExecutor() and improve logging a bit.

Change-Id: I9c7052472289f701a289f4ba76312fb28af18a3f
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-614: convert NotificationBrokerImpl 59/7559/1
Robert Varga [Sat, 31 May 2014 07:34:09 +0000 (09:34 +0200)]
BUG-614: convert NotificationBrokerImpl

This does a straight xtend->java conversion by moving xtend-generated
java files into the repository instead of xtend. This is the first step
in optimizing NotificationBrokerImpl.

Change-Id: Ie8dc1dfb6c5b9e80a8d79a5de31410100b35c7fc
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoRemoved `which` dependency, now using proper shell builtin. 49/7549/1
Daniel Farrell [Fri, 30 May 2014 18:54:23 +0000 (14:54 -0400)]
Removed `which` dependency, now using proper shell builtin.

- `which` isn't installed by default on all distros.
- `which` doesn't resolve exactly like the shell, potential bugs.
- `which` unnecessary spawns a new process.

Change-Id: Ie89ea78b6f4cfb9c5415e889ec0393924870d883
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
9 years agoBUG-1051: logback configuration loader proposal 52/7252/3
Michal Rehak [Tue, 20 May 2014 15:57:18 +0000 (17:57 +0200)]
BUG-1051: logback configuration loader proposal

- uses environment variable logback.config.d (pointing to config root folder)
- removes previously loaded logging configuration
- applies all config files from config root folder in alphabetical order
- requires:
  - to be added to osgi.bundles (configuration.ini)
  - existing logback.config.d variable (configuration.ini)
  - logback config files in specified config root folder
- added overloads for load method
- enriched util class protection against "accidental" instantiation
- using precompiled pattern while iterating folder content
- added classcast protection for case when the logging backend differs from logback

Change-Id: Id0242c78fe39b9631d1a4bca66d9674f7a3fec62
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoBug 981: Converted test to use BitsType.create() 38/7538/1
Tony Tkacik [Fri, 30 May 2014 14:39:36 +0000 (16:39 +0200)]
Bug 981: Converted test to use BitsType.create()

Change-Id: I759c55c48de64e48c5757aba5b7665f2478aa0fb
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "Bug 1003: Restconf - remove whitespace on input"
Tony Tkacik [Fri, 30 May 2014 12:33:04 +0000 (12:33 +0000)]
Merge "Bug 1003: Restconf - remove whitespace on input"

9 years agoMerge "Bug 1073: Introduced Transaction Chain to DOMStore APIs."
Ed Warnicke [Fri, 30 May 2014 12:25:16 +0000 (12:25 +0000)]
Merge "Bug 1073: Introduced Transaction Chain to DOMStore APIs."

9 years agoTCP_Flag extension model additions for OFPXMC_NXM_1 class 32/7532/2
Brent Salisbury [Tue, 27 May 2014 09:00:42 +0000 (05:00 -0400)]
TCP_Flag extension model additions for OFPXMC_NXM_1 class

Patch2: changed model descrip to be more generic to better
represent the high level model.

Patch1: Modified the high level models
opendaylight-match-types.yang and
opendaylight-table-types.yang to support TCP_Flag reads.

Once this and the low-level openflowjava patches merge,
I will commit the openflowplugin conversion patch since
openflowplugin will fail its build until the yang bindings
are generated.

Change-Id: Ia80e9014efa02bdb52dffeb1620625103e8dd985
Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>
9 years agoBug 1100 - Invoking an RPC with no input should not throw 500 when expected 24/7524/3
Devin Avery [Thu, 29 May 2014 20:42:03 +0000 (16:42 -0400)]
Bug 1100 - Invoking an RPC with no input should not throw 500 when expected

Patch Set 3:
*Modified the Json/Xml readers to not throw an except if the content is empty
*Moved the validation of non empty object into restconf where the knowledge
of what is expected exists.

Change-Id: I4e689770d1a6843e99ce498bd12cecc5e1817eaa
Signed-off-by: Devin Avery <devin.avery@brocade.com>
9 years agoBUG-509: cleanup datastore interafaces 16/7516/2
Robert Varga [Thu, 29 May 2014 13:04:30 +0000 (15:04 +0200)]
BUG-509: cleanup datastore interafaces

This removes unused methods and adds interface contract documentation.

Change-Id: I7bc57d034da1d0503d76afa6f4c09ce6a6bfe669
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-509: remove unnecessary Version objects 15/7515/2
Robert Varga [Wed, 28 May 2014 22:02:17 +0000 (00:02 +0200)]
BUG-509: remove unnecessary Version objects

Testing has revealed the datastore instantiates effectively a version
per tree node. This turns out to be not needed, as we really just need a
single version per commit -- which can be shared between nodes, as the
(node,version) tuple remains unique.

So let's just instantiate a single version when we start the
transaction, which we need to do anyway, and use it for all
nodes/subtrees added or modified. This places an upper bound on Version
objects retained to the number of transactions committed (not counting
no-ops).

Change-Id: I40d095ec230eee8b5af2409c1e8ee61a1860a9d3
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-509: use concurrent hash-trie Map 63/7363/5
Robert Varga [Fri, 23 May 2014 11:11:39 +0000 (13:11 +0200)]
BUG-509: use concurrent hash-trie Map

This patch switches to using concurrent hash-trie map for metadata
tracking. It has the nice feature of having O(1) concurrent snapshots,
which should give us better performance when dealing with large children
bases.

This is a trade-off, please refer to yangtools.util.MapAdaptor for
system properties which tune its behavior.

Change-Id: I2ddb81a1296cc17528a605eeaeda1f303560fb55
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "BUG-648: include yangtools.util package"
Tony Tkacik [Thu, 29 May 2014 10:37:59 +0000 (10:37 +0000)]
Merge "BUG-648: include yangtools.util package"

9 years agoBug 625 - Fixed Apache DM Activation after removing xtend code. 85/7485/1
Vaclav Demcak [Thu, 29 May 2014 09:44:19 +0000 (11:44 +0200)]
Bug 625 - Fixed Apache DM Activation after removing xtend code.

Apache DM does not provide any compile time/ runtime checks
for callbacks missing / modified.
Previously in xtend callbacks were provided by @Property
annotation, which generated setters and getters for this.

In refactor these was accidentally ommited. From code-perspective
it was not obvious that this affects Apache DM instantiation of
this service, since Apache DM uses strings and reflection.

Change-Id: I655ce7c1bc9971e3db370c5048057c1e6070a46d
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
9 years agoBUG-648: include yangtools.util package 65/7465/3
Robert Varga [Wed, 28 May 2014 17:02:01 +0000 (19:02 +0200)]
BUG-648: include yangtools.util package

This include yangtools.util, which will hold various utility classes.
First of which is MapAdaptor, needed to solve the 'copying hashmaps'
problem.

Change-Id: Ifdb7709e1b83d07d1e96832954987072f82274ae
Signed-off-by: Robert Varga <rovarga@cisco.com>