draft-ietf-netconf-restconf-client-server-14.txt   draft-ietf-netconf-restconf-client-server-15.txt 
NETCONF Working Group K. Watsen NETCONF Working Group K. Watsen
Internet-Draft Watsen Networks Internet-Draft Watsen Networks
Intended status: Standards Track July 2, 2019 Intended status: Standards Track October 18, 2019
Expires: January 3, 2020 Expires: April 20, 2020
RESTCONF Client and Server Models RESTCONF Client and Server Models
draft-ietf-netconf-restconf-client-server-14 draft-ietf-netconf-restconf-client-server-15
Abstract Abstract
This document defines two YANG modules, one module to configure a This document defines two YANG modules, one module to configure a
RESTCONF client and the other module to configure a RESTCONF server. RESTCONF client and the other module to configure a RESTCONF server.
Both modules support the TLS transport protocol with both standard Both modules support the TLS transport protocol with both standard
RESTCONF and RESTCONF Call Home connections. RESTCONF and RESTCONF Call Home connections.
Editorial Note (To be removed by RFC Editor) Editorial Note (To be removed by RFC Editor)
skipping to change at page 2, line 11 skipping to change at page 2, line 11
o "BBBB" --> the assigned RFC value for I-D.ietf-netconf-tls-client- o "BBBB" --> the assigned RFC value for I-D.ietf-netconf-tls-client-
server server
o "CCCC" --> the assigned RFC value for I-D.ietf-netconf-http- o "CCCC" --> the assigned RFC value for I-D.ietf-netconf-http-
client-server client-server
Artwork in this document contains placeholder values for the date of Artwork in this document contains placeholder values for the date of
publication of this draft. Please apply the following replacement: publication of this draft. Please apply the following replacement:
o "2019-07-02" --> the publication date of this draft o "2019-10-18" --> the publication date of this draft
The following Appendix section is to be removed prior to publication: The following Appendix section is to be removed prior to publication:
o Appendix B. Change Log o Appendix B. Change Log
Status of This Memo Status of This Memo
This Internet-Draft is submitted in full conformance with the This Internet-Draft is submitted in full conformance with the
provisions of BCP 78 and BCP 79. provisions of BCP 78 and BCP 79.
Internet-Drafts are working documents of the Internet Engineering Internet-Drafts are working documents of the Internet Engineering
Task Force (IETF). Note that other groups may also distribute Task Force (IETF). Note that other groups may also distribute
working documents as Internet-Drafts. The list of current Internet- working documents as Internet-Drafts. The list of current Internet-
Drafts is at https://datatracker.ietf.org/drafts/current/. Drafts is at https://datatracker.ietf.org/drafts/current/.
Internet-Drafts are draft documents valid for a maximum of six months Internet-Drafts are draft documents valid for a maximum of six months
and may be updated, replaced, or obsoleted by other documents at any and may be updated, replaced, or obsoleted by other documents at any
time. It is inappropriate to use Internet-Drafts as reference time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress." material or to cite them other than as "work in progress."
This Internet-Draft will expire on January 3, 2020. This Internet-Draft will expire on April 20, 2020.
Copyright Notice Copyright Notice
Copyright (c) 2019 IETF Trust and the persons identified as the Copyright (c) 2019 IETF Trust and the persons identified as the
document authors. All rights reserved. document authors. All rights reserved.
This document is subject to BCP 78 and the IETF Trust's Legal This document is subject to BCP 78 and the IETF Trust's Legal
Provisions Relating to IETF Documents Provisions Relating to IETF Documents
(https://trustee.ietf.org/license-info) in effect on the date of (https://trustee.ietf.org/license-info) in effect on the date of
publication of this document. Please review these documents publication of this document. Please review these documents
skipping to change at page 3, line 11 skipping to change at page 3, line 11
include Simplified BSD License text as described in Section 4.e of include Simplified BSD License text as described in Section 4.e of
the Trust Legal Provisions and are provided without warranty as the Trust Legal Provisions and are provided without warranty as
described in the Simplified BSD License. described in the Simplified BSD License.
Table of Contents Table of Contents
1. Introduction . . . . . . . . . . . . . . . . . . . . . . . . 3 1. Introduction . . . . . . . . . . . . . . . . . . . . . . . . 3
1.1. Terminology . . . . . . . . . . . . . . . . . . . . . . . 4 1.1. Terminology . . . . . . . . . . . . . . . . . . . . . . . 4
2. The RESTCONF Client Model . . . . . . . . . . . . . . . . . . 4 2. The RESTCONF Client Model . . . . . . . . . . . . . . . . . . 4
2.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 4 2.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 4
2.2. Example Usage . . . . . . . . . . . . . . . . . . . . . . 6 2.2. Example Usage . . . . . . . . . . . . . . . . . . . . . . 5
2.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 9 2.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 9
3. The RESTCONF Server Model . . . . . . . . . . . . . . . . . . 17 3. The RESTCONF Server Model . . . . . . . . . . . . . . . . . . 19
3.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 18 3.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 19
3.2. Example Usage . . . . . . . . . . . . . . . . . . . . . . 19 3.2. Example Usage . . . . . . . . . . . . . . . . . . . . . . 20
3.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 23 3.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 25
4. Security Considerations . . . . . . . . . . . . . . . . . . . 35 4. Security Considerations . . . . . . . . . . . . . . . . . . . 36
5. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 36 5. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 37
5.1. The IETF XML Registry . . . . . . . . . . . . . . . . . . 36 5.1. The IETF XML Registry . . . . . . . . . . . . . . . . . . 37
5.2. The YANG Module Names Registry . . . . . . . . . . . . . 36 5.2. The YANG Module Names Registry . . . . . . . . . . . . . 38
6. References . . . . . . . . . . . . . . . . . . . . . . . . . 36 6. References . . . . . . . . . . . . . . . . . . . . . . . . . 38
6.1. Normative References . . . . . . . . . . . . . . . . . . 36 6.1. Normative References . . . . . . . . . . . . . . . . . . 38
6.2. Informative References . . . . . . . . . . . . . . . . . 38 6.2. Informative References . . . . . . . . . . . . . . . . . 39
Appendix A. Expanded Tree Diagrams . . . . . . . . . . . . . . . 39 Appendix A. Expanded Tree Diagrams . . . . . . . . . . . . . . . 41
A.1. Expanded Tree Diagram for 'ietf-restconf-client' . . . . 39 A.1. Expanded Tree Diagram for 'ietf-restconf-client' . . . . 41
A.2. Expanded Tree Diagram for 'ietf-restconf-server' . . . . 49 A.2. Expanded Tree Diagram for 'ietf-restconf-server' . . . . 53
Appendix B. Change Log . . . . . . . . . . . . . . . . . . . . . 56 Appendix B. Change Log . . . . . . . . . . . . . . . . . . . . . 63
B.1. 00 to 01 . . . . . . . . . . . . . . . . . . . . . . . . 56 B.1. 00 to 01 . . . . . . . . . . . . . . . . . . . . . . . . 63
B.2. 01 to 02 . . . . . . . . . . . . . . . . . . . . . . . . 56 B.2. 01 to 02 . . . . . . . . . . . . . . . . . . . . . . . . 63
B.3. 02 to 03 . . . . . . . . . . . . . . . . . . . . . . . . 57 B.3. 02 to 03 . . . . . . . . . . . . . . . . . . . . . . . . 63
B.4. 03 to 04 . . . . . . . . . . . . . . . . . . . . . . . . 57 B.4. 03 to 04 . . . . . . . . . . . . . . . . . . . . . . . . 63
B.5. 04 to 05 . . . . . . . . . . . . . . . . . . . . . . . . 57 B.5. 04 to 05 . . . . . . . . . . . . . . . . . . . . . . . . 64
B.6. 05 to 06 . . . . . . . . . . . . . . . . . . . . . . . . 57 B.6. 05 to 06 . . . . . . . . . . . . . . . . . . . . . . . . 64
B.7. 06 to 07 . . . . . . . . . . . . . . . . . . . . . . . . 57 B.7. 06 to 07 . . . . . . . . . . . . . . . . . . . . . . . . 64
B.8. 07 to 08 . . . . . . . . . . . . . . . . . . . . . . . . 58 B.8. 07 to 08 . . . . . . . . . . . . . . . . . . . . . . . . 64
B.9. 08 to 09 . . . . . . . . . . . . . . . . . . . . . . . . 58 B.9. 08 to 09 . . . . . . . . . . . . . . . . . . . . . . . . 64
B.10. 09 to 10 . . . . . . . . . . . . . . . . . . . . . . . . 58 B.10. 09 to 10 . . . . . . . . . . . . . . . . . . . . . . . . 65
B.11. 10 to 11 . . . . . . . . . . . . . . . . . . . . . . . . 58 B.11. 10 to 11 . . . . . . . . . . . . . . . . . . . . . . . . 65
B.12. 11 to 12 . . . . . . . . . . . . . . . . . . . . . . . . 58 B.12. 11 to 12 . . . . . . . . . . . . . . . . . . . . . . . . 65
B.13. 12 to 13 . . . . . . . . . . . . . . . . . . . . . . . . 59 B.13. 12 to 13 . . . . . . . . . . . . . . . . . . . . . . . . 65
B.14. 13 to 14 . . . . . . . . . . . . . . . . . . . . . . . . 59 B.14. 13 to 14 . . . . . . . . . . . . . . . . . . . . . . . . 66
Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . . 59 B.15. 14 to 15 . . . . . . . . . . . . . . . . . . . . . . . . 66
Author's Address . . . . . . . . . . . . . . . . . . . . . . . . 60 Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . . 66
Author's Address . . . . . . . . . . . . . . . . . . . . . . . . 67
1. Introduction 1. Introduction
This document defines two YANG [RFC7950] modules, one module to This document defines two YANG [RFC7950] modules, one module to
configure a RESTCONF client and the other module to configure a configure a RESTCONF client and the other module to configure a
RESTCONF server [RFC8040]. Both modules support the TLS [RFC8446] RESTCONF server [RFC8040]. Both modules support the TLS [RFC8446]
transport protocol with both standard RESTCONF and RESTCONF Call Home transport protocol with both standard RESTCONF and RESTCONF Call Home
connections [RFC8071]. connections [RFC8071].
1.1. Terminology 1.1. Terminology
skipping to change at page 5, line 7 skipping to change at page 4, line 37
This tree diagram only shows the nodes defined in this module; it This tree diagram only shows the nodes defined in this module; it
does show the nodes defined by "grouping" statements used by this does show the nodes defined by "grouping" statements used by this
module. module.
Please see Appendix A.1 for a tree diagram that illustrates what the Please see Appendix A.1 for a tree diagram that illustrates what the
module looks like with all the "grouping" statements expanded. module looks like with all the "grouping" statements expanded.
module: ietf-restconf-client module: ietf-restconf-client
+--rw restconf-client +--rw restconf-client
+---u restconf-client-grouping +---u restconf-client-app-grouping
grouping restconf-client-grouping grouping restconf-client-grouping
grouping restconf-client-initiate-stack-grouping
+-- (transport)
+--:(https) {https-initiate}?
+-- https
+-- tcp-client-parameters
| +---u tcpc:tcp-client-grouping
+-- tls-client-parameters
| +---u tlsc:tls-client-grouping
+-- http-client-parameters
| +---u httpc:http-client-grouping
+-- restconf-client-parameters
grouping restconf-client-listen-stack-grouping
+-- (transport)
+--:(http) {http-listen}?
| +-- FIXME
+--:(https) {https-listen}?
+-- https
+-- tcp-server-parameters
| +---u tcps:tcp-server-grouping
+-- tls-client-parameters
| +---u tlsc:tls-client-grouping
+-- http-client-parameters
| +---u httpc:http-client-grouping
+-- restconf-client-parameters
grouping restconf-client-app-grouping
+-- initiate! {https-initiate}? +-- initiate! {https-initiate}?
| +-- restconf-server* [name] | +-- restconf-server* [name]
| +-- name? string | +-- name? string
| +-- endpoints | +-- endpoints
| | +-- endpoint* [name] | | +-- endpoint* [name]
| | +-- name? string | | +-- name? string
| | +-- (transport) | | +---u restconf-client-initiate-stack-grouping
| | +--:(https) {https-initiate}?
| | +-- https
| | +-- tcp-client-parameters
| | | +---u tcpc:tcp-client-grouping
| | +-- tls-client-parameters
| | | +---u tlsc:tls-client-grouping
| | +-- http-client-parameters
| | +---u httpc:http-client-grouping
| +-- connection-type | +-- connection-type
| | +-- (connection-type) | | +-- (connection-type)
| | +--:(persistent-connection) | | +--:(persistent-connection)
| | | +-- persistent! | | | +-- persistent!
| | +--:(periodic-connection) | | +--:(periodic-connection)
| | +-- periodic! | | +-- periodic!
| | +-- period? uint16 | | +-- period? uint16
| | +-- anchor-time? yang:date-and-time | | +-- anchor-time? yang:date-and-time
| | +-- idle-timeout? uint16 | | +-- idle-timeout? uint16
| +-- reconnect-strategy | +-- reconnect-strategy
| +-- start-with? enumeration | +-- start-with? enumeration
| +-- max-attempts? uint8 | +-- max-attempts? uint8
+-- listen! {https-listen}? +-- listen! {http-listen or https-listen}?
+-- idle-timeout? uint16 +-- idle-timeout? uint16
+-- endpoint* [name] +-- endpoint* [name]
+-- name? string +-- name? string
+-- (transport) +---u restconf-client-listen-stack-grouping
+--:(https) {https-listen}?
+-- https
+-- tcp-server-parameters
| +---u tcps:tcp-server-grouping
+-- tls-client-parameters
| +---u tlsc:tls-client-grouping
+-- http-client-parameters
+---u httpc:http-client-grouping
2.2. Example Usage 2.2. Example Usage
The following example illustrates configuring a RESTCONF client to The following example illustrates configuring a RESTCONF client to
initiate connections, as well as listening for call-home connections. initiate connections, as well as listening for call-home connections.
This example is consistent with the examples presented in Section 2 This example is consistent with the examples presented in Section 2
of [I-D.ietf-netconf-trust-anchors] and Section 3.2 of of [I-D.ietf-netconf-trust-anchors] and Section 3.2 of
[I-D.ietf-netconf-keystore]. [I-D.ietf-netconf-keystore].
=========== NOTE: '\' line wrapping per BCP XX (RFC XXXX) =========== ========== NOTE: '\' line wrapping per BCP XXX (RFC XXXX) ===========
<restconf-client <restconf-client
xmlns="urn:ietf:params:xml:ns:yang:ietf-restconf-client"> xmlns="urn:ietf:params:xml:ns:yang:ietf-restconf-client">
<!-- RESTCONF servers to initiate connections to --> <!-- RESTCONF servers to initiate connections to -->
<initiate> <initiate>
<restconf-server> <restconf-server>
<name>corp-fw1</name> <name>corp-fw1</name>
<endpoints> <endpoints>
<endpoint> <endpoint>
<name>corp-fw1.example.com</name> <name>corp-fw1.example.com</name>
skipping to change at page 6, line 45 skipping to change at page 6, line 33
<tls-client-parameters> <tls-client-parameters>
<client-identity> <client-identity>
<local-definition> <local-definition>
<algorithm>rsa2048</algorithm> <algorithm>rsa2048</algorithm>
<private-key>base64encodedvalue==</private-key> <private-key>base64encodedvalue==</private-key>
<public-key>base64encodedvalue==</public-key> <public-key>base64encodedvalue==</public-key>
<cert>base64encodedvalue==</cert> <cert>base64encodedvalue==</cert>
</local-definition> </local-definition>
</client-identity> </client-identity>
<server-authentication> <server-authentication>
<ca-certs>explicitly-trusted-server-ca-certs</ca-cer\ <ca-certs>
ts> <truststore-reference>explicitly-trusted-server-ca\
<server-certs>explicitly-trusted-server-certs</serve\ -certs</truststore-reference>
r-certs> </ca-certs>
<server-certs>
<truststore-reference>explicitly-trusted-server-ce\
rts</truststore-reference>
</server-certs>
</server-authentication> </server-authentication>
<keepalives> <keepalives>
<max-wait>30</max-wait> <max-wait>30</max-wait>
<max-attempts>3</max-attempts> <max-attempts>3</max-attempts>
</keepalives> </keepalives>
</tls-client-parameters> </tls-client-parameters>
<http-client-parameters> <http-client-parameters>
<protocol-version>HTTP/1.1</protocol-version> <protocol-version>HTTP/1.1</protocol-version>
<client-identity> <client-identity>
<basic> <basic>
<user-id>bob</user-id> <user-id>bob</user-id>
<password>secret</password> <password>secret</password>
</basic> </basic>
</client-identity> </client-identity>
skipping to change at page 7, line 39 skipping to change at page 7, line 31
<tls-client-parameters> <tls-client-parameters>
<client-identity> <client-identity>
<local-definition> <local-definition>
<algorithm>rsa2048</algorithm> <algorithm>rsa2048</algorithm>
<private-key>base64encodedvalue==</private-key> <private-key>base64encodedvalue==</private-key>
<public-key>base64encodedvalue==</public-key> <public-key>base64encodedvalue==</public-key>
<cert>base64encodedvalue==</cert> <cert>base64encodedvalue==</cert>
</local-definition> </local-definition>
</client-identity> </client-identity>
<server-authentication> <server-authentication>
<ca-certs>explicitly-trusted-server-ca-certs</ca-cer\ <ca-certs>
ts> <truststore-reference>explicitly-trusted-server-ca\
<server-certs>explicitly-trusted-server-certs</serve\ -certs</truststore-reference>
r-certs> </ca-certs>
<server-certs>
<truststore-reference>explicitly-trusted-server-ce\
rts</truststore-reference>
</server-certs>
</server-authentication> </server-authentication>
<keepalives> <keepalives>
<max-wait>30</max-wait> <max-wait>30</max-wait>
<max-attempts>3</max-attempts> <max-attempts>3</max-attempts>
</keepalives> </keepalives>
</tls-client-parameters> </tls-client-parameters>
<http-client-parameters> <http-client-parameters>
<protocol-version>HTTP/1.1</protocol-version> <protocol-version>HTTP/1.1</protocol-version>
<client-identity> <client-identity>
<basic> <basic>
skipping to change at page 8, line 36 skipping to change at page 8, line 34
<tls-client-parameters> <tls-client-parameters>
<client-identity> <client-identity>
<local-definition> <local-definition>
<algorithm>rsa2048</algorithm> <algorithm>rsa2048</algorithm>
<private-key>base64encodedvalue==</private-key> <private-key>base64encodedvalue==</private-key>
<public-key>base64encodedvalue==</public-key> <public-key>base64encodedvalue==</public-key>
<cert>base64encodedvalue==</cert> <cert>base64encodedvalue==</cert>
</local-definition> </local-definition>
</client-identity> </client-identity>
<server-authentication> <server-authentication>
<ca-certs>explicitly-trusted-server-ca-certs</ca-certs> <ca-certs>
<server-certs>explicitly-trusted-server-certs</server-ce\ <truststore-reference>explicitly-trusted-server-ca-cer\
rts> ts</truststore-reference>
</ca-certs>
<server-certs>
<truststore-reference>explicitly-trusted-server-certs<\
/truststore-reference>
</server-certs>
</server-authentication> </server-authentication>
</tls-client-parameters> </tls-client-parameters>
<http-client-parameters> <http-client-parameters>
<protocol-version>HTTP/1.1</protocol-version> <protocol-version>HTTP/1.1</protocol-version>
<client-identity> <client-identity>
<basic> <basic>
<user-id>bob</user-id> <user-id>bob</user-id>
<password>secret</password> <password>secret</password>
</basic> </basic>
</client-identity> </client-identity>
skipping to change at page 9, line 15 skipping to change at page 9, line 17
</listen> </listen>
</restconf-client> </restconf-client>
2.3. YANG Module 2.3. YANG Module
This YANG module has normative references to [RFC6991], [RFC8040], This YANG module has normative references to [RFC6991], [RFC8040],
and [RFC8071], [I-D.kwatsen-netconf-tcp-client-server], and [RFC8071], [I-D.kwatsen-netconf-tcp-client-server],
[I-D.ietf-netconf-tls-client-server], and [I-D.ietf-netconf-tls-client-server], and
[I-D.kwatsen-netconf-http-client-server]. [I-D.kwatsen-netconf-http-client-server].
<CODE BEGINS> file "ietf-restconf-client@2019-07-02.yang" <CODE BEGINS> file "ietf-restconf-client@2019-10-18.yang"
module ietf-restconf-client { module ietf-restconf-client {
yang-version 1.1; yang-version 1.1;
namespace "urn:ietf:params:xml:ns:yang:ietf-restconf-client"; namespace "urn:ietf:params:xml:ns:yang:ietf-restconf-client";
prefix rcc; prefix rcc;
import ietf-yang-types { import ietf-yang-types {
prefix yang; prefix yang;
reference reference
"RFC 6991: Common YANG Data Types"; "RFC 6991: Common YANG Data Types";
} }
skipping to change at page 10, line 36 skipping to change at page 10, line 38
(https://www.rfc-editor.org/info/rfcXXXX); see the RFC (https://www.rfc-editor.org/info/rfcXXXX); see the RFC
itself for full legal notices.; itself for full legal notices.;
The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL',
'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED',
'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document 'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document
are to be interpreted as described in BCP 14 (RFC 2119) are to be interpreted as described in BCP 14 (RFC 2119)
(RFC 8174) when, and only when, they appear in all (RFC 8174) when, and only when, they appear in all
capitals, as shown here."; capitals, as shown here.";
revision 2019-07-02 { revision 2019-10-18 {
description description
"Initial version"; "Initial version";
reference reference
"RFC XXXX: RESTCONF Client and Server Models"; "RFC XXXX: RESTCONF Client and Server Models";
} }
// Features // Features
feature https-initiate { feature https-initiate {
description description
"The 'https-initiate' feature indicates that the RESTCONF "The 'https-initiate' feature indicates that the RESTCONF
client supports initiating HTTPS connections to RESTCONF client supports initiating HTTPS connections to RESTCONF
servers. This feature exists as HTTPS might not be a servers. This feature exists as HTTPS might not be a
mandatory to implement transport in the future."; mandatory to implement transport in the future.";
reference reference
"RFC 8040: RESTCONF Protocol"; "RFC 8040: RESTCONF Protocol";
}
feature http-listen {
description
"The 'https-listen' feature indicates that the RESTCONF client
supports opening a port to listen for incoming RESTCONF
server call-home connections. This feature exists as not
all RESTCONF clients may support RESTCONF call home.";
reference
"RFC 8071: NETCONF Call Home and RESTCONF Call Home";
} }
feature https-listen { feature https-listen {
description description
"The 'https-listen' feature indicates that the RESTCONF client "The 'https-listen' feature indicates that the RESTCONF client
supports opening a port to listen for incoming RESTCONF supports opening a port to listen for incoming RESTCONF
server call-home connections. This feature exists as not server call-home connections. This feature exists as not
all RESTCONF clients may support RESTCONF call home."; all RESTCONF clients may support RESTCONF call home.";
reference reference
"RFC 8071: NETCONF Call Home and RESTCONF Call Home"; "RFC 8071: NETCONF Call Home and RESTCONF Call Home";
} }
// Groupings // Groupings
grouping restconf-client-grouping { grouping restconf-client-grouping {
description description
"Top-level grouping for RESTCONF client configuration."; "A reusable grouping for configuring a RESTCONF client
without any consideration for how underlying transport
sessions are established.
This grouping currently doesn't define any nodes.";
}
grouping restconf-client-initiate-stack-grouping {
description
"A reusable grouping for configuring a RESTCONF client
'initiate' protocol stack for a single connection.";
choice transport {
mandatory true;
description
"Selects between available transports. This is a
'choice' statement so as to support additional
transport options to be augmented in.";
case https {
if-feature "https-initiate";
container https {
description
"Specifies HTTPS-specific transport
configuration.";
container tcp-client-parameters {
description
"A wrapper around the TCP client parameters
to avoid name collisions.";
uses tcpc:tcp-client-grouping {
refine "remote-port" {
default "443";
description
"The RESTCONF client will attempt to
connect to the IANA-assigned well-known
port value for 'https' (443) if no value
is specified.";
}
}
}
container tls-client-parameters {
must "client-identity" {
description
"NETCONF/TLS clients MUST pass some
authentication credentials.";
}
description
"A wrapper around the TLS client parameters
to avoid name collisions.";
uses tlsc:tls-client-grouping;
}
container http-client-parameters {
description
"A wrapper around the HTTP client parameters
to avoid name collisions.";
uses httpc:http-client-grouping;
}
container restconf-client-parameters {
description
"A wrapper around the HTTP client parameters
to avoid name collisions.";
uses rcc:restconf-client-grouping;
}
}
}
}
} // restconf-client-initiate-stack-grouping
grouping restconf-client-listen-stack-grouping {
description
"A reusable grouping for configuring a RESTCONF client
'listen' protocol stack for a single connection.";
choice transport {
mandatory true;
description
"Selects between available transports. This is a
'choice' statement so as to support additional
transport options to be augmented in.";
case http {
if-feature "http-listen";
container FIXME {
description "FIXME";
}
}
case https {
if-feature "https-listen";
container https {
description
"HTTPS-specific listening configuration for inbound
connections.";
container tcp-server-parameters {
description
"A wrapper around the TCP client parameters
to avoid name collisions.";
uses tcps:tcp-server-grouping {
refine "local-port" {
default "4336";
description
"The RESTCONF client will listen on the IANA-
assigned well-known port for 'restconf-ch-tls'
(4336) if no value is specified.";
}
}
}
container tls-client-parameters {
must "client-identity" {
description
"NETCONF/TLS clients MUST pass some
authentication credentials.";
}
description
"A wrapper around the TLS client parameters
to avoid name collisions.";
uses tlsc:tls-client-grouping;
}
container http-client-parameters {
description
"A wrapper around the HTTP client parameters
to avoid name collisions.";
uses httpc:http-client-grouping;
}
container restconf-client-parameters {
description
"A wrapper around the RESTCONF client parameters
to avoid name collisions.";
uses rcc:restconf-client-grouping;
}
}
}
}
} // restconf-client-listen-stack-grouping
grouping restconf-client-app-grouping {
description
"A reusable grouping for configuring a RESTCONF client
application that supports both 'initiate' and 'listen'
protocol stacks for a multiplicity of connections.";
container initiate { container initiate {
if-feature "https-initiate"; if-feature "https-initiate";
presence "Enables client to initiate TCP connections"; presence "Enables client to initiate TCP connections";
description description
"Configures client initiating underlying TCP connections."; "Configures client initiating underlying TCP connections.";
list restconf-server { list restconf-server {
key "name"; key "name";
min-elements 1; min-elements 1;
description description
"List of RESTCONF servers the RESTCONF client is to "List of RESTCONF servers the RESTCONF client is to
initiate connections to in parallel."; maintain simultaneous connections with.";
leaf name { leaf name {
type string; type string;
description description
"An arbitrary name for the RESTCONF server."; "An arbitrary name for the RESTCONF server.";
} }
container endpoints { container endpoints {
description description
"Container for the list of endpoints."; "Container for the list of endpoints.";
list endpoint { list endpoint {
key "name"; key "name";
skipping to change at page 11, line 49 skipping to change at page 15, line 4
description description
"Container for the list of endpoints."; "Container for the list of endpoints.";
list endpoint { list endpoint {
key "name"; key "name";
min-elements 1; min-elements 1;
ordered-by user; ordered-by user;
description description
"A non-empty user-ordered list of endpoints for this "A non-empty user-ordered list of endpoints for this
RESTCONF client to try to connect to in sequence. RESTCONF client to try to connect to in sequence.
Defining more than one enables high-availability."; Defining more than one enables high-availability.";
leaf name { leaf name {
type string; type string;
description description
"An arbitrary name for this endpoint."; "An arbitrary name for this endpoint.";
} }
choice transport { uses restconf-client-initiate-stack-grouping;
mandatory true; }
description }
"Selects between available transports. This is a
'choice' statement so as to support additional
transport options to be augmented in.";
case https {
if-feature "https-initiate";
container https {
description
"Specifies HTTPS-specific transport
configuration.";
container tcp-client-parameters {
description
"A wrapper around the TCP client parameters
to avoid name collisions.";
uses tcpc:tcp-client-grouping {
refine "remote-port" {
default "443";
description
"The RESTCONF client will attempt to
connect to the IANA-assigned well-known
port value for 'https' (443) if no value
is specified.";
}
}
}
container tls-client-parameters {
must "client-identity" {
description
"NETCONF/TLS clients MUST pass some
authentication credentials.";
}
description
"A wrapper around the TLS client parameters
to avoid name collisions.";
uses tlsc:tls-client-grouping;
}
container http-client-parameters {
description
"A wrapper around the HTTP client parameters
to avoid name collisions.";
uses httpc:http-client-grouping;
}
}
} // https
} // transport
} // endpoint
} // endpoints
container connection-type { container connection-type {
description description
"Indicates the RESTCONF client's preference for how "Indicates the RESTCONF client's preference for how
the RESTCONF connection is maintained."; the RESTCONF connection is maintained.";
choice connection-type { choice connection-type {
mandatory true; mandatory true;
description description
"Selects between available connection types."; "Selects between available connection types.";
case persistent-connection { case persistent-connection {
container persistent { container persistent {
skipping to change at page 15, line 46 skipping to change at page 17, line 51
type uint8 { type uint8 {
range "1..max"; range "1..max";
} }
default "3"; default "3";
description description
"Specifies the number times the RESTCONF client "Specifies the number times the RESTCONF client
tries to connect to a specific endpoint before tries to connect to a specific endpoint before
moving on to the next endpoint in the list moving on to the next endpoint in the list
(round robin)."; (round robin).";
} }
} // reconnect-strategy }
} // restconf-server
} // initiate
}
} // initiate
container listen { container listen {
if-feature "https-listen"; if-feature "http-listen or https-listen";
presence "Enables client to accept call-home connections"; presence "Enables client to accept call-home connections";
description description
"Configures client accepting call-home TCP connections."; "Configures client accepting call-home TCP connections.";
leaf idle-timeout { leaf idle-timeout {
type uint16; type uint16;
units "seconds"; units "seconds";
default 3600; // one hour default 3600; // one hour
description description
"Specifies the maximum number of seconds that an "Specifies the maximum number of seconds that an
underlying TCP session may remain idle. A TCP session underlying TCP session may remain idle. A TCP session
skipping to change at page 16, line 29 skipping to change at page 18, line 35
list endpoint { list endpoint {
key "name"; key "name";
min-elements 1; min-elements 1;
description description
"List of endpoints to listen for RESTCONF connections."; "List of endpoints to listen for RESTCONF connections.";
leaf name { leaf name {
type string; type string;
description description
"An arbitrary name for the RESTCONF listen endpoint."; "An arbitrary name for the RESTCONF listen endpoint.";
} }
choice transport { uses restconf-client-listen-stack-grouping;
mandatory true; }
description }
"Selects between available transports. This is a } // restconf-client-app-grouping
'choice' statement so as to support additional
transport options to be augmented in.";
case https {
if-feature "https-listen";
container https {
description
"HTTPS-specific listening configuration for inbound
connections.";
container tcp-server-parameters {
description
"A wrapper around the TCP client parameters
to avoid name collisions.";
uses tcps:tcp-server-grouping {
refine "local-port" {
default "4336";
description
"The RESTCONF client will listen on the IANA-
assigned well-known port for 'restconf-ch-tls'
(4336) if no value is specified.";
}
}
}
container tls-client-parameters {
must "client-identity" {
description
"NETCONF/TLS clients MUST pass some
authentication credentials.";
}
description
"A wrapper around the TLS client parameters
to avoid name collisions.";
uses tlsc:tls-client-grouping;
}
container http-client-parameters {
description
"A wrapper around the HTTP client parameters
to avoid name collisions.";
uses httpc:http-client-grouping;
}
}
} // case https
} // transport
} // endpoint
} // listen
} // restconf-client
// Protocol accessible node, for servers that implement this // Protocol accessible node, for servers that implement this
// module. // module.
container restconf-client { container restconf-client {
uses restconf-client-grouping; uses restconf-client-app-grouping;
description description
"Top-level container for RESTCONF client configuration."; "Top-level container for RESTCONF client configuration.";
} }
} }
<CODE ENDS> <CODE ENDS>
3. The RESTCONF Server Model 3. The RESTCONF Server Model
The RESTCONF server model presented in this section supports both The RESTCONF server model presented in this section supports both
listening for connections as well as initiating call-home listening for connections as well as initiating call-home
connections. connections.
YANG feature statements are used to enable implementations to YANG feature statements are used to enable implementations to
advertise which potentially uncommon parts of the model the RESTCONF advertise which potentially uncommon parts of the model the RESTCONF
skipping to change at page 18, line 29 skipping to change at page 19, line 39
+---u restconf-server-app-grouping +---u restconf-server-app-grouping
grouping restconf-server-grouping grouping restconf-server-grouping
+-- client-identification +-- client-identification
+-- cert-maps +-- cert-maps
+---u x509c2n:cert-to-name +---u x509c2n:cert-to-name
grouping restconf-server-listen-stack-grouping grouping restconf-server-listen-stack-grouping
+-- (transport) +-- (transport)
+--:(http) {http-listen}? +--:(http) {http-listen}?
| +-- http | +-- http
| +-- external-endpoint | +-- external-endpoint!
| | +-- address inet:ip-address | | +-- address inet:ip-address
| | +-- port? inet:port-number | | +-- port? inet:port-number
| +-- tcp-server-parameters | +-- tcp-server-parameters
| | +---u tcps:tcp-server-grouping | | +---u tcps:tcp-server-grouping
| +-- http-server-parameters | +-- http-server-parameters
| | +---u https:http-server-grouping | | +---u https:http-server-grouping
| +-- restconf-server-parameters | +-- restconf-server-parameters
| +---u rcs:restconf-server-grouping | +---u rcs:restconf-server-grouping
+--:(https) {https-listen}? +--:(https) {https-listen}?
+-- https +-- https
skipping to change at page 19, line 12 skipping to change at page 20, line 22
+-- https +-- https
+-- tcp-client-parameters +-- tcp-client-parameters
| +---u tcpc:tcp-client-grouping | +---u tcpc:tcp-client-grouping
+-- tls-server-parameters +-- tls-server-parameters
| +---u tlss:tls-server-grouping | +---u tlss:tls-server-grouping
+-- http-server-parameters +-- http-server-parameters
| +---u https:http-server-grouping | +---u https:http-server-grouping
+-- restconf-server-parameters +-- restconf-server-parameters
+---u rcs:restconf-server-grouping +---u rcs:restconf-server-grouping
grouping restconf-server-app-grouping grouping restconf-server-app-grouping
+-- listen! {https-listen}? +-- listen! {http-listen or https-listen}?
| +-- endpoint* [name] | +-- endpoint* [name]
| +-- name? string | +-- name? string
| +---u restconf-server-listen-stack-grouping | +---u restconf-server-listen-stack-grouping
+-- call-home! {https-call-home}? +-- call-home! {https-call-home}?
+-- restconf-client* [name] +-- restconf-client* [name]
+-- name? string +-- name? string
+-- endpoints +-- endpoints
| +-- endpoint* [name] | +-- endpoint* [name]
| +-- name? string | +-- name? string
| +---u restconf-server-callhome-stack-grouping | +---u restconf-server-callhome-stack-grouping
skipping to change at page 19, line 46 skipping to change at page 21, line 9
3.2. Example Usage 3.2. Example Usage
The following example illustrates configuring a RESTCONF server to The following example illustrates configuring a RESTCONF server to
listen for RESTCONF client connections, as well as configuring call- listen for RESTCONF client connections, as well as configuring call-
home to one RESTCONF client. home to one RESTCONF client.
This example is consistent with the examples presented in Section 2 This example is consistent with the examples presented in Section 2
of [I-D.ietf-netconf-trust-anchors] and Section 3.2 of of [I-D.ietf-netconf-trust-anchors] and Section 3.2 of
[I-D.ietf-netconf-keystore]. [I-D.ietf-netconf-keystore].
=========== NOTE: '\' line wrapping per BCP XX (RFC XXXX) =========== ========== NOTE: '\' line wrapping per BCP XXX (RFC XXXX) ===========
<restconf-server <restconf-server
xmlns="urn:ietf:params:xml:ns:yang:ietf-restconf-server" xmlns="urn:ietf:params:xml:ns:yang:ietf-restconf-server"
xmlns:x509c2n="urn:ietf:params:xml:ns:yang:ietf-x509-cert-to-name"> xmlns:x509c2n="urn:ietf:params:xml:ns:yang:ietf-x509-cert-to-name">
<!-- endpoints to listen for RESTCONF connections on --> <!-- endpoints to listen for RESTCONF connections on -->
<listen> <listen>
<endpoint> <endpoint>
<name>netconf/tls</name> <name>netconf/tls</name>
<https> <https>
<tcp-server-parameters> <tcp-server-parameters>
<local-address>11.22.33.44</local-address> <local-address>11.22.33.44</local-address>
</tcp-server-parameters> </tcp-server-parameters>
<tls-server-parameters> <tls-server-parameters>
<server-identity> <server-identity>
skipping to change at page 20, line 23 skipping to change at page 21, line 34
<server-identity> <server-identity>
<local-definition> <local-definition>
<algorithm>rsa2048</algorithm> <algorithm>rsa2048</algorithm>
<private-key>base64encodedvalue==</private-key> <private-key>base64encodedvalue==</private-key>
<public-key>base64encodedvalue==</public-key> <public-key>base64encodedvalue==</public-key>
<cert>base64encodedvalue==</cert> <cert>base64encodedvalue==</cert>
</local-definition> </local-definition>
</server-identity> </server-identity>
<client-authentication> <client-authentication>
<required/> <required/>
<ca-certs>explicitly-trusted-client-ca-certs</ca-certs> <ca-certs>
<client-certs>explicitly-trusted-client-certs</client-ce\ <truststore-reference>explicitly-trusted-client-ca-cer\
rts> ts</truststore-reference>
</ca-certs>
<client-certs>
<truststore-reference>explicitly-trusted-client-certs<\
/truststore-reference>
</client-certs>
</client-authentication> </client-authentication>
</tls-server-parameters> </tls-server-parameters>
<http-server-parameters> <http-server-parameters>
<server-name>foo.example.com</server-name> <server-name>foo.example.com</server-name>
<protocol-versions> <protocol-versions>
<protocol-version>HTTP/1.1</protocol-version> <protocol-version>HTTP/1.1</protocol-version>
<protocol-version>HTTP/2.0</protocol-version> <protocol-version>HTTP/2.0</protocol-version>
</protocol-versions> </protocol-versions>
</http-server-parameters> </http-server-parameters>
<restconf-server-parameters> <restconf-server-parameters>
skipping to change at page 21, line 31 skipping to change at page 22, line 45
<server-identity> <server-identity>
<local-definition> <local-definition>
<algorithm>rsa2048</algorithm> <algorithm>rsa2048</algorithm>
<private-key>base64encodedvalue==</private-key> <private-key>base64encodedvalue==</private-key>
<public-key>base64encodedvalue==</public-key> <public-key>base64encodedvalue==</public-key>
<cert>base64encodedvalue==</cert> <cert>base64encodedvalue==</cert>
</local-definition> </local-definition>
</server-identity> </server-identity>
<client-authentication> <client-authentication>
<required/> <required/>
<ca-certs>explicitly-trusted-client-ca-certs</ca-cer\ <ca-certs>
ts> <truststore-reference>explicitly-trusted-client-ca\
<client-certs>explicitly-trusted-client-certs</clien\ -certs</truststore-reference>
t-certs> </ca-certs>
<client-certs>
<truststore-reference>explicitly-trusted-client-ce\
rts</truststore-reference>
</client-certs>
</client-authentication> </client-authentication>
</tls-server-parameters> </tls-server-parameters>
<http-server-parameters> <http-server-parameters>
<server-name>foo.example.com</server-name> <server-name>foo.example.com</server-name>
<protocol-versions> <protocol-versions>
<protocol-version>HTTP/1.1</protocol-version> <protocol-version>HTTP/1.1</protocol-version>
<protocol-version>HTTP/2.0</protocol-version> <protocol-version>HTTP/2.0</protocol-version>
</protocol-versions> </protocol-versions>
</http-server-parameters> </http-server-parameters>
<restconf-server-parameters> <restconf-server-parameters>
skipping to change at page 22, line 31 skipping to change at page 23, line 50
<server-identity> <server-identity>
<local-definition> <local-definition>
<algorithm>rsa2048</algorithm> <algorithm>rsa2048</algorithm>
<private-key>base64encodedvalue==</private-key> <private-key>base64encodedvalue==</private-key>
<public-key>base64encodedvalue==</public-key> <public-key>base64encodedvalue==</public-key>
<cert>base64encodedvalue==</cert> <cert>base64encodedvalue==</cert>
</local-definition> </local-definition>
</server-identity> </server-identity>
<client-authentication> <client-authentication>
<required/> <required/>
<ca-certs>explicitly-trusted-client-ca-certs</ca-cer\ <ca-certs>
ts> <truststore-reference>explicitly-trusted-client-ca\
<client-certs>explicitly-trusted-client-certs</clien\
t-certs> -certs</truststore-reference>
</ca-certs>
<client-certs>
<truststore-reference>explicitly-trusted-client-ce\
rts</truststore-reference>
</client-certs>
</client-authentication> </client-authentication>
</tls-server-parameters> </tls-server-parameters>
<http-server-parameters> <http-server-parameters>
<server-name>foo.example.com</server-name> <server-name>foo.example.com</server-name>
<protocol-versions> <protocol-versions>
<protocol-version>HTTP/1.1</protocol-version> <protocol-version>HTTP/1.1</protocol-version>
<protocol-version>HTTP/2.0</protocol-version> <protocol-version>HTTP/2.0</protocol-version>
</protocol-versions> </protocol-versions>
</http-server-parameters> </http-server-parameters>
<restconf-server-parameters> <restconf-server-parameters>
skipping to change at page 23, line 37 skipping to change at page 25, line 12
</call-home> </call-home>
</restconf-server> </restconf-server>
3.3. YANG Module 3.3. YANG Module
This YANG module has normative references to [RFC6991], [RFC7407], This YANG module has normative references to [RFC6991], [RFC7407],
[RFC8040], [RFC8071], [I-D.kwatsen-netconf-tcp-client-server], [RFC8040], [RFC8071], [I-D.kwatsen-netconf-tcp-client-server],
[I-D.ietf-netconf-tls-client-server], and [I-D.ietf-netconf-tls-client-server], and
[I-D.kwatsen-netconf-http-client-server]. [I-D.kwatsen-netconf-http-client-server].
<CODE BEGINS> file "ietf-restconf-server@2019-07-02.yang" <CODE BEGINS> file "ietf-restconf-server@2019-10-18.yang"
module ietf-restconf-server { module ietf-restconf-server {
yang-version 1.1; yang-version 1.1;
namespace "urn:ietf:params:xml:ns:yang:ietf-restconf-server"; namespace "urn:ietf:params:xml:ns:yang:ietf-restconf-server";
prefix rcs; prefix rcs;
import ietf-yang-types { import ietf-yang-types {
prefix yang; prefix yang;
reference reference
"RFC 6991: Common YANG Data Types"; "RFC 6991: Common YANG Data Types";
} }
skipping to change at page 25, line 26 skipping to change at page 26, line 49
(https://www.rfc-editor.org/info/rfcXXXX); see the RFC (https://www.rfc-editor.org/info/rfcXXXX); see the RFC
itself for full legal notices.; itself for full legal notices.;
The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL',
'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED',
'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document 'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document
are to be interpreted as described in BCP 14 (RFC 2119) are to be interpreted as described in BCP 14 (RFC 2119)
(RFC 8174) when, and only when, they appear in all (RFC 8174) when, and only when, they appear in all
capitals, as shown here."; capitals, as shown here.";
revision 2019-07-02 { revision 2019-10-18 {
description description
"Initial version"; "Initial version";
reference reference
"RFC XXXX: RESTCONF Client and Server Models"; "RFC XXXX: RESTCONF Client and Server Models";
} }
// Features // Features
feature http-listen { feature http-listen {
description description
skipping to change at page 25, line 50 skipping to change at page 27, line 24
terminated by an external system."; terminated by an external system.";
reference reference
"RFC 8040: RESTCONF Protocol"; "RFC 8040: RESTCONF Protocol";
} }
feature https-listen { feature https-listen {
description description
"The 'https-listen' feature indicates that the RESTCONF server "The 'https-listen' feature indicates that the RESTCONF server
supports opening a port to listen for incoming RESTCONF over supports opening a port to listen for incoming RESTCONF over
TLS client connections, whereby the TLS connections are TLS client connections, whereby the TLS connections are
terminated by the server itself/"; terminated by the server itself.";
reference reference
"RFC 8040: RESTCONF Protocol"; "RFC 8040: RESTCONF Protocol";
} }
feature https-call-home { feature https-call-home {
description description
"The 'https-call-home' feature indicates that the RESTCONF "The 'https-call-home' feature indicates that the RESTCONF
server supports initiating connections to RESTCONF clients."; server supports initiating connections to RESTCONF clients.";
reference reference
"RFC 8071: NETCONF Call Home and RESTCONF Call Home"; "RFC 8071: NETCONF Call Home and RESTCONF Call Home";
} }
skipping to change at page 26, line 23 skipping to change at page 27, line 45
} }
// Groupings // Groupings
grouping restconf-server-grouping { grouping restconf-server-grouping {
description description
"A reusable grouping for configuring a RESTCONF server "A reusable grouping for configuring a RESTCONF server
without any consideration for how underlying transport without any consideration for how underlying transport
sessions are established. sessions are established.
Note that this grouping uses fairly typical descendent Note that this grouping uses a fairly typical descendent
node names such that a stack of 'uses' statements will node name such that a stack of 'uses' statements will
have name conflicts. It is intended that the consuming have name conflicts. It is intended that the consuming
data model will resolve the issue (e.g., by wrapping data model will resolve the issue by wrapping the 'uses'
the 'uses' statement in a container called statement in a container called, e.g.,
'restconf-server-parameters'). This model purposely does 'restconf-server-parameters'. This model purposely does
not do this itself so as to provide maximum flexibility not do this itself so as to provide maximum flexibility
to consuming models."; to consuming models.";
container client-identification { // FIXME: if-feature? container client-identification { // FIXME: if-feature?
description description
"Specifies a mapping through which clients MAY be identified "Specifies a mapping through which clients MAY be identified
(i.e., the RESTCONF username) from a supplied certificate. (i.e., the RESTCONF username) from a supplied certificate.
Note that a client MAY alternatively be identified via an Note that a client MAY alternatively be identified via an
HTTP-level authentication schema. This configuration does HTTP-level authentication schema. This configuration does
not necessitate clients send a certificate (that can be not necessitate clients send a certificate (that can be
skipping to change at page 27, line 12 skipping to change at page 28, line 35
over it."; over it.";
reference reference
"RFC 7407: A YANG Data Model for SNMP Configuration."; "RFC 7407: A YANG Data Model for SNMP Configuration.";
} }
} }
} }
grouping restconf-server-listen-stack-grouping { grouping restconf-server-listen-stack-grouping {
description description
"A reusable grouping for configuring a RESTCONF server "A reusable grouping for configuring a RESTCONF server
'listen' protocol stack, for a single connection."; 'listen' protocol stack for a single connection.";
choice transport { choice transport {
mandatory true; mandatory true;
description description
"Selects between available transports. This is a "Selects between available transports. This is a
'choice' statement so as to support additional 'choice' statement so as to support additional
transport options to be augmented in."; transport options to be augmented in.";
case http { case http {
if-feature "http-listen"; if-feature "http-listen";
container http { container http {
description description
"Configures RESTCONF server stack assuming that "Configures RESTCONF server stack assuming that
TLS-termination is handled externally."; TLS-termination is handled externally.";
container external-endpoint { container external-endpoint {
presence
"Specifies configuration for an external endpoint.";
description description
"Identifies contact information for the external "Identifies contact information for the external
system that terminates connections before passing system that terminates connections before passing
them thru to this server (e.g., a network address them thru to this server (e.g., a network address
translator or a load balancer). These values have translator or a load balancer). These values have
no effect on the local operation of this server, but no effect on the local operation of this server, but
may be used by the application when needing to may be used by the application when needing to
inform other systems how to contact this server."; inform other systems how to contact this server.";
leaf address { leaf address {
type inet:ip-address; type inet:ip-address;
skipping to change at page 30, line 40 skipping to change at page 32, line 17
} }
} }
} }
} }
} }
grouping restconf-server-app-grouping { grouping restconf-server-app-grouping {
description description
"A reusable grouping for configuring a RESTCONF server "A reusable grouping for configuring a RESTCONF server
application that supports both 'listen' and 'call-home' application that supports both 'listen' and 'call-home'
protocol stacks and for many connections."; protocol stacks for a multiplicity of connections.";
container listen { container listen {
if-feature "https-listen"; if-feature "http-listen or https-listen";
presence presence
"Enables the RESTCONF server to listen for RESTCONF "Enables the RESTCONF server to listen for RESTCONF
client connections."; client connections.";
description "Configures listen behavior"; description "Configures listen behavior";
list endpoint { list endpoint {
key "name"; key "name";
min-elements 1; min-elements 1;
description description
"List of endpoints to listen for RESTCONF connections."; "List of endpoints to listen for RESTCONF connections.";
leaf name { leaf name {
skipping to change at page 31, line 24 skipping to change at page 32, line 48
if-feature "https-call-home"; if-feature "https-call-home";
presence presence
"Enables the RESTCONF server to initiate the underlying "Enables the RESTCONF server to initiate the underlying
transport connection to RESTCONF clients."; transport connection to RESTCONF clients.";
description "Configures call-home behavior"; description "Configures call-home behavior";
list restconf-client { list restconf-client {
key "name"; key "name";
min-elements 1; min-elements 1;
description description
"List of RESTCONF clients the RESTCONF server is to "List of RESTCONF clients the RESTCONF server is to
initiate call-home connections to in parallel."; maintain simultaneous call-home connections with.";
leaf name { leaf name {
type string; type string;
description description
"An arbitrary name for the remote RESTCONF client."; "An arbitrary name for the remote RESTCONF client.";
} }
container endpoints { container endpoints {
description description
"Container for the list of endpoints."; "Container for the list of endpoints.";
list endpoint { list endpoint {
key "name"; key "name";
skipping to change at page 36, line 46 skipping to change at page 38, line 27
namespace: urn:ietf:params:xml:ns:yang:ietf-restconf-server namespace: urn:ietf:params:xml:ns:yang:ietf-restconf-server
prefix: ncs prefix: ncs
reference: RFC XXXX reference: RFC XXXX
6. References 6. References
6.1. Normative References 6.1. Normative References
[I-D.ietf-netconf-keystore] [I-D.ietf-netconf-keystore]
Watsen, K., "A YANG Data Model for a Keystore", draft- Watsen, K., "A YANG Data Model for a Keystore", draft-
ietf-netconf-keystore-11 (work in progress), June 2019. ietf-netconf-keystore-12 (work in progress), July 2019.
[I-D.ietf-netconf-tls-client-server] [I-D.ietf-netconf-tls-client-server]
Watsen, K., Wu, G., and L. Xia, "YANG Groupings for TLS Watsen, K., Wu, G., and L. Xia, "YANG Groupings for TLS
Clients and TLS Servers", draft-ietf-netconf-tls-client- Clients and TLS Servers", draft-ietf-netconf-tls-client-
server-13 (work in progress), June 2019. server-14 (work in progress), July 2019.
[I-D.kwatsen-netconf-http-client-server] [I-D.kwatsen-netconf-http-client-server]
Watsen, K., "YANG Groupings for HTTP Clients and HTTP Watsen, K., "YANG Groupings for HTTP Clients and HTTP
Servers", draft-kwatsen-netconf-http-client-server-03 Servers", draft-kwatsen-netconf-http-client-server-03
(work in progress), June 2019. (work in progress), June 2019.
[I-D.kwatsen-netconf-tcp-client-server] [I-D.kwatsen-netconf-tcp-client-server]
Watsen, K. and M. Scharf, "YANG Groupings for TCP Clients Watsen, K. and M. Scharf, "YANG Groupings for TCP Clients
and TCP Servers", draft-kwatsen-netconf-tcp-client- and TCP Servers", draft-kwatsen-netconf-tcp-client-
server-02 (work in progress), April 2019. server-02 (work in progress), April 2019.
skipping to change at page 39, line 18 skipping to change at page 41, line 18
The following tree diagram [RFC8340] provides an overview of the data The following tree diagram [RFC8340] provides an overview of the data
model for the "ietf-restconf-client" module. model for the "ietf-restconf-client" module.
This tree diagram shows all the nodes defined in this module, This tree diagram shows all the nodes defined in this module,
including those defined by "grouping" statements used by this module. including those defined by "grouping" statements used by this module.
Please see Section 2.1 for a tree diagram that illustrates what the Please see Section 2.1 for a tree diagram that illustrates what the
module looks like without all the "grouping" statements expanded. module looks like without all the "grouping" statements expanded.
========== NOTE: '\\' line wrapping per BCP XX (RFC XXXX) =========== ========== NOTE: '\\' line wrapping per BCP XXX (RFC XXXX) ==========
module: ietf-restconf-client module: ietf-restconf-client
+--rw restconf-client +--rw restconf-client
+--rw initiate! {https-initiate}? +--rw initiate! {https-initiate}?
| +--rw restconf-server* [name] | +--rw restconf-server* [name]
| +--rw name string | +--rw name string
| +--rw endpoints | +--rw endpoints
| | +--rw endpoint* [name] | | +--rw endpoint* [name]
| | +--rw name string | | +--rw name string
| | +--rw (transport) | | +--rw (transport)
skipping to change at page 40, line 4 skipping to change at page 42, line 4
| | +--rw tls-client-parameters | | +--rw tls-client-parameters
| | | +--rw client-identity | | | +--rw client-identity
| | | | +--rw (local-or-keystore) | | | | +--rw (local-or-keystore)
| | | | +--:(local) | | | | +--:(local)
| | | | | {local-definitions-suppo\ | | | | | {local-definitions-suppo\
\rted}? \rted}?
| | | | | +--rw local-definition | | | | | +--rw local-definition
| | | | | +--rw algorithm | | | | | +--rw algorithm
| | | | | | asymmetric-key-algo\ | | | | | | asymmetric-key-algo\
\rithm-t \rithm-t
| | | | | +--rw public-key-format?
| | | | | | identityref
| | | | | +--rw public-key | | | | | +--rw public-key
| | | | | | binary | | | | | | binary
| | | | | +--rw private-key-format?
| | | | | | identityref
| | | | | +--rw (private-key-type) | | | | | +--rw (private-key-type)
| | | | | | +--:(private-key) | | | | | | +--:(private-key)
| | | | | | | +--rw private-key? | | | | | | | +--rw private-key?
| | | | | | | binary | | | | | | | binary
| | | | | | +--:(hidden-private-key) | | | | | | +--:(hidden-private-key)
| | | | | | | +--rw hidden-private-\ | | | | | | | +--rw hidden-private-\
\key? \key?
| | | | | | | empty | | | | | | | empty
| | | | | | +--:(encrypted-private-k\ | | | | | | +--:(encrypted-private-k\
\ey) \ey)
skipping to change at page 41, line 11 skipping to change at page 43, line 16
| | | | | binary | | | | | binary
| | | | +--:(keystore) | | | | +--:(keystore)
| | | | {keystore-supported}? | | | | {keystore-supported}?
| | | | +--rw keystore-reference | | | | +--rw keystore-reference
| | | | +--rw asymmetric-key? | | | | +--rw asymmetric-key?
| | | | | ks:asymmetric-key-r\ | | | | | ks:asymmetric-key-r\
\ef \ef
| | | | +--rw certificate? lea\ | | | | +--rw certificate? lea\
\fref \fref
| | | +--rw server-authentication | | | +--rw server-authentication
| | | | +--rw ca-certs? | | | | +--rw ca-certs!
| | | | | ts:certificates-ref
| | | | | {ts:x509-certificates}? | | | | | {ts:x509-certificates}?
| | | | +--rw server-certs? | | | | | +--rw (local-or-truststore)
| | | | ts:certificates-ref | | | | | +--:(local)
| | | | | | {local-definitions-su\
\pported}?
| | | | | | +--rw local-definition
| | | | | | +--rw cert*
| | | | | | | trust-anchor-cer\
\t-cms
| | | | | | +---n certificate-expira\
\tion
| | | | | | +-- expiration-date
| | | | | | yang:date-and\
\-time
| | | | | +--:(truststore)
| | | | | {truststore-supported\
\,x509-certificates}?
| | | | | +--rw truststore-reference?
| | | | | ts:certificates-ref
| | | | +--rw server-certs!
| | | | {ts:x509-certificates}? | | | | {ts:x509-certificates}?
| | | | +--rw (local-or-truststore)
| | | | +--:(local)
| | | | | {local-definitions-su\
\pported}?
| | | | | +--rw local-definition
| | | | | +--rw cert*
| | | | | | trust-anchor-cer\
\t-cms
| | | | | +---n certificate-expira\
\tion
| | | | | +-- expiration-date
| | | | | yang:date-and\
\-time
| | | | +--:(truststore)
| | | | {truststore-supported\
\,x509-certificates}?
| | | | +--rw truststore-reference?
| | | | ts:certificates-ref
| | | +--rw hello-params | | | +--rw hello-params
| | | | {tls-client-hello-params-config\ | | | | {tls-client-hello-params-config\
\}? \}?
| | | | +--rw tls-versions | | | | +--rw tls-versions
| | | | | +--rw tls-version* identityref | | | | | +--rw tls-version* identityref
| | | | +--rw cipher-suites | | | | +--rw cipher-suites
| | | | +--rw cipher-suite* identityref | | | | +--rw cipher-suite* identityref
| | | +--rw keepalives! | | | +--rw keepalives!
| | | {tls-client-keepalives}? | | | {tls-client-keepalives}?
| | | +--rw max-wait? uint16 | | | +--rw max-wait? uint16
| | | +--rw max-attempts? uint8 | | | +--rw max-attempts? uint8
| | +--rw http-client-parameters | | +--rw http-client-parameters
| | +--rw protocol-version? enumeration | | | +--rw protocol-version? enumeration
| | +--rw client-identity | | | +--rw client-identity
| | | +--rw (auth-type)? | | | | +--rw (auth-type)
| | | +--:(basic) | | | | +--:(basic)
| | | | +--rw basic {basic-auth}? | | | | +--rw basic {basic-auth}?
| | | | +--rw user-id? string | | | | +--rw user-id string
| | | | +--rw password? string | | | | +--rw password string
| | | +--:(bearer) | | | +--rw proxy-server! {proxy-connect}?
| | | | +--rw bearer {bearer-auth}? | | | +--rw tcp-client-parameters
| | | | +--rw token? string | | | | +--rw remote-address inet:host
| | | +--:(digest) | | | | +--rw remote-port?
| | | | +--rw digest {digest-auth}? | | | | | inet:port-number
| | | | +--rw username? string | | | | +--rw local-address?
| | | | +--rw password? string | | | | | inet:ip-address
| | | +--:(hoba) | | | | | {local-binding-supported}?
| | | | +--rw hoba {hoba-auth}? | | | | +--rw local-port?
| | | +--:(mutual) | | | | | inet:port-number
| | | | +--rw mutual {mutual-auth}? | | | | | {local-binding-supported}?
| | | +--:(negotiate) | | | | +--rw keepalives!
| | | | +--rw negotiate | | | | {keepalives-supported}?
| | | | {negotiate-auth}? | | | | +--rw idle-time uint16
| | | +--:(oauth) | | | | +--rw max-probes uint16
| | | | +--rw oauth {oauth-auth}? | | | | +--rw probe-interval uint16
| | | +--:(scram-sha-1) | | | +--rw tls-client-parameters
| | | | +--rw scram-sha-1 | | | | +--rw client-identity
| | | | {scram-sha-1-auth}? | | | | | +--rw (local-or-keystore)
| | | +--:(scram-sha-256) | | | | | +--:(local)
| | | | +--rw scram-sha-256 | | | | | | {local-definitions\
| | | | {scram-sha-256-auth}?
| | | +--:(vapid)
| | | +--rw vapid {vapid-auth}?
| | +--rw proxy-server! {proxy-connect}?
| | +--rw tcp-client-parameters
| | | +--rw remote-address inet:host
| | | +--rw remote-port?
| | | | inet:port-number
| | | +--rw local-address?
| | | | inet:ip-address
| | | | {local-binding-supported}?
| | | +--rw local-port?
| | | | inet:port-number
| | | | {local-binding-supported}?
| | | +--rw keepalives!
| | | {keepalives-supported}?
| | | +--rw idle-time uint16
| | | +--rw max-probes uint16
| | | +--rw probe-interval uint16
| | +--rw tls-client-parameters
| | | +--rw client-identity
| | | | +--rw (local-or-keystore)
| | | | +--:(local)
| | | | | {local-definitions\
\-supported}? \-supported}?
| | | | | +--rw local-definition | | | | | | +--rw local-definition
| | | | | +--rw algorithm | | | | | | +--rw algorithm
| | | | | | asymmetric-ke\ | | | | | | | asymmetric-ke\
\y-algorithm-t \y-algorithm-t
| | | | | +--rw public-key | | | | | | +--rw public-key-form\
| | | | | | binary \at?
| | | | | +--rw (private-key-ty\ | | | | | | | identityref
| | | | | | +--rw public-key
| | | | | | | binary
| | | | | | +--rw private-key-for\
\mat?
| | | | | | | identityref
| | | | | | +--rw (private-key-ty\
\pe) \pe)
| | | | | | +--:(private-key) | | | | | | | +--:(private-key)
| | | | | | | +--rw private-k\ | | | | | | | | +--rw private-k\
\ey? \ey?
| | | | | | | binary | | | | | | | | binary
| | | | | | +--:(hidden-privat\ | | | | | | | +--:(hidden-privat\
\e-key) \e-key)
| | | | | | | +--rw hidden-pr\ | | | | | | | | +--rw hidden-pr\
\ivate-key? \ivate-key?
| | | | | | | empty | | | | | | | | empty
| | | | | | +--:(encrypted-pri\ | | | | | | | +--:(encrypted-pri\
\vate-key) \vate-key)
| | | | | | +--rw encrypted\ | | | | | | | +--rw encrypted\
\-private-key \-private-key
| | | | | | +--rw (key-t\ | | | | | | | +--rw (key-t\
\ype) \ype)
| | | | | | | +--:(symm\ | | | | | | | | +--:(symm\
\etric-key-ref) \etric-key-ref)
| | | | | | | | +--rw \ | | | | | | | | | +--rw \
\symmetric-key-ref? leafref \symmetric-key-ref? leafref
| | | | | | | | \ | | | | | | | | | \
\ {keystore-supported}? \ {keystore-supported}?
| | | | | | | +--:(asym\ | | | | | | | | +--:(asym\
\metric-key-ref) \metric-key-ref)
| | | | | | | +--rw \ | | | | | | | | +--rw \
\asymmetric-key-ref? leafref \asymmetric-key-ref? leafref
| | | | | | | \ | | | | | | | | \
\ {keystore-supported}? \ {keystore-supported}?
| | | | | | +--rw value? | | | | | | | +--rw value?
| | | | | | bina\ | | | | | | | bina\
\ry \ry
| | | | | +--rw cert? | | | | | | +--rw cert?
| | | | | | end-entity-ce\ | | | | | | | end-entity-ce\
\rt-cms \rt-cms
| | | | | +---n certificate-exp\ | | | | | | +---n certificate-exp\
\iration \iration
| | | | | | +-- expiration-date | | | | | | | +-- expiration-date
| | | | | | yang:date-\ | | | | | | | yang:date-\
\and-time \and-time
| | | | | +---x generate-certif\ | | | | | | +---x generate-certif\
\icate-signing-request \icate-signing-request
| | | | | +---w input | | | | | | +---w input
| | | | | | +---w subject | | | | | | | +---w subject
| | | | | | | binary | | | | | | | | binary
| | | | | | +---w attribute\ | | | | | | | +---w attribute\
\s? \s?
| | | | | | binary | | | | | | | binary
| | | | | +--ro output | | | | | | +--ro output
| | | | | +--ro certifica\ | | | | | | +--ro certifica\
\te-signing-request \te-signing-request
| | | | | binary | | | | | | binary
| | | | +--:(keystore) | | | | | +--:(keystore)
| | | | {keystore-supporte\ | | | | | {keystore-supporte\
\d}? \d}?
| | | | +--rw keystore-reference | | | | | +--rw keystore-reference
| | | | +--rw asymmetric-key? | | | | | +--rw asymmetric-key?
| | | | | ks:asymmetric\ | | | | | | ks:asymmetric\
\-key-ref \-key-ref
| | | | +--rw certificate? \ | | | | | +--rw certificate? \
\ leafref \ leafref
| | | +--rw server-authentication | | | | +--rw server-authentication
| | | | +--rw ca-certs? | | | | | +--rw ca-certs!
| | | | | ts:certificates-ref | | | | | | {ts:x509-certificates}?
| | | | | {ts:x509-certificates}? | | | | | | +--rw (local-or-truststore)
| | | | +--rw server-certs? | | | | | | +--:(local)
| | | | ts:certificates-ref | | | | | | | {local-definiti\
| | | | {ts:x509-certificates}? \ons-supported}?
| | | +--rw hello-params | | | | | | | +--rw local-definition
| | | | {tls-client-hello-params-\ | | | | | | | +--rw cert*
| | | | | | | | trust-anch\
\or-cert-cms
| | | | | | | +---n certificate-\
\expiration
| | | | | | | +-- expiration-\
\date
| | | | | | | yang:da\
\te-and-time
| | | | | | +--:(truststore)
| | | | | | {truststore-sup\
\ported,x509-certificates}?
| | | | | | +--rw truststore-refe\
\rence?
| | | | | | ts:certificat\
\es-ref
| | | | | +--rw server-certs!
| | | | | {ts:x509-certificates}?
| | | | | +--rw (local-or-truststore)
| | | | | +--:(local)
| | | | | | {local-definiti\
\ons-supported}?
| | | | | | +--rw local-definition
| | | | | | +--rw cert*
| | | | | | | trust-anch\
\or-cert-cms
| | | | | | +---n certificate-\
\expiration
| | | | | | +-- expiration-\
\date
| | | | | | yang:da\
\te-and-time
| | | | | +--:(truststore)
| | | | | {truststore-sup\
\ported,x509-certificates}?
| | | | | +--rw truststore-refe\
\rence?
| | | | | ts:certificat\
\es-ref
| | | | +--rw hello-params
| | | | | {tls-client-hello-params-\
\config}? \config}?
| | | | +--rw tls-versions | | | | | +--rw tls-versions
| | | | | +--rw tls-version* | | | | | | +--rw tls-version*
| | | | | identityref | | | | | | identityref
| | | | +--rw cipher-suites | | | | | +--rw cipher-suites
| | | | +--rw cipher-suite* | | | | | +--rw cipher-suite*
| | | | identityref | | | | | identityref
| | | +--rw keepalives! | | | | +--rw keepalives!
| | | {tls-client-keepalives}? | | | | {tls-client-keepalives}?
| | | +--rw max-wait? uint16 | | | | +--rw max-wait? uint16
| | | +--rw max-attempts? uint8 | | | | +--rw max-attempts? uint8
| | +--rw proxy-client-identity | | | +--rw proxy-client-identity
| | +--rw user-id? string | | | +--rw (auth-type)
| | +--rw password? string | | | +--:(basic)
| | | +--rw basic {basic-auth}?
| | | +--rw user-id string
| | | +--rw password string
| | +--rw restconf-client-parameters
| +--rw connection-type | +--rw connection-type
| | +--rw (connection-type) | | +--rw (connection-type)
| | +--:(persistent-connection) | | +--:(persistent-connection)
| | | +--rw persistent! | | | +--rw persistent!
| | +--:(periodic-connection) | | +--:(periodic-connection)
| | +--rw periodic! | | +--rw periodic!
| | +--rw period? uint16 | | +--rw period? uint16
| | +--rw anchor-time? yang:date-and-time | | +--rw anchor-time? yang:date-and-time
| | +--rw idle-timeout? uint16 | | +--rw idle-timeout? uint16
| +--rw reconnect-strategy | +--rw reconnect-strategy
| +--rw start-with? enumeration | +--rw start-with? enumeration
| +--rw max-attempts? uint8 | +--rw max-attempts? uint8
+--rw listen! {https-listen}? +--rw listen! {http-listen or https-listen}?
+--rw idle-timeout? uint16 +--rw idle-timeout? uint16
+--rw endpoint* [name] +--rw endpoint* [name]
+--rw name string +--rw name string
+--rw (transport) +--rw (transport)
+--:(http) {http-listen}?
| +--rw FIXME
+--:(https) {https-listen}? +--:(https) {https-listen}?
+--rw https +--rw https
+--rw tcp-server-parameters +--rw tcp-server-parameters
| +--rw local-address inet:ip-address | +--rw local-address inet:ip-address
| +--rw local-port? inet:port-number | +--rw local-port? inet:port-number
| +--rw keepalives! {keepalives-supported}? | +--rw keepalives! {keepalives-supported}?
| +--rw idle-time uint16 | +--rw idle-time uint16
| +--rw max-probes uint16 | +--rw max-probes uint16
| +--rw probe-interval uint16 | +--rw probe-interval uint16
+--rw tls-client-parameters +--rw tls-client-parameters
| +--rw client-identity | +--rw client-identity
| | +--rw (local-or-keystore) | | +--rw (local-or-keystore)
| | +--:(local) | | +--:(local)
| | | {local-definitions-supported}? | | | {local-definitions-supported}?
| | | +--rw local-definition | | | +--rw local-definition
| | | +--rw algorithm | | | +--rw algorithm
| | | | asymmetric-key-algorithm-t | | | | asymmetric-key-algorithm-t
| | | +--rw public-key-format?
| | | | identityref
| | | +--rw public-key | | | +--rw public-key
| | | | binary | | | | binary
| | | +--rw private-key-format?
| | | | identityref
| | | +--rw (private-key-type) | | | +--rw (private-key-type)
| | | | +--:(private-key) | | | | +--:(private-key)
| | | | | +--rw private-key? | | | | | +--rw private-key?
| | | | | binary | | | | | binary
| | | | +--:(hidden-private-key) | | | | +--:(hidden-private-key)
| | | | | +--rw hidden-private-key? | | | | | +--rw hidden-private-key?
| | | | | empty | | | | | empty
| | | | +--:(encrypted-private-key) | | | | +--:(encrypted-private-key)
| | | | +--rw encrypted-private-key | | | | +--rw encrypted-private-key
| | | | +--rw (key-type) | | | | +--rw (key-type)
skipping to change at page 46, line 4 skipping to change at page 49, line 26
| | | +---n certificate-expiration | | | +---n certificate-expiration
| | | | +-- expiration-date | | | | +-- expiration-date
| | | | yang:date-and-time | | | | yang:date-and-time
| | | +---x generate-certificate-signin\ | | | +---x generate-certificate-signin\
\g-request \g-request
| | | +---w input | | | +---w input
| | | | +---w subject binary | | | | +---w subject binary
| | | | +---w attributes? binary | | | | +---w attributes? binary
| | | +--ro output | | | +--ro output
| | | +--ro certificate-signing-r\ | | | +--ro certificate-signing-r\
\equest \equest
| | | binary | | | binary
| | +--:(keystore) {keystore-supported}? | | +--:(keystore) {keystore-supported}?
| | +--rw keystore-reference | | +--rw keystore-reference
| | +--rw asymmetric-key? | | +--rw asymmetric-key?
| | | ks:asymmetric-key-ref | | | ks:asymmetric-key-ref
| | +--rw certificate? leafref | | +--rw certificate? leafref
| +--rw server-authentication | +--rw server-authentication
| | +--rw ca-certs? ts:certificates-ref | | +--rw ca-certs! {ts:x509-certificates}?
| | | {ts:x509-certificates}? | | | +--rw (local-or-truststore)
| | +--rw server-certs? ts:certificates-ref | | | +--:(local)
| | {ts:x509-certificates}? | | | | {local-definitions-supporte\
\d}?
| | | | +--rw local-definition
| | | | +--rw cert*
| | | | | trust-anchor-cert-cms
| | | | +---n certificate-expiration
| | | | +-- expiration-date
| | | | yang:date-and-time
| | | +--:(truststore)
| | | {truststore-supported,x509-\
\certificates}?
| | | +--rw truststore-reference?
| | | ts:certificates-ref
| | +--rw server-certs! {ts:x509-certificates}?
| | +--rw (local-or-truststore)
| | +--:(local)
| | | {local-definitions-supporte\
\d}?
| | | +--rw local-definition
| | | +--rw cert*
| | | | trust-anchor-cert-cms
| | | +---n certificate-expiration
| | | +-- expiration-date
| | | yang:date-and-time
| | +--:(truststore)
| | {truststore-supported,x509-\
\certificates}?
| | +--rw truststore-reference?
| | ts:certificates-ref
| +--rw hello-params | +--rw hello-params
| | {tls-client-hello-params-config}? | | {tls-client-hello-params-config}?
| | +--rw tls-versions | | +--rw tls-versions
| | | +--rw tls-version* identityref | | | +--rw tls-version* identityref
| | +--rw cipher-suites | | +--rw cipher-suites
| | +--rw cipher-suite* identityref | | +--rw cipher-suite* identityref
| +--rw keepalives! {tls-client-keepalives}? | +--rw keepalives! {tls-client-keepalives}?
| +--rw max-wait? uint16 | +--rw max-wait? uint16
| +--rw max-attempts? uint8 | +--rw max-attempts? uint8
+--rw http-client-parameters +--rw http-client-parameters
+--rw protocol-version? enumeration | +--rw protocol-version? enumeration
+--rw client-identity | +--rw client-identity
| +--rw (auth-type)? | | +--rw (auth-type)
| +--:(basic) | | +--:(basic)
| | +--rw basic {basic-auth}? | | +--rw basic {basic-auth}?
| | +--rw user-id? string | | +--rw user-id string
| | +--rw password? string | | +--rw password string
| +--:(bearer) | +--rw proxy-server! {proxy-connect}?
| | +--rw bearer {bearer-auth}? | +--rw tcp-client-parameters
| | +--rw token? string | | +--rw remote-address inet:host
| +--:(digest) | | +--rw remote-port? inet:port-number
| | +--rw digest {digest-auth}? | | +--rw local-address? inet:ip-address
| | +--rw username? string | | | {local-binding-supported}?
| | +--rw password? string | | +--rw local-port? inet:port-number
| +--:(hoba) | | | {local-binding-supported}?
| | +--rw hoba {hoba-auth}? | | +--rw keepalives!
| +--:(mutual) | | {keepalives-supported}?
| | +--rw mutual {mutual-auth}? | | +--rw idle-time uint16
| +--:(negotiate) | | +--rw max-probes uint16
| | +--rw negotiate {negotiate-auth}? | | +--rw probe-interval uint16
| +--:(oauth) | +--rw tls-client-parameters
| | +--rw oauth {oauth-auth}? | | +--rw client-identity
| +--:(scram-sha-1) | | | +--rw (local-or-keystore)
| | +--rw scram-sha-1 {scram-sha-1-auth}? | | | +--:(local)
| +--:(scram-sha-256) | | | | {local-definitions-suppo\
| | +--rw scram-sha-256
| | {scram-sha-256-auth}?
| +--:(vapid)
| +--rw vapid {vapid-auth}?
+--rw proxy-server! {proxy-connect}?
+--rw tcp-client-parameters
| +--rw remote-address inet:host
| +--rw remote-port? inet:port-number
| +--rw local-address? inet:ip-address
| | {local-binding-supported}?
| +--rw local-port? inet:port-number
| | {local-binding-supported}?
| +--rw keepalives!
| {keepalives-supported}?
| +--rw idle-time uint16
| +--rw max-probes uint16
| +--rw probe-interval uint16
+--rw tls-client-parameters
| +--rw client-identity
| | +--rw (local-or-keystore)
| | +--:(local)
| | | {local-definitions-suppo\
\rted}? \rted}?
| | | +--rw local-definition | | | | +--rw local-definition
| | | +--rw algorithm | | | | +--rw algorithm
| | | | asymmetric-key-algo\ | | | | | asymmetric-key-algo\
\rithm-t \rithm-t
| | | +--rw public-key | | | | +--rw public-key-format?
| | | | binary | | | | | identityref
| | | +--rw (private-key-type) | | | | +--rw public-key
| | | | +--:(private-key) | | | | | binary
| | | | | +--rw private-key? | | | | +--rw private-key-format?
| | | | | binary | | | | | identityref
| | | | +--:(hidden-private-key) | | | | +--rw (private-key-type)
| | | | | +--rw hidden-private-\ | | | | | +--:(private-key)
| | | | | | +--rw private-key?
| | | | | | binary
| | | | | +--:(hidden-private-key)
| | | | | | +--rw hidden-private-\
\key? \key?
| | | | | empty | | | | | | empty
| | | | +--:(encrypted-private-k\ | | | | | +--:(encrypted-private-k\
\ey) \ey)
| | | | +--rw encrypted-priva\ | | | | | +--rw encrypted-priva\
\te-key \te-key
| | | | +--rw (key-type) | | | | | +--rw (key-type)
| | | | | +--:(symmetric-\ | | | | | | +--:(symmetric-\
\key-ref) \key-ref)
| | | | | | +--rw symmet\ | | | | | | | +--rw symmet\
\ric-key-ref? leafref \ric-key-ref? leafref
| | | | | | {key\ | | | | | | | {key\
\store-supported}? \store-supported}?
| | | | | +--:(asymmetric\ | | | | | | +--:(asymmetric\
\-key-ref) \-key-ref)
| | | | | +--rw asymme\ | | | | | | +--rw asymme\
\tric-key-ref? leafref \tric-key-ref? leafref
| | | | | {key\ | | | | | | {key\
\store-supported}? \store-supported}?
| | | | +--rw value? | | | | | +--rw value?
| | | | binary | | | | | binary
| | | +--rw cert? | | | | +--rw cert?
| | | | end-entity-cert-cms | | | | | end-entity-cert-cms
| | | +---n certificate-expiration | | | | +---n certificate-expiration
| | | | +-- expiration-date | | | | | +-- expiration-date
| | | | yang:date-and-ti\ | | | | | yang:date-and-ti\
\me \me
| | | +---x generate-certificate-\ | | | | +---x generate-certificate-\
\signing-request \signing-request
| | | +---w input | | | | +---w input
| | | | +---w subject | | | | | +---w subject
| | | | | binary | | | | | | binary
| | | | +---w attributes? | | | | | +---w attributes?
| | | | binary | | | | | binary
| | | +--ro output | | | | +--ro output
| | | +--ro certificate-sig\ | | | | +--ro certificate-sig\
\ning-request \ning-request
| | | binary | | | | binary
| | +--:(keystore) | | | +--:(keystore)
| | {keystore-supported}? | | | {keystore-supported}?
| | +--rw keystore-reference | | | +--rw keystore-reference
| | +--rw asymmetric-key? | | | +--rw asymmetric-key?
| | | ks:asymmetric-key-r\ | | | | ks:asymmetric-key-r\
\ef \ef
| | +--rw certificate? lea\ | | | +--rw certificate? lea\
\fref \fref
| +--rw server-authentication | | +--rw server-authentication
| | +--rw ca-certs? | | | +--rw ca-certs!
| | | ts:certificates-ref | | | | {ts:x509-certificates}?
| | | {ts:x509-certificates}? | | | | +--rw (local-or-truststore)
| | +--rw server-certs? | | | | +--:(local)
| | ts:certificates-ref | | | | | {local-definitions-su\
| | {ts:x509-certificates}? \pported}?
| +--rw hello-params | | | | | +--rw local-definition
| | {tls-client-hello-params-config\ | | | | | +--rw cert*
| | | | | | trust-anchor-cer\
\t-cms
| | | | | +---n certificate-expira\
\tion
| | | | | +-- expiration-date
| | | | | yang:date-and\
\-time
| | | | +--:(truststore)
| | | | {truststore-supported\
\,x509-certificates}?
| | | | +--rw truststore-reference?
| | | | ts:certificates-ref
| | | +--rw server-certs!
| | | {ts:x509-certificates}?
| | | +--rw (local-or-truststore)
| | | +--:(local)
| | | | {local-definitions-su\
\pported}?
| | | | +--rw local-definition
| | | | +--rw cert*
| | | | | trust-anchor-cer\
\t-cms
| | | | +---n certificate-expira\
\tion
| | | | +-- expiration-date
| | | | yang:date-and\
\-time
| | | +--:(truststore)
| | | {truststore-supported\
\,x509-certificates}?
| | | +--rw truststore-reference?
| | | ts:certificates-ref
| | +--rw hello-params
| | | {tls-client-hello-params-config\
\}? \}?
| | +--rw tls-versions | | | +--rw tls-versions
| | | +--rw tls-version* identityref | | | | +--rw tls-version* identityref
| | +--rw cipher-suites | | | +--rw cipher-suites
| | +--rw cipher-suite* identityref | | | +--rw cipher-suite* identityref
| +--rw keepalives! | | +--rw keepalives!
| {tls-client-keepalives}? | | {tls-client-keepalives}?
| +--rw max-wait? uint16 | | +--rw max-wait? uint16
| +--rw max-attempts? uint8 | | +--rw max-attempts? uint8
+--rw proxy-client-identity | +--rw proxy-client-identity
+--rw user-id? string | +--rw (auth-type)
+--rw password? string | +--:(basic)
| +--rw basic {basic-auth}?
| +--rw user-id string
| +--rw password string
+--rw restconf-client-parameters
A.2. Expanded Tree Diagram for 'ietf-restconf-server' A.2. Expanded Tree Diagram for 'ietf-restconf-server'
The following tree diagram [RFC8340] provides an overview of the data The following tree diagram [RFC8340] provides an overview of the data
model for the "ietf-restconf-server" module. model for the "ietf-restconf-server" module.
This tree diagram shows all the nodes defined in this module, This tree diagram shows all the nodes defined in this module,
including those defined by "grouping" statements used by this module. including those defined by "grouping" statements used by this module.
Please see Section 3.1 for a tree diagram that illustrates what the Please see Section 3.1 for a tree diagram that illustrates what the
module looks like without all the "grouping" statements expanded. module looks like without all the "grouping" statements expanded.
=========== NOTE: '\' line wrapping per BCP XX (RFC XXXX) =========== ========== NOTE: '\' line wrapping per BCP XXX (RFC XXXX) ===========
module: ietf-restconf-server module: ietf-restconf-server
+--rw restconf-server +--rw restconf-server
+--rw listen! {https-listen}? +--rw listen! {http-listen or https-listen}?
| +--rw endpoint* [name] | +--rw endpoint* [name]
| +--rw name string | +--rw name string
| +--rw (transport) | +--rw (transport)
| +--:(http) {http-listen}? | +--:(http) {http-listen}?
| | +--rw http | | +--rw http
| | +--rw external-endpoint | | +--rw external-endpoint!
| | | +--rw address inet:ip-address | | | +--rw address inet:ip-address
| | | +--rw port? inet:port-number | | | +--rw port? inet:port-number
| | +--rw tcp-server-parameters | | +--rw tcp-server-parameters
| | | +--rw local-address inet:ip-address | | | +--rw local-address inet:ip-address
| | | +--rw local-port? inet:port-number | | | +--rw local-port? inet:port-number
| | | +--rw keepalives! {keepalives-supported}? | | | +--rw keepalives! {keepalives-supported}?
| | | +--rw idle-time uint16 | | | +--rw idle-time uint16
| | | +--rw max-probes uint16 | | | +--rw max-probes uint16
| | | +--rw probe-interval uint16 | | | +--rw probe-interval uint16
| | +--rw http-server-parameters | | +--rw http-server-parameters
skipping to change at page 50, line 9 skipping to change at page 54, line 31
| | | | +--:(required) | | | | +--:(required)
| | | | | +--rw required? | | | | | +--rw required?
| | | | | empty | | | | | empty
| | | | +--:(optional) | | | | +--:(optional)
| | | | +--rw optional? | | | | +--rw optional?
| | | | empty | | | | empty
| | | +--rw (local-or-external) | | | +--rw (local-or-external)
| | | +--:(local) | | | +--:(local)
| | | | {local-client-auth-supported}? | | | | {local-client-auth-supported}?
| | | | +--rw users | | | | +--rw users
| | | | +--rw user* [name] | | | | +--rw user* [user-id]
| | | | +--rw name string | | | | +--rw user-id string
| | | | +--rw password? | | | | +--rw (auth-type)?
| | | | ianach:crypt-hash | | | | +--:(basic)
| | | | +--rw basic {basic-auth}?
| | | | +--rw user-id?
| | | | | string
| | | | +--rw password?
| | | | ianach:crypt-\
hash
| | | +--:(external) | | | +--:(external)
| | | {external-client-auth-supporte\ | | | {external-client-auth-supporte\
d}? d}?
| | | +--rw client-auth-defined-elsewhere? | | | +--rw client-auth-defined-elsewhere?
| | | empty | | | empty
| | +--rw restconf-server-parameters | | +--rw restconf-server-parameters
| | +--rw client-identification | | +--rw client-identification
| | +--rw cert-maps | | +--rw cert-maps
| | +--rw cert-to-name* [id] | | +--rw cert-to-name* [id]
| | +--rw id uint32 | | +--rw id uint32
skipping to change at page 50, line 44 skipping to change at page 55, line 24
| | +--rw max-probes uint16 | | +--rw max-probes uint16
| | +--rw probe-interval uint16 | | +--rw probe-interval uint16
| +--rw tls-server-parameters | +--rw tls-server-parameters
| | +--rw server-identity | | +--rw server-identity
| | | +--rw (local-or-keystore) | | | +--rw (local-or-keystore)
| | | +--:(local) | | | +--:(local)
| | | | {local-definitions-supported}? | | | | {local-definitions-supported}?
| | | | +--rw local-definition | | | | +--rw local-definition
| | | | +--rw algorithm | | | | +--rw algorithm
| | | | | asymmetric-key-algorithm-t | | | | | asymmetric-key-algorithm-t
| | | | +--rw public-key-format?
| | | | | identityref
| | | | +--rw public-key | | | | +--rw public-key
| | | | | binary | | | | | binary
| | | | +--rw private-key-format?
| | | | | identityref
| | | | +--rw (private-key-type) | | | | +--rw (private-key-type)
| | | | | +--:(private-key) | | | | | +--:(private-key)
| | | | | | +--rw private-key? | | | | | | +--rw private-key?
| | | | | | binary | | | | | | binary
| | | | | +--:(hidden-private-key) | | | | | +--:(hidden-private-key)
| | | | | | +--rw hidden-private-key? | | | | | | +--rw hidden-private-key?
| | | | | | empty | | | | | | empty
| | | | | +--:(encrypted-private-key) | | | | | +--:(encrypted-private-key)
| | | | | +--rw encrypted-private-key | | | | | +--rw encrypted-private-key
| | | | | +--rw (key-type) | | | | | +--rw (key-type)
skipping to change at page 52, line 4 skipping to change at page 56, line 36
| | | +--rw (required-or-optional) | | | +--rw (required-or-optional)
| | | | +--:(required) | | | | +--:(required)
| | | | | +--rw required? | | | | | +--rw required?
| | | | | empty | | | | | empty
| | | | +--:(optional) | | | | +--:(optional)
| | | | +--rw optional? | | | | +--rw optional?
| | | | empty | | | | empty
| | | +--rw (local-or-external) | | | +--rw (local-or-external)
| | | +--:(local) | | | +--:(local)
| | | | {local-client-auth-supported}? | | | | {local-client-auth-supported}?
| | | | +--rw ca-certs? | | | | +--rw ca-certs!
| | | | | ts:certificates-ref
| | | | | {ts:x509-certificates}? | | | | | {ts:x509-certificates}?
| | | | +--rw client-certs? | | | | | +--rw (local-or-truststore)
| | | | ts:certificates-ref | | | | | +--:(local)
| | | | | | {local-definitions-su\
pported}?
| | | | | | +--rw local-definition
| | | | | | +--rw cert*
| | | | | | | trust-anchor-cer\
t-cms
| | | | | | +---n certificate-expira\
tion
| | | | | | +-- expiration-date
| | | | | | yang:date-and\
-time
| | | | | +--:(truststore)
| | | | | {truststore-supported\
,x509-certificates}?
| | | | | +--rw truststore-reference?
| | | | | ts:certificates-ref
| | | | +--rw client-certs!
| | | | {ts:x509-certificates}? | | | | {ts:x509-certificates}?
| | | | +--rw (local-or-truststore)
| | | | +--:(local)
| | | | | {local-definitions-su\
pported}?
| | | | | +--rw local-definition
| | | | | +--rw cert*
| | | | | | trust-anchor-cer\
t-cms
| | | | | +---n certificate-expira\
tion
| | | | | +-- expiration-date
| | | | | yang:date-and\
-time
| | | | +--:(truststore)
| | | | {truststore-supported\
,x509-certificates}?
| | | | +--rw truststore-reference?
| | | | ts:certificates-ref
| | | +--:(external) | | | +--:(external)
| | | {external-client-auth-supporte\ | | | {external-client-auth-supporte\
d}? d}?
| | | +--rw client-auth-defined-elsewhere? | | | +--rw client-auth-defined-elsewhere?
| | | empty | | | empty
| | +--rw hello-params | | +--rw hello-params
| | | {tls-server-hello-params-config}? | | | {tls-server-hello-params-config}?
| | | +--rw tls-versions | | | +--rw tls-versions
| | | | +--rw tls-version* identityref | | | | +--rw tls-version* identityref
| | | +--rw cipher-suites | | | +--rw cipher-suites
skipping to change at page 52, line 40 skipping to change at page 58, line 10
| | | +--:(required) | | | +--:(required)
| | | | +--rw required? | | | | +--rw required?
| | | | empty | | | | empty
| | | +--:(optional) | | | +--:(optional)
| | | +--rw optional? | | | +--rw optional?
| | | empty | | | empty
| | +--rw (local-or-external) | | +--rw (local-or-external)
| | +--:(local) | | +--:(local)
| | | {local-client-auth-supported}? | | | {local-client-auth-supported}?
| | | +--rw users | | | +--rw users
| | | +--rw user* [name] | | | +--rw user* [user-id]
| | | +--rw name string | | | +--rw user-id string
| | | +--rw password? | | | +--rw (auth-type)?
| | | ianach:crypt-hash | | | +--:(basic)
| | | +--rw basic {basic-auth}?
| | | +--rw user-id?
| | | | string
| | | +--rw password?
| | | ianach:crypt-\
hash
| | +--:(external) | | +--:(external)
| | {external-client-auth-supporte\ | | {external-client-auth-supporte\
d}? d}?
| | +--rw client-auth-defined-elsewhere? | | +--rw client-auth-defined-elsewhere?
| | empty | | empty
| +--rw restconf-server-parameters | +--rw restconf-server-parameters
| +--rw client-identification | +--rw client-identification
| +--rw cert-maps | +--rw cert-maps
| +--rw cert-to-name* [id] | +--rw cert-to-name* [id]
| +--rw id uint32 | +--rw id uint32
skipping to change at page 53, line 41 skipping to change at page 59, line 17
| +--rw tls-server-parameters | +--rw tls-server-parameters
| | +--rw server-identity | | +--rw server-identity
| | | +--rw (local-or-keystore) | | | +--rw (local-or-keystore)
| | | +--:(local) | | | +--:(local)
| | | | {local-definitions-suppo\ | | | | {local-definitions-suppo\
rted}? rted}?
| | | | +--rw local-definition | | | | +--rw local-definition
| | | | +--rw algorithm | | | | +--rw algorithm
| | | | | asymmetric-key-algo\ | | | | | asymmetric-key-algo\
rithm-t rithm-t
| | | | +--rw public-key-format?
| | | | | identityref
| | | | +--rw public-key | | | | +--rw public-key
| | | | | binary | | | | | binary
| | | | +--rw private-key-format?
| | | | | identityref
| | | | +--rw (private-key-type) | | | | +--rw (private-key-type)
| | | | | +--:(private-key) | | | | | +--:(private-key)
| | | | | | +--rw private-key? | | | | | | +--rw private-key?
| | | | | | binary | | | | | | binary
| | | | | +--:(hidden-private-key) | | | | | +--:(hidden-private-key)
| | | | | | +--rw hidden-private-\ | | | | | | +--rw hidden-private-\
key? key?
| | | | | | empty | | | | | | empty
| | | | | +--:(encrypted-private-k\ | | | | | +--:(encrypted-private-k\
ey) ey)
| | | | | +--rw encrypted-priva\ | | | | | +--rw encrypted-priva\
te-key te-key
| | | | | +--rw (key-type) | | | | | +--rw (key-type)
| | | | | | +--:(symmetric-\ | | | | | | +--:(symmetric-\
key-ref) key-ref)
| | | | | | | +--rw symmet\ | | | | | | | +--rw symmet\
ric-key-ref? leafref ric-key-ref? leafref
| | | | | | | {key\ | | | | | | | {key\
store-supported}? store-supported}?
skipping to change at page 55, line 11 skipping to change at page 60, line 39
| | | | +--:(required) | | | | +--:(required)
| | | | | +--rw required? | | | | | +--rw required?
| | | | | empty | | | | | empty
| | | | +--:(optional) | | | | +--:(optional)
| | | | +--rw optional? | | | | +--rw optional?
| | | | empty | | | | empty
| | | +--rw (local-or-external) | | | +--rw (local-or-external)
| | | +--:(local) | | | +--:(local)
| | | | {local-client-auth-suppo\ | | | | {local-client-auth-suppo\
rted}? rted}?
| | | | +--rw ca-certs? | | | | +--rw ca-certs!
| | | | | ts:certificates-ref
| | | | | {ts:x509-certificates}? | | | | | {ts:x509-certificates}?
| | | | +--rw client-certs? | | | | | +--rw (local-or-truststore)
| | | | ts:certificates-ref | | | | | +--:(local)
| | | | | | {local-definiti\
ons-supported}?
| | | | | | +--rw local-definition
| | | | | | +--rw cert*
| | | | | | | trust-anch\
or-cert-cms
| | | | | | +---n certificate-\
expiration
| | | | | | +-- expiration-\
date
| | | | | | yang:da\
te-and-time
| | | | | +--:(truststore)
| | | | | {truststore-sup\
ported,x509-certificates}?
| | | | | +--rw truststore-refe\
rence?
| | | | | ts:certificat\
es-ref
| | | | +--rw client-certs!
| | | | {ts:x509-certificates}? | | | | {ts:x509-certificates}?
| | | | +--rw (local-or-truststore)
| | | | +--:(local)
| | | | | {local-definiti\
ons-supported}?
| | | | | +--rw local-definition
| | | | | +--rw cert*
| | | | | | trust-anch\
or-cert-cms
| | | | | +---n certificate-\
expiration
| | | | | +-- expiration-\
date
| | | | | yang:da\
te-and-time
| | | | +--:(truststore)
| | | | {truststore-sup\
ported,x509-certificates}?
| | | | +--rw truststore-refe\
rence?
| | | | ts:certificat\
es-ref
| | | +--:(external) | | | +--:(external)
| | | {external-client-auth-su\ | | | {external-client-auth-su\
pported}? pported}?
| | | +--rw client-auth-defined-else\ | | | +--rw client-auth-defined-else\
where? where?
| | | empty | | | empty
| | +--rw hello-params | | +--rw hello-params
| | | {tls-server-hello-params-config\ | | | {tls-server-hello-params-config\
}? }?
| | | +--rw tls-versions | | | +--rw tls-versions
skipping to change at page 55, line 51 skipping to change at page 62, line 23
| | | | +--rw required? | | | | +--rw required?
| | | | empty | | | | empty
| | | +--:(optional) | | | +--:(optional)
| | | +--rw optional? | | | +--rw optional?
| | | empty | | | empty
| | +--rw (local-or-external) | | +--rw (local-or-external)
| | +--:(local) | | +--:(local)
| | | {local-client-auth-suppo\ | | | {local-client-auth-suppo\
rted}? rted}?
| | | +--rw users | | | +--rw users
| | | +--rw user* [name] | | | +--rw user* [user-id]
| | | +--rw name string | | | +--rw user-id
| | | +--rw password? | | | | string
| | | ianach:crypt-hash | | | +--rw (auth-type)?
| | | +--:(basic)
| | | +--rw basic
| | | {basic-aut\
h}?
| | | +--rw user-id?
| | | | string
| | | +--rw password?
| | | ianach:\
crypt-hash
| | +--:(external) | | +--:(external)
| | {external-client-auth-su\ | | {external-client-auth-su\
pported}? pported}?
| | +--rw client-auth-defined-else\ | | +--rw client-auth-defined-else\
where? where?
| | empty | | empty
| +--rw restconf-server-parameters | +--rw restconf-server-parameters
| +--rw client-identification | +--rw client-identification
| +--rw cert-maps | +--rw cert-maps
| +--rw cert-to-name* [id] | +--rw cert-to-name* [id]
skipping to change at page 59, line 48 skipping to change at page 66, line 29
o Updated examples to reflect ietf-crypto-types change (e.g., o Updated examples to reflect ietf-crypto-types change (e.g.,
identities --> enumerations) identities --> enumerations)
o Adjusting from change in TLS client model (removing the top-level o Adjusting from change in TLS client model (removing the top-level
'certificate' container). 'certificate' container).
o Added "external-endpoint" to the "http-listen" choice in ietf- o Added "external-endpoint" to the "http-listen" choice in ietf-
restconf-server. restconf-server.
B.15. 14 to 15
o Added missing "or https-listen" clause in a "must" expression.
o Refactored the client module similar to how the server module was
refactored in -13. Now the 'restconf-client-grouping' is just the
RC-specific bits, the 'restconf-client-[initiate|listen]-stack-
grouping' is the protocol stack for a single connection, and
'restconf-client-app-grouping' is effectively what was before
(both listen+callhome for many inbound/outbound endpoints).
Acknowledgements Acknowledgements
The authors would like to thank for following for lively discussions The authors would like to thank for following for lively discussions
on list and in the halls (ordered by first name): Alan Luchuk, Andy on list and in the halls (ordered by first name): Alan Luchuk, Andy
Bierman, Balazs Kovacs, Benoit Claise, Bert Wijnen David Lamparter, Bierman, Balazs Kovacs, Benoit Claise, Bert Wijnen David Lamparter,
Juergen Schoenwaelder, Ladislav Lhotka, Martin Bjorklund, Mehmet Juergen Schoenwaelder, Ladislav Lhotka, Martin Bjorklund, Mehmet
Ersue, Phil Shafer, Radek Krejci, Ramkumar Dhanapal, Sean Turner, and Ersue, Phil Shafer, Radek Krejci, Ramkumar Dhanapal, Sean Turner, and
Tom Petch. Tom Petch.
Author's Address Author's Address
 End of changes. 126 change blocks. 
477 lines changed or deleted 798 lines changed or added

This html diff was produced by rfcdiff 1.47. The latest version is available from http://tools.ietf.org/tools/rfcdiff/