Updated git submodules

Updated git submodules

Project: netconf master 6d7e12bf3ef64e5004703a1d540e7e26f30a9595

Add 'protocol-framework/' from commit '5d015c2c5f800d136406c15fcb64fd531d4ffc26'

Change-Id: I206dca66b860abaa9bc25615d42703c638bf5b3f
git-subtree-dir: protocol-framework
git-subtree-mainline: 21588aadb96699b6f4f87e2cbbbb08fe1e38ed78
git-subtree-split: 5d015c2c5f800d136406c15fcb64fd531d4ffc26
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Upgrade to odlparent 2.0.2

Change-Id: I748830e39c108056ecd81809a0556e8c43d251f4
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Bump odlparent dependency to 2.0.1

Bumps odlparent to latest release.

Change-Id: Ifaf36c6539206ec5c35663717b691a0d962d1744
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Bump to odlparent 2.0.0

This takes odlparent 2.0.0, adjusts for guava update and feature
movement. Since jenkins is failing on the distro run, that is
disabled and a follow-up patch will re-enable it to get us going
again.

Change-Id: If3e1289ed7f73a79a5a47428c634bda9702e824d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Migrate to odlparent 1.9.0

Change-Id: I7d4af74e7713d48dd6ad8431229c4963423abbf6
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Remove protocol-framework config yang

The protocol-framework config yang modules aren't used, ie aren't
instantiated in any config XML file, so remove them.

Change-Id: I8cc8c8c8666ef731a2e7da20a3046300ce5aad45
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
Replace logger and log by LOG

Replace logger and log by LOG to follow the
OpenDaylight recommendations [1].

[1]
https://wiki.opendaylight.org/view/BestPractices/Logging_Best_Practices

Change-Id: I63787ccee5950bebbc8c3769885574593a666809
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>
protocol-framework: use lambdas

This series of patches uses lambdas instead of anonymous classes for
functional interfaces when possible. Lambdas are replaced with method
references when appropriate.

Change-Id: Ife557068a519c0b2822b9ee5dc4b5150373e0cf8
Signed-off-by: Stephen Kitt <skitt@redhat.com>
protocol-framework: final parameters

This automatically-generated patch flags all appropriate parameters as
final (including caught exceptions).

Change-Id: I48aac237ca7730845935e53adbbe2ce314f7c564
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Bump versions by x.(y+1).z for next dev cycle

Change-Id: Ife090ef2c9bb25e515b2fb06e2766c56d8174d76
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Drop explicit dependency on Findbugs annotations

odlparent provides jsr305, and will eventually provide annotations
instead; so the dependencies no longer need to be explicitly added to
downstream projects.

Bug: 7663
Change-Id: If8fa8b231f9cb3d4a5e4fbdbd1b58e720756f5c0
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Replace FindBugs :jsr305 by full :annotation (Bug 7663)

Change-Id: I76584c682c1e5d5acdbdb3b420f5a56da0aa363e
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Fix javadocs and enable doclint

This eliminates the doclint suppression and fixes up javadoc, so they
work with Java 8 out of the box.

Change-Id: I7294f0dcd570e3e3c445e54cc8989078175d05d7
Signed-off-by: Robert Varga <rovarga@cisco.com>
Do not use opendaylight/commons/opendaylight as parent

Change-Id: I9a858c90274c7c82bac75fc7931a10c1ff707ef8
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
Revert "Clean-up pom.xml layout"

Since this got merged, I'm facing issue building the project correctly, it's
failing in samples/toaster-it and runtime is broken because of mess-up classpath.
If others are facing the same issue, this should be merged.

I'll rework the overall patch later.

This reverts commit 8a637013c102c11323230dae08fa4407863945d6.

Change-Id: I61aae87439736d0163e6b4c49d8753052b28bac0
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
Clean-up pom.xml layout

Do not depend on opendaylight/commons/opendaylight/pom.xml

Change-Id: Ic7313dc6b703739a6c14b1f0cd1a37ba3b7827af
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
Mechanical code cleanup (commons)

* Remove unnecessary type specifiers (use Java 7 <>)
* Remove unnecessary "extends Object" declarations
* Remove unnecessary semi-colons
* Merge identical catch blocks
* Remove redundant modifiers:
  - enum constructors are private by default
  - interface properties are public static final by default
  - interface methods are public abstract by default
  - interfaces are abstract by default
  - inner interfaces are static by default
  - inner classes in interfaces are public static by default

Change-Id: If1805b63e52c1ab0c68983e7856e7ccf184cb2a9
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Bump versions by 0.1.0 for next dev cycle

Change-Id: I9c4a4b1e6d0e101392fb19dc68f814e30de4fa5c
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Switch to StandardCharsets

Guava's Charsets should not be used when StandardCharsets are
available.

Change-Id: I7c52bd3070bb48857cbba82e8d4bc5993d7aea9d
Signed-off-by: Robert Varga <rovarga@cisco.com>
Enable netty config modules to restart when blueprint container restarts

Added the necessary service properties such that when the blueprint
container is restarted on config change the associated config system
Module instances are recreated/restarted. This for backwards compatibility
for existing CSS modules that inject the netty CSS modules.

Change-Id: Icb12968805d8760cb03d3eea1e8ceda5ec1de2f5
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
Modify config Module impls to co-exist with blueprint

Modified various config system Module implementation classes which
have corresponding instances created and advertised via blueprint to
obtain the instance in createInstance from the OSGi registry. The
instance may not be available yet so it will wait. I added a
WaitingServiceTracker class to encapsulate this logic using a ServiceTracker.

For those modules that don't advertise services, createInstance simply
returns a noop AutoCloseable since the components are created via
blueprint.

I also added the new disable-osgi-service-registration flag to the
corresponding service yang identities to prevent the CSS from
duplicating the service registrations.

This patch also adds the blueprint bundle to the mdsal features and
"turns on" blueprint.

Change-Id: I60099c82a2a248fc233ad930c4808d6ab19ea881
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
Bump yangtools to 1.0.0-SNAPSHOT

Change-Id: Ic55c573d6d57b27cb8f2640c938e6b7eeb08a42f
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Bumping versions by 0.1.0 for next dev cycle

Change-Id: I2155a23eb208cc34d29b3e5ee0c8f6a3f551cacf
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Return throwable in NeverReconnectStrategy

NeverReconnectStrategy returns empty throwable instead of
passed throwabled with the failed previous
connection reasons.

Change-Id: I5695af09379f06a66c37ccf27293ff85657afeaa
Signed-off-by: Claudio D. Gasparini <cgaspari@cisco.com>
Bug 4202: Migration to use mdsal project

Migrated controller to use MD-SAL provided
Java Binding instead of YANG-Tools provided JAVA
Binding.

This migration deals only with compile time and
in runtime.

Updated following features
  - features-config
  - features-config-netty
  - features-config-persister
  - features-mdsal
  - features-extras
  - features-protocol-framework

to use
  - Java Binding hosted in MD-SAL project
  - features-parent from odlparent

Change-Id: Iba40d74d118e212c9a57fa28711bbbe339fe1bbd
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
[RFC][Fix] Fix for connection in pom.xml.

The connection value was wrong.
Apply values proposed by zxiiro.

Also fix sal-dom-xsql (wrong developerConnection).

This allows me to run  mvn site
w/o failing due to the wrong entry.

Change-Id: I15d953647a40dde4b37246a78bae120552efb15b
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Bug 3197: Netconf client not reconnecting due address unresolved

Netconf client not reconnecting, when failed 1st time due
address unresolved. InetSocketAddress remains in state unresolved,
after connection failed first time due address unresolved.
Now recreating InetSocketAddress by each reconnect,
so address is checked by each reconnect attempt.

Change-Id: I29ef130d7bf3f65023a611cee51245a6ae6f9a03
Signed-off-by: Marian Dubai <mdubai@cisco.com>
BUG 2914 TCP Options incorrect

Obvious - basic use of TCP in a double-buffering environment for command/responce protocols.

Change-Id: I4d5117039bdcdc089adb177972ab9460165d6297
Signed-off-by: Anton Ivanov <aivanov@brocade.com>
Bumped controller version by minor for next release cycle.

Change-Id: I80ea0aecf42e5ee96dcebc68af1e872b1f10e7b5
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Marked as deprecated all classes within protocol-framework.

- this part of controller will be removed between M3 and M5
- if you're using it, rewrite your code to use netty directly

Change-Id: I864b914d885e15029bca903829c683306780a69d
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
BUG-2310 - widen yang model for netconf-node.

Netconf datastore is now in topology, added connection state,
resolved/unresolved schemas with failure reasons and host to netconf node.
Deprecated old netconf node in inventory.

Change-Id: Id34a17b82420eaf69d03d72b9a1523210cc87cc2
Signed-off-by: Tomas Cere <tcere@cisco.com>
Remove unnecessary declaration of <prerequisites> in protocol-framework

Bug: 2605
Change-Id: I26a1a5434dfdb3d4e28bfd141f575991a8e91f03
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
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>
BUG-8: migrate newMBeanProxy() -> newMXBeanProxy()

newMBeanProxy() is deprecated, so migrate users over, eliminating
associated warnings.

Change-Id: Ifd9ff1146f2f0e5b2a20a55bd8c34f48f837cb01
Signed-off-by: Robert Varga <rovarga@cisco.com>
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
BUG-2340 Fix improper cleanup of resources in netconf ssh handler

This commit also fixes proper reconnect scheduling for netconf-connector.

Change-Id: I1d848af57fddc35e73596fc47f8c7318b8747130
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Fix failing reconnect test.

Test verified that session that was dropped during negotiation was not reconnected.
This is no longer true, so the test is failing. However not on jenkins.

Change-Id: I5f416a3397c33607e5004dc48f9569d9da992326
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
BUG-2207 Make reconnect promise reconnect even if session was dropped during negotiation

Change-Id: I58adc2e42bb8ce09bfb8b5cd214a91300bb2bbb0
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Incrementing versions by 0.1.0 for post-Helium master branch

* The only version not incrmented is aaa.version, which is left at
  0.1.0-SNAPSHOT since they depend on controller and can't update yet.
* To break the cyclic dependency, this patch temporarily stops running
  the netconf-connector and restconf feature tests.
* Also fixing a bug causing Errors like "Choice has two nodes case with
  same qnames".

A second patch (to be run after AAA increments their versions to
0.2.0-SNAPSHOT) wiil update aaa.version and re-enable these tests.

Change-Id: I70a3987d32504e798c5ed05a67a0a1174338844b
Signed-off-by: Colin Dixon <colin@colindixon.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
BUG-2109 : removed final modifier to allow overriding of negotiationFailed() method

Change-Id: Iffe9dcf061480844ceb8a8278997c28000ec329d
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
BUG-1621 Fix reconnecting.

Netconf-connector did not reconnect after recent changes (Ssh mina integration)
SshHandler was in pipeline after listener in reconnect, thats why the listener received no event about session down.

Change-Id: Id39062f51bc3a0caf066ca49682a2acc837b06ef
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Merge "BUG-190 Simplify reconnect logic in protocol-framework."

Fix config attributes with same names for different modules.

Yang does not allow attributes in different cases to have the same name.
In yang modules for config, the configuration is located in cases and if 2 cases in same yang module contain child with same name, the transformation of data from CompositeNode to NormalizedNode

NOTE: This might break bgpcep and SP distribution, check.

Change-Id: I9bad24df9ac149da74b745ff648c72345e33deb1
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
BUG-190 Simplify reconnect logic in protocol-framework.

- Removed duplicate code from ReconnectPromise (almost the same code in ProtocolSessionPromise)
- ReconnectPromise now only calls ProtocolSessionPromise.connect (once right away to connect initially,
then every time channel is closed by dropped session)
- Removed second ReconnectingStrategyFactory from ReconnectPromise and AbstractDispatcher.createReconnectingClient
(Kept in AbstractDispatcher for backwards compatibility as deprecated). Only one factory needed for reconnecting client
- Added unit tests to ServerTest to test different cases of reconnecting
- Slightly refactored ProtocolSessionPromise to make code more readable

Change-Id: If3af8f468e7d59822c984cf814d15460ab35921f
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Merge "Protocol framework: use pooled ByteBuf allocator"

Fix MD5 channel client channel not working

As it turns out, the client code needs the same fix server-side
received, which is to allow customizeBootstrap() to set channel.

Change-Id: I5efc541ad27bb3e317348c3bb08b13f3fd4110ed
Signed-off-by: Robert Varga <rovarga@cisco.com>
Protocol framework: use pooled ByteBuf allocator

This should enhance the default performance characteristics by reusing
ByteBufs if possible. With 4.0.19, netty keeps a thread-local cache of
direct buffers, so we should see a reduction in buffer copying, if not
other effects.

Change-Id: I81fcf380f6f3b03187000dbca0dd8507975e8dd1
Signed-off-by: Robert Varga <rovarga@cisco.com>
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>
BUG-633: allow overriding of channelFactory

It turns out netty does not let us override an already-set
channelFactory. Reorder customization to detect when such an override is
necessary.

Change-Id: I99de69b98e4034d4701313942d9ed2a09923375d
Signed-off-by: Robert Varga <rovarga@cisco.com>
Resolve Bug:681 - Fix config module registration to Service Registry.

Rework OSGi service registration during second phase commit: only service references
will be registered into SR, instead of old behaviour when each module's service
interfaces were used. Only one key-value entry is persisted in registration:
{name: name of service reference} .

Change-Id: I25249fe8f9e51570cd3ea963e91145b7e44da57d
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
 Remove version mismatch in config.version

 - End goal was to remove several config.version present in the pom, in
 the making i cleaned some of the repetition in config parent pom and
 aligned with the commons.opendaylight
- Removed some more warning on the pom files

Change-Id: I6717ceb915fe90fa7313472eb03884de9d09235d
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
Adding auto-sorting plugin to all Controller via parent/pom.xml

leveraging google's sortpom plugin, all controller poms are sorted
at build time as per the opendaylight/commons/parent/pom.xml configuration.

Sorted lists of properties, dependencies, and plugins will increase pom readability
and help prevent duplicate entry errors.

This first submission is huge as I changed one pom.xml and all are then sorted.
Only if the sortpom plugin is reconfigured will all pom's again be changed.

Note that if any pom.xml is pushed without having been through a build ... folks are
going to see pom.xml files showup as modified unintentionally.

Change-Id: I8553f38b9f0e5f6d27177ad6b9b9c35a4b43d55a
Signed-off-by: jameshall03885 <ghall@brocade.com>
Bug 651 - Added back IDE profile and changed target for yang sources

- The IDE maven profile was added back based on feedback from Giovanni Meo

- To avoid devs from having to run the IDE profile so eclipse can see the yang
generated source files, the yang source files are now generated under src/main/yang-gen-sals
or src/main/yang-gen-config instead of target/target-ide.

- The maven-clean-plugin was moved to the commons base pom and removed from
all child poms where it was specified. Thus, it will be automatically run for all
projects. The plugin's execution will clean all xtend and yang generated source dirs.

- The build-helper-maven-plugin was also moved to the commons base pom and removed from
all child poms. It will automatically run for all projects and no longer needs to be
specified in child poms. The plugin's execution will created eclipse source folders
for all xtend and yang generated source.

Tom P and Devin A really did all this work, Greg just gets credit unfairly.

Conflicts:
        opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/pom.xml

Change-Id: I8d9e403629cab2e48d03d5c7a417a02f1d878ca7
Signed-off-by: tpantelis <tpanteli@brocade.com>
Signed-off-by: jameshall03885 <ghall@brocade.com>
Signed-off-by: dbavery <devin.avery@brocade.com>
Signed-off-by: jameshall03885 <ghall@brocade.com>
BUG-633: allow bootstrap customization

Downstream projects may need to customize Bootstrap/ServerBootstrap
instances before they are used. Create two protected methods which
can be overridden to gain access to the instances before they are used.

Change-Id: Ibb45c7b99847cbe2fe8b90e8d1bf125c66a18e0d
Signed-off-by: Robert Varga <rovarga@cisco.com>
BUG-467: reconnect-strategy configuration moved into controller/commons/protocol-framework
-changed reconnect-strategy service and modules to reconnect-strategy-factory - configuration of ReconnectStrategyFactory.

Change-Id: I863cf4f7cf559504d05e14293af9d2c5e9373ca7
Signed-off-by: Milos Fabian <milfabia@cisco.com>
Suppress unchecked cast warnings

These casts are either safe, or we need to throw an exception --
ClassCast is as good an exception as any.

Change-Id: I74026fee5004984bfc18d990a3b6fee68a1fb479
Signed-off-by: Robert Varga <rovarga@cisco.com>
Introduce checked sendMessage() method

This method send a message down the socket and makes sure that
negotiation fails if the message does not reach the peer for any reason.
Subclasses should use this method instead of talking directly to the
underlying channel.

Change-Id: I5b8201caef1c4ba655dad12fb139b054b9e75f06
Signed-off-by: Robert Varga <rovarga@cisco.com>
CHange log level from warn to debug in ProtocolSessionPromise when connection attempt fails

Change-Id: I933bb145fb8dfda19a98c60cda108da078eb93e5
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Remove deprecated API elements from protocol framework

The use of these concepts has been deprecated in version 0.4.0, which
was released. The only in-tree user was netconf, which was refactored to
not to rely on these concepts, so bump the version to 0.5.0 and purge
the  code.

Change-Id: Ibf2195b51bf12ea99b8b21f3da322d666b103b5e
Signed-off-by: Robert Varga <rovarga@cisco.com>
Get rid of NetconfMessageFactory

This removes the use of deprecated ProtocolMessageFactory and
ProtocolHandlerFactory. Just instantiate appropriate Netty handlers
instead.

Change-Id: I98b6424af0256483be21c92dfdbe4c0ddbac7a9d
Signed-off-by: Robert Varga <rovarga@cisco.com>
[maven-release-plugin] prepare for next development iteration

[maven-release-plugin] prepare release master-tagforprepareonly-controller-bulk-release-2-1

Make AbstractSessionNegotiator react to exceptions

While the SessionNegotiator is present on the pipeline it should react
to exceptions happening on the channel by failing negotiation.

Change-Id: I6571dc25f17c7afe8fa4e4eb58f70ad0bb3397a4
Signed-off-by: Robert Varga <rovarga@cisco.com>
Fixed inappropriate uses of log level INFO

This is done per the recommendation here:

https://wiki.opendaylight.org/view/Draft_Syslog_Level_Settings

Change-Id: I69bbe15d81ed49511f643fd4a8c0ad60f58a0c22
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Move protocol framework from BGPCEP project

This moves the current parts of BGPCEP protocol framework into the
controller project, eliminating the circular dependency forced by
netconf being resident in this project.

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