controller.git
7 years agoBug 1073: Added support to DOMBrokerImpl for Transaction Chaining 95/7395/14
Tony Tkacik [Mon, 26 May 2014 10:04:45 +0000 (12:04 +0200)]
Bug 1073: Added support to DOMBrokerImpl for Transaction Chaining

Splitted functionality of DOMBrokerImpl to separate classes
which allows easier code reuse with transaction chaining:

New internal APIs:
DOMDataCommitExecutor - Commit executor which invokes
   three-phase commit coordination
DOMDataCommitErrorListener - Error listener for commit executor
and one execution

AbstractDOMForwardedTransactionFactory - Factory which creates
   composite transactions on top of DOMStore transactions
DOMDataCommitCoordinatorImpl - Commit Executor implementation
DOMBrokerTransactionChainImpl - Implementation of DOMTransactionChain.

Added 2 JUnit tests for Transaction Chains:
  - Test positive scenario (chain of write, read, delete transactions)
  - Test IllegalStateException when previous transaction
    was not commited.

Change-Id: Ic2290d7fb3d4ea52a44bea02b493c1e537e929a6
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
7 years agoMerge "Bug-1152:Wrapping PopVlanAction within PopVlanActionCase"
Ed Warnicke [Wed, 11 Jun 2014 23:21:51 +0000 (23:21 +0000)]
Merge "Bug-1152:Wrapping PopVlanAction within PopVlanActionCase"

7 years agoMerge "Added move of branding jar to assembly"
Ed Warnicke [Wed, 11 Jun 2014 19:38:36 +0000 (19:38 +0000)]
Merge "Added move of branding jar to assembly"

7 years agoMerge "Added karaf branding."
Ed Warnicke [Wed, 11 Jun 2014 19:38:21 +0000 (19:38 +0000)]
Merge "Added karaf branding."

7 years agoMerge "Renamed MD-SAL all feature to follow proper odl prefix"
Ed Warnicke [Wed, 11 Jun 2014 17:09:28 +0000 (17:09 +0000)]
Merge "Renamed MD-SAL all feature to follow proper odl prefix"

7 years agoBug 951 - Externalize cors definition of restconf 88/5888/6
Tomas Olvecky [Wed, 7 May 2014 12:23:08 +0000 (14:23 +0200)]
Bug 951 - Externalize cors definition of restconf

Create new project called filter-valve that allows defining filters
outside of web.xml. An xml file is added to configuration folder
of distribution.

The valve allows any kind of filters to be applied around each
request, mapping contexts and path pattern same way as servlet
specification does. The xml file allows defining filter templates,
each context (WAB) can reuse and modify the common configuration.

Currently only restconf has externalized cors filter definition.

Change-Id: Ia8b6053efdff2b3c1150eec95e63b460d84c457e
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
7 years agoBug-1152:Wrapping PopVlanAction within PopVlanActionCase 86/7886/1
Kamal Rameshan [Wed, 11 Jun 2014 02:05:41 +0000 (19:05 -0700)]
Bug-1152:Wrapping PopVlanAction within PopVlanActionCase

Change-Id: Ibafe249a6fc86c914efb188b7af63d635b971b38
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
7 years agoRenamed MD-SAL all feature to follow proper odl prefix 82/7882/1
Mathieu Lemay [Tue, 10 Jun 2014 20:09:43 +0000 (16:09 -0400)]
Renamed MD-SAL all feature to follow proper odl prefix

Change-Id: I727869714d42f9711000c9660cdb3ee2c468b3f0
Signed-off-by: Mathieu Lemay <mlemay@inocybe.com>
7 years agoMerge changes I52e0dd0d,I6dbf3316,Iafae27bc,Ibbb1250b,Icdb56d14,I7ede1482,Ib335fd1d...
Tony Tkacik [Tue, 10 Jun 2014 19:33:30 +0000 (19:33 +0000)]
Merge changes I52e0dd0d,I6dbf3316,Iafae27bc,Ibbb1250b,Icdb56d14,I7ede1482,Ib335fd1d,I6ce09820,I621fa3a4

* changes:
  BUG-272: fix issues in sal-rest-docgen
  BUG-272: fix sal-binding-api
  BUG-272: fix sal-compatibility
  BUG-272: fix sal-dom-spi
  BUG-272: fix sal-dom-broker
  BUG-272: fix sal-remoterpc-connector
  BUG-272: fix remoterpc-routingtable
  BUG-272: fix sal-dom-api
  BUG-272: fix sal-binding-broker

7 years agoMerge changes I63383291,I1c9f10e9,I9cac529f,I269d373b,I7ede3ba5,I4afc1e15
Tony Tkacik [Tue, 10 Jun 2014 17:32:19 +0000 (17:32 +0000)]
Merge changes I63383291,I1c9f10e9,I9cac529f,I269d373b,I7ede3ba5,I4afc1e15

* changes:
  BUG-272: fix sal-common-api
  BUG-272: fix sal-netconf-connector
  BUG-272: fix toaster-consumer
  BUG-272: cleanup sal-rest-connector
  BUG-272: use L for long suffix
  BUG-272: remove empty statements

7 years agoMerge "Bug 1106: Introduced TransactionCommitFailedException."
Ed Warnicke [Tue, 10 Jun 2014 14:06:58 +0000 (14:06 +0000)]
Merge "Bug 1106: Introduced TransactionCommitFailedException."

7 years agoMerge "Removed `which` dependency, now using proper shell builtin."
Ed Warnicke [Tue, 10 Jun 2014 13:46:52 +0000 (13:46 +0000)]
Merge "Removed `which` dependency, now using proper shell builtin."

7 years agoBUG-272: fix issues in sal-rest-docgen 74/7874/1
Robert Varga [Tue, 10 Jun 2014 12:51:08 +0000 (14:51 +0200)]
BUG-272: fix issues in sal-rest-docgen

This fixes some small issues in sal-rest-docgen.

Change-Id: I52e0dd0d4aaed1363f203e81acf3922b4dd285b5
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-272: fix sal-binding-api 73/7873/1
Robert Varga [Tue, 10 Jun 2014 12:34:16 +0000 (14:34 +0200)]
BUG-272: fix sal-binding-api

Fixes various small issues in sal-binding-api

Change-Id: I6dbf33169e693cb8f449c42062dfedbf6a3e105e
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-272: fix sal-compatibility 72/7872/1
Robert Varga [Tue, 10 Jun 2014 12:37:02 +0000 (14:37 +0200)]
BUG-272: fix sal-compatibility

FIxes a single issue in sal-compatibility

Change-Id: Iafae27bca3d1266b0b4f4492b152cd73d0314641
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-272: fix sal-dom-spi 71/7871/1
Robert Varga [Tue, 10 Jun 2014 12:32:31 +0000 (14:32 +0200)]
BUG-272: fix sal-dom-spi

Fixes minor offences in sal-dop-spi

Change-Id: Ibbb1250bc930c2b5b74b919a184d413279a51f74
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-272: fix sal-dom-broker 70/7870/1
Robert Varga [Tue, 10 Jun 2014 12:32:02 +0000 (14:32 +0200)]
BUG-272: fix sal-dom-broker

Fixes minor offences in sal-dom-broker

Change-Id: Icdb56d14f57626e59b39296af9e9e8946e8fb4b6
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-272: fix sal-remoterpc-connector 69/7869/1
Robert Varga [Tue, 10 Jun 2014 12:06:08 +0000 (14:06 +0200)]
BUG-272: fix sal-remoterpc-connector

Fixes various offences in sal-remoterpc-connector

Change-Id: I7ede148251ba0e4a84d2bdcaf213c27218d7804b
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-272: fix remoterpc-routingtable 68/7868/1
Robert Varga [Tue, 10 Jun 2014 11:56:19 +0000 (13:56 +0200)]
BUG-272: fix remoterpc-routingtable

Organizes imports to fix issues reported.

Change-Id: Ib335fd1d3e199f332437423017deaf25acfd81e8
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-272: fix sal-dom-api 67/7867/1
Robert Varga [Tue, 10 Jun 2014 11:55:28 +0000 (13:55 +0200)]
BUG-272: fix sal-dom-api

Removes imports used only by documentation.

Change-Id: I6ce098201e1a80244c650931192d746eec1cb848
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-272: fix sal-binding-broker 65/7865/1
Robert Varga [Tue, 10 Jun 2014 11:35:46 +0000 (13:35 +0200)]
BUG-272: fix sal-binding-broker

Fixes various small offenses in sal-binding-broker

Change-Id: I621fa3a430e869ecaade06fb2bf189d692d90e85
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-272: fix sal-common-api 64/7864/1
Robert Varga [Tue, 10 Jun 2014 09:32:23 +0000 (11:32 +0200)]
BUG-272: fix sal-common-api

Removes a single unused import.

Change-Id: I633832911c6a0459c4b4428cd17cca63c8287e56
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-272: fix sal-netconf-connector 60/7860/3
Robert Varga [Tue, 10 Jun 2014 09:29:25 +0000 (11:29 +0200)]
BUG-272: fix sal-netconf-connector

Removes unused imports

Change-Id: I1c9f10e91147e942581f12248c9b9539a15d9253
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-272: fix toaster-consumer 59/7859/3
Robert Varga [Tue, 10 Jun 2014 09:26:17 +0000 (11:26 +0200)]
BUG-272: fix toaster-consumer

Removes superfluous imports from the same package.

Change-Id: I9cac529f12587660161b219376d0340ddecd8c88
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-272: cleanup sal-rest-connector 58/7858/3
Robert Varga [Tue, 10 Jun 2014 09:15:04 +0000 (11:15 +0200)]
BUG-272: cleanup sal-rest-connector

Preparatory patch, expand wildcard imports to get rid of checkstyle
failures. Save action added final keywords where appropriate.

Change-Id: I269d373bed9fd83d3837f9ed4d3ff7fc105d7305
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-272: use L for long suffix 57/7857/3
Robert Varga [Tue, 10 Jun 2014 09:10:08 +0000 (11:10 +0200)]
BUG-272: use L for long suffix

This is 'L' is less ambiguous visually than 'l'.

Change-Id: I7ede3ba56e3622cbbc9d513c0a3d7fd07ff1121c
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-272: remove empty statements 55/7855/3
Robert Varga [Tue, 10 Jun 2014 09:05:54 +0000 (11:05 +0200)]
BUG-272: remove empty statements

Preparatory patch: removes reported empty statements.

Change-Id: I4afc1e15efe6edd5d48ea8f40e189ee1e1774d4e
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoMerge "BUG-868: do not instantiate SchemaPath directly"
Tony Tkacik [Tue, 10 Jun 2014 11:32:21 +0000 (11:32 +0000)]
Merge "BUG-868: do not instantiate SchemaPath directly"

7 years agoMerge "BUG-614: Remove YangtoolsMappingHelper in favor of BindingReflections"
Tony Tkacik [Tue, 10 Jun 2014 11:30:42 +0000 (11:30 +0000)]
Merge "BUG-614: Remove YangtoolsMappingHelper in favor of BindingReflections"

7 years agoMerge "BUG-614: introduce AbstractRuntimeCodeGenerator"
Tony Tkacik [Tue, 10 Jun 2014 11:30:21 +0000 (11:30 +0000)]
Merge "BUG-614: introduce AbstractRuntimeCodeGenerator"

7 years agoMerge "BUG-614: migrate RuntimeGeneratedInvoker"
Tony Tkacik [Tue, 10 Jun 2014 11:30:06 +0000 (11:30 +0000)]
Merge "BUG-614: migrate RuntimeGeneratedInvoker"

7 years agoMerge "BUG-614: migrate RpcMetadata"
Tony Tkacik [Tue, 10 Jun 2014 11:29:34 +0000 (11:29 +0000)]
Merge "BUG-614: migrate RpcMetadata"

7 years agoMerge "BUG-868: use a single version of ClassLoaderUtils"
Tony Tkacik [Tue, 10 Jun 2014 11:29:16 +0000 (11:29 +0000)]
Merge "BUG-868: use a single version of ClassLoaderUtils"

7 years agoMerge "BUG-272: remove tabs from Java files"
Tony Tkacik [Tue, 10 Jun 2014 11:02:28 +0000 (11:02 +0000)]
Merge "BUG-272: remove tabs from Java files"

7 years agoMerge "BUG-272: remove trailing whitespace from Java files"
Tony Tkacik [Tue, 10 Jun 2014 10:47:22 +0000 (10:47 +0000)]
Merge "BUG-272: remove trailing whitespace from Java files"

7 years agoMerge "BUG-272: remove trailing whitespace from XML files"
Tony Tkacik [Tue, 10 Jun 2014 10:46:50 +0000 (10:46 +0000)]
Merge "BUG-272: remove trailing whitespace from XML files"

7 years agoMerge "BUG-272: remove tabs from XML files"
Tony Tkacik [Tue, 10 Jun 2014 10:46:37 +0000 (10:46 +0000)]
Merge "BUG-272: remove tabs from XML files"

7 years agoBUG-272: remove tabs from Java files 54/7854/1
Robert Varga [Tue, 10 Jun 2014 09:02:29 +0000 (11:02 +0200)]
BUG-272: remove tabs from Java files

Preparatory patch: bulk-convert tabs to 4 spaces.

Change-Id: I4c24c763faf41cb4fcfd0277f8b3c7511269e9b7
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-272: remove trailing whitespace from Java files 53/7853/1
Robert Varga [Tue, 10 Jun 2014 08:58:26 +0000 (10:58 +0200)]
BUG-272: remove trailing whitespace from Java files

Preparatory patch, bulk-removes all trailing whitespace from Java files.

Change-Id: I1fbef5746df7277b3865429d4faa82fc8ba8cbb5
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-272: remove trailing whitespace from XML files 52/7852/1
Robert Varga [Tue, 10 Jun 2014 08:56:20 +0000 (10:56 +0200)]
BUG-272: remove trailing whitespace from XML files

Preparatory patch, bulk-removes trailing whitespace.

Change-Id: I32287893c6ed3079aa7926567f8d0705f8607564
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-272: remove tabs from XML files 51/7851/1
Robert Varga [Tue, 10 Jun 2014 08:54:33 +0000 (10:54 +0200)]
BUG-272: remove tabs from XML files

Preparatory patch, replaces tabs with 4 spaces.

Change-Id: I84bff9c83d19b9252cf277f23d2931e2ba8dd6de
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-614: Remove YangtoolsMappingHelper in favor of BindingReflections 44/7744/5
Robert Varga [Thu, 5 Jun 2014 15:15:11 +0000 (17:15 +0200)]
BUG-614: Remove YangtoolsMappingHelper in favor of BindingReflections

As it turns out YangtoolsMappingHelper is an old duplicate of
BindingReflections, with a single isNotification() method. That method
is buggy, as it does not perform all the checks required. Remove it and
use the unified method exposed from BindingReflections.

Change-Id: Ifc2ef9746c2556feac05466439ed910208289413
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-614: introduce AbstractRuntimeCodeGenerator 43/7743/5
Robert Varga [Thu, 5 Jun 2014 12:15:44 +0000 (14:15 +0200)]
BUG-614: introduce AbstractRuntimeCodeGenerator

Introduce AbstractRuntimeCodeGenerator, which is the base service class
for interactions with the rest of the world. It implements the public
contracts and as much of the logic as possible in pure Java and defines
a clear interface subclasses need to provide. RuntimeCodeGenerator.xtend
then adds an implementation of it.

Change-Id: Ic04f3e840825ae1f59583c0a9a2f6fbfc7bb66f6
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-614: migrate RuntimeGeneratedInvoker 37/7737/6
Robert Varga [Thu, 5 Jun 2014 11:54:08 +0000 (13:54 +0200)]
BUG-614: migrate RuntimeGeneratedInvoker

RuntimeGeneratedInvoker is another DTO, so let's migrate it to
java-land.

Change-Id: If8e654c38de1be5f8e263f81eb7550d745913906
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-614: migrate RpcMetadata 36/7736/6
Robert Varga [Thu, 5 Jun 2014 11:27:09 +0000 (13:27 +0200)]
BUG-614: migrate RpcMetadata

RpcMetadata is just another DTO. Just migrate it to Java.

Change-Id: I9bff2616a1cd14fc7a5d73f7be2607d46b67b23e
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBUG-868: use a single version of ClassLoaderUtils 35/7735/6
Robert Varga [Thu, 5 Jun 2014 11:24:31 +0000 (13:24 +0200)]
BUG-868: use a single version of ClassLoaderUtils

This removes the static import, which hid the fact we are using two
different ClassLoaderUtils (both deprecated).

Change-Id: If37786d591a4c9975d2d10539c70f888dd7d6c5c
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoTopology manager: get rid of sychronized sections 05/7805/4
Robert Varga [Sat, 7 Jun 2014 10:31:55 +0000 (12:31 +0200)]
Topology manager: get rid of sychronized sections

Instead of executing changes one by one, we aggregate them such that
ordering is preserved and we have one outstanding transaction at any
given moment. This is done by placing a queue between the notification
and data store, dispatched by a background thread. This should improve
scalability by reducing number of transactions and improving
notification thread concurrency.

Change-Id: Ica70971e4540a060491ac4c0b89a134984947fca
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoBug 1106: Introduced TransactionCommitFailedException. 45/7745/3
Tony Tkacik [Thu, 5 Jun 2014 15:43:36 +0000 (17:43 +0200)]
Bug 1106: Introduced TransactionCommitFailedException.

Change-Id: Icc4392a74aee24e3d2ae69387caa76bbeccb15ca
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
7 years agoTopology manager: Pre-construct identifiers 04/7804/3
Robert Varga [Sat, 7 Jun 2014 07:51:50 +0000 (09:51 +0200)]
Topology manager: Pre-construct identifiers

Another obvious optimization: we pre-construct identifiers for later
use, so we do not end up performing "expensive" operations.

Change-Id: I2f611dca6fb37363799dfbffc72588391008c041
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoMinimize synchronized blocks 03/7803/3
Robert Varga [Fri, 6 Jun 2014 17:20:03 +0000 (19:20 +0200)]
Minimize synchronized blocks

This is a simple, obviously-correct improvement of scalability: we
reduce the sice of the synchronized sections such that they only cover
the datastore interaction.

Change-Id: I1c78804e6aed22aac73f67e9c5de43ff465c7836
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoMerge changes I057476f2,I5b8602e7
Tony Tkacik [Mon, 9 Jun 2014 09:43:21 +0000 (09:43 +0000)]
Merge changes I057476f2,I5b8602e7

* changes:
  BUG-832 Fix rpcResult to xml translation to use schema for get/get-config.
  BUG-1041 Make rpc-request -> xml translation use schema context

7 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>
7 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"

7 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>
7 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>
7 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>
7 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"

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

7 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"

7 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

7 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."

7 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"

7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 years agoMerge "BUG-1089: convert TopologyReader"
Tony Tkacik [Fri, 6 Jun 2014 09:49:23 +0000 (09:49 +0000)]
Merge "BUG-1089: convert TopologyReader"

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

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

7 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>
7 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>
7 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"

7 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"

7 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."

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

7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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"

7 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>
7 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"

7 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"

7 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"

7 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."

7 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"

7 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>