draft-ietf-netconf-restconf-client-server-13.txt   draft-ietf-netconf-restconf-client-server-14.txt 
NETCONF Working Group K. Watsen NETCONF Working Group K. Watsen
Internet-Draft Watsen Networks Internet-Draft Watsen Networks
Intended status: Standards Track June 7, 2019 Intended status: Standards Track July 2, 2019
Expires: December 9, 2019 Expires: January 3, 2020
RESTCONF Client and Server Models RESTCONF Client and Server Models
draft-ietf-netconf-restconf-client-server-13 draft-ietf-netconf-restconf-client-server-14
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-06-07" --> the publication date of this draft o "2019-07-02" --> 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 December 9, 2019. This Internet-Draft will expire on January 3, 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 13 skipping to change at page 3, line 13
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 . . . . . . . . . . . . . . . . . . . . . . 6
2.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 9 2.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 9
3. The RESTCONF Server Model . . . . . . . . . . . . . . . . . . 18 3. The RESTCONF Server Model . . . . . . . . . . . . . . . . . . 17
3.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 18 3.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 18
3.2. Example Usage . . . . . . . . . . . . . . . . . . . . . . 19 3.2. Example Usage . . . . . . . . . . . . . . . . . . . . . . 19
3.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 23 3.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 23
4. Security Considerations . . . . . . . . . . . . . . . . . . . 34 4. Security Considerations . . . . . . . . . . . . . . . . . . . 35
5. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 35 5. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 36
5.1. The IETF XML Registry . . . . . . . . . . . . . . . . . . 35 5.1. The IETF XML Registry . . . . . . . . . . . . . . . . . . 36
5.2. The YANG Module Names Registry . . . . . . . . . . . . . 36 5.2. The YANG Module Names Registry . . . . . . . . . . . . . 36
6. References . . . . . . . . . . . . . . . . . . . . . . . . . 36 6. References . . . . . . . . . . . . . . . . . . . . . . . . . 36
6.1. Normative References . . . . . . . . . . . . . . . . . . 36 6.1. Normative References . . . . . . . . . . . . . . . . . . 36
6.2. Informative References . . . . . . . . . . . . . . . . . 37 6.2. Informative References . . . . . . . . . . . . . . . . . 38
Appendix A. Expanded Tree Diagrams . . . . . . . . . . . . . . . 39 Appendix A. Expanded Tree Diagrams . . . . . . . . . . . . . . . 39
A.1. Expanded Tree Diagram for 'ietf-restconf-client' . . . . 39 A.1. Expanded Tree Diagram for 'ietf-restconf-client' . . . . 39
A.2. Expanded Tree Diagram for 'ietf-restconf-server' . . . . 48 A.2. Expanded Tree Diagram for 'ietf-restconf-server' . . . . 49
Appendix B. Change Log . . . . . . . . . . . . . . . . . . . . . 54 Appendix B. Change Log . . . . . . . . . . . . . . . . . . . . . 56
B.1. 00 to 01 . . . . . . . . . . . . . . . . . . . . . . . . 54 B.1. 00 to 01 . . . . . . . . . . . . . . . . . . . . . . . . 56
B.2. 01 to 02 . . . . . . . . . . . . . . . . . . . . . . . . 54 B.2. 01 to 02 . . . . . . . . . . . . . . . . . . . . . . . . 56
B.3. 02 to 03 . . . . . . . . . . . . . . . . . . . . . . . . 55 B.3. 02 to 03 . . . . . . . . . . . . . . . . . . . . . . . . 57
B.4. 03 to 04 . . . . . . . . . . . . . . . . . . . . . . . . 55 B.4. 03 to 04 . . . . . . . . . . . . . . . . . . . . . . . . 57
B.5. 04 to 05 . . . . . . . . . . . . . . . . . . . . . . . . 55 B.5. 04 to 05 . . . . . . . . . . . . . . . . . . . . . . . . 57
B.6. 05 to 06 . . . . . . . . . . . . . . . . . . . . . . . . 55 B.6. 05 to 06 . . . . . . . . . . . . . . . . . . . . . . . . 57
B.7. 06 to 07 . . . . . . . . . . . . . . . . . . . . . . . . 55 B.7. 06 to 07 . . . . . . . . . . . . . . . . . . . . . . . . 57
B.8. 07 to 08 . . . . . . . . . . . . . . . . . . . . . . . . 56 B.8. 07 to 08 . . . . . . . . . . . . . . . . . . . . . . . . 58
B.9. 08 to 09 . . . . . . . . . . . . . . . . . . . . . . . . 56 B.9. 08 to 09 . . . . . . . . . . . . . . . . . . . . . . . . 58
B.10. 09 to 10 . . . . . . . . . . . . . . . . . . . . . . . . 56 B.10. 09 to 10 . . . . . . . . . . . . . . . . . . . . . . . . 58
B.11. 10 to 11 . . . . . . . . . . . . . . . . . . . . . . . . 56 B.11. 10 to 11 . . . . . . . . . . . . . . . . . . . . . . . . 58
B.12. 11 to 12 . . . . . . . . . . . . . . . . . . . . . . . . 56 B.12. 11 to 12 . . . . . . . . . . . . . . . . . . . . . . . . 58
B.13. 12 to 13 . . . . . . . . . . . . . . . . . . . . . . . . 57 B.13. 12 to 13 . . . . . . . . . . . . . . . . . . . . . . . . 59
Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . . 57 B.14. 13 to 14 . . . . . . . . . . . . . . . . . . . . . . . . 59
Author's Address . . . . . . . . . . . . . . . . . . . . . . . . 57 Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . . 59
Author's Address . . . . . . . . . . . . . . . . . . . . . . . . 60
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 6, line 37 skipping to change at page 6, line 37
<tcp-client-parameters> <tcp-client-parameters>
<remote-address>corp-fw1.example.com</remote-address> <remote-address>corp-fw1.example.com</remote-address>
<keepalives> <keepalives>
<idle-time>15</idle-time> <idle-time>15</idle-time>
<max-probes>3</max-probes> <max-probes>3</max-probes>
<probe-interval>30</probe-interval> <probe-interval>30</probe-interval>
</keepalives> </keepalives>
</tcp-client-parameters> </tcp-client-parameters>
<tls-client-parameters> <tls-client-parameters>
<client-identity> <client-identity>
<certificate> <local-definition>
<local-definition> <algorithm>rsa2048</algorithm>
<algorithm xmlns:ct="urn:ietf:params:xml:ns:yang\ <private-key>base64encodedvalue==</private-key>
:ietf-crypto-types">ct:rsa2048</algorithm> <public-key>base64encodedvalue==</public-key>
<private-key>base64encodedvalue==</private-key> <cert>base64encodedvalue==</cert>
<public-key>base64encodedvalue==</public-key> </local-definition>
<cert>base64encodedvalue==</cert>
</local-definition>
</certificate>
</client-identity> </client-identity>
<server-authentication> <server-authentication>
<ca-certs>explicitly-trusted-server-ca-certs</ca-cer\ <ca-certs>explicitly-trusted-server-ca-certs</ca-cer\
ts> ts>
<server-certs>explicitly-trusted-server-certs</serve\ <server-certs>explicitly-trusted-server-certs</serve\
r-certs> r-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>
skipping to change at page 7, line 33 skipping to change at page 7, line 31
<tcp-client-parameters> <tcp-client-parameters>
<remote-address>corp-fw2.example.com</remote-address> <remote-address>corp-fw2.example.com</remote-address>
<keepalives> <keepalives>
<idle-time>15</idle-time> <idle-time>15</idle-time>
<max-probes>3</max-probes> <max-probes>3</max-probes>
<probe-interval>30</probe-interval> <probe-interval>30</probe-interval>
</keepalives> </keepalives>
</tcp-client-parameters> </tcp-client-parameters>
<tls-client-parameters> <tls-client-parameters>
<client-identity> <client-identity>
<certificate> <local-definition>
<local-definition> <algorithm>rsa2048</algorithm>
<algorithm xmlns:ct="urn:ietf:params:xml:ns:yang\ <private-key>base64encodedvalue==</private-key>
:ietf-crypto-types">ct:rsa2048</algorithm> <public-key>base64encodedvalue==</public-key>
<private-key>base64encodedvalue==</private-key> <cert>base64encodedvalue==</cert>
<public-key>base64encodedvalue==</public-key> </local-definition>
<cert>base64encodedvalue==</cert>
</local-definition>
</certificate>
</client-identity> </client-identity>
<server-authentication> <server-authentication>
<ca-certs>explicitly-trusted-server-ca-certs</ca-cer\ <ca-certs>explicitly-trusted-server-ca-certs</ca-cer\
ts> ts>
<server-certs>explicitly-trusted-server-certs</serve\ <server-certs>explicitly-trusted-server-certs</serve\
r-certs> r-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>
skipping to change at page 8, line 35 skipping to change at page 8, line 28
<!-- endpoints to listen for RESTCONF Call Home connections on --> <!-- endpoints to listen for RESTCONF Call Home connections on -->
<listen> <listen>
<endpoint> <endpoint>
<name>Intranet-facing listener</name> <name>Intranet-facing listener</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-client-parameters> <tls-client-parameters>
<client-identity> <client-identity>
<certificate> <local-definition>
<local-definition> <algorithm>rsa2048</algorithm>
<algorithm xmlns:ct="urn:ietf:params:xml:ns:yang:iet\ <private-key>base64encodedvalue==</private-key>
f-crypto-types">ct:rsa2048</algorithm> <public-key>base64encodedvalue==</public-key>
<private-key>base64encodedvalue==</private-key> <cert>base64encodedvalue==</cert>
<public-key>base64encodedvalue==</public-key> </local-definition>
<cert>base64encodedvalue==</cert>
</local-definition>
</certificate>
</client-identity> </client-identity>
<server-authentication> <server-authentication>
<ca-certs>explicitly-trusted-server-ca-certs</ca-certs> <ca-certs>explicitly-trusted-server-ca-certs</ca-certs>
<server-certs>explicitly-trusted-server-certs</server-ce\ <server-certs>explicitly-trusted-server-certs</server-ce\
rts> rts>
</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>
skipping to change at page 9, line 23 skipping to change at page 9, line 15
</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-06-07.yang" <CODE BEGINS> file "ietf-restconf-client@2019-07-02.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 44 skipping to change at page 10, line 36
(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-06-07 { revision 2019-07-02 {
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 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";
skipping to change at page 12, line 41 skipping to change at page 12, line 34
default "443"; default "443";
description description
"The RESTCONF client will attempt to "The RESTCONF client will attempt to
connect to the IANA-assigned well-known connect to the IANA-assigned well-known
port value for 'https' (443) if no value port value for 'https' (443) if no value
is specified."; is specified.";
} }
} }
} }
container tls-client-parameters { container tls-client-parameters {
must "client-identity" {
description
"NETCONF/TLS clients MUST pass some
authentication credentials.";
}
description description
"A wrapper around the TLS client parameters "A wrapper around the TLS client parameters
to avoid name collisions."; to avoid name collisions.";
uses tlsc:tls-client-grouping { uses tlsc:tls-client-grouping;
refine "client-identity/auth-type" {
mandatory true;
description
"RESTCONF clients MUST pass some
authentication credentials.";
}
}
} }
container http-client-parameters { container http-client-parameters {
description description
"A wrapper around the HTTP client parameters "A wrapper around the HTTP client parameters
to avoid name collisions."; to avoid name collisions.";
uses httpc:http-client-grouping; uses httpc:http-client-grouping;
} }
} }
} // https } // https
} // transport } // transport
skipping to change at page 17, line 14 skipping to change at page 17, line 4
description description
"A wrapper around the TCP client parameters "A wrapper around the TCP client parameters
to avoid name collisions."; to avoid name collisions.";
uses tcps:tcp-server-grouping { uses tcps:tcp-server-grouping {
refine "local-port" { refine "local-port" {
default "4336"; default "4336";
description description
"The RESTCONF client will listen on the IANA- "The RESTCONF client will listen on the IANA-
assigned well-known port for 'restconf-ch-tls' assigned well-known port for 'restconf-ch-tls'
(4336) if no value is specified."; (4336) if no value is specified.";
} }
} }
} }
container tls-client-parameters { container tls-client-parameters {
must "client-identity" {
description
"NETCONF/TLS clients MUST pass some
authentication credentials.";
}
description description
"A wrapper around the TLS client parameters "A wrapper around the TLS client parameters
to avoid name collisions."; to avoid name collisions.";
uses tlsc:tls-client-grouping { uses tlsc:tls-client-grouping;
refine "client-identity/auth-type" {
mandatory true;
description
"RESTCONF clients MUST pass some authentication
credentials.";
}
}
} }
container http-client-parameters { container http-client-parameters {
description description
"A wrapper around the HTTP client parameters "A wrapper around the HTTP client parameters
to avoid name collisions."; to avoid name collisions.";
uses httpc:http-client-grouping; uses httpc:http-client-grouping;
} }
} }
} // case https } // case https
} // transport } // transport
skipping to change at page 18, line 40 skipping to change at page 18, line 29
+---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
| | +-- address inet:ip-address
| | +-- 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
+-- tcp-server-parameters +-- tcp-server-parameters
| +---u tcps:tcp-server-grouping | +---u tcps:tcp-server-grouping
skipping to change at page 20, line 26 skipping to change at page 20, line 15
<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>
<local-definition> <local-definition>
<algorithm xmlns:ct="urn:ietf:params:xml:ns:yang:ietf-\ <algorithm>rsa2048</algorithm>
crypto-types">ct: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>explicitly-trusted-client-ca-certs</ca-certs>
<client-certs>explicitly-trusted-client-certs</client-ce\ <client-certs>explicitly-trusted-client-certs</client-ce\
rts> rts>
skipping to change at page 21, line 33 skipping to change at page 21, line 23
<endpoints> <endpoints>
<endpoint> <endpoint>
<name>east-data-center</name> <name>east-data-center</name>
<https> <https>
<tcp-client-parameters> <tcp-client-parameters>
<remote-address>east.example.com</remote-address> <remote-address>east.example.com</remote-address>
</tcp-client-parameters> </tcp-client-parameters>
<tls-server-parameters> <tls-server-parameters>
<server-identity> <server-identity>
<local-definition> <local-definition>
<algorithm xmlns:ct="urn:ietf:params:xml:ns:yang:i\ <algorithm>rsa2048</algorithm>
etf-crypto-types">ct: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>explicitly-trusted-client-ca-certs</ca-cer\
ts> ts>
<client-certs>explicitly-trusted-client-certs</clien\ <client-certs>explicitly-trusted-client-certs</clien\
skipping to change at page 22, line 35 skipping to change at page 22, line 23
</endpoint> </endpoint>
<endpoint> <endpoint>
<name>west-data-center</name> <name>west-data-center</name>
<https> <https>
<tcp-client-parameters> <tcp-client-parameters>
<remote-address>west.example.com</remote-address> <remote-address>west.example.com</remote-address>
</tcp-client-parameters> </tcp-client-parameters>
<tls-server-parameters> <tls-server-parameters>
<server-identity> <server-identity>
<local-definition> <local-definition>
<algorithm xmlns:ct="urn:ietf:params:xml:ns:yang:i\ <algorithm>rsa2048</algorithm>
etf-crypto-types">ct: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>explicitly-trusted-client-ca-certs</ca-cer\
ts> ts>
<client-certs>explicitly-trusted-client-certs</clien\ <client-certs>explicitly-trusted-client-certs</clien\
skipping to change at page 23, line 50 skipping to change at page 23, line 37
</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-06-07.yang" <CODE BEGINS> file "ietf-restconf-server@2019-07-02.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";
} }
import ietf-inet-types {
prefix inet;
reference
"RFC 6991: Common YANG Data Types";
}
import ietf-x509-cert-to-name { import ietf-x509-cert-to-name {
prefix x509c2n; prefix x509c2n;
reference reference
"RFC 7407: A YANG Data Model for SNMP Configuration"; "RFC 7407: A YANG Data Model for SNMP Configuration";
} }
import ietf-tcp-client { import ietf-tcp-client {
prefix tcpc; prefix tcpc;
reference reference
"RFC AAAA: YANG Groupings for TCP Clients and TCP Servers"; "RFC AAAA: YANG Groupings for TCP Clients and TCP Servers";
skipping to change at page 25, line 32 skipping to change at page 25, line 26
(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-06-07 { revision 2019-07-02 {
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 27, line 34 skipping to change at page 27, line 25
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 {
description
"Identifies contact information for the external
system that terminates connections before passing
them thru to this server (e.g., a network address
translator or a load balancer). These values have
no effect on the local operation of this server, but
may be used by the application when needing to
inform other systems how to contact this server.";
leaf address {
type inet:ip-address;
mandatory true;
description
"The IP address or hostname of the external system
that terminates incoming RESTCONF client
connections before forwarding them to this
server.";
}
leaf port {
type inet:port-number;
default "443";
description
"The port number that the external system listens
on for incoming RESTCONF client connections that
are forwarded to this server. The default HTTPS
port (443) is used, as expected for a RESTCONF
connection.";
}
}
container tcp-server-parameters { container tcp-server-parameters {
description description
"A wrapper around the TCP server parameters "A wrapper around the TCP server parameters
to avoid name collisions."; to avoid name collisions.";
uses tcps:tcp-server-grouping { uses tcps:tcp-server-grouping {
refine "local-port" { refine "local-port" {
default "80"; default "80";
description description
"The RESTCONF server will listen on the IANA- "The RESTCONF server will listen on the IANA-
assigned well-known port value for 'http' assigned well-known port value for 'http'
skipping to change at page 36, line 26 skipping to change at page 36, line 45
name: ietf-restconf-server name: ietf-restconf-server
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., "YANG Data Model for a Centralized Keystore Watsen, K., "A YANG Data Model for a Keystore", draft-
Mechanism", draft-ietf-netconf-keystore-09 (work in ietf-netconf-keystore-11 (work in progress), June 2019.
progress), April 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-12 (work in progress), April 2019. server-13 (work in progress), June 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-02 Servers", draft-kwatsen-netconf-http-client-server-03
(work in progress), April 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.
[RFC2119] Bradner, S., "Key words for use in RFCs to Indicate [RFC2119] Bradner, S., "Key words for use in RFCs to Indicate
Requirement Levels", BCP 14, RFC 2119, Requirement Levels", BCP 14, RFC 2119,
DOI 10.17487/RFC2119, March 1997, DOI 10.17487/RFC2119, March 1997,
<https://www.rfc-editor.org/info/rfc2119>. <https://www.rfc-editor.org/info/rfc2119>.
skipping to change at page 37, line 37 skipping to change at page 38, line 8
RFC 8071, DOI 10.17487/RFC8071, February 2017, RFC 8071, DOI 10.17487/RFC8071, February 2017,
<https://www.rfc-editor.org/info/rfc8071>. <https://www.rfc-editor.org/info/rfc8071>.
[RFC8174] Leiba, B., "Ambiguity of Uppercase vs Lowercase in RFC [RFC8174] Leiba, B., "Ambiguity of Uppercase vs Lowercase in RFC
2119 Key Words", BCP 14, RFC 8174, DOI 10.17487/RFC8174, 2119 Key Words", BCP 14, RFC 8174, DOI 10.17487/RFC8174,
May 2017, <https://www.rfc-editor.org/info/rfc8174>. May 2017, <https://www.rfc-editor.org/info/rfc8174>.
6.2. Informative References 6.2. Informative References
[I-D.ietf-netconf-trust-anchors] [I-D.ietf-netconf-trust-anchors]
Watsen, K., "YANG Data Model for Global Trust Anchors", Watsen, K., "A YANG Data Model for a Truststore", draft-
draft-ietf-netconf-trust-anchors-04 (work in progress), ietf-netconf-trust-anchors-05 (work in progress), June
April 2019. 2019.
[RFC3688] Mealling, M., "The IETF XML Registry", BCP 81, RFC 3688, [RFC3688] Mealling, M., "The IETF XML Registry", BCP 81, RFC 3688,
DOI 10.17487/RFC3688, January 2004, DOI 10.17487/RFC3688, January 2004,
<https://www.rfc-editor.org/info/rfc3688>. <https://www.rfc-editor.org/info/rfc3688>.
[RFC6241] Enns, R., Ed., Bjorklund, M., Ed., Schoenwaelder, J., Ed., [RFC6241] Enns, R., Ed., Bjorklund, M., Ed., Schoenwaelder, J., Ed.,
and A. Bierman, Ed., "Network Configuration Protocol and A. Bierman, Ed., "Network Configuration Protocol
(NETCONF)", RFC 6241, DOI 10.17487/RFC6241, June 2011, (NETCONF)", RFC 6241, DOI 10.17487/RFC6241, June 2011,
<https://www.rfc-editor.org/info/rfc6241>. <https://www.rfc-editor.org/info/rfc6241>.
skipping to change at page 39, line 45 skipping to change at page 39, line 45
| | | | {local-binding-supported}? | | | | {local-binding-supported}?
| | | +--rw local-port? inet:port-number | | | +--rw local-port? inet:port-number
| | | | {local-binding-supported}? | | | | {local-binding-supported}?
| | | +--rw keepalives! | | | +--rw keepalives!
| | | {keepalives-supported}? | | | {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 (auth-type) | | | | +--rw (local-or-keystore)
| | | | +--:(certificate) | | | | +--:(local)
| | | | +--rw certificate | | | | | {local-definitions-suppo\
| | | | +--rw (local-or-keystore)
| | | | +--:(local)
| | | | | {local-definiti\
\ons-supported}?
| | | | | +--rw local-definition
| | | | | +--rw algorithm
| | | | | | asymmetric\
\-key-algorithm-ref
| | | | | +--rw public-key
| | | | | | binary
| | | | | +--rw private-key
| | | | | | union
| | | | | +--rw cert?
| | | | | | end-entity\
\-cert-cms
| | | | | +---n certificate-\
\expiration
| | | | | | +-- expiration-\
\date
| | | | | | yang:da\
\te-and-time
| | | | | +---x generate-cer\
\tificate-signing-request
| | | | | +---w input
| | | | | | +---w subject
| | | | | | | bina\
\ry
| | | | | | +---w attrib\
\utes?
| | | | | | bina\
\ry
| | | | | +--ro output
| | | | | +--ro certif\
\icate-signing-request
| | | | | bina\
\ry
| | | | +--:(keystore)
| | | | {keystore-suppo\
\rted}? \rted}?
| | | | +--rw keystore-refere\ | | | | | +--rw local-definition
\nce? | | | | | +--rw algorithm
| | | | ks:asymmetric\ | | | | | | asymmetric-key-algo\
\-key-certificate-ref \rithm-t
| | | | | +--rw public-key
| | | | | | binary
| | | | | +--rw (private-key-type)
| | | | | | +--:(private-key)
| | | | | | | +--rw private-key?
| | | | | | | binary
| | | | | | +--:(hidden-private-key)
| | | | | | | +--rw hidden-private-\
\key?
| | | | | | | empty
| | | | | | +--:(encrypted-private-k\
\ey)
| | | | | | +--rw encrypted-priva\
\te-key
| | | | | | +--rw (key-type)
| | | | | | | +--:(symmetric-\
\key-ref)
| | | | | | | | +--rw symmet\
\ric-key-ref? leafref
| | | | | | | | {key\
\store-supported}?
| | | | | | | +--:(asymmetric\
\-key-ref)
| | | | | | | +--rw asymme\
\tric-key-ref? leafref
| | | | | | | {key\
\store-supported}?
| | | | | | +--rw value?
| | | | | | binary
| | | | | +--rw cert?
| | | | | | end-entity-cert-cms
| | | | | +---n certificate-expiration
| | | | | | +-- expiration-date
| | | | | | yang:date-and-ti\
\me
| | | | | +---x generate-certificate-\
\signing-request
| | | | | +---w input
| | | | | | +---w subject
| | | | | | | binary
| | | | | | +---w attributes?
| | | | | | binary
| | | | | +--ro output
| | | | | +--ro certificate-sig\
\ning-request
| | | | | binary
| | | | +--:(keystore)
| | | | {keystore-supported}?
| | | | +--rw keystore-reference
| | | | +--rw asymmetric-key?
| | | | | ks:asymmetric-key-r\
\ef
| | | | +--rw certificate? lea\
\fref
| | | +--rw server-authentication | | | +--rw server-authentication
| | | | +--rw ca-certs? | | | | +--rw ca-certs?
| | | | | ts:certificates-ref | | | | | ts:certificates-ref
| | | | | {ts:x509-certificates}? | | | | | {ts:x509-certificates}?
| | | | +--rw server-certs? | | | | +--rw server-certs?
| | | | ts:certificates-ref | | | | ts:certificates-ref
| | | | {ts:x509-certificates}? | | | | {ts:x509-certificates}?
| | | +--rw hello-params | | | +--rw hello-params
| | | | {tls-client-hello-params-config\ | | | | {tls-client-hello-params-config\
\}? \}?
skipping to change at page 42, line 14 skipping to change at page 42, line 30
| | | +--rw local-port? | | | +--rw local-port?
| | | | inet:port-number | | | | inet:port-number
| | | | {local-binding-supported}? | | | | {local-binding-supported}?
| | | +--rw keepalives! | | | +--rw keepalives!
| | | {keepalives-supported}? | | | {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 (auth-type)? | | | | +--rw (local-or-keystore)
| | | | +--:(certificate) | | | | +--:(local)
| | | | +--rw certificate | | | | | {local-definitions\
| | | | +--rw (local-or-keyst\
\ore)
| | | | +--:(local)
| | | | | {local-de\
\finitions-supported}?
| | | | | +--rw local-def\
\inition
| | | | | +--rw algori\
\thm
| | | | | | asym\
\metric-key-algorithm-ref
| | | | | +--rw public\
\-key
| | | | | | bina\
\ry
| | | | | +--rw privat\
\e-key
| | | | | | union
| | | | | +--rw cert?
| | | | | | end-\
\entity-cert-cms
| | | | | +---n certif\
\icate-expiration
| | | | | | +-- expir\
\ation-date
| | | | | | y\
\ang:date-and-time
| | | | | +---x genera\
\te-certificate-signing-request
| | | | | +---w inp\
\ut
| | | | | | +---w \
\subject
| | | | | | | \
\ binary
| | | | | | +---w \
\attributes?
| | | | | | \
\ binary
| | | | | +--ro out\
\put
| | | | | +--ro \
\certificate-signing-request
| | | | | \
\ binary
| | | | +--:(keystore)
| | | | {keystore\
\-supported}? \-supported}?
| | | | +--rw keystore-\ | | | | | +--rw local-definition
\reference? | | | | | +--rw algorithm
| | | | ks:asym\ | | | | | | asymmetric-ke\
\metric-key-certificate-ref \y-algorithm-t
| | | | | +--rw public-key
| | | | | | binary
| | | | | +--rw (private-key-ty\
\pe)
| | | | | | +--:(private-key)
| | | | | | | +--rw private-k\
\ey?
| | | | | | | binary
| | | | | | +--:(hidden-privat\
\e-key)
| | | | | | | +--rw hidden-pr\
\ivate-key?
| | | | | | | empty
| | | | | | +--:(encrypted-pri\
\vate-key)
| | | | | | +--rw encrypted\
\-private-key
| | | | | | +--rw (key-t\
\ype)
| | | | | | | +--:(symm\
\etric-key-ref)
| | | | | | | | +--rw \
\symmetric-key-ref? leafref
| | | | | | | | \
\ {keystore-supported}?
| | | | | | | +--:(asym\
\metric-key-ref)
| | | | | | | +--rw \
\asymmetric-key-ref? leafref
| | | | | | | \
\ {keystore-supported}?
| | | | | | +--rw value?
| | | | | | bina\
\ry
| | | | | +--rw cert?
| | | | | | end-entity-ce\
\rt-cms
| | | | | +---n certificate-exp\
\iration
| | | | | | +-- expiration-date
| | | | | | yang:date-\
\and-time
| | | | | +---x generate-certif\
\icate-signing-request
| | | | | +---w input
| | | | | | +---w subject
| | | | | | | binary
| | | | | | +---w attribute\
\s?
| | | | | | binary
| | | | | +--ro output
| | | | | +--ro certifica\
\te-signing-request
| | | | | binary
| | | | +--:(keystore)
| | | | {keystore-supporte\
\d}?
| | | | +--rw keystore-reference
| | | | +--rw asymmetric-key?
| | | | | ks:asymmetric\
\-key-ref
| | | | +--rw certificate? \
\ leafref
| | | +--rw server-authentication | | | +--rw server-authentication
| | | | +--rw ca-certs? | | | | +--rw ca-certs?
| | | | | ts:certificates-ref | | | | | ts:certificates-ref
| | | | | {ts:x509-certificates}? | | | | | {ts:x509-certificates}?
| | | | +--rw server-certs? | | | | +--rw server-certs?
| | | | ts:certificates-ref | | | | ts:certificates-ref
| | | | {ts:x509-certificates}? | | | | {ts:x509-certificates}?
| | | +--rw hello-params | | | +--rw hello-params
| | | | {tls-client-hello-params-\ | | | | {tls-client-hello-params-\
\config}? \config}?
skipping to change at page 44, line 16 skipping to change at page 44, line 49
| +--rw start-with? enumeration | +--rw start-with? enumeration
| +--rw max-attempts? uint8 | +--rw max-attempts? uint8
+--rw listen! {https-listen}? +--rw listen! {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)
+--:(https) {https-listen}? +--:(https) {https-listen}?
+--rw https +--rw https
+--rw tcp-server-parameters +--rw tcp-server-parameters
| +--rw local-address | +--rw local-address inet:ip-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 external-endpoint-values!
| {external-endpoints}?
| +--rw address inet:ip-address
| +--rw port? inet:port-number
+--rw tls-client-parameters +--rw tls-client-parameters
| +--rw client-identity | +--rw client-identity
| | +--rw (auth-type) | | +--rw (local-or-keystore)
| | +--:(certificate) | | +--:(local)
| | +--rw certificate | | | {local-definitions-supported}?
| | +--rw (local-or-keystore) | | | +--rw local-definition
| | +--:(local) | | | +--rw algorithm
| | | {local-definitions-su\ | | | | asymmetric-key-algorithm-t
\pported}? | | | +--rw public-key
| | | +--rw local-definition | | | | binary
| | | +--rw algorithm | | | +--rw (private-key-type)
| | | | asymmetric-key-a\ | | | | +--:(private-key)
\lgorithm-ref | | | | | +--rw private-key?
| | | +--rw public-key | | | | | binary
| | | | binary | | | | +--:(hidden-private-key)
| | | +--rw private-key | | | | | +--rw hidden-private-key?
| | | | union | | | | | empty
| | | +--rw cert? | | | | +--:(encrypted-private-key)
| | | | end-entity-cert-\ | | | | +--rw encrypted-private-key
\cms | | | | +--rw (key-type)
| | | +---n certificate-expira\ | | | | | +--:(symmetric-key-re\
\tion \f)
| | | | +-- expiration-date | | | | | | +--rw symmetric-ke\
| | | | yang:date-and\ \y-ref? leafref
| | | | | | {keystore-\
\supported}?
| | | | | +--:(asymmetric-key-r\
\ef)
| | | | | +--rw asymmetric-k\
\ey-ref? leafref
| | | | | {keystore-\
\supported}?
| | | | +--rw value?
| | | | binary
| | | +--rw cert?
| | | | end-entity-cert-cms
| | | +---n certificate-expiration
| | | | +-- expiration-date
| | | | yang:date-and-time
| | | +---x generate-certificate-signin\
\g-request
| | | +---w input
| | | | +---w subject binary
| | | | +---w attributes? binary
| | | +--ro output
| | | +--ro certificate-signing-r\
\-time \equest
| | | +---x generate-certifica\ | | | binary
\te-signing-request | | +--:(keystore) {keystore-supported}?
| | | +---w input | | +--rw keystore-reference
| | | | +---w subject | | +--rw asymmetric-key?
| | | | | binary | | | ks:asymmetric-key-ref
| | | | +---w attributes? | | +--rw certificate? leafref
| | | | binary
| | | +--ro output
| | | +--ro certificate-\
\signing-request
| | | binary
| | +--:(keystore)
| | {keystore-supported}?
| | +--rw keystore-reference?
| | ks:asymmetric-key-c\
\ertificate-ref
| +--rw server-authentication | +--rw server-authentication
| | +--rw ca-certs? ts:certificates-ref | | +--rw ca-certs? ts:certificates-ref
| | | {ts:x509-certificates}? | | | {ts:x509-certificates}?
| | +--rw server-certs? ts:certificates-ref | | +--rw server-certs? ts:certificates-ref
| | {ts:x509-certificates}? | | {ts:x509-certificates}?
| +--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
skipping to change at page 46, line 32 skipping to change at page 47, line 22
| | {local-binding-supported}? | | {local-binding-supported}?
| +--rw local-port? inet:port-number | +--rw local-port? inet:port-number
| | {local-binding-supported}? | | {local-binding-supported}?
| +--rw keepalives! | +--rw keepalives!
| {keepalives-supported}? | {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 (auth-type)? | | +--rw (local-or-keystore)
| | +--:(certificate) | | +--:(local)
| | +--rw certificate | | | {local-definitions-suppo\
| | +--rw (local-or-keystore)
| | +--:(local)
| | | {local-definiti\
\ons-supported}?
| | | +--rw local-definition
| | | +--rw algorithm
| | | | asymmetric\
\-key-algorithm-ref
| | | +--rw public-key
| | | | binary
| | | +--rw private-key
| | | | union
| | | +--rw cert?
| | | | end-entity\
\-cert-cms
| | | +---n certificate-\
\expiration
| | | | +-- expiration-\
\date
| | | | yang:da\
\te-and-time
| | | +---x generate-cer\
\tificate-signing-request
| | | +---w input
| | | | +---w subject
| | | | | bina\
\ry
| | | | +---w attrib\
\utes?
| | | | bina\
\ry
| | | +--ro output
| | | +--ro certif\
\icate-signing-request
| | | bina\
\ry
| | +--:(keystore)
| | {keystore-suppo\
\rted}? \rted}?
| | +--rw keystore-refere\ | | | +--rw local-definition
\nce? | | | +--rw algorithm
| | ks:asymmetric\ | | | | asymmetric-key-algo\
\-key-certificate-ref \rithm-t
| | | +--rw public-key
| | | | binary
| | | +--rw (private-key-type)
| | | | +--:(private-key)
| | | | | +--rw private-key?
| | | | | binary
| | | | +--:(hidden-private-key)
| | | | | +--rw hidden-private-\
\key?
| | | | | empty
| | | | +--:(encrypted-private-k\
\ey)
| | | | +--rw encrypted-priva\
\te-key
| | | | +--rw (key-type)
| | | | | +--:(symmetric-\
\key-ref)
| | | | | | +--rw symmet\
\ric-key-ref? leafref
| | | | | | {key\
\store-supported}?
| | | | | +--:(asymmetric\
\-key-ref)
| | | | | +--rw asymme\
\tric-key-ref? leafref
| | | | | {key\
\store-supported}?
| | | | +--rw value?
| | | | binary
| | | +--rw cert?
| | | | end-entity-cert-cms
| | | +---n certificate-expiration
| | | | +-- expiration-date
| | | | yang:date-and-ti\
\me
| | | +---x generate-certificate-\
\signing-request
| | | +---w input
| | | | +---w subject
| | | | | binary
| | | | +---w attributes?
| | | | binary
| | | +--ro output
| | | +--ro certificate-sig\
\ning-request
| | | binary
| | +--:(keystore)
| | {keystore-supported}?
| | +--rw keystore-reference
| | +--rw asymmetric-key?
| | | ks:asymmetric-key-r\
\ef
| | +--rw certificate? lea\
\fref
| +--rw server-authentication | +--rw server-authentication
| | +--rw ca-certs? | | +--rw ca-certs?
| | | ts:certificates-ref | | | ts:certificates-ref
| | | {ts:x509-certificates}? | | | {ts:x509-certificates}?
| | +--rw server-certs? | | +--rw server-certs?
| | ts:certificates-ref | | ts:certificates-ref
| | {ts:x509-certificates}? | | {ts:x509-certificates}?
| +--rw hello-params | +--rw hello-params
| | {tls-client-hello-params-config\ | | {tls-client-hello-params-config\
\}? \}?
skipping to change at page 48, line 26 skipping to change at page 49, line 31
=========== NOTE: '\' line wrapping per BCP XX (RFC XXXX) =========== =========== NOTE: '\' line wrapping per BCP XX (RFC XXXX) ===========
module: ietf-restconf-server module: ietf-restconf-server
+--rw restconf-server +--rw restconf-server
+--rw listen! {https-listen}? +--rw listen! {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 address inet:ip-address
| | | +--rw port? inet:port-number
| | +--rw tcp-server-parameters | | +--rw tcp-server-parameters
| | | +--rw local-address | | | +--rw local-address inet:ip-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 external-endpoint-values!
| | | {external-endpoints}?
| | | +--rw address inet:ip-address
| | | +--rw port? inet:port-number
| | +--rw http-server-parameters | | +--rw http-server-parameters
| | | +--rw server-name? string | | | +--rw server-name? string
| | | +--rw protocol-versions | | | +--rw protocol-versions
| | | | +--rw protocol-version* enumeration | | | | +--rw protocol-version* enumeration
| | | +--rw client-authentication! | | | +--rw client-authentication!
| | | +--rw (required-or-optional) | | | +--rw (required-or-optional)
| | | | +--:(required) | | | | +--:(required)
| | | | | +--rw required? | | | | | +--rw required?
| | | | | empty | | | | | empty
| | | | +--:(optional) | | | | +--:(optional)
skipping to change at page 49, line 27 skipping to change at page 50, line 30
| | +--rw cert-maps | | +--rw cert-maps
| | +--rw cert-to-name* [id] | | +--rw cert-to-name* [id]
| | +--rw id uint32 | | +--rw id uint32
| | +--rw fingerprint | | +--rw fingerprint
| | | x509c2n:tls-fingerprint | | | x509c2n:tls-fingerprint
| | +--rw map-type identityref | | +--rw map-type identityref
| | +--rw name string | | +--rw name string
| +--:(https) {https-listen}? | +--:(https) {https-listen}?
| +--rw https | +--rw https
| +--rw tcp-server-parameters | +--rw tcp-server-parameters
| | +--rw local-address | | +--rw local-address inet:ip-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 external-endpoint-values!
| | {external-endpoints}?
| | +--rw address inet:ip-address
| | +--rw port? inet:port-number
| +--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-\ | | | | | asymmetric-key-algorithm-t
ref
| | | | +--rw public-key | | | | +--rw public-key
| | | | | binary | | | | | binary
| | | | +--rw private-key | | | | +--rw (private-key-type)
| | | | | union | | | | | +--:(private-key)
| | | | | | +--rw private-key?
| | | | | | binary
| | | | | +--:(hidden-private-key)
| | | | | | +--rw hidden-private-key?
| | | | | | empty
| | | | | +--:(encrypted-private-key)
| | | | | +--rw encrypted-private-key
| | | | | +--rw (key-type)
| | | | | | +--:(symmetric-key-re\
f)
| | | | | | | +--rw symmetric-ke\
y-ref? leafref
| | | | | | | {keystore-\
supported}?
| | | | | | +--:(asymmetric-key-r\
ef)
| | | | | | +--rw asymmetric-k\
ey-ref? leafref
| | | | | | {keystore-\
supported}?
| | | | | +--rw value?
| | | | | 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-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
| | | ks:asymmetric-key-certificat\ | | | +--rw asymmetric-key?
e-ref | | | | ks:asymmetric-key-ref
| | | +--rw certificate? leafref
| | +--rw client-authentication! | | +--rw client-authentication!
| | | +--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)
skipping to change at page 52, line 21 skipping to change at page 53, line 40
| | +--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-suppo\ | | | | {local-definitions-suppo\
rted}? rted}?
| | | | +--rw local-definition | | | | +--rw local-definition
| | | | +--rw algorithm | | | | +--rw algorithm
| | | | | asymmetric-key-algo\ | | | | | asymmetric-key-algo\
rithm-ref rithm-t
| | | | +--rw public-key | | | | +--rw public-key
| | | | | binary | | | | | binary
| | | | +--rw private-key | | | | +--rw (private-key-type)
| | | | | union | | | | | +--:(private-key)
| | | | | | +--rw private-key?
| | | | | | binary
| | | | | +--:(hidden-private-key)
| | | | | | +--rw hidden-private-\
key?
| | | | | | empty
| | | | | +--:(encrypted-private-k\
ey)
| | | | | +--rw encrypted-priva\
te-key
| | | | | +--rw (key-type)
| | | | | | +--:(symmetric-\
key-ref)
| | | | | | | +--rw symmet\
ric-key-ref? leafref
| | | | | | | {key\
store-supported}?
| | | | | | +--:(asymmetric\
-key-ref)
| | | | | | +--rw asymme\
tric-key-ref? leafref
| | | | | | {key\
store-supported}?
| | | | | +--rw value?
| | | | | 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
| | | ks:asymmetric-key-cert\ | | | +--rw asymmetric-key?
ificate-ref | | | | ks:asymmetric-key-r\
ef
| | | +--rw certificate? lea\
fref
| | +--rw client-authentication! | | +--rw client-authentication!
| | | +--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)
skipping to change at page 57, line 37 skipping to change at page 59, line 37
o Refactored server module to be more like other 'server' models. o Refactored server module to be more like other 'server' models.
If folks like it, will also apply to the client model, as well as If folks like it, will also apply to the client model, as well as
to both the netconf client/server models. Now the 'restconf- to both the netconf client/server models. Now the 'restconf-
server-grouping' is just the RC-specific bits (i.e., the "demux" server-grouping' is just the RC-specific bits (i.e., the "demux"
container minus the container), 'restconf-server- container minus the container), 'restconf-server-
[listen|callhome]-stack-grouping' is the protocol stack for a [listen|callhome]-stack-grouping' is the protocol stack for a
single connection, and 'restconf-server-app-grouping' is single connection, and 'restconf-server-app-grouping' is
effectively what was before (both listen+callhome for many effectively what was before (both listen+callhome for many
inbound/outbound endpoints). inbound/outbound endpoints).
B.14. 13 to 14
o Updated examples to reflect ietf-crypto-types change (e.g.,
identities --> enumerations)
o Adjusting from change in TLS client model (removing the top-level
'certificate' container).
o Added "external-endpoint" to the "http-listen" choice in ietf-
restconf-server.
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 last name): Andy Bierman, Martin on list and in the halls (ordered by first name): Alan Luchuk, Andy
Bjorklund, Benoit Claise, Ramkumar Dhanapal, Mehmet Ersue, Balazs Bierman, Balazs Kovacs, Benoit Claise, Bert Wijnen David Lamparter,
Kovacs, David Lamparter, Alan Luchuk, Ladislav Lhotka, Radek Krejci, Juergen Schoenwaelder, Ladislav Lhotka, Martin Bjorklund, Mehmet
Tom Petch, Juergen Schoenwaelder, Phil Shafer, Sean Turner, and Bert Ersue, Phil Shafer, Radek Krejci, Ramkumar Dhanapal, Sean Turner, and
Wijnen. Tom Petch.
Author's Address Author's Address
Kent Watsen Kent Watsen
Watsen Networks Watsen Networks
EMail: kent+ietf@watsen.net EMail: kent+ietf@watsen.net
 End of changes. 55 change blocks. 
324 lines changed or deleted 458 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/