controller.git
9 years agoBUG-2500: add current tree state to traces 63/13563/3
Robert Varga [Thu, 11 Dec 2014 12:10:10 +0000 (13:10 +0100)]
BUG-2500: add current tree state to traces

When a data validation exception occurs, also add the current tree state
to trace output.

Change-Id: I637973458519d4ed25fa3203fa79b72faf9a9e8b
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-2506: split out maven binding 90/13590/2
Robert Varga [Fri, 12 Dec 2014 11:07:45 +0000 (12:07 +0100)]
BUG-2506: split out maven binding

Maven integration needs to be split out of the runtime implementation,
simply because we do not want to pull the requisite runtime into our
containers. It would never be used there anyway.

Change-Id: Ided36e3b06316739a3829d758889ba523e7e19ad
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "BUG-2470: add trace of failed modification"
Tony Tkacik [Wed, 10 Dec 2014 15:35:38 +0000 (15:35 +0000)]
Merge "BUG-2470: add trace of failed modification"

9 years agoMerge "BUG-2475: Do not issue garbage collection on when pushing configurations"
Tony Tkacik [Wed, 10 Dec 2014 15:34:14 +0000 (15:34 +0000)]
Merge "BUG-2475: Do not issue garbage collection on when pushing configurations"

9 years agoMerge topic 'checkstyle'
Tony Tkacik [Wed, 10 Dec 2014 09:11:31 +0000 (09:11 +0000)]
Merge topic 'checkstyle'

* changes:
  Fix checkstyle if-statements must use braces liblldp
  Fix checkstyle if-statements must use braces hosttracker
  Fix checkstyle if-statements must use braces bundlescanner
  Fix checkstyle if-statements must use braces ClusterManager
  Fix checkstyle if-statements must use braces HostTrackerCallable
  Fix checkstyle if-statements must use braces ConnectionManagerNorthbound
  Fix checkstyle if-statements must use braces HostTrackerNorthbound
  Fix checkstyle if-statements must use braces BridgeDomainNorthbound
  Fix checkstyle if-statements must use braces adsal/northbound/staticrouting
  Fix checkstyle if-statements must use braces adsal/northbound/statistics
  Fix checkstyle if-statements must use braces adsal/protocol_plugins
  Fix checkstyle if-statements must use braces adsal/sal/connection
  Fix checkstyle if-statements must use braces adsal/samples/loadbalancer
  Fix checkstyle if-statements must use braces adsal/usermanager
  Fix checkstyle if-statements must use braces config-persister-file-xml-adapter
  Fix checkstyle if-statements must use braces logback-config
  Fix checkstyle if-statements must use braces yang-jmx-generator-plugin
  Fix checkstyle if-statements must use braces yang-jmx-generator
  Fix checkstyle if-statements must use braces sal-common-impl
  Fix checkstyle if-statements must use braces sal-common-util
  Fix checkstyle if-statements must use braces sal-dom-xsql
  Fix checkstyle if-statements must use braces sal-netconf-connector
  Fix checkstyle if-statements must use braces sal-rest-docgen
  Fix checkstyle if-statements must use braces md/statistics
  Fix checkstyle if-statements must use braces netconf

9 years agoMerge "Fix duplicate dependency warnings"
Tony Tkacik [Wed, 10 Dec 2014 09:07:23 +0000 (09:07 +0000)]
Merge "Fix duplicate dependency warnings"

9 years agoMerge "Fix Sonar Bad practice - Method may fail to close stream"
Tony Tkacik [Wed, 10 Dec 2014 09:07:01 +0000 (09:07 +0000)]
Merge "Fix Sonar Bad practice - Method may fail to close stream"

9 years agoFix checkstyle if-statements must use braces liblldp 24/13524/1
Thanh Ha [Wed, 10 Dec 2014 00:19:16 +0000 (19:19 -0500)]
Fix checkstyle if-statements must use braces liblldp

Change-Id: I2e36139dbeea5890a7eec7003da186af162e8998
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces hosttracker 23/13523/1
Thanh Ha [Wed, 10 Dec 2014 00:16:11 +0000 (19:16 -0500)]
Fix checkstyle if-statements must use braces hosttracker

Change-Id: I4ecd87422d228da396bfd3027aae3a365206fe2a
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces bundlescanner 22/13522/1
Thanh Ha [Wed, 10 Dec 2014 00:13:17 +0000 (19:13 -0500)]
Fix checkstyle if-statements must use braces bundlescanner

Change-Id: I54dcb1e13e913f3dcfcb1b2801b78aa62919a6bf
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces ClusterManager 21/13521/1
Thanh Ha [Tue, 9 Dec 2014 23:03:30 +0000 (18:03 -0500)]
Fix checkstyle if-statements must use braces ClusterManager

Change-Id: Ie8f6ec2ad3ea1e4131218b599fa4f1c5a9eb5cc4
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces HostTrackerCallable 20/13520/1
Thanh Ha [Tue, 9 Dec 2014 23:02:46 +0000 (18:02 -0500)]
Fix checkstyle if-statements must use braces HostTrackerCallable

Change-Id: I199f7b95f8e2740a4f5375f2ecd9a6ce4e39a2f6
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces ConnectionManagerNorthbound 19/13519/1
Thanh Ha [Tue, 9 Dec 2014 23:01:44 +0000 (18:01 -0500)]
Fix checkstyle if-statements must use braces ConnectionManagerNorthbound

Change-Id: If429fd24b5b346a350bc1cf488c800d445d4bbc1
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces HostTrackerNorthbound 18/13518/1
Thanh Ha [Tue, 9 Dec 2014 23:01:12 +0000 (18:01 -0500)]
Fix checkstyle if-statements must use braces HostTrackerNorthbound

Change-Id: Iaf3b56c7d66bd1609599e05833788c80bddf8924
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces BridgeDomainNorthbound 17/13517/1
Thanh Ha [Tue, 9 Dec 2014 22:59:45 +0000 (17:59 -0500)]
Fix checkstyle if-statements must use braces BridgeDomainNorthbound

Change-Id: If3656f11133856b14340ef03939e53ebd46874a3
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces adsal/northbound/staticrouting 16/13516/1
Thanh Ha [Tue, 9 Dec 2014 22:58:29 +0000 (17:58 -0500)]
Fix checkstyle if-statements must use braces adsal/northbound/staticrouting

Change-Id: I1a12ee8523e948af752c5fb2627a8567c99ed9e5
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces adsal/northbound/statistics 15/13515/1
Thanh Ha [Tue, 9 Dec 2014 22:57:09 +0000 (17:57 -0500)]
Fix checkstyle if-statements must use braces adsal/northbound/statistics

Change-Id: I2ef8d4fc3977eb8db6e369d9bb2fb2c6b5ad70db
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces adsal/protocol_plugins 14/13514/1
Thanh Ha [Tue, 9 Dec 2014 22:55:35 +0000 (17:55 -0500)]
Fix checkstyle if-statements must use braces adsal/protocol_plugins

Change-Id: I2110c4623f141e738b368d0bce0695ebc98809ff
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces adsal/sal/connection 13/13513/1
Thanh Ha [Tue, 9 Dec 2014 22:54:26 +0000 (17:54 -0500)]
Fix checkstyle if-statements must use braces adsal/sal/connection

Change-Id: Ib08edee1ed589b1bcbbaa9b38054ed5c301bb49c
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces adsal/samples/loadbalancer 12/13512/1
Thanh Ha [Tue, 9 Dec 2014 22:53:03 +0000 (17:53 -0500)]
Fix checkstyle if-statements must use braces adsal/samples/loadbalancer

Change-Id: I57535ed22a2ad4947dfb768b399c69d15444b39e
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces adsal/usermanager 11/13511/1
Thanh Ha [Tue, 9 Dec 2014 22:51:06 +0000 (17:51 -0500)]
Fix checkstyle if-statements must use braces adsal/usermanager

Change-Id: Idfb6cc67ab679c6b126724d25fefecc3e4cf45c2
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces config-persister-file-xml-adapter 10/13510/1
Thanh Ha [Tue, 9 Dec 2014 22:50:14 +0000 (17:50 -0500)]
Fix checkstyle if-statements must use braces config-persister-file-xml-adapter

Change-Id: I8c3d8a5e7ada9bb39822d364e765be253c6a9691
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces logback-config 09/13509/1
Thanh Ha [Tue, 9 Dec 2014 22:49:34 +0000 (17:49 -0500)]
Fix checkstyle if-statements must use braces logback-config

Change-Id: Ie857c55d72e6ab582a9abde8bf7e649e23f8323a
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces yang-jmx-generator-plugin 08/13508/1
Thanh Ha [Tue, 9 Dec 2014 22:48:37 +0000 (17:48 -0500)]
Fix checkstyle if-statements must use braces yang-jmx-generator-plugin

Change-Id: Ic3411f453bea29817e0c637423059efa6d398e93
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces yang-jmx-generator 07/13507/1
Thanh Ha [Tue, 9 Dec 2014 22:45:50 +0000 (17:45 -0500)]
Fix checkstyle if-statements must use braces yang-jmx-generator

Change-Id: I2d57b840a80d48d5227651582436b6c78ddf1ad5
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces sal-common-impl 06/13506/1
Thanh Ha [Tue, 9 Dec 2014 22:42:25 +0000 (17:42 -0500)]
Fix checkstyle if-statements must use braces sal-common-impl

Change-Id: Ib2d0a8bcf4cef4a589a8c23181433dd14ea84657
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces sal-common-util 05/13505/1
Thanh Ha [Tue, 9 Dec 2014 22:41:24 +0000 (17:41 -0500)]
Fix checkstyle if-statements must use braces sal-common-util

Change-Id: I518b9fa156af55c080d7e6a55067deab2c789a42
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces sal-dom-xsql 04/13504/1
Thanh Ha [Tue, 9 Dec 2014 22:40:23 +0000 (17:40 -0500)]
Fix checkstyle if-statements must use braces sal-dom-xsql

Change-Id: I68b6f356b30e56247dec7c96aa43e345e6d972f8
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces sal-netconf-connector 03/13503/1
Thanh Ha [Tue, 9 Dec 2014 22:35:29 +0000 (17:35 -0500)]
Fix checkstyle if-statements must use braces sal-netconf-connector

Change-Id: I2b4587534eb54833a012e01179d24e526d70d208
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces sal-rest-docgen 02/13502/1
Thanh Ha [Tue, 9 Dec 2014 22:32:21 +0000 (17:32 -0500)]
Fix checkstyle if-statements must use braces sal-rest-docgen

Change-Id: Id08ad375b27838637497dd507df0c076bf2b63df
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces md/statistics 01/13501/1
Thanh Ha [Tue, 9 Dec 2014 22:30:56 +0000 (17:30 -0500)]
Fix checkstyle if-statements must use braces md/statistics

Change-Id: I3e1ba6fdbed82a4f724585d5a420299698e851c9
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix checkstyle if-statements must use braces netconf 00/13500/1
Thanh Ha [Tue, 9 Dec 2014 22:28:38 +0000 (17:28 -0500)]
Fix checkstyle if-statements must use braces netconf

Change-Id: I2e5b8cc264acee74530ccbb990014b54649764b1
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoBUG-2470: add trace of failed modification 82/13482/1
Robert Varga [Tue, 9 Dec 2014 17:01:10 +0000 (18:01 +0100)]
BUG-2470: add trace of failed modification

With this change, the InMemoryDOMDataStore trace logs should contain the
dump of failed modifications.

Change-Id: Iea3038169090a574030c5e03cf155089faa6e985
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-2475: Do not issue garbage collection on when pushing configurations 79/13479/3
Robert Varga [Tue, 9 Dec 2014 15:11:48 +0000 (16:11 +0100)]
BUG-2475: Do not issue garbage collection on when pushing configurations

This gc() call used to make sense when we were running this code as a
one-shot initialization (e.g. Hydrogen container). With the Karaf
changes, this was moved into a persistent codepath -- which does not
make sense at all.

Change-Id: I0e3d4a2b674241c80d682630b031fb3517621251
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Fix checkstyle warnings in yang-test."
Tony Tkacik [Tue, 9 Dec 2014 15:46:37 +0000 (15:46 +0000)]
Merge "Fix checkstyle warnings in yang-test."

9 years agoMerge "Fix checkstyle warnings in yang-test-plugin."
Tony Tkacik [Tue, 9 Dec 2014 15:46:30 +0000 (15:46 +0000)]
Merge "Fix checkstyle warnings in yang-test-plugin."

9 years agoMerge "Fix checkstyle warnings in yang-jmx-generator."
Tony Tkacik [Tue, 9 Dec 2014 15:46:22 +0000 (15:46 +0000)]
Merge "Fix checkstyle warnings in yang-jmx-generator."

9 years agoMerge "Fix checkstyle warnings in yang-jmx-generator-plugin"
Tony Tkacik [Tue, 9 Dec 2014 15:46:13 +0000 (15:46 +0000)]
Merge "Fix checkstyle warnings in yang-jmx-generator-plugin"

9 years agoMerge "Fix checkstyle warnings in yang-jmx-generator-it."
Tony Tkacik [Tue, 9 Dec 2014 15:46:05 +0000 (15:46 +0000)]
Merge "Fix checkstyle warnings in yang-jmx-generator-it."

9 years agoMerge "Fix checkstyle warnings in threadpool-config-impl"
Tony Tkacik [Tue, 9 Dec 2014 15:45:58 +0000 (15:45 +0000)]
Merge "Fix checkstyle warnings in threadpool-config-impl"

9 years agoMerge "Fix checkstyle warnings in netty-timer-config"
Tony Tkacik [Tue, 9 Dec 2014 15:45:51 +0000 (15:45 +0000)]
Merge "Fix checkstyle warnings in netty-timer-config"

9 years agoFix checkstyle warnings in yang-test. 07/13007/8
Marian Dubai [Thu, 20 Nov 2014 12:13:13 +0000 (13:13 +0100)]
Fix checkstyle warnings in yang-test.

Change-Id: I82e31fbcb5a375d009556f2163829f1beff7cc5b
Signed-off-by: Marian Dubai <mdubai@cisco.com>
9 years agoFix checkstyle warnings in yang-test-plugin. 06/13006/9
Marian Dubai [Thu, 20 Nov 2014 12:12:21 +0000 (13:12 +0100)]
Fix checkstyle warnings in yang-test-plugin.

Change-Id: Ic89f1d2c4006181d8cfdcf0a4c1f71a468e977b7
Signed-off-by: Marian Dubai <mdubai@cisco.com>
9 years agoFix checkstyle warnings in yang-jmx-generator. 05/13005/9
Marian Dubai [Thu, 20 Nov 2014 12:11:16 +0000 (13:11 +0100)]
Fix checkstyle warnings in yang-jmx-generator.

Change-Id: I0bb7cb63e6e75f24d293e6ceaad0ab6ec4e8d458
Signed-off-by: Marian Dubai <mdubai@cisco.com>
9 years agoFix checkstyle warnings in yang-jmx-generator-plugin 04/13004/10
Marian Dubai [Thu, 20 Nov 2014 12:10:18 +0000 (13:10 +0100)]
Fix checkstyle warnings in yang-jmx-generator-plugin

Change-Id: I2c1d564b8ddbc04beaa0f2a1914fb6c64bfc2dfb
Signed-off-by: Marian Dubai <mdubai@cisco.com>
9 years agoFix checkstyle warnings in yang-jmx-generator-it. 03/13003/10
Marian Dubai [Thu, 20 Nov 2014 12:09:18 +0000 (13:09 +0100)]
Fix checkstyle warnings in yang-jmx-generator-it.

Change-Id: I448d07b553bdf432e2fe709947cb45d96af4426b
Signed-off-by: Marian Dubai <mdubai@cisco.com>
9 years agoFix checkstyle warnings in threadpool-config-impl 02/13002/10
Marian Dubai [Thu, 20 Nov 2014 12:08:15 +0000 (13:08 +0100)]
Fix checkstyle warnings in threadpool-config-impl

Change-Id: If16877977975fa07190ea8c245be3a80264a29ec
Signed-off-by: Marian Dubai <mdubai@cisco.com>
9 years agoFix checkstyle warnings in netty-timer-config 01/13001/11
Marian Dubai [Thu, 20 Nov 2014 10:17:30 +0000 (11:17 +0100)]
Fix checkstyle warnings in netty-timer-config

Change-Id: I8c2127cfd7cf00edc8ffcc90882ec2965f4bb775
Signed-off-by: Marian Dubai <mdubai@cisco.com>
9 years agoAdditional checkstyle fixes. Checkstyle validation fail enabled 11/12911/7
Marian Dubai [Tue, 18 Nov 2014 11:53:01 +0000 (12:53 +0100)]
Additional checkstyle fixes. Checkstyle validation fail enabled

Change-Id: Ie6052a2ed10e2964f3da56f1832a797e700dc2f6
Signed-off-by: Marian Dubai <mdubai@cisco.com>
9 years agoFix duplicate dependency warnings 50/13150/6
Thanh Ha [Wed, 26 Nov 2014 19:18:56 +0000 (14:18 -0500)]
Fix duplicate dependency warnings

Reorganizes dependencies to be neater as well as resolve duplicate
dependencies that were causing Maven to throw warnings.

Change-Id: Id3bfa285df3beabb95a813509294fd288ee90e6e
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoFix Sonar Bad practice - Method may fail to close stream 60/13060/6
Thanh Ha [Sat, 22 Nov 2014 23:30:30 +0000 (18:30 -0500)]
Fix Sonar Bad practice - Method may fail to close stream

Change-Id: I8360fce5e14a0b90134004e3255ee979fc73dfa3
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoMerge changes I26ca5aba,Ia615dbd4
Tony Tkacik [Mon, 8 Dec 2014 14:58:28 +0000 (14:58 +0000)]
Merge changes I26ca5aba,Ia615dbd4

* changes:
  BUG-2459: optimize NetconfOperationRouterImpl operations
  BUG-2459: Reuse SAXTransformerFactory in EXI decoder

9 years agoMerge "BUG-2459: do not convert NetconfMessage"
Tony Tkacik [Mon, 8 Dec 2014 09:57:43 +0000 (09:57 +0000)]
Merge "BUG-2459: do not convert NetconfMessage"

9 years agoBUG-2459: optimize NetconfOperationRouterImpl operations 06/13406/4
Robert Varga [Fri, 5 Dec 2014 09:38:26 +0000 (10:38 +0100)]
BUG-2459: optimize NetconfOperationRouterImpl operations

Ensure operations are created immutable at initialization, thus removing
the need for synchronization and speeding up lookups.

Change-Id: I26ca5aba435d989689994364c53b4d27c7eccd84
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Fix improper cleanup of operational data in sal-netconf-connector's disconnect"
Tony Tkacik [Mon, 8 Dec 2014 09:08:11 +0000 (09:08 +0000)]
Merge "Fix improper cleanup of operational data in sal-netconf-connector's disconnect"

9 years agoMerge "Fix channelInactive event handling in the netty pipeline for netconf."
Tony Tkacik [Mon, 8 Dec 2014 09:07:36 +0000 (09:07 +0000)]
Merge "Fix channelInactive event handling in the netty pipeline for netconf."

9 years agoMerge "Remove logged unstubbed exception in test for netconf-monitoring"
Tony Tkacik [Mon, 8 Dec 2014 09:07:27 +0000 (09:07 +0000)]
Merge "Remove logged unstubbed exception in test for netconf-monitoring"

9 years agoBUG-2459: Reuse SAXTransformerFactory in EXI decoder 06/13306/13
Robert Varga [Tue, 2 Dec 2014 13:19:49 +0000 (14:19 +0100)]
BUG-2459: Reuse SAXTransformerFactory in EXI decoder

Rather than allocating the same factory over and over, create a single
instance for reuse.

Change-Id: Ia615dbd462527addadb03a5f2e54618438fb1612
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-2459: do not convert NetconfMessage 84/13384/5
Robert Varga [Thu, 4 Dec 2014 22:55:47 +0000 (23:55 +0100)]
BUG-2459: do not convert NetconfMessage

Router's onNetconfMessage shows up as a hotspot in performance traces,
which turns out to be another case of coversion of XML document to a
string just for debugging/error handling purposes.

In case of a debug + error we are taking the hit of one toString()
operation, but that should be fine. We make that up by being smarter
about creating maps in the error path.

Change-Id: I78ec6ad44c4689b67bbc51184465c5092b0d8657
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Speed up chunked framing"
Tony Tkacik [Mon, 8 Dec 2014 09:02:25 +0000 (09:02 +0000)]
Merge "Speed up chunked framing"

9 years agoMerge "Remove duplicate dependency declaration"
Tony Tkacik [Mon, 8 Dec 2014 09:01:42 +0000 (09:01 +0000)]
Merge "Remove duplicate dependency declaration"

9 years agoSpeed up chunked framing 13/13413/3
Robert Varga [Fri, 5 Dec 2014 12:37:41 +0000 (13:37 +0100)]
Speed up chunked framing

Instead of allocating temporary byte arrays and ByteBufs, insert chunk
headers explicitly and transfer bytes directly from input message to
output.

Change-Id: Id300cbb9bc39b36e9a07def3d50c948edda7f570
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoFix improper cleanup of operational data in sal-netconf-connector's disconnect 20/13420/1
Maros Marsalek [Fri, 5 Dec 2014 13:31:37 +0000 (14:31 +0100)]
Fix improper cleanup of operational data in sal-netconf-connector's disconnect

Use put instead of merge to fully replace operational data on ever yupdate

Change-Id: I8ebf19a9bcfaba9cc56be6967999754265e44236
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoFix channelInactive event handling in the netty pipeline for netconf. 17/13417/1
Maros Marsalek [Fri, 5 Dec 2014 13:28:31 +0000 (14:28 +0100)]
Fix channelInactive event handling in the netty pipeline for netconf.

Reoreding events from AsyncSshHandler.
+ Moving ClosedChannelHandler from Reconnect promise at the end of the pipeline.
+ Add channel id to toString() of abstract netconf session

Change-Id: I9884c2b8d8b2d89878e2fe5cb43fda7a98be5b23
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoRemove logged unstubbed exception in test for netconf-monitoring 45/13345/2
Maros Marsalek [Wed, 3 Dec 2014 16:45:23 +0000 (17:45 +0100)]
Remove logged unstubbed exception in test for netconf-monitoring

Change-Id: I68d3cac8626c2d555ee4775add14394cbbbe94e6
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoMerge changes I07a18f32,I8a1a0129
Tony Tkacik [Fri, 5 Dec 2014 11:22:17 +0000 (11:22 +0000)]
Merge changes I07a18f32,I8a1a0129

* changes:
  Implement NetconfMessage.toString()
  Cleanup message logging in netconf handlers

9 years agoMerge "BUG-2459: Default to byte-aligned encoding"
Tony Tkacik [Fri, 5 Dec 2014 11:21:57 +0000 (11:21 +0000)]
Merge "BUG-2459: Default to byte-aligned encoding"

9 years agoMerge "BUG-2477 Remove unused pax-exam plugin from netconf-it"
Anil Vishnoi [Fri, 5 Dec 2014 10:48:48 +0000 (10:48 +0000)]
Merge "BUG-2477 Remove unused pax-exam plugin from netconf-it"

9 years agoRemove duplicate dependency declaration 97/13197/2
Robert Varga [Fri, 28 Nov 2014 12:40:48 +0000 (13:40 +0100)]
Remove duplicate dependency declaration

These are duplicates, triggering maven warnings. Get rid of them.

Change-Id: I88b258eb3d3a22f4c278ee3ae21e9f402220ee04
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "BUG-2459: Fix netconf-monitoring not reusing JAXB context"
Tony Tkacik [Fri, 5 Dec 2014 09:56:25 +0000 (09:56 +0000)]
Merge "BUG-2459: Fix netconf-monitoring not reusing JAXB context"

9 years agoImplement NetconfMessage.toString() 20/13320/5
Robert Varga [Tue, 2 Dec 2014 22:26:38 +0000 (23:26 +0100)]
Implement NetconfMessage.toString()

Rather than explicitly converting the internal document intoa string
before logging it, teach NetconfMessage how to do toString(). This way
we do not have to check Logger configuration and pass NetconfMessages
directly. The logger will cann toString() as needed.

Change-Id: I07a18f32a1500784b81f52f0412acd73123a161e
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoCleanup message logging in netconf handlers 05/13305/6
Robert Varga [Tue, 2 Dec 2014 13:14:39 +0000 (14:14 +0100)]
Cleanup message logging in netconf handlers

This wraps LOG.trace() invocations in LOG.isTraceEnabled(), as they
construct potentially big objects which may end up being unused.

Also cleans up method declarations to not use Exception, as Sonar warns
about these.

Change-Id: I8a1a01291b04eea0823b72e254f9ca4cc11557ea
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG 2463 - Changing setting for shard-snapshot-data-threshold-percentage does not... 41/13341/2
Moiz Raja [Wed, 3 Dec 2014 13:20:33 +0000 (05:20 -0800)]
BUG 2463 - Changing setting for shard-snapshot-data-threshold-percentage does not work

This was missed by the commit which introduced this setting. It was not read from the config
and set on the DataStoreContext. This meant that the default (12 percent) was used regardless
of the actual setting.

Also changed the name of the stat to InMemoryJournalDataSize instead of just DataSize to be
more clear

Change-Id: Iaffddb3e614db7a270d847ba219801e36c8a64e0
Signed-off-by: Moiz Raja <moraja@cisco.com>
9 years agoMerge "Make neutron a simple osgi app"
Moiz Raja [Thu, 4 Dec 2014 23:14:21 +0000 (23:14 +0000)]
Merge "Make neutron a simple osgi app"

9 years agoMake neutron a simple osgi app 54/12654/14
Ed Warnicke [Fri, 7 Nov 2014 21:15:58 +0000 (15:15 -0600)]
Make neutron a simple osgi app

Change-Id: I57aabd9db316632d6051eae477ea8a9882699d7f
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoBUG-2477 Remove unused pax-exam plugin from netconf-it 72/13372/3
Vaclav Demcak [Thu, 4 Dec 2014 21:15:38 +0000 (22:15 +0100)]
BUG-2477 Remove unused pax-exam plugin from netconf-it

+ remove version depend. in for pax-exam in adsal/commons/integrationtest

Change-Id: Ib077603f23072a1c56f6d39c51ad29bb7d7d8ad7
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
9 years agoBUG-2459: Fix netconf-monitoring not reusing JAXB context 73/13373/2
Robert Varga [Thu, 4 Dec 2014 16:22:16 +0000 (17:22 +0100)]
BUG-2459: Fix netconf-monitoring not reusing JAXB context

JAXBContext can be freely reused, so cache it, as it has significant
footprint in testing tool.

Change-Id: If2f53b9dfd4a1d30390580fd800aa2f5eb4e2b72
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-2459: Default to byte-aligned encoding 78/13378/1
Robert Varga [Thu, 4 Dec 2014 19:06:13 +0000 (20:06 +0100)]
BUG-2459: Default to byte-aligned encoding

Switches from preCompress encoding, and optimizes things a bit more.

Change-Id: I77afc3e7c105d5a5711852f3f63a63bada96613f
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Fix bug 2450 - Statistics collection slow - performance"
Anil Vishnoi [Wed, 3 Dec 2014 11:30:37 +0000 (11:30 +0000)]
Merge "Fix bug 2450 - Statistics collection slow - performance"

9 years agoMerge "Do not force toString() in NetconfClientSession"
Tony Tkacik [Wed, 3 Dec 2014 10:28:18 +0000 (10:28 +0000)]
Merge "Do not force toString() in NetconfClientSession"

9 years agoMerge "Refactor DOMDataBrokerImpl"
Tony Tkacik [Wed, 3 Dec 2014 10:28:00 +0000 (10:28 +0000)]
Merge "Refactor DOMDataBrokerImpl"

9 years agoMerge "Add MD-SAL artifacts"
Tony Tkacik [Wed, 3 Dec 2014 10:27:44 +0000 (10:27 +0000)]
Merge "Add MD-SAL artifacts"

9 years agoMerge "Remove use of xtend"
Tony Tkacik [Wed, 3 Dec 2014 10:26:32 +0000 (10:26 +0000)]
Merge "Remove use of xtend"

9 years agoMerge "Fix checkstyle warnings in netty-threadgroup-config."
Tony Tkacik [Wed, 3 Dec 2014 09:26:58 +0000 (09:26 +0000)]
Merge "Fix checkstyle warnings in netty-threadgroup-config."

9 years agoMerge "Fix checkstyle warnings in netty-event-executor-config."
Tony Tkacik [Wed, 3 Dec 2014 09:26:50 +0000 (09:26 +0000)]
Merge "Fix checkstyle warnings in netty-event-executor-config."

9 years agoMerge "Fix checkstyle warnings in logback-config"
Tony Tkacik [Wed, 3 Dec 2014 09:26:42 +0000 (09:26 +0000)]
Merge "Fix checkstyle warnings in logback-config"

9 years agoMerge "Fix checkstyle warnings in netconf-util"
Tony Tkacik [Wed, 3 Dec 2014 09:26:34 +0000 (09:26 +0000)]
Merge "Fix checkstyle warnings in netconf-util"

9 years agoMerge "BUG-8: migrate newMBeanProxy() -> newMXBeanProxy()"
Tony Tkacik [Wed, 3 Dec 2014 09:26:27 +0000 (09:26 +0000)]
Merge "BUG-8: migrate newMBeanProxy() -> newMXBeanProxy()"

9 years agoFix bug 2450 - Statistics collection slow - performance 28/13328/2
Vaclav Demcak [Tue, 2 Dec 2014 10:36:34 +0000 (11:36 +0100)]
Fix bug 2450 - Statistics collection slow - performance

* fix timeout value for statWaiter to notification (30 sec is mistake - 3sec is correct value)
* add check TransactionId for every notification (prevent unexpected notification for collecting next statistics)
* timeout has to clear TransactionId (prevention for notification from slower statistics processes

* patch 3  - revert the log level msg (debuging issue in StatPermCollectorImpl)
- change an expiration calculation for cached RPC results (StatRpcMsgManagerImpl)
- fix conditions for call notifyToCollectNextStat (Meter, Group)

succesfull tested for karaf-compatible

Change-Id: I54d7fe9e5c1a5d265c9378507fce1163691b62e5
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
9 years agoDo not force toString() in NetconfClientSession 15/13315/2
Robert Varga [Tue, 2 Dec 2014 17:27:20 +0000 (18:27 +0100)]
Do not force toString() in NetconfClientSession

Passing 'this' will cause toString() to be invoked if needed.

Change-Id: I3859cee6aafd26bf57107f66fb20695b3df15c93
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoRefactor DOMDataBrokerImpl 78/13078/6
Robert Varga [Mon, 24 Nov 2014 14:15:42 +0000 (15:15 +0100)]
Refactor DOMDataBrokerImpl

This patch shuffles the abstractions, eliminating two intermediate
interfaces and ensuring proper layring is maintained with
AbstractDataBroker serving as a base for the Concurrent and Serialized
versions.

Change-Id: If363aa796db0c2ebf22fdefe7659dd428745dc75
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Handle more specific BindException and IOException"
Ed Warnicke [Tue, 2 Dec 2014 16:21:52 +0000 (16:21 +0000)]
Merge "Handle more specific BindException and IOException"

9 years agoMerge "Fix allowable Unix ports range 1024 - 65535"
Ed Warnicke [Tue, 2 Dec 2014 16:20:59 +0000 (16:20 +0000)]
Merge "Fix allowable Unix ports range 1024 - 65535"

9 years agoMerge "BUG 2335 : Add jolokia feature"
Ed Warnicke [Tue, 2 Dec 2014 14:49:28 +0000 (14:49 +0000)]
Merge "BUG 2335 : Add jolokia feature"

9 years agoBUG 2335 : Add jolokia feature 72/12772/7
Moiz Raja [Wed, 12 Nov 2014 00:55:45 +0000 (16:55 -0800)]
BUG 2335 : Add jolokia feature

This is to make it easy to install jolokia. Earlier it was
possible to install the jolokia bundle the feature just makes
it more convenient.

With this patch I have created a placeholder for extra features. This is
where tiny little utility features of the controller can be put in.

Change-Id: Ifd980656d368902b13834e1e77783151536ca87c
Signed-off-by: Moiz Raja <moraja@cisco.com>
9 years agoBug 2175 - Migrate frm, statistics and inventory manager to config subsystem 03/13303/3
Vaclav Demcak [Tue, 2 Dec 2014 11:10:18 +0000 (12:10 +0100)]
Bug 2175 - Migrate frm, statistics and inventory manager to config subsystem

* migrated statistics manager to config subsystem
* updated tests
* patch resolves Bug 1646 and Bug 2079
* Patch Set 6 - add log.warn msg for a fail loading xml ConfigSubsystem input value + fix MIN_REQUEST_NET_MONITOR_INTERVAL_DEFAULT to 3sec (follow Anil's comment)

Change-Id: I67d398c82c3dafbb2ef759d07a80d17ad6656c1e
Signed-off-by: Jan Hajnar <jhajnar@cisco.com>
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
9 years agoMerge "Bug 2415: Fixed intermittent RpcRegistry unit test failures"
Moiz Raja [Tue, 2 Dec 2014 01:19:37 +0000 (01:19 +0000)]
Merge "Bug 2415: Fixed intermittent RpcRegistry unit test failures"

9 years agoMerge "BUG 2437 - Enable snapshotting based on size of data in the in-memory journal"
Tom Pantelis [Mon, 1 Dec 2014 22:03:00 +0000 (22:03 +0000)]
Merge "BUG 2437 - Enable snapshotting based on size of data in the in-memory journal"

9 years agoMerge "bug 2266 : added more types of schema nodes to increase code coverage"
Moiz Raja [Mon, 1 Dec 2014 21:59:11 +0000 (21:59 +0000)]
Merge "bug 2266 : added more types of schema nodes to increase code coverage"

9 years agoHandle more specific BindException and IOException 77/13177/2
Thanh Ha [Thu, 27 Nov 2014 20:22:54 +0000 (15:22 -0500)]
Handle more specific BindException and IOException

It is good pratice to handle specific exceptions rather than using the
catch all generic Exception.

This code change handles the java.net.BindException such that if an port
is already in use we skip creating the simulated device on that port.

IOException will display the failure message and exception and not cause
additional attempts.

Change-Id: I7cbf3aa7016b0589f8fdd3f6476006954068a9a0
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>