netconf.git
5 years agoNETCONF-542: PUT request return 500 if operational data are used 46/72446/3
miroslav.kovac [Tue, 29 May 2018 18:09:24 +0000 (20:09 +0200)]
NETCONF-542: PUT request return 500 if operational data are used

  * Cherry-pick

Change-Id: I5e45b0276e39c3a6af647b6632b67b3f96751464
Signed-off-by: miroslav.kovac <miroslav.kovac@pantheon.tech>
5 years agoodl-netconf-api should not repackage yang-model-api 30/72630/1
Robert Varga [Mon, 4 Jun 2018 00:03:24 +0000 (02:03 +0200)]
odl-netconf-api should not repackage yang-model-api

yang-model-api should be pulled in via odl-yangtools-parser-api,
do exactly that.

Change-Id: I854f6813a378cca691d992e009a55540368ec3bf
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoRestconfDocumentedExceptionMapper not returning json 83/72583/1
Tom Pantelis [Fri, 1 Jun 2018 20:16:47 +0000 (16:16 -0400)]
RestconfDocumentedExceptionMapper not returning json

The media types returned from HttpHeaders returns wildcard type "/"
which we were incorrectly filtering out. So it was defaulting to
xml instead of json.

Change-Id: I2f64840ca4bbc48651c2a8bbe72fdbbc666024a2
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
5 years agoodl-netconf-notifications-impl should pull in mdsal runtime 46/72546/1
Robert Varga [Fri, 1 Jun 2018 09:09:31 +0000 (11:09 +0200)]
odl-netconf-notifications-impl should pull in mdsal runtime

Rather than repackaging upstream artifacts, depend on
odl-mdsal-binding-runtime.

Change-Id: I699ab19bc9bdcc115b80a689f0f8c3dbdb10a9ab
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoFix jersey 2 WARNs in RestconfApplication 35/72535/2
Tom Pantelis [Thu, 31 May 2018 19:35:06 +0000 (15:35 -0400)]
Fix jersey 2 WARNs in RestconfApplication

16:11:13 2018-05-31T16:08:28,928 | WARN  | Blueprint Extender: 2 | Providers                        | 197 - org.glassfish.jersey.core.jersey-common - 2.25.1 | A provider org.opendaylight.netconf.sal.restconf.impl.ControllerContext registered in SERVER runtime does not implement any provider interfaces applicable in the SERVER runtime. Due to constraint configuration problems the provider org.opendaylight.netconf.sal.restconf.impl.ControllerContext will be ignored.
16:11:13 2018-05-31T16:08:28,929 | WARN  | Blueprint Extender: 2 | Providers                        | 197 - org.glassfish.jersey.core.jersey-common - 2.25.1 | A provider org.opendaylight.netconf.sal.restconf.impl.BrokerFacade registered in SERVER runtime does not implement any provider interfaces applicable in the SERVER runtime. Due to constraint configuration problems the provider org.opendaylight.netconf.sal.restconf.impl.BrokerFacade will be ignored.

We shouldn't return ControllerContext and BrokerFacade as singletons.

Change-Id: I64aa7c6da97fa12f0203b8664d07c1af04f93c6b
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
5 years agoFix RestconfDocumentedExceptionMapper exception 25/72525/1
Tom Pantelis [Thu, 31 May 2018 13:34:52 +0000 (09:34 -0400)]
Fix RestconfDocumentedExceptionMapper exception

Seen in CSIT run after jersey 2 upgrade:

2018-05-31T08:47:19,494 | ERROR | qtp315470863-147 | ServerRuntime$Responder          | 190 - org.glassfish.jersey.core.jersey-server - 2.25.1 | An exception has been thrown from an exception mapper class org.opendaylight.netconf.sal.rest.impl.RestconfDocumentedExceptionMapper.
java.lang.UnsupportedOperationException: null
at java.util.Collections$UnmodifiableList$1.remove(Collections.java:1349) [?:?]
at jersey.repackaged.com.google.common.collect.TransformedIterator.remove(TransformedIterator.java:53) [185:org.glassfish.jersey.bundles.repackaged.jersey-guava:2.25.1]
at java.util.AbstractCollection.remove(AbstractCollection.java:293) [?:?]
at org.opendaylight.netconf.sal.rest.impl.RestconfDocumentedExceptionMapper.toResponse(RestconfDocumentedExceptionMapper.java:104) [346:org.opendaylight.netconf.restconf-nb-bierman02:1.8.0.SNAPSHOT]
at org.opendaylight.netconf.sal.rest.impl.RestconfDocumentedExceptionMapper.toResponse(RestconfDocumentedExceptionMapper.java:76) [346:org.opendaylight.netconf.restconf-nb-bierman02:1.8.0.SNAPSHOT]

headers.getAcceptableMediaTypes() now returns an immutable list so rework
the code to use stream -> filter - findFirst.

Change-Id: I346c884226c1cfe3afce1b6937176f5397cc3367
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
5 years agoConvert to jersey 2 45/72245/4
Tom Pantelis [Thu, 24 May 2018 17:32:29 +0000 (13:32 -0400)]
Convert to jersey 2

JIRA: TSC-113

Change-Id: Iaed173f251fc1a38dc42d10b9257cd4531598ed5
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
5 years agoMerge changes I0587299e,I81a92c4e
Jakub Morvay [Wed, 30 May 2018 08:18:56 +0000 (08:18 +0000)]
Merge changes I0587299e,I81a92c4e

* changes:
  Add AST yang model caching to netconf connector's schema repository
  Do not parse YANG schemas into AST when checking if present

5 years agoAdd slave/master end-to-end test 17/72117/8
Tom Pantelis [Mon, 21 May 2018 14:26:52 +0000 (10:26 -0400)]
Add slave/master end-to-end test

Added a MountPointEndToEndTest that tests master and slave
mount point operations end-to-end with as little mocking as
possible. Hooks were added in NetconfTopologyContext and MasterSalFacade
for the MountPointEndToEndTest to get a hold of the MasterSalFacade
to invoke it manually to simulate backend device connectivity and to
inject the backend DOMDataBroker.

Change-Id: I5cc59987570ba4e99980af4e2f4c5adf47b6a81e
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
5 years agoAdjust to RPC method signature update 22/71222/6
Robert Varga [Mon, 23 Apr 2018 15:28:44 +0000 (17:28 +0200)]
Adjust to RPC method signature update

Input/Output structures are always present and we need to return
ListenableFuture. Also cleans up unneeded use of CheckedFuture,
reducing the number of warnings and easing future transition.

Change-Id: I517b2e6c930735c544c1582c3027891658c9e452
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoMerge changes Id268d747,Id095a4ff
Jakub Morvay [Tue, 22 May 2018 14:44:44 +0000 (14:44 +0000)]
Merge changes Id268d747,Id095a4ff

* changes:
  Mods/improvements to NetconfNodeActorTest et al
  NetconfTopologyManager and UT mods/improvements

5 years agoMerge "Slave mount point registration hardening/resiliency"
Jakub Morvay [Tue, 22 May 2018 14:32:30 +0000 (14:32 +0000)]
Merge "Slave mount point registration hardening/resiliency"

6 years agoMerge "Allow specification of ODL's HELLO message"
JakubToth [Thu, 17 May 2018 20:30:14 +0000 (20:30 +0000)]
Merge "Allow specification of ODL's HELLO message"

6 years agoMerge "Make CapabilityChangeNotificationProducer AutoClosable"
Jakub Morvay [Thu, 17 May 2018 16:56:37 +0000 (16:56 +0000)]
Merge "Make CapabilityChangeNotificationProducer AutoClosable"

6 years agoBring in org.json 40/72040/1
Ryan Goulding [Wed, 16 May 2018 15:20:55 +0000 (11:20 -0400)]
Bring in org.json

It appears that RESTCONF actually relies on org.json as a runtime
dependency and currently relies on AAA bringing it in.  AAA plans
to remove any dependency on org.json ideally in Fluorine.  As
such, have RESTCONF properly declare its dependency.

Change-Id: Ib94aef9fafd12d9646f492f63cd63be9b3e2cb09
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoMake CapabilityChangeNotificationProducer AutoClosable 26/72026/1
Marek Gradzki [Wed, 16 May 2018 06:21:17 +0000 (08:21 +0200)]
Make CapabilityChangeNotificationProducer AutoClosable

the CapabilityChangeNotificationProducer has AutoClosable dependencies
and already implements close() method.

Change-Id: I463df6b5285deb441586fcc786fd1bb53ab6734b
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
6 years agoAllow specification of ODL's HELLO message 82/70682/4
Ryan Goulding [Mon, 9 Apr 2018 22:47:29 +0000 (18:47 -0400)]
Allow specification of ODL's HELLO message

Some devices are very particular about what they will accept
for a HELLO message.  This change allows specification of a custom
message per device mount.  If one is not specified, then the
existing default is utilized.

Additionally, certain tests were using very out of date versions of
netconf-node-topology.  This is due to the fact that the test
yang files are located in src/test/resources, and were out of date
with the netconf-node-topology used in src/main/yang.  These were
updated to the most up-to-date version as of this patch.

JIRA: NETCONF-543
Change-Id: I4049a87a7781655d8d396bb35eb43aab2eca0223
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoAdd AST yang model caching to netconf connector's schema repository 16/72016/1
Maros Marsalek [Thu, 10 May 2018 14:27:49 +0000 (16:27 +0200)]
Add AST yang model caching to netconf connector's schema repository

text -> AST transformation of YANG takes majority of the time when tryinh to parse
SchemaContext. Caching is important when mounting a device where not all yang models
are valid or have their dependencies. Netconf connector tires to parse and eliminate
YANG models in a loop until a valid subset is found. Until now, the text -> AST has
been performed in each iteration, really slowing donw the mount process.

Also fix logs in NetconfDevice

Change-Id: I0587299eefdc7a813afd9967363200243b815551
Signed-off-by: Maros Marsalek <mmarsalek@frinx.io>
6 years agoMods/improvements to NetconfNodeActorTest et al 82/71982/4
Tom Pantelis [Sat, 12 May 2018 18:29:44 +0000 (14:29 -0400)]
Mods/improvements to NetconfNodeActorTest et al

Increased code coverage in NetconfNodeActor et al via new test
cases and mods to existing tests cases in NetconfNodeActorTest.

Also made other mods - see inline comments.

Change-Id: Id268d747110fe5c1b05a0c2959138661b966d0f6
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoDo not parse YANG schemas into AST when checking if present 15/72015/1
Maros Marsalek [Thu, 10 May 2018 12:31:36 +0000 (14:31 +0200)]
Do not parse YANG schemas into AST when checking if present

In the filterMissingSources method, each source was also parsed into AST
The process of text -> AST transformation is pretty expensive and not
 necessary when checking if source can be downloaded or not

Change-Id: I81a92c4eb2acbf0e17346ef62080151b8821c2b6
Signed-off-by: Maros Marsalek <mmarsalek@frinx.io>
6 years agoNetconfTopologyManager and UT mods/improvements 21/71921/2
Tom Pantelis [Fri, 11 May 2018 01:57:44 +0000 (21:57 -0400)]
NetconfTopologyManager and UT mods/improvements

NetconfTopologyManagerTest:

 - separated the test cases for successful and failed CSS registration
   to make it easier to understand/follow.

 - added additional scenarios/coverage/verification for DTCL
   create/update/replace/delete notifications.

 - removed the manipulation and direct verification of the
   NetconfTopologyManager internal maps via reflection. These
   are internal implementation details that the UTs shouldn't
   have knowledge of. The maps are indirectly verified via
   verification of the stored mocks.

 - used the real DataBroker to verify the initilization of the
   Topology nodes. This is easier than mocking a write trannsaction
   correctly.

NetconfTopologyManager:

 - changed the Maps to ConcurrentHashMap as they are accessed by
   multiple threads and could even be accessed concurrently.

 - added a hook for the UTs to create mock NetconfTopologyContexts

 - if CSS registration fails, it should just close the NetconfTopologyContext
   and not itself.

 - other minor changes.

NetconfTopologyContext:

 - implement AutoCloseable and rename closeFinal to the standard close.

 - Renamed the AtomicBooleans for clarity.

Change-Id: Id095a4ff9395d68912a92b0b59d725e062ddd9fc
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoSlave mount point registration hardening/resiliency 98/71898/6
Tom Pantelis [Thu, 10 May 2018 01:38:01 +0000 (21:38 -0400)]
Slave mount point registration hardening/resiliency

- It's possible for a message to the master to timeout in which
case the slave mount point doesn't get registered so add retries
for the AskForMasterMountPoint message in NetconfNodeManager and
schema resolution in NetconfNodeActor. The AskForMasterMountPoint
and RegisterMountPoint messages were changed to pass the
slave/master ActorRefs in order to send a success/failure reply to
the original caller.

- In NetconfNodeActor, preserve actor safety by executing
ListenableFuture callbacks via the actor's dispatch queue
(using executeInSelf) if the callback accesses actor state.

- Hardened synchronization in NetconfNodeManager and NetconfNodeManager.

- Added UTs for NetconfNodeManager to cover the slave mount point
registration scenarios.

- Added more logging where appropriate

Change-Id: I31c2d6584d56cb87c1b266565bc4b6f4a48ff303
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoMerge "Convert yanglib to new web API"
Jakub Morvay [Thu, 10 May 2018 07:52:54 +0000 (07:52 +0000)]
Merge "Convert yanglib to new web API"

6 years agoMerge "Convert apidocs to new web API"
Jakub Morvay [Wed, 9 May 2018 15:10:49 +0000 (15:10 +0000)]
Merge "Convert apidocs to new web API"

6 years agoMerge "Implement AsyncWriteTransaction.commit()"
Jakub Morvay [Wed, 9 May 2018 15:07:35 +0000 (15:07 +0000)]
Merge "Implement AsyncWriteTransaction.commit()"

6 years agoRemove controller DCL-related references 41/71841/1
Tom Pantelis [Mon, 7 May 2018 22:10:58 +0000 (18:10 -0400)]
Remove controller DCL-related references

DataChangeListener, DataChangeScope and friends are being removed
from the controller. The DataChangeScope enum is part of the NB data
change stream registration API although the implementation was removed
in Oxygen when it was internally changed to use DTCL. We may still
want/need to support the scope on top of DTCL so the enum was copied
to restconf-common.

Change-Id: If2ebe7b863975b4cae63c838d60f83b33e9e37b4
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoConvert yanglib to new web API 60/71760/1
Tom Pantelis [Thu, 3 May 2018 14:44:55 +0000 (10:44 -0400)]
Convert yanglib to new web API

Change-Id: I10b287d2aa2cb44ad11c30b69dbccc7fc725e815
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoNETCONF-536: support for <candidate> validation 17/70917/4
Marek Gradzki [Wed, 28 Mar 2018 19:52:41 +0000 (21:52 +0200)]
NETCONF-536: support for <candidate> validation

Provides support <validate> RPC, as defined in:
https://tools.ietf.org/html/rfc4741#section-8.6.

Only <candidate> datastore is supported.

Support for test-option and capability advertisement
are not included in this patch.

The actual implementation of validation process is delegated to
DOMDataTransactionValidator - an DOMDataBrokerExtension.

Change-Id: I4bbaba18d2e630787d127a51c26918d05fd7e648
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
6 years agoConvert apidocs to new web API 26/71426/3
Tom Pantelis [Thu, 26 Apr 2018 14:08:55 +0000 (10:08 -0400)]
Convert apidocs to new web API

The ApiDocGenerator and MountPointSwagger classes were overloaded to
handle draft02 and rfc8040 differences via a 'newDraft' flag. To
facilitate elimination of the static instances, the classes were
refactored to remove the flag and implement the differences via
abstract methods and derived classes.

Change-Id: I950dfceac40b0aee1bafb4d8b78d36d1ef67eadc
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoImplement AsyncWriteTransaction.commit() 45/71545/3
Tom Pantelis [Sun, 29 Apr 2018 22:51:36 +0000 (18:51 -0400)]
Implement AsyncWriteTransaction.commit()

Implement the new commit() method which uses FluentFuture
instead of the deprecated CheckedFuture. The commit() method
is defaulted in the interface but, as soon as all implementations
implement commit(), the deprecated submit() method will be defaulted
instead.

Change-Id: If053be0d3864513685a231a320a7f47931f76684
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoMerge "NETCONF-540: do not ignore namespace when building error rpc-reply"
Jakub Morvay [Fri, 27 Apr 2018 09:01:44 +0000 (09:01 +0000)]
Merge "NETCONF-540: do not ignore namespace when building error rpc-reply"

6 years agoMerge "Convert rcf8040 from web.xml to programmtic web API"
Jakub Morvay [Fri, 27 Apr 2018 07:10:41 +0000 (07:10 +0000)]
Merge "Convert rcf8040 from web.xml to programmtic web API"

6 years agoNETCONF-540: do not ignore namespace when building error rpc-reply 15/71415/2
Marek Gradzki [Fri, 20 Apr 2018 05:57:38 +0000 (07:57 +0200)]
NETCONF-540: do not ignore namespace when building error rpc-reply

use Element.getLocalName() + Element.getNamespaceURI()
instead of Element.getTagName()
to support clients using namespace prefixes.

Change-Id: I29bfa55e6ac043be6306b8da026ae5228ec9344e
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
6 years agoConvert rcf8040 from web.xml to programmtic web API 69/71269/4
Tom Pantelis [Tue, 24 Apr 2018 18:48:30 +0000 (14:48 -0400)]
Convert rcf8040 from web.xml to programmtic web API

To simplify, the noauth feature was removed. Since this is
a new API, it's been decided not to carry it forward. The
noauth feature for the bierman02 implementation was put in
and kept for legacy reasons.

Change-Id: Ic432b175fae62caee8cc641bb77c19f38a5ab6f6
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoMove TestSessionNegotiator class to separate file 99/71299/2
Marek Gradzki [Wed, 25 Apr 2018 09:20:09 +0000 (11:20 +0200)]
Move TestSessionNegotiator class to separate file

Change-Id: I20ba4048cc65c40b0b1247e3412abb5c5cb6caed
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
6 years agoNETCONF-539: use netconf namespace in base:1.1 capability check 98/71298/2
Marek Gradzki [Wed, 25 Apr 2018 07:32:57 +0000 (09:32 +0200)]
NETCONF-539: use netconf namespace in base:1.1 capability check

Use Document.getElementsByTagNameNSgetElementsByTagNameNS
with urn:ietf:params:xml:ns:netconf:base:1.0 namespace

instead of getElementsByTagName

to support clients using namespace prefixes in the hello message.

Change-Id: I333bb4522aca566b74db3e4411be1c90ec419aec
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
6 years agoMerge changes from topic 'rem_web_xml'
Jakub Morvay [Thu, 26 Apr 2018 10:38:38 +0000 (10:38 +0000)]
Merge changes from topic 'rem_web_xml'

* changes:
  Remove RestConnectorProvider
  Use DOMMountPointServiceHandler non-statically
  Use SchemaContextHandler non-statically
  Remove static TransactionChainHandler instance

6 years agoRemove RestConnectorProvider 78/71178/1
Tom Pantelis [Fri, 20 Apr 2018 18:58:40 +0000 (14:58 -0400)]
Remove RestConnectorProvider

RestConnectorProvider has been reduced to just initialize the
ServiceWrapper instance so is no longer needed. Also the ServiceWrapper
interface is no longer needed and, as a result, the ServicesWrapperImpl
class was renamed to just ServiceWrappers. The ServiceWrappers
is now instantiated/initiated via blueprint. The static instance
remains temporarily for the RestconfApplication.

Change-Id: I643d18a6980b5f51262396c49af281515b94868f
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoUse DOMMountPointServiceHandler non-statically 70/71170/1
Tom Pantelis [Fri, 20 Apr 2018 13:30:32 +0000 (09:30 -0400)]
Use DOMMountPointServiceHandler non-statically

Removed the static field in RestConnectorProvider and made the
DOMMountPointServiceHandler instance static temporarily for the
RestconfApplication but converts the rest of the code to reference
it non-statically. The static DOMMountPointServiceHandler will be
removed in a subsequent patch.

Change-Id: I92e98c4f8c15a8e77bc2e0b970e74e3fe56d58a5
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoUse SchemaContextHandler non-statically 31/71131/2
Tom Pantelis [Thu, 19 Apr 2018 22:16:03 +0000 (18:16 -0400)]
Use SchemaContextHandler non-statically

Removed the static SchemaContext field and made the SchemaContextHandler
instance static temporarily for the RestconfApplication but converts the
rest of the code to reference it non-statically. The static SchemaContextHandler
will be removed in a subsequent patch.

Change-Id: I9763ad472acdefbade511c47ee7e2f140f9d6ca1
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoRemove static TransactionChainHandler instance 09/71109/4
Tom Pantelis [Thu, 19 Apr 2018 14:17:47 +0000 (10:17 -0400)]
Remove static TransactionChainHandler instance

RestConnectorProvider maintained a static instance in order
to reset the DOMTransactionChain statically. The reset logic
was moved to TransactionChainHandler and call sites in the
static Utils were modified to pass the TransactionChainHandler via
the TransactionVarsWrapper and call reset. This allows the static
instance to be removed. The TransactionChainHandler singleton is now
created via blueprint.

Change-Id: I483ac83103286146bc636b7f1e6ba0df70f2f5a6
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoConvert bierman02 from web.xml to programmtic web API 61/71061/2
Tom Pantelis [Wed, 18 Apr 2018 01:39:22 +0000 (21:39 -0400)]
Convert bierman02 from web.xml to programmtic web API

To handle auth vs noauth, 2 new bundles were added that
import a new Bierman02WebRegistrar service advertised by
the restconf-nb-bierman02 bundle and simply invoke the
appropriate register*Authentication method.

The odl-restconf no longer installs odl-restconf-noauth nor
the aaa-shiro-act bundle. Both bundles install a new
odl-restconf-base feature and their respective
restconf-nb-bierman02-auth/restconf-nb-bierman02-noauth
bundle.

Change-Id: I93f58e791d8b9666083bd379c99a548bff6e8971
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoRemove static RestconfImpl 96/70996/1
Tom Pantelis [Mon, 16 Apr 2018 21:40:31 +0000 (17:40 -0400)]
Remove static RestconfImpl

The RestconfImpl does not need to be static as it is indirectly
shared between the web and blueprint instantiated components via
the StatisticsRestconfServiceWrapper. Also code using the
StatisticsRestconfServiceWrapper was modified to reference it
non-statically except for the RestconfApplication. This will be
cleaned up when converted to use the new programmtic web API.

Change-Id: I96a0c7724c642db9b2fbe0d78dc79c9c6efc47ad
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoUse BrokerFacade non-statically 95/70995/1
Tom Pantelis [Mon, 16 Apr 2018 18:24:59 +0000 (14:24 -0400)]
Use BrokerFacade non-statically

Similar to the previous patch that was done for ControllerContext.
keeps the static BrokerFacade instance temporarily
for the RestconfApplication but converts the rest of the code to
reference it non-statically.

Change-Id: Iafdb26200f8d645a8ed61c7006edd0b106d7d976
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoUse ControllerContext non-statically 35/70935/1
Tom Pantelis [Fri, 13 Apr 2018 23:19:10 +0000 (19:19 -0400)]
Use ControllerContext non-statically

This is a preliminary patch for removing the web.xml and converting
to the new programmtic web API which will allow us to remove the
static instances that bridge between the web-instantiated
and blueprint-instanriated components. First up is the
ControllerContext - this patch keeps the static instance temporarily
for the RestconfApplication but converts the rest of the code to
inject the ControllerContext instance and reference it non-statically.

This patch touches a lot of files but most are UTs.

Change-Id: I08e2ee24e518c01bb1d5fdb5796abd9354dccfa2
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoAdd missing synchronisation 02/70902/1
Stephen Kitt [Fri, 13 Apr 2018 09:01:31 +0000 (11:01 +0200)]
Add missing synchronisation

AbstractNetconfSessionNegotiator synchronises access to state in
changeState(); this also needs to be done in ifNegotiatedAlready.
(FindBugs now flags this and fails the build.)

Change-Id: Id2209e1987429f3b754a2c7afc1a7e47dc4135ab
Signed-off-by: Stephen Kitt <skitt@redhat.com>
6 years agoMerge "Bump to odlparent 3.1.0 and yangtools 2.0.3"
Anil Belur [Fri, 13 Apr 2018 02:49:10 +0000 (02:49 +0000)]
Merge "Bump to odlparent 3.1.0 and yangtools 2.0.3"

6 years agoMerge "fix failure during connecting device when channelActive happens later than...
Jakub Morvay [Thu, 12 Apr 2018 14:20:59 +0000 (14:20 +0000)]
Merge "fix failure during connecting device when channelActive happens later than handleMessage"

6 years agoMerge "Specify necessary dependencies"
Jakub Morvay [Thu, 12 Apr 2018 07:13:10 +0000 (07:13 +0000)]
Merge "Specify necessary dependencies"

6 years agoSpecify necessary dependencies 94/70794/1
Ryan Goulding [Wed, 11 Apr 2018 16:47:49 +0000 (12:47 -0400)]
Specify necessary dependencies

odl-restconf-common relies on AAA bringing in Jersey 1.X dependencies.
Relying on transitive dependencies is not good practice, since it
binds the upstream to providing them continuously.  AAA is undergoing
cleanup related to Jersey implementation, part of which is an experiment
to switch on Jersey 2.  In order to do this, we remove the Jersey 1
"com.sun.jersey" dependencies.  This causes RESTCONF to have missing
runtime dependencies.  This patch fixes this issue properly.

Change-Id: Idb32f44573684770b9a57675dfadf010d8a16c9e
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoMerge "Fix yanglib SFT failure"
Jakub Morvay [Wed, 11 Apr 2018 07:23:04 +0000 (07:23 +0000)]
Merge "Fix yanglib SFT failure"

6 years agoFix yanglib SFT failure 59/70759/1
Tom Pantelis [Fri, 6 Apr 2018 22:35:29 +0000 (18:35 -0400)]
Fix yanglib SFT failure

For some reason the YangLibRestApp doesn't get created which causes
BP to timeout b/c it advertises an OSGi service referenced by the
BP xml. Instead of using a service I changed it to use a static
to bridge between BP and the web app, as is done elsewhere.

Change-Id: Ia606514258d2082bf041ac81ab890f53f999ee2c
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
(cherry picked from commit c734a43d922f4603c0463e6de86c99f0ca317887)

6 years agoSpecify explicit javax.ws.rs version in yanglib 25/70725/3
Jakub Morvay [Tue, 10 Apr 2018 16:40:46 +0000 (18:40 +0200)]
Specify explicit javax.ws.rs version in yanglib

This is a follow-up patch to
https://git.opendaylight.org/gerrit/#/c/68255/. We should specify
explicit javax.ws.rs version also in netconf yanglib.

Change-Id: I4c255c5ba6ef3728226d264f755a62019e5e56ef
Signed-off-by: Jakub Morvay <jmorvay@frinx.io>
6 years agoAdd TLS option to NetonfConnectDeviceCommand. 09/70209/5
LiGuosheng [Fri, 30 Mar 2018 06:07:25 +0000 (14:07 +0800)]
Add TLS option to NetonfConnectDeviceCommand.

Add parameter protocol to support connection to a netconf device via TLS.

Change-Id: I9744e2fad71886de1c4f1f8a2d020d96d7947828
Signed-off-by: Li guosheng <li.guosheng6@zte.com.cn>
6 years agoBump to odlparent 3.1.0 and yangtools 2.0.3 68/69868/6
Stephen Kitt [Thu, 22 Mar 2018 17:24:26 +0000 (18:24 +0100)]
Bump to odlparent 3.1.0 and yangtools 2.0.3

Change-Id: I9a3afa42f9995598686daf3b2d3885e556fff70b
Signed-off-by: Stephen Kitt <skitt@redhat.com>
6 years agoRemove dependency on controller config-util 44/70444/1
Tom Pantelis [Thu, 5 Apr 2018 15:47:42 +0000 (11:47 -0400)]
Remove dependency on controller config-util

netconf uses a few classes from config-util, including
DocumentedException, XmlElement, XmlUtil, Capability etc
so copy them to netconf-api. config-util will be removed
later.

Change-Id: I440b7bcf03b5d612a81c46a16d001699bd0515da
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoRemove the config-netconf-connector 79/70379/1
Tom Pantelis [Thu, 5 Apr 2018 17:12:49 +0000 (13:12 -0400)]
Remove the config-netconf-connector

The config system is being removed in Flourine.

Change-Id: I97efbe7263773ddbf5776be51de08502717af39d
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoMerge "Remove unused controller config dependencies"
Jakub Morvay [Thu, 5 Apr 2018 16:10:10 +0000 (16:10 +0000)]
Merge "Remove unused controller config dependencies"

6 years agoDo not needlessly bridge promises 25/70225/4
Robert Varga [Sat, 31 Mar 2018 15:31:00 +0000 (17:31 +0200)]
Do not needlessly bridge promises

Channel has an alternative writeAndFlush() method, which takes
a promise to complete. Using it saves allocation of two objects
and required listener synchronization.

Change-Id: I96c933de6e3406116b30f735d480462ef6d161d8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoRemove unused controller config dependencies 40/70340/1
Tom Pantelis [Wed, 4 Apr 2018 15:51:43 +0000 (11:51 -0400)]
Remove unused controller config dependencies

Change-Id: I1cf7a694cc514359ca24ac0f646dbd3f163598a1
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoMerge "NETCONF-526 : edit-config payload default-operation needs to be set to default...
Jakub Morvay [Wed, 4 Apr 2018 08:34:19 +0000 (08:34 +0000)]
Merge "NETCONF-526 : edit-config payload default-operation needs to be set to default-value"

6 years agoRemove unneeded lambda casts 24/70224/2
Robert Varga [Sat, 31 Mar 2018 15:10:39 +0000 (17:10 +0200)]
Remove unneeded lambda casts

These callsites do not require disambiguation, remove unneeded
casts, lowering explicit dependencies.

Change-Id: Ie253a3eb48d3d18f1ca84ffe5f967c38b1f85b53
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoMerge "Fix findbugs violations in netconf"
Jakub Morvay [Sat, 31 Mar 2018 18:27:41 +0000 (18:27 +0000)]
Merge "Fix findbugs violations in netconf"

6 years agoRemove checkstyle config from child poms 12/70212/1
Tom Pantelis [Fri, 30 Mar 2018 16:49:20 +0000 (12:49 -0400)]
Remove checkstyle config from child poms

The checkstyle config is now in the parent pom.

Change-Id: Idc68c3f669d9072f45ec1503e275398a4251f043
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agofix failure during connecting device when channelActive happens later than handleMessage 38/69738/6
jiang.wei [Wed, 21 Mar 2018 07:17:36 +0000 (15:17 +0800)]
fix failure during connecting device when channelActive happens later than handleMessage

fix bug NETCONF-533
--https://jira.opendaylight.org/browse/NETCONF-533

Change-Id: I46e4a85fc7be1bc221cfbb43386eae95768ac5ac
Signed-off-by: jiang.wei <351183359@qq.com>
6 years agoFix findbugs violations in netconf 02/70202/2
Tom Pantelis [Thu, 29 Mar 2018 23:29:44 +0000 (19:29 -0400)]
Fix findbugs violations in netconf

- Field is a mutable collection which should be package protected
- Unchecked/unconfirmed cast of return value from method
- May expose internal representation by returning reference to mutable object
- May expose internal representation by incorporating reference to mutable object
- Field should be package protected
- Parameter must be non-null but is marked as nullable
- Nullcheck of value previously dereferenced
- Inconsistent synchronization
- Method ignores return value
- Boxing/unboxing to parse a primitive
- Boxed value is unboxed and then immediately reboxed
- Unchecked/unconfirmed cast
- Class implements same interface as superclass
- Switch statement found where one case falls through to the next case
- Field not initialized in constructor but dereferenced without null check
- Reliance on default encoding
- Private method is never called
- Method invokes toString() method on a String
- Possible null pointer dereference
- Consider using Locale parameterized version of invoked method
- Field not guarded against concurrent access
- Method does not release lock on all exception paths
- Inefficient use of keySet iterator instead of entrySet iterator
- Load of known null value
- Redundant nullcheck of value known to be non-null
- Non-transient non-serializable instance field in serializable class
- Class is Externalizable but doesn't define a void constructor
- Class is Serializable, but doesn't define serialVersionUID
- Class defines field that masks a superclass field
- Should be a static inner class
- Repeated conditional tests
- Format string should use %n rather than \n
- Method may fail to close stream
- Unconditional wait
- Wait not in loop
- Method concatenates strings using + in a loop
- Dead store to local variable
- Possible null pointer dereference due to return value of called method
- Useless object created

Change-Id: If4b7fe5431a4b957f344ecc4307982a40241c97b
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoMerge "Rename restconf-binding-parent -> restconf-parent"
Jakub Morvay [Thu, 29 Mar 2018 10:49:53 +0000 (10:49 +0000)]
Merge "Rename restconf-binding-parent -> restconf-parent"

6 years agoRename restconf-binding-parent -> restconf-parent 69/70169/3
Jakub Morvay [Wed, 28 Mar 2018 21:30:43 +0000 (23:30 +0200)]
Rename restconf-binding-parent -> restconf-parent

This unifies the parent names across netconf project.

Change-Id: Ic4f75b6de44d0a85e499e8a13f5cff2be570ba67
Signed-off-by: Jakub Morvay <jmorvay@frinx.io>
6 years agoFix NetconfDisconnectDeviceCommand logic error. 77/70177/1
LiGuosheng [Thu, 29 Mar 2018 01:38:20 +0000 (09:38 +0800)]
Fix NetconfDisconnectDeviceCommand logic error.

The validation check of deviceIp and devicePort should be OR, not AND.

Change-Id: I8a4ca1642d0bc6b196222ee60b6af9bf19f6330d
Signed-off-by: Li guosheng <li.guosheng6@zte.com.cn>
6 years agoMerge "Add netconf parent pom"
Jakub Morvay [Wed, 28 Mar 2018 22:52:16 +0000 (22:52 +0000)]
Merge "Add netconf parent pom"

6 years agoAdd netconf parent pom 16/70116/6
Tom Pantelis [Mon, 26 Mar 2018 19:25:07 +0000 (15:25 -0400)]
Add netconf parent pom

This centralizes common configurations for checkstyle, findbugs etc

Change-Id: Ic0b766644991a167b22b19966c494096f465f5d7
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
Signed-off-by: Jakub Morvay <jmorvay@frinx.io>
6 years agoMerge changes Id70838c2,I6201e5b7,I4eb2d1d1
Jakub Morvay [Wed, 28 Mar 2018 20:55:04 +0000 (20:55 +0000)]
Merge changes Id70838c2,I6201e5b7,I4eb2d1d1

* changes:
  Introduce AbstractNetconfOperationTest to decrease code duplication
  Introduce common parent for EditConfig and CopyConfig operations
  NETCONF-529: add support for <copy-config>

6 years agoIntroduce AbstractNetconfOperationTest to decrease code duplication 11/69611/5
Marek Gradzki [Mon, 19 Mar 2018 13:00:50 +0000 (14:00 +0100)]
Introduce AbstractNetconfOperationTest to decrease code duplication

Moves common code for NetconfOperation testing
to AbstractNetconfOperationTest.

Change-Id: Id70838c2b0c29cccb36c7a4e0c53519f65fd5bd7
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
6 years agoIntroduce common parent for EditConfig and CopyConfig operations 93/69593/8
Marek Gradzki [Sun, 18 Mar 2018 21:21:42 +0000 (22:21 +0100)]
Introduce common parent for EditConfig and CopyConfig operations

<copy-config> and <edit-config> handling shares many common patterns.

Common code was moved to AbstractEdit class
(following AbstractGet naming)
in order to reduce code duplication
and simplify implementation of both operations.

Change-Id: I6201e5b7fde6a307058e8ed20ac41f5622742024
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
6 years agoNETCONF-529: add support for <copy-config> 05/69605/4
Marek Gradzki [Wed, 14 Mar 2018 17:09:20 +0000 (18:09 +0100)]
NETCONF-529: add support for <copy-config>

While <edit-config> is enough to configure any Netconf device,
<copy-config> is more user friendly in scenarios,
when entire configuration has to be written in single request, e.g.
there is no need for explicit delete of nodes that were present in DS.

This patch adds support for <copy-config> to mdsal-netconf-connector.
Only <candidate/> is supported.

To be included in subsequent patches:
- move common test code to AbstractNetconfOperationTest
- move common edit-config and copy-config code to AbstractEdit class

Change-Id: I4eb2d1d1c82e60acc1502b01265de5ec3aab4cd8
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
6 years agoMerge "Remove deprecated AsyncWriteTransaction#commit method"
Jakub Morvay [Wed, 28 Mar 2018 14:40:42 +0000 (14:40 +0000)]
Merge "Remove deprecated AsyncWriteTransaction#commit method"

6 years agoMerge "Use odl-jackson-2.8"
Jakub Morvay [Wed, 28 Mar 2018 13:41:49 +0000 (13:41 +0000)]
Merge "Use odl-jackson-2.8"

6 years agoRemove deprecated AsyncWriteTransaction#commit method 30/69930/2
Tom Pantelis [Thu, 22 Mar 2018 23:38:01 +0000 (19:38 -0400)]
Remove deprecated AsyncWriteTransaction#commit method

This method has been deprecated for quite some time and now has a
default implementation so can be safely removed from sub-classes.

Change-Id: I118d749f744d7253651f06927f490d8f17718832
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
Signed-off-by: Jakub Morvay <jmorvay@frinx.io>
6 years agoNETCONF-526 : edit-config payload default-operation needs to be set to default-value 82/69482/4
Balaji Varadaraju [Wed, 14 Mar 2018 06:40:46 +0000 (01:40 -0500)]
NETCONF-526 : edit-config payload default-operation needs to be set to default-value

For the PUT/POST calls right now default-operation tag in the edit-config is set to
"none". As per RFC with this value devices can reject a config operation when
elements present in the request whose structure is not already present in the tree.
For example a nested parent-child structure where parent structure does not yet exist
yet in the tree may result in an error based on implementation.
We should  leave this field out ( which will default to merge) and let the device make
the right decision.

Change-Id: I8b85ef072785381897a19724dc94003b8f315bd4
Signed-off-by: Balaji Varadaraju <bvaradar@luminanetworks.com>
6 years agoMerge "NETCONF-241: Switch to using Exificient"
Jakub Morvay [Wed, 28 Mar 2018 13:07:47 +0000 (13:07 +0000)]
Merge "NETCONF-241: Switch to using Exificient"

6 years agoNETCONF-241: Switch to using Exificient 31/35131/32
Robert Varga [Wed, 17 Jan 2018 18:38:27 +0000 (19:38 +0100)]
NETCONF-241: Switch to using Exificient

Exificient has a bit nicer API, it is available from maven central and
has a friendly (MIT) license, plus the source code is on GitHub. Switch
to using it instead of OpenEXI.

Change-Id: I2cb7bf244361b021afb4cdc275e2442f5b778056
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Andrej Mak <andrej.mak@pantheon.tech>
6 years agoFix NetconfCommand test case error 53/70153/1
LiGuosheng [Wed, 28 Mar 2018 04:49:10 +0000 (12:49 +0800)]
Fix NetconfCommand test case error

In testDisconnectDeviceCommand case, there should not appear
connectDevice, but disconnectDevice.

Change-Id: Ie4e980c1400612fb33300e9a9ccbff57e85c0067
Signed-off-by: Li guosheng <li.guosheng6@zte.com.cn>
6 years agoUse odl-jackson-2.8 24/70124/2
Stephen Kitt [Mon, 26 Mar 2018 23:52:34 +0000 (16:52 -0700)]
Use odl-jackson-2.8

We should use the odl-jackson-2.8 feature to fulfill our dependencies
on Jackson.

Change-Id: I9ed683e1221d381635eb05885e2fb25bd42eed71
Signed-off-by: Stephen Kitt <skitt@redhat.com>
6 years agoNETCONF-530 - netconf-testtool failed on start with NullPointerException 19/69719/5
Jakub Tóth [Mon, 19 Mar 2018 11:05:05 +0000 (12:05 +0100)]
NETCONF-530 - netconf-testtool failed on start with NullPointerException

missing revisions in default names of YANG models

Change-Id: I52c09699989b38ab828f99070081634dac9853ce
Signed-off-by: Jakub Tóth <jakub.toth@pantheon.tech>
6 years agoRemove unused test method 58/70058/3
Ryan Goulding [Sun, 25 Mar 2018 17:20:42 +0000 (13:20 -0400)]
Remove unused test method

This is done in preparation of Jackson removal.

Change-Id: Ie919f9a8a548f6498ab21a67b8eedd295ee898bd
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoMerge "Remove unused reference to Broker in NetconfDeviceSalProviderTest"
JakubToth [Mon, 26 Mar 2018 09:48:14 +0000 (09:48 +0000)]
Merge "Remove unused reference to Broker in NetconfDeviceSalProviderTest"

6 years agoMerge "Depend on odl-aaa-shiro-act feature instead of bundle"
JakubToth [Mon, 26 Mar 2018 09:02:35 +0000 (09:02 +0000)]
Merge "Depend on odl-aaa-shiro-act feature instead of bundle"

6 years agoRemove unused reference to Broker in NetconfDeviceSalProviderTest 32/70032/2
Tom Pantelis [Fri, 23 Mar 2018 15:25:44 +0000 (11:25 -0400)]
Remove unused reference to Broker in NetconfDeviceSalProviderTest

The Broker et el interfaces are being deprecated so remove references.

Change-Id: I17706b065f0e5503e83b37bfabe66596d563d5f1
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoDepend on odl-aaa-shiro-act feature instead of bundle 69/70069/2
Ryan Goulding [Sun, 25 Mar 2018 22:22:55 +0000 (18:22 -0400)]
Depend on odl-aaa-shiro-act feature instead of bundle

This is related to AAA-164, which involves exposing a feature for
AAA activation instead of a bundle.

JIRA: AAA-164
Change-Id: I032e7dc8afef4b053d2162194454cde73cf85f45
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoProperly specify Jackson runtime dependencies 70/70070/1
Ryan Goulding [Sun, 25 Mar 2018 22:48:37 +0000 (18:48 -0400)]
Properly specify Jackson runtime dependencies

Properly list feature dependencies for Jackson instead of relying on
AAA bringing these deps in.

Change-Id: I4857bf8498b7a64ddd12716c0a5e0b7d1d1d1928
JIRA: NETCONF-531
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoFix odl-config-netconf-connector 03/69903/1
Robert Varga [Thu, 22 Mar 2018 17:59:06 +0000 (18:59 +0100)]
Fix odl-config-netconf-connector

It should not be pulling in notifications-impl, but rather pull
it in via a feature.

Change-Id: Id49b573358df1d72685fba001247f0f1404af9cb
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoAdd odl-restconf-common 27/69827/1
Robert Varga [Thu, 22 Mar 2018 15:57:12 +0000 (16:57 +0100)]
Add odl-restconf-common

Restconf features and up duplicating a lot of common infrastructure,
make sure we package it in a common feature.

Change-Id: Ia8f69fcf5668010e3f62a6204828bf819745ca87
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoAdd the entry for using TLS protocol type 97/69597/3
LiGuosheng [Mon, 19 Mar 2018 01:16:37 +0000 (09:16 +0800)]
Add the entry for using TLS protocol type

Add TLS protocol type to the method getClientConfig of class
AbstractNetconfTopology. Add test case.

Change-Id: Ia0d32c629d21c48a65d12edc76bc0decc2a3a9f6
Signed-off-by: Li guosheng <li.guosheng6@zte.com.cn>
6 years agoMerge "NETCONF-525: fix netconf AuthProvider packaging"
JakubToth [Wed, 21 Mar 2018 08:02:42 +0000 (08:02 +0000)]
Merge "NETCONF-525: fix netconf AuthProvider packaging"

6 years agoNETCONF-525: fix netconf AuthProvider packaging 95/69695/1
Ryan Goulding [Tue, 20 Mar 2018 17:01:47 +0000 (13:01 -0400)]
NETCONF-525: fix netconf AuthProvider packaging

Change-Id: I79fe7d68d6f026ce22d2ced158531c26270d5105
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
6 years agoUse YinExportUtils.writeModuleAsYinText() 43/69443/2
Robert Varga [Tue, 13 Mar 2018 14:57:10 +0000 (15:57 +0100)]
Use YinExportUtils.writeModuleAsYinText()

This removes the use of deprecated SchemaNode-based writer in favor
of EffectiveModuleStatement-based one.

Change-Id: I89b465ad25e34be6cb23344446a4078edacd8cf5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoAdd branch for creating TLS client 81/69481/1
LiGuosheng [Wed, 14 Mar 2018 06:40:51 +0000 (14:40 +0800)]
Add branch for creating TLS client

Add TLS case to NetconfClientDispatcherImpl for creating TLS
clients.

Change-Id: I7da44d1c7c074633e7ae08b2863b4c3466066a4f
Signed-off-by: Li guosheng <li.guosheng6@zte.com.cn>
6 years agoAdd TLS client channel initializer 45/69245/4
LiGuosheng [Thu, 8 Mar 2018 01:52:46 +0000 (09:52 +0800)]
Add TLS client channel initializer

The initializer will use the SslHandlerFactory to create
SslHandler each time the channel is active.

Change-Id: Id7010f3e47d60723b4be4bd0d6f99ffcf3a67aa2
Signed-off-by: Li guosheng <li.guosheng6@zte.com.cn>
6 years agoConvert rfc8040 ListenerAdapter to DOMDataTreeChangeListener 93/69093/4
Tom Pantelis [Sat, 3 Mar 2018 18:43:55 +0000 (13:43 -0500)]
Convert rfc8040 ListenerAdapter to DOMDataTreeChangeListener

DOMDataChangeListener is scheduled for removal - the bierman02
ListenerAdapter was already converted. Also modified the
ListenerAdapter to use the org.json lib instead of the jackson
lib as the UT revealed that the jackson lib doesn't convert
the XML to JSON correctly and the bierman02 ListenerAdapter
was recently converted to use org.json.

Change-Id: I9e6778a206f412bb8498297cdcb94b77ebba25dd
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoAdd SslHandlerFactory to NetconfClientConfiguration 54/69254/2
LiGuosheng [Thu, 8 Mar 2018 08:40:15 +0000 (16:40 +0800)]
Add SslHandlerFactory to NetconfClientConfiguration

If client protocol is TLS, then add a SslHandlerFactory instance to
NetconfClientConfiguration instead of SSH AuthenticationHandler.

Change-Id: Ie0d06a31e1cfca7f78dc0721a76b4995d69cd529
Signed-off-by: Li guosheng <li.guosheng6@zte.com.cn>