Ed Warnicke [Sun, 8 Dec 2013 16:22:08 +0000 (16:22 +0000)]
Merge "Fixed sal-netconf-connector readConfiguration"
Tony Tkacik [Wed, 4 Dec 2013 19:21:01 +0000 (20:21 +0100)]
Fixed sal-netconf-connector readConfiguration
- Promoted Netconf client to v1.1.
- Added reconnect retry.
- Fixed readConfiguration for mounted netconf device.
- Fixed serialization issue in restconf related to mount points with unknown schema.
Change-Id: Iefb85866cfc2fcbda5b4239ab112629f5e70e76d
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Robert Varga [Sun, 8 Dec 2013 12:57:33 +0000 (13:57 +0100)]
Fix a typo in debug message
Change-Id: Ia37a2b49ae0cfb1196997d82df04d5edb7fffba7
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
Ed Warnicke [Sat, 7 Dec 2013 22:49:51 +0000 (22:49 +0000)]
Merge "Updated xpath pointing to a module instance under services subtree."
Ed Warnicke [Sat, 7 Dec 2013 20:48:04 +0000 (20:48 +0000)]
Merge "Refactor yang-jmx-generator and -plugin to support list of dependencies."
Tomas Olvecky [Wed, 4 Dec 2013 15:57:40 +0000 (16:57 +0100)]
Refactor persister: Add ability to publish multiple snapshots while loading initial configuration.
Persister adaptors now return list of snapshots to be pushed to netconf at server startup. Persister maintains an ordered list of adaptor
instances, each with its configuration. During server startup it iterates the list backwards until non empty list of snapshot is returned.
Each snapshot can depend on different capabilities, once all capabilities for given snapshot are announced by server, persister pushes this
snapshot.
Change-Id: If73ead980c9cf8cd237af170872fbf1a491cb029
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Ed Warnicke [Fri, 6 Dec 2013 16:08:15 +0000 (16:08 +0000)]
Merge "Initial implementation of netconf monitoring module according to tools.ietf.org/html/rfc6022"
Tomas Olvecky [Thu, 5 Dec 2013 16:22:16 +0000 (17:22 +0100)]
Refactor yang-jmx-generator and -plugin to support list of dependencies.
Change-Id: I87aec9e234588d12ac5ea2dd26509de1c625bbb2
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Ed Warnicke [Fri, 6 Dec 2013 13:09:29 +0000 (13:09 +0000)]
Merge "Used log instead of exception"
msunal [Fri, 6 Dec 2013 08:53:25 +0000 (09:53 +0100)]
Used log instead of exception
- logging was added instead of throwing exception in problematic part
Change-Id: Ic1fb85db4e8eeba18a2fdaec0796c0683bf6430c
Signed-off-by: Martin Sunal <msunal@cisco.com>
Ed Warnicke [Thu, 5 Dec 2013 22:55:00 +0000 (22:55 +0000)]
Merge "netconf-ssh dependency cleanup"
Ed Warnicke [Thu, 5 Dec 2013 22:50:29 +0000 (22:50 +0000)]
Merge "Common yang and xml loader for tests"
Ed Warnicke [Thu, 5 Dec 2013 22:12:13 +0000 (22:12 +0000)]
Merge "RestconfImpl.invokeRpc method test"
Maros Marsalek [Thu, 5 Dec 2013 13:17:47 +0000 (14:17 +0100)]
Updated xpath pointing to a module instance under services subtree.
From /config/modules/module[name='hash-map-data-store']/instance[name='hash-map-data-store']
To /modules/module[type=hash-map-data-store][name=hash-map-data-store']
Affected netconf operations: get-config, edit-config.
Backwards compatibility with previous xpath version is preserved.
Change-Id: Ic7c8057811001dbec34115b3745ce42bae790a45
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Maros Marsalek [Fri, 29 Nov 2013 13:23:44 +0000 (14:23 +0100)]
Initial implementation of netconf monitoring module according to tools.ietf.org/html/rfc6022
Response from netconf GET operation now contains monitoring information about current netconf state.
Modified netconf-impl module: added monitoring capabilities to netconf-impl module exposed as OSGi service.
Added netconf-monitoring module that provides a filter for netconf GET operation
and adds monitoring information retrieved from netconf-impl to the response of the GET operation.
It implements netconf-mapping-api similar to config-netconf-connector and
currently provides information about current netconf SESSIONS and yang SCHEMAS
(these information is retrieved via the netconf monitoring OSGi service provided by netconf-impl).
Added ietf-netconf-monitoring module that contains sources generated from ietf-netconf-monitoring yang.
These sources serve as an interface between netconf-impl and netconf-monitoring.
Change-Id: I62c457cde42e01781d9039c6dde0a03115134df4
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Ed Warnicke [Wed, 4 Dec 2013 19:02:17 +0000 (19:02 +0000)]
Merge "Fixed serialization issues with Augments and java types"
Ed Warnicke [Wed, 4 Dec 2013 16:28:52 +0000 (16:28 +0000)]
Merge "client IP/port definition in configuration separation new netconf.client properties added to integration tests"
Martin Bobak [Wed, 4 Dec 2013 10:18:49 +0000 (11:18 +0100)]
netconf-ssh dependency cleanup
Change-Id: Ida6d8aa12f1609deb0f63dab86dc987edb4d299a
Signed-off-by: Martin Bobak <mbobak@cisco.com>
Ed Warnicke [Wed, 4 Dec 2013 15:19:33 +0000 (15:19 +0000)]
Merge "Created own XML mapper for translation"
Martin Bobak [Wed, 4 Dec 2013 14:09:42 +0000 (15:09 +0100)]
client IP/port definition in configuration separation
new netconf.client properties added to integration tests
Change-Id: Ic9517d19ec00b8656c29528903d538d32674a5e9
Signed-off-by: Martin Bobak <mbobak@cisco.com>
Jozef Gloncak [Wed, 4 Dec 2013 12:50:06 +0000 (13:50 +0100)]
Common yang and xml loader for tests
Class YangAndXmlAndDataSchemaLoader was created as common ancestor for
those test which need load yang files, get reference to concrete module
and concrete schema node.
DummyRpcResult class was transformed (inner Builder class including) to
generic class. Type parameter represents return type of method getResult.
Now it is possible to use DummyRpcResult also in InvokeRpcMethodTest.
Change-Id: Ib8d99596bbb16c42724ab79125f4273f9d609a50
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
Jozef Gloncak [Wed, 4 Dec 2013 10:37:32 +0000 (11:37 +0100)]
RestconfImpl.invokeRpc method test
Change-Id: I5e663c08d73fe7fe0871650d5f6b1d36de2df63f
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
Martin Bobak [Tue, 3 Dec 2013 08:24:44 +0000 (09:24 +0100)]
- added hello message with client ip and user@host trace message
- SSH bridge adds customHeader at the beginning of bridged
communication
Change-Id: I4bd1733901f3d37a5d62022bad0c39c33db8c5ed
Signed-off-by: Martin Bobak <mbobak@cisco.com>
Ed Warnicke [Tue, 3 Dec 2013 23:25:56 +0000 (23:25 +0000)]
Merge "Add support for BigDecimal to netconf mapping."
Tony Tkacik [Tue, 3 Dec 2013 19:00:20 +0000 (20:00 +0100)]
Fixed serialization issues with Augments and java types
Change-Id: I55a522423c4bb6ac809527c175d1689897c35fb2
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Maros Marsalek [Tue, 3 Dec 2013 15:37:43 +0000 (16:37 +0100)]
Add support for BigDecimal to netconf mapping.
Change-Id: Iffc1d679105899f0b66a5b62020dfedd17931b45
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
msunal [Mon, 2 Dec 2013 15:17:41 +0000 (16:17 +0100)]
Created own XML mapper for translation
- XmlMapper.java was created for translation from CompositeNode to XML
Change-Id: I880d12b7ea4046157ab7f5fe67b090fa09e0c53c
Signed-off-by: Martin Sunal <msunal@cisco.com>
Ed Warnicke [Tue, 3 Dec 2013 13:31:44 +0000 (13:31 +0000)]
Merge "- remove TLS/SSL support from netconf server and client - refactoring related to AbstractSslChannelInitializer deletion - common code of initialize method moved to AbstractChannelInitializer - refactoring sal-netconf-connector's NetconfConnectorModule - integration tests reflects current changes - netconf server activator throws InvalidStateException if initial tcp configuration is not found"
Ed Warnicke [Tue, 3 Dec 2013 12:37:16 +0000 (12:37 +0000)]
Merge "Leafref and identityref types to Json"
Martin Bobak [Mon, 2 Dec 2013 09:30:56 +0000 (10:30 +0100)]
- remove TLS/SSL support from netconf server and client
- refactoring related to AbstractSslChannelInitializer deletion
- common code of initialize method moved to AbstractChannelInitializer
- refactoring sal-netconf-connector's NetconfConnectorModule
- integration tests reflects current changes
- netconf server activator throws InvalidStateException if
initial tcp configuration is not found
Change-Id: I4fe793866cf9c1927f707943d922b36dae3c6665
Signed-off-by: Martin Bobak <mbobak@cisco.com>
Jozef Gloncak [Mon, 2 Dec 2013 11:36:12 +0000 (12:36 +0100)]
Leafref and identityref types to Json
If type of leaf or leaf-list is leafref then the referenced type
is found and its type is used to specify how will be single node value written to
output.
Path-predicate in leafref aren't supported yet.
Also reference to yang-model-util artifact was added.
Change-Id: I6af19bcda6841e07fc48469ebd556d88979f705b
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
Ed Warnicke [Mon, 2 Dec 2013 23:05:24 +0000 (23:05 +0000)]
Merge "RPC input is wrapped into RPC name element"
Ed Warnicke [Mon, 2 Dec 2013 22:43:50 +0000 (22:43 +0000)]
Merge "Added DELETE on cors.allowed.methods for a few missing nb bundles. Also added toString() method to a few Neutron backend classes."
Ed Warnicke [Mon, 2 Dec 2013 22:34:28 +0000 (22:34 +0000)]
Merge "Add numberOfBackups=1 property to config.ini's netconf.config.persister.2.properties"
Tomas Olvecky [Mon, 2 Dec 2013 16:18:08 +0000 (17:18 +0100)]
Add numberOfBackups=1 property to config.ini's netconf.config.persister.2.properties
Change-Id: I36db930ee46592dc949f37b4b19c3d4de4e8fa73
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Madhu Venugopal [Mon, 2 Dec 2013 17:36:13 +0000 (09:36 -0800)]
Added DELETE on cors.allowed.methods for a few missing nb bundles.
Also added toString() method to a few Neutron backend classes.
Change-Id: I484b785384c802bc47463567f5f0d7670eb044c3
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
msunal [Mon, 2 Dec 2013 11:31:00 +0000 (12:31 +0100)]
RPC input is wrapped into RPC name element
- input RPC section is wrapped into CompositeNode with RPC name due to MD-SAL
Change-Id: I7a49f2c5c93e53e5985606230d5d2c5b2a884ce4
Signed-off-by: Martin Sunal <msunal@cisco.com>
Ed Warnicke [Mon, 2 Dec 2013 12:34:42 +0000 (12:34 +0000)]
Merge "Fix static state in PersisterAggregatorTest causing test failures depending on order in which tests are run."
Tomas Olvecky [Mon, 2 Dec 2013 12:11:17 +0000 (13:11 +0100)]
Fix static state in PersisterAggregatorTest causing test failures depending on order in which tests are run.
Change-Id: I4e8d027a7260bf8d21c351ccf4627050b8072c4e
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Anil Vishnoi [Sun, 1 Dec 2013 09:33:30 +0000 (15:03 +0530)]
MD-SAL Statistics Manager - Minor change in group/meter type/capabilities
Group/Meter feature request is now moved to plugin. Plugin will send request
whenever switch will connect to the plugin.
Change-Id: I8821fcb6c1c3d0ebcf9df11611103e846e8c6ccf
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
Ed Warnicke [Sat, 30 Nov 2013 16:33:07 +0000 (16:33 +0000)]
Merge "Fixed PersisterAggregatorTest."
Tomas Olvecky [Sat, 30 Nov 2013 15:54:15 +0000 (16:54 +0100)]
Fix persister bug introduced in last commit.
Registering to JMX failed due to previous bugfix.
Change-Id: I8be8751e299d7f10c7ed691b9bcefbd62308fcae
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Ed Warnicke [Fri, 29 Nov 2013 15:23:13 +0000 (15:23 +0000)]
Merge "Fix bug in persister causing to persist last configuration in a loop."
Ed Warnicke [Fri, 29 Nov 2013 14:20:34 +0000 (14:20 +0000)]
Merge "Finding data nodes in choices and cases."
Tomas Olvecky [Fri, 29 Nov 2013 14:16:25 +0000 (15:16 +0100)]
Fix bug in persister causing to persist last configuration in a loop.
Change-Id: Ie2c35d5bb4aba19783b4c37d250e575fae2c50cc
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Milos Fabian [Fri, 29 Nov 2013 11:46:26 +0000 (12:46 +0100)]
Fixed PersisterAggregatorTest.
Change-Id: Iefc264ddc026df33f5a8124c17835f177627cd50
Signed-off-by: Milos Fabian <milfabia@cisco.com>
Ed Warnicke [Fri, 29 Nov 2013 12:25:31 +0000 (12:25 +0000)]
Merge "Fix race conditions between config-manager and persister."
Ed Warnicke [Fri, 29 Nov 2013 12:18:33 +0000 (12:18 +0000)]
Merge "Resolved namespace from input data"
Tomas Olvecky [Fri, 29 Nov 2013 11:17:06 +0000 (12:17 +0100)]
Fix race conditions between config-manager and persister.
Config-manager commits a blank transaction each time new ModuleFactory is discovered. At the same time
persister might try to push configuration. Add retries to both routines to overcome optimistic lock failure.
Change-Id: Ia45505d285b2eb6cc7fa949289a3fbeb4c62f9e7
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Jozef Gloncak [Fri, 29 Nov 2013 09:46:51 +0000 (10:46 +0100)]
Finding data nodes in choices and cases.
Feature was rewritten. It is no more taken into account if schemas for data
nodes at the same level are in the same case for concrete choice. This check should be done in system which takes Json as input
Change-Id: I12e9d2dd9bba21e5ec59a6864a41c4b82cb4f43f
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
msunal [Fri, 29 Nov 2013 11:34:23 +0000 (12:34 +0100)]
Resolved namespace from input data
Data of POST and PUT operations can contain namespace/module name:
- xml element can contain yang namespace
- json element can contain yang module name
Change-Id: I503c36de5cf76d6e7ca852d4b4e54e93d171920c
Signed-off-by: Martin Sunal <msunal@cisco.com>
Ed Warnicke [Fri, 29 Nov 2013 11:18:20 +0000 (11:18 +0000)]
Merge "Add support for enums as configuration attributes in config and netconf subsystem."
Ed Warnicke [Fri, 29 Nov 2013 11:17:38 +0000 (11:17 +0000)]
Merge changes Ia268965a,Iefa79f99
* changes:
Add running configuration data to get netconf operation response
Add support for configuration attributes based on yang leaves with custom types (typedef) to netconf.
Ed Warnicke [Fri, 29 Nov 2013 11:16:05 +0000 (11:16 +0000)]
Merge "Choice and case resolving in JSON output"
Ed Warnicke [Fri, 29 Nov 2013 11:12:31 +0000 (11:12 +0000)]
Merge "Add config-persister-directory-adapter. This implementation reads initial configuration from a directory. It can combine multiple files into one snapshot to be sent to netconf. It does not support writing when configuration changes."
Ed Warnicke [Fri, 29 Nov 2013 11:12:16 +0000 (11:12 +0000)]
Merge "Refactor persister to handle multiple storage engines. Allow persister to load and save configuration snapshots from/to multiple storage instances. Loading works by iterating list of storages backwards and pushing first non-empty response to netconf. This allows having a default (initial) configuration for the controller that will never be overwrittern. Saving configuration will be propagated to all storage engines except those configured as read only."
Ed Warnicke [Fri, 29 Nov 2013 11:11:59 +0000 (11:11 +0000)]
Merge "Refactor persister: require only capabilities referenced by the xml snapshot. Also repair logback bug preventing it from taking snapshot configuration."
Tomas Olvecky [Wed, 27 Nov 2013 12:52:20 +0000 (13:52 +0100)]
Add config-persister-directory-adapter.
This implementation reads initial configuration from a directory. It can combine multiple files into one snapshot to be
sent to netconf. It does not support writing when configuration changes.
Change-Id: I6d92ce6a7221c424f64b2fe07b61fee30e9590f0
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Tomas Olvecky [Wed, 27 Nov 2013 12:52:20 +0000 (13:52 +0100)]
Refactor persister to handle multiple storage engines.
Allow persister to load and save configuration snapshots from/to multiple storage instances.
Loading works by iterating list of storages backwards and pushing first non-empty response to netconf.
This allows having a default (initial) configuration for the controller that will never be overwrittern.
Saving configuration will be propagated to all storage engines except those configured as read only.
Change-Id: If4cdbb9e0c303d5ebb2a3d04a316c74ff76dfb91
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Maros Marsalek [Thu, 28 Nov 2013 09:09:24 +0000 (10:09 +0100)]
Add running configuration data to get netconf operation response
Change-Id: Ia268965a9ef64944138c3b6eb7313fd1ca606da4
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Jozef Gloncak [Thu, 28 Nov 2013 14:00:45 +0000 (15:00 +0100)]
Choice and case resolving in JSON output
Searching via choices and cases which are defined in YANG when resolving
composite node to find elements with corresponding name.
Change-Id: I4b62b323676a2cdd8212f102bcd0dbbbaf9b6c10
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
Tomas Olvecky [Wed, 27 Nov 2013 17:04:40 +0000 (18:04 +0100)]
Refactor persister: require only capabilities referenced by the xml snapshot.
Also repair logback bug preventing it from taking snapshot configuration.
Change-Id: I48c0383441bfaee3c192159f5158f833e7e1d938
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Ed Warnicke [Thu, 28 Nov 2013 20:37:31 +0000 (20:37 +0000)]
Merge "Refactor persister. Remove obsolete TLS netconf configuration. Prefix all ServiceAdaptor configurations with common namespace."
Tomas Olvecky [Wed, 27 Nov 2013 12:52:20 +0000 (13:52 +0100)]
Refactor persister.
Remove obsolete TLS netconf configuration. Prefix all ServiceAdaptor configurations with common namespace.
Change-Id: Ief5fc0a9b62bd9857f77e934d8097543c2fc7a65
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Maros Marsalek [Thu, 28 Nov 2013 12:54:50 +0000 (13:54 +0100)]
Add support for enums as configuration attributes in config and netconf subsystem.
Change-Id: Ieb6054e2136a2eaf834105f9c1cff6db8668d507
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Maros Marsalek [Wed, 27 Nov 2013 09:16:43 +0000 (10:16 +0100)]
Add support for configuration attributes based on yang leaves with custom types (typedef) to netconf.
Change-Id: Iefa79f99772eaa6a0974d6e7a106cd8c14dc648f
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Ed Warnicke [Thu, 28 Nov 2013 14:51:34 +0000 (14:51 +0000)]
Merge "Fixed handshake issues with SSH Netconf client"
Tony Tkacik [Thu, 28 Nov 2013 14:23:25 +0000 (15:23 +0100)]
Fixed handshake issues with SSH Netconf client
Change-Id: I979d64e529337a3bf1cd84f82684c5ce822a5514
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Ed Warnicke [Thu, 28 Nov 2013 11:34:00 +0000 (11:34 +0000)]
Merge "- netconf SSH bridge bundle - Implement bridge using socket - standard netconf configuration added to netconf-ssh - NetconfClietnSession no longer needs to propagate channel - introducet IOThread class for stream copy - serversession closed when -1 received - NetconfSSHActivator throws Exception where no valid configuration is found - ganymed bundle fixed to propagate whole package ch.ethz.ssh2.signature - netconf-ssh bundle added to distribution pom - netconf ssh server starting in separate thread in order to finis activator's start method"
Ed Warnicke [Thu, 28 Nov 2013 11:33:47 +0000 (11:33 +0000)]
Merge "- introduced netconf ssh wrapper bundle - incorporation of Tomas's notes - CRLF removed - introduced KeyStoreHandler for providing server keys - netconf server connection is created when subsystem 'netconf' received - data forwarding to netconf server on requestShell - netconfClientSession exposes channel - removed star imports in SocketThread - integration tests for netconf SSH - introduced SSHChannelInboudnHandler which forwards data from pipeline to SSH serer session - resolved dependencies - tests changed due netconf client sending hello message on session create, added netconf-it to main pom.xml - added logging for integration tests"
Ed Warnicke [Thu, 28 Nov 2013 10:28:01 +0000 (10:28 +0000)]
Merge changes I178e467a,Ia8720c2c
* changes:
Mark deprecated methods in DataModification as such
Remove executable permissions from pom.xml
Ed Warnicke [Thu, 28 Nov 2013 10:27:19 +0000 (10:27 +0000)]
Merge "Removed POST, PUT for /restconf/operational"
Martin Bobak [Mon, 25 Nov 2013 17:54:16 +0000 (18:54 +0100)]
- netconf SSH bridge bundle
- Implement bridge using socket
- standard netconf configuration added to netconf-ssh
- NetconfClietnSession no longer needs to propagate channel
- introducet IOThread class for stream copy
- serversession closed when -1 received
- NetconfSSHActivator throws Exception where no valid configuration
is found
- ganymed bundle fixed to propagate whole package ch.ethz.ssh2.signature
- netconf-ssh bundle added to distribution pom
- netconf ssh server starting in separate thread in order to finis
activator's start method
Change-Id: I46eac8106a0f222e432d3d8e81c85239ed04ac42
Signed-off-by: Martin Bobak <mbobak@cisco.com>
Martin Bobak [Wed, 20 Nov 2013 13:03:33 +0000 (14:03 +0100)]
- introduced netconf ssh wrapper bundle
- incorporation of Tomas's notes
- CRLF removed
- introduced KeyStoreHandler for providing server keys
- netconf server connection is created when subsystem 'netconf' received
- data forwarding to netconf server on requestShell
- netconfClientSession exposes channel
- removed star imports in SocketThread
- integration tests for netconf SSH
- introduced SSHChannelInboudnHandler which forwards data from pipeline to SSH serer session
- resolved dependencies
- tests changed due netconf client sending hello message on session create, added netconf-it to main pom.xml
- added logging for integration tests
Change-Id: I357a7118f2a34c445b0ce8cc9cbe4a7eff27a3a9
Signed-off-by: Martin Bobak <mbobak@cisco.com>
msunal [Thu, 28 Nov 2013 09:47:36 +0000 (10:47 +0100)]
Removed POST, PUT for /restconf/operational
- regarding to RFC the operations POST and PUT do not have to be allowed for client on /restconf/operational
Change-Id: Ie0e8cb07154e4a1a016090fef9645aa38b790b41
Signed-off-by: Martin Sunal <msunal@cisco.com>
Robert Varga [Tue, 26 Nov 2013 10:36:02 +0000 (11:36 +0100)]
Remove executable permissions from pom.xml
Change-Id: Ia8720c2c29e4cc1f2ac3c0d69827fe4010c5870a
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
Ed Warnicke [Wed, 27 Nov 2013 17:08:36 +0000 (17:08 +0000)]
Merge changes I6ff6c55c,I92b7e285
* changes:
Bug 165 and changed operations
Json with prefix for augmented elements
msunal [Wed, 27 Nov 2013 15:15:58 +0000 (16:15 +0100)]
Bug 165 and changed operations
Main changes according to corresponding RFC draft 01 and 02:
- corrected media types (used application/yang.data and application/vnd.yang.data)
- PUT operation was changed to POST
- POST operation was changed to PUT
There was also added media types due to Bug 165 :
- application/json
- application/xml
- text/xml
Change-Id: I6ff6c55c272cef0b63d5795d5b9842db83f1b627
Signed-off-by: Martin Sunal <msunal@cisco.com>
Jozef Gloncak [Tue, 26 Nov 2013 15:32:47 +0000 (16:32 +0100)]
Json with prefix for augmented elements
Json elements which are created via augmentation are written with
prefix which is equal to module name from where augmentation was defined.
Change-Id: I92b7e2854cea3abf052f9fadc2783d29f1e82391
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
Ed Warnicke [Tue, 26 Nov 2013 14:35:34 +0000 (14:35 +0000)]
Merge changes I0f752636,Idd154499,Ic35fa3e8
* changes:
Updated xml generated by get netconf operation to conform to yang schema in config-api
Add logback as a default config module.
Fix logging of yang parsing problems in yang-parser-impl
Ed Warnicke [Tue, 26 Nov 2013 14:23:32 +0000 (14:23 +0000)]
Merge "Better exception message in persister. Split information about missing capabilities into log message, and exception that only contains missing capabilities."
Ed Warnicke [Tue, 26 Nov 2013 14:06:16 +0000 (14:06 +0000)]
Merge "Update context-instance xpath format according to latest changes in config-api yang."
Ed Warnicke [Tue, 26 Nov 2013 14:04:46 +0000 (14:04 +0000)]
Merge "Null data from XML"
Ed Warnicke [Tue, 26 Nov 2013 14:03:22 +0000 (14:03 +0000)]
Merge changes I50218f21,I6bc2631b
* changes:
Serialization to Json improvement
Union type processing added to JsonMapper
Ed Warnicke [Tue, 26 Nov 2013 14:02:25 +0000 (14:02 +0000)]
Merge "Bug 164"
Tomas Olvecky [Tue, 26 Nov 2013 13:39:46 +0000 (14:39 +0100)]
Better exception message in persister.
Split information about missing capabilities into log message, and exception that only contains missing capabilities.
Change-Id: I5673542d14b3b8cd3ea4bcb6e0166566e9a105b8
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
msunal [Tue, 26 Nov 2013 11:41:10 +0000 (12:41 +0100)]
Serialization to Json improvement
- During serialization of List and LeafList is not get parent from composite node
but he is added as a parameter
Change-Id: I50218f2132eb571c3faf103f7914e2f49f735bf6
Signed-off-by: Martin Sunal <msunal@cisco.com>
Maros Marsalek [Tue, 26 Nov 2013 09:15:54 +0000 (10:15 +0100)]
Updated xml generated by get netconf operation to conform to yang schema in config-api
Change-Id: I0f7526369840eb83fdd83aba2459365ccbd9fd16
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Ed Warnicke [Mon, 25 Nov 2013 17:48:58 +0000 (17:48 +0000)]
Merge changes I4ba7cf7d,Ia3e319ee
* changes:
Allow multiple services provided from same namespace parsed from netconf message
Fix no response from netconf server if no operation is available to handle message.
Maros Marsalek [Mon, 25 Nov 2013 10:25:34 +0000 (11:25 +0100)]
Update context-instance xpath format according to latest changes in config-api yang.
Change-Id: I7b432ecf4703617899e5e945e900a54ec479d342
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
msunal [Mon, 25 Nov 2013 12:14:57 +0000 (13:14 +0100)]
Bug 164
- if URI has bad format then error status 400 is returned
- corrected xtend conventions: triple equals for null
Change-Id: Idfa58e21942506b7483ca6ecf19aedfd1c1de827
Signed-off-by: Martin Sunal <msunal@cisco.com>
Jozef Gloncak [Mon, 25 Nov 2013 09:42:58 +0000 (10:42 +0100)]
Null data from XML
In case of reading data from XMl to Composite node following rule was
added:
- XML with opening and closing tag without data is mapped to single node
with empty string
(e. g. <foo></foo> -> single node with empty string)
- XML with only closing tag is mapped to single node with null value (e.
g. <foo /> -> single node with null value)
Change-Id: I17ba4387949dd3cfe943999829dbcc63a29fbac8
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
Jozef Gloncak [Fri, 22 Nov 2013 09:00:19 +0000 (10:00 +0100)]
Union type processing added to JsonMapper
if data type according to schema is union then data from single node are validated as follows:
- if simple node value is null -> [null] is written to JSON
- if simple node value is number and union yang contains one of number types ->
number is written to JSON
- if simple node value si true or false and union yang contains BooleanType ->
true or false is written to JSON
- other cases are written to JSON as string (inside "")
Change-Id: I6bc2631bc9b018e9497464fac4efbc5abc726882
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
Ed Warnicke [Mon, 25 Nov 2013 09:42:51 +0000 (09:42 +0000)]
Merge "Add prefixes to type attribute in generated xml from netconf Add support for parsing prefixed type attributes from incomming xml to netconf"
Ed Warnicke [Mon, 25 Nov 2013 09:42:21 +0000 (09:42 +0000)]
Merge changes Ia09a1107,I2c30f3b6
* changes:
Change type of service-ref grouping to service-type-ref from leafref.
Fix config-netconf-connector needed for interacting with yuma's yangcli.
Maros Marsalek [Fri, 22 Nov 2013 13:42:38 +0000 (14:42 +0100)]
Allow multiple services provided from same namespace parsed from netconf message
Change-Id: I4ba7cf7d3e728be447066abc3a3c9f871faba954
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Maros Marsalek [Fri, 22 Nov 2013 13:08:30 +0000 (14:08 +0100)]
Fix no response from netconf server if no operation is available to handle message.
Change-Id: Ia3e319ee6b9d224a92def7652ed50f4ae7021b4a
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Maros Marsalek [Thu, 21 Nov 2013 16:50:31 +0000 (17:50 +0100)]
Add prefixes to type attribute in generated xml from netconf
Add support for parsing prefixed type attributes from incomming xml to netconf
Prefixed type attribute conforms to config api defined in yang
Change-Id: I4516ddb97d3fcfaab50f3402edb4a6e1bd6505cf
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Tomas Olvecky [Thu, 21 Nov 2013 16:07:26 +0000 (17:07 +0100)]
Change type of service-ref grouping to service-type-ref from leafref.
Also fix bug in config-netconf-connector where edit strategy was in global scope.
Change-Id: Ia09a11078c87ffa4c6fa8de34f0b69b438b6c50e
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Tomas Olvecky [Thu, 21 Nov 2013 12:29:09 +0000 (13:29 +0100)]
Fix config-netconf-connector needed for interacting with yuma's yangcli.
Mitigate issue when yuma is sending services/service/type with a prefix that is not referenced anywhere - it will be ignored.
When issuing edit-config with merge strategy, populate services as they appear in get-config.
Change-Id: I2c30f3b626fc25cfd3b46225d5f1c24109d655b7
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>