diff options
author | 2018-04-13 13:38:16 +0200 | |
---|---|---|
committer | 2018-06-11 16:21:21 +0200 | |
commit | aedef4e46dac4b991072034ee07e3f35b6e5a700 (patch) | |
tree | d2670e825e34d1001b8bd3f1ad0a33804067c69f /infra/it/it-test/src/test/resources | |
parent | 9b39d6767724d824f7ed8070138319ff0411dabb (diff) |
WriteTransaction: make sure TransactionCommitFailedException is thrown
DataTreeModification.ready() used by DataModification.validate()
might throw IllegalArgumentException in case of missing mandatory nodes.
Use broader Exception type in WriteTransaction.submit()
to make sure contract defined by AsyncWriteTransaction is preserved.
Change-Id: I95cb3e1e8c6db36df90d2c78e7d63c854189e2fd
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'infra/it/it-test/src/test/resources')
4 files changed, 100 insertions, 0 deletions
diff --git a/infra/it/it-test/src/test/resources/messages/commit.xml b/infra/it/it-test/src/test/resources/messages/commit.xml new file mode 100644 index 000000000..a4a98f4ca --- /dev/null +++ b/infra/it/it-test/src/test/resources/messages/commit.xml @@ -0,0 +1,19 @@ +<!-- + ~ Copyright (c) 2018 Cisco and/or its affiliates. + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at: + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<rpc message-id="a" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"> + <commit/> +</rpc> diff --git a/infra/it/it-test/src/test/resources/messages/edit-config/edit-config-missing-mandatory-node.xml b/infra/it/it-test/src/test/resources/messages/edit-config/edit-config-missing-mandatory-node.xml new file mode 100644 index 000000000..829ef567a --- /dev/null +++ b/infra/it/it-test/src/test/resources/messages/edit-config/edit-config-missing-mandatory-node.xml @@ -0,0 +1,35 @@ +<!-- + ~ Copyright (c) 2018 Cisco and/or its affiliates. + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at: + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<rpc message-id="a" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"> + <edit-config> + <target> + <candidate/> + </target> + <default-operation>none</default-operation> + <config> + <top-container xmlns="urn:honeycomb:params:xml:ns:yang:test:validate" xmlns:a="urn:ietf:params:xml:ns:netconf:base:1.0" a:operation="create"> + <list-in-container> + <name>item1</name>> + </list-in-container> + <list-in-container> + <name>item2</name> + <description>description2</description> + </list-in-container> + </top-container> + </config> + </edit-config> +</rpc>
\ No newline at end of file diff --git a/infra/it/it-test/src/test/resources/messages/rpc-reply_ok.xml b/infra/it/it-test/src/test/resources/messages/rpc-reply_ok.xml new file mode 100644 index 000000000..df205b60b --- /dev/null +++ b/infra/it/it-test/src/test/resources/messages/rpc-reply_ok.xml @@ -0,0 +1,19 @@ +<!-- + ~ Copyright (c) 2018 Cisco and/or its affiliates. + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at: + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" message-id="a"> + <ok/> +</rpc-reply>
\ No newline at end of file diff --git a/infra/it/it-test/src/test/resources/models/test-validate.yang b/infra/it/it-test/src/test/resources/models/test-validate.yang new file mode 100644 index 000000000..144045661 --- /dev/null +++ b/infra/it/it-test/src/test/resources/models/test-validate.yang @@ -0,0 +1,27 @@ +module test-validate { + yang-version 1; + namespace "urn:honeycomb:params:xml:ns:yang:test:validate"; + prefix "td"; + + revision "2018-06-08" { + description "Initial revision"; + } + + container top-container { + leaf name { + type string; + } + list list-in-container { + key "name"; + + leaf name { + type string; + } + + leaf description { + type string; + mandatory true; + } + } + } +} |