draft-ietf-netconf-restconf-client-server-07.txt   draft-ietf-netconf-restconf-client-server-08.txt 
NETCONF Working Group K. Watsen NETCONF Working Group K. Watsen
Internet-Draft Juniper Networks Internet-Draft Juniper Networks
Intended status: Standards Track September 20, 2018 Intended status: Standards Track October 22, 2018
Expires: March 24, 2019 Expires: April 25, 2019
RESTCONF Client and Server Models RESTCONF Client and Server Models
draft-ietf-netconf-restconf-client-server-07 draft-ietf-netconf-restconf-client-server-08
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 1, line 45 skipping to change at page 1, line 45
progress. Please apply the following replacements: progress. Please apply the following replacements:
o "XXXX" --> the assigned RFC value for this draft o "XXXX" --> the assigned RFC value for this draft
o "ZZZZ" --> the assigned RFC value for I-D.ietf-netconf-tls-client- o "ZZZZ" --> the assigned RFC value for I-D.ietf-netconf-tls-client-
server 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 "2018-09-20" --> the publication date of this draft o "2018-10-22" --> 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 A. Change Log o Appendix A. 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 March 24, 2019. This Internet-Draft will expire on April 25, 2019.
Copyright Notice Copyright Notice
Copyright (c) 2018 IETF Trust and the persons identified as the Copyright (c) 2018 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 16 skipping to change at page 3, line 16
6.1. Normative References . . . . . . . . . . . . . . . . . . 36 6.1. Normative References . . . . . . . . . . . . . . . . . . 36
6.2. Informative References . . . . . . . . . . . . . . . . . 37 6.2. Informative References . . . . . . . . . . . . . . . . . 37
Appendix A. Change Log . . . . . . . . . . . . . . . . . . . . . 38 Appendix A. Change Log . . . . . . . . . . . . . . . . . . . . . 38
A.1. 00 to 01 . . . . . . . . . . . . . . . . . . . . . . . . 38 A.1. 00 to 01 . . . . . . . . . . . . . . . . . . . . . . . . 38
A.2. 01 to 02 . . . . . . . . . . . . . . . . . . . . . . . . 38 A.2. 01 to 02 . . . . . . . . . . . . . . . . . . . . . . . . 38
A.3. 02 to 03 . . . . . . . . . . . . . . . . . . . . . . . . 38 A.3. 02 to 03 . . . . . . . . . . . . . . . . . . . . . . . . 38
A.4. 03 to 04 . . . . . . . . . . . . . . . . . . . . . . . . 38 A.4. 03 to 04 . . . . . . . . . . . . . . . . . . . . . . . . 38
A.5. 04 to 05 . . . . . . . . . . . . . . . . . . . . . . . . 38 A.5. 04 to 05 . . . . . . . . . . . . . . . . . . . . . . . . 38
A.6. 05 to 06 . . . . . . . . . . . . . . . . . . . . . . . . 39 A.6. 05 to 06 . . . . . . . . . . . . . . . . . . . . . . . . 39
A.7. 06 to 07 . . . . . . . . . . . . . . . . . . . . . . . . 39 A.7. 06 to 07 . . . . . . . . . . . . . . . . . . . . . . . . 39
A.8. 07 to 08 . . . . . . . . . . . . . . . . . . . . . . . . 39
Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . . 39 Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . . 39
Author's Address . . . . . . . . . . . . . . . . . . . . . . . . 39 Author's Address . . . . . . . . . . . . . . . . . . . . . . . . 39
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].
skipping to change at page 4, line 36 skipping to change at page 4, line 36
| | +--rw port? inet:port-number | | +--rw port? inet:port-number
| | +--rw client-identity | | +--rw client-identity
| | | +--rw (auth-type) | | | +--rw (auth-type)
| | | +--:(certificate) | | | +--:(certificate)
| | | +--rw certificate | | | +--rw certificate
| | | +--rw (local-or-keystore) | | | +--rw (local-or-keystore)
| | | +--:(local) | | | +--:(local)
| | | | {local-keys-suppor\ | | | | {local-keys-suppor\
ted}? ted}?
| | | | +--rw algorithm? | | | | +--rw algorithm?
| | | | | ct:key-algorithm\ | | | | | asymmetric-key-e\
-ref ncryption-algorithm-ref
| | | | +--rw public-key? | | | | +--rw public-key?
| | | | | binary | | | | | binary
| | | | +--rw private-key? | | | | +--rw private-key?
| | | | | union | | | | | union
| | | | +---x generate-hidden-key | | | | +---x generate-hidden-key
| | | | | +---w input | | | | | +---w input
| | | | | +---w algorithm | | | | | +---w algorithm
| | | | | ct:key-alg\ | | | | | asymmetric\
orithm-ref -key-encryption-algorithm-ref
| | | | +---x install-hidden-key | | | | +---x install-hidden-key
| | | | | +---w input | | | | | +---w input
| | | | | +---w algorithm | | | | | +---w algorithm
| | | | | | ct:key-alg\ | | | | | | asymmetric\
orithm-ref -key-encryption-algorithm-ref
| | | | | +---w public-key? | | | | | +---w public-key?
| | | | | | binary | | | | | | binary
| | | | | +---w private-key? | | | | | +---w private-key?
| | | | | binary | | | | | binary
| | | | +--rw cert | | | | +--rw cert?
| | | | | ct:end-entity-ce\ | | | | | end-entity-cert-\
rt-cms cms
| | | | +---n certificate-expira\ | | | | +---n certificate-expira\
tion tion
| | | | +-- expiration-date? | | | | +-- expiration-date
| | | | yang:date-and\ | | | | yang:date-and\
-time -time
| | | +--:(keystore) | | | +--:(keystore)
| | | {keystore-supporte\ | | | {keystore-supporte\
d}? d}?
| | | +--rw reference? | | | +--rw reference?
| | | ks:asymmetric-ke\ | | | ks:asymmetric-ke\
y-certificate-ref y-certificate-ref
| | +--rw server-auth | | +--rw server-auth
| | | +--rw pinned-ca-certs? | | | +--rw pinned-ca-certs?
skipping to change at page 6, line 19 skipping to change at page 6, line 19
+--rw address? inet:ip-address +--rw address? inet:ip-address
+--rw port? inet:port-number +--rw port? inet:port-number
+--rw client-identity +--rw client-identity
| +--rw (auth-type) | +--rw (auth-type)
| +--:(certificate) | +--:(certificate)
| +--rw certificate | +--rw certificate
| +--rw (local-or-keystore) | +--rw (local-or-keystore)
| +--:(local) {local-keys-supported\ | +--:(local) {local-keys-supported\
}? }?
| | +--rw algorithm? | | +--rw algorithm?
| | | ct:key-algorithm-ref | | | asymmetric-key-encrypt\
ion-algorithm-ref
| | +--rw public-key? | | +--rw public-key?
| | | binary | | | binary
| | +--rw private-key? | | +--rw private-key?
| | | union | | | union
| | +---x generate-hidden-key | | +---x generate-hidden-key
| | | +---w input | | | +---w input
| | | +---w algorithm | | | +---w algorithm
| | | ct:key-algorithm\ | | | asymmetric-key-e\
-ref ncryption-algorithm-ref
| | +---x install-hidden-key | | +---x install-hidden-key
| | | +---w input | | | +---w input
| | | +---w algorithm | | | +---w algorithm
| | | | ct:key-algorithm\ | | | | asymmetric-key-e\
-ref ncryption-algorithm-ref
| | | +---w public-key? bin\ | | | +---w public-key? bin\
ary ary
| | | +---w private-key? bin\ | | | +---w private-key? bin\
ary ary
| | +--rw cert | | +--rw cert?
| | | ct: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
| +--:(keystore) {keystore-supporte\ | +--:(keystore) {keystore-supporte\
d}? d}?
| +--rw reference? | +--rw reference?
| ks:asymmetric-key-cert\ | ks:asymmetric-key-cert\
ificate-ref ificate-ref
+--rw server-auth +--rw server-auth
| +--rw pinned-ca-certs? | +--rw pinned-ca-certs?
| | ta:pinned-certificates-ref | | ta:pinned-certificates-ref
| | {ta:x509-certificates}? | | {ta:x509-certificates}?
skipping to change at page 7, line 39 skipping to change at page 7, line 40
<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>
<tls> <tls>
<address>corp-fw1.example.com</address> <address>corp-fw1.example.com</address>
<client-identity> <client-identity>
<certificate> <certificate>
<algorithm xmlns:ct="urn:ietf:params:xml:ns:yang:iet\ <algorithm xmlns:ct="urn:ietf:params:xml:ns:yang:iet\
f-crypto-types">ct:secp521r1</algorithm> f-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>
</certificate> </certificate>
</client-identity> </client-identity>
<server-auth> <server-auth>
<pinned-ca-certs>explicitly-trusted-server-ca-certs</p\ <pinned-ca-certs>explicitly-trusted-server-ca-certs</p\
inned-ca-certs> inned-ca-certs>
<pinned-server-certs>explicitly-trusted-server-certs</\ <pinned-server-certs>explicitly-trusted-server-certs</\
pinned-server-certs> pinned-server-certs>
skipping to change at page 8, line 17 skipping to change at page 8, line 17
<persistent/> <persistent/>
</connection-type> </connection-type>
</endpoint> </endpoint>
<endpoint> <endpoint>
<name>corp-fw2.example.com</name> <name>corp-fw2.example.com</name>
<tls> <tls>
<address>corp-fw2.example.com</address> <address>corp-fw2.example.com</address>
<client-identity> <client-identity>
<certificate> <certificate>
<algorithm xmlns:ct="urn:ietf:params:xml:ns:yang:iet\ <algorithm xmlns:ct="urn:ietf:params:xml:ns:yang:iet\
f-crypto-types">ct:secp521r1</algorithm> f-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>
</certificate> </certificate>
</client-identity> </client-identity>
<server-auth> <server-auth>
<pinned-ca-certs>explicitly-trusted-server-ca-certs</p\ <pinned-ca-certs>explicitly-trusted-server-ca-certs</p\
inned-ca-certs> inned-ca-certs>
<pinned-server-certs>explicitly-trusted-server-certs</\ <pinned-server-certs>explicitly-trusted-server-certs</\
pinned-server-certs> pinned-server-certs>
skipping to change at page 8, line 47 skipping to change at page 8, line 47
<!-- 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>
<tls> <tls>
<address>11.22.33.44</address> <address>11.22.33.44</address>
<client-identity> <client-identity>
<certificate> <certificate>
<algorithm xmlns:ct="urn:ietf:params:xml:ns:yang:ietf-cr\ <algorithm xmlns:ct="urn:ietf:params:xml:ns:yang:ietf-cr\
ypto-types">ct:secp521r1</algorithm> ypto-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>
</certificate> </certificate>
</client-identity> </client-identity>
<server-auth> <server-auth>
<pinned-ca-certs>explicitly-trusted-server-ca-certs</pinne\ <pinned-ca-certs>explicitly-trusted-server-ca-certs</pinne\
d-ca-certs> d-ca-certs>
<pinned-server-certs>explicitly-trusted-server-certs</pinn\ <pinned-server-certs>explicitly-trusted-server-certs</pinn\
ed-server-certs> ed-server-certs>
</server-auth> </server-auth>
</tls> </tls>
</endpoint> </endpoint>
</listen> </listen>
skipping to change at page 9, line 20 skipping to change at page 9, line 22
</tls> </tls>
</endpoint> </endpoint>
</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], and [I-D.ietf-netconf-tls-client-server]. and [RFC8071], and [I-D.ietf-netconf-tls-client-server].
<CODE BEGINS> file "ietf-restconf-client@2018-09-20.yang" <CODE BEGINS> file "ietf-restconf-client@2018-10-22.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";
} }
import ietf-inet-types { import ietf-inet-types {
prefix inet; prefix inet;
reference reference
"RFC 6991: Common YANG Data Types"; "RFC 6991: Common YANG Data Types";
} }
import ietf-tls-client { import ietf-tls-client {
prefix ts; prefix ts;
revision-date 2018-09-20; // stable grouping definitions revision-date 2018-10-22; // stable grouping definitions
reference reference
"RFC ZZZZ: YANG Groupings for TLS Clients and TLS Servers"; "RFC ZZZZ: YANG Groupings for TLS Clients and TLS Servers";
} }
organization organization
"IETF NETCONF (Network Configuration) Working Group"; "IETF NETCONF (Network Configuration) Working Group";
contact contact
"WG Web: <http://datatracker.ietf.org/wg/restconf/> "WG Web: <http://datatracker.ietf.org/wg/restconf/>
WG List: <mailto:restconf@ietf.org> WG List: <mailto:restconf@ietf.org>
skipping to change at page 10, line 27 skipping to change at page 10, line 29
Redistribution and use in source and binary forms, with or Redistribution and use in source and binary forms, with or
without modification, is permitted pursuant to, and subject without modification, is permitted pursuant to, and subject
to the license terms contained in, the Simplified BSD to the license terms contained in, the Simplified BSD
License set forth in Section 4.c of the IETF Trust's License set forth in Section 4.c of the IETF Trust's
Legal Provisions Relating to IETF Documents Legal Provisions Relating to IETF Documents
(http://trustee.ietf.org/license-info). (http://trustee.ietf.org/license-info).
This version of this YANG module is part of RFC XXXX; see This version of this YANG module is part of RFC XXXX; see
the RFC itself for full legal notices."; the RFC itself for full legal notices.";
revision "2018-09-20" { revision "2018-10-22" {
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 initiate { feature initiate {
description description
skipping to change at page 19, line 12 skipping to change at page 19, line 14
| +--rw name string | +--rw name string
| +--rw (transport) | +--rw (transport)
| +--:(tls) {tls-listen}? | +--:(tls) {tls-listen}?
| +--rw tls | +--rw tls
| +--rw address? inet:ip-address | +--rw address? inet:ip-address
| +--rw port? inet:port-number | +--rw port? inet:port-number
| +--rw server-identity | +--rw server-identity
| | +--rw (local-or-keystore) | | +--rw (local-or-keystore)
| | +--:(local) {local-keys-supported}? | | +--:(local) {local-keys-supported}?
| | | +--rw algorithm? | | | +--rw algorithm?
| | | | ct:key-algorithm-ref | | | | asymmetric-key-encryption-algor\
ithm-ref
| | | +--rw public-key? binary | | | +--rw public-key? binary
| | | +--rw private-key? union | | | +--rw private-key? union
| | | +---x generate-hidden-key | | | +---x generate-hidden-key
| | | | +---w input | | | | +---w input
| | | | +---w algorithm | | | | +---w algorithm
| | | | ct:key-algorithm-ref | | | | asymmetric-key-encryption\
-algorithm-ref
| | | +---x install-hidden-key | | | +---x install-hidden-key
| | | | +---w input | | | | +---w input
| | | | +---w algorithm | | | | +---w algorithm
| | | | | ct:key-algorithm-ref | | | | | asymmetric-key-encryption\
-algorithm-ref
| | | | +---w public-key? binary | | | | +---w public-key? binary
| | | | +---w private-key? binary | | | | +---w private-key? binary
| | | +--rw cert | | | +--rw cert?
| | | | ct: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
| | +--:(keystore) {keystore-supported}? | | +--:(keystore) {keystore-supported}?
| | +--rw reference? | | +--rw reference?
| | ks:asymmetric-key-certificate-r\ | | ks:asymmetric-key-certificate-r\
ef ef
| +--rw client-auth | +--rw client-auth
| | +--rw pinned-ca-certs? | | +--rw pinned-ca-certs?
| | | ta:pinned-certificates-ref | | | ta:pinned-certificates-ref
| | | {ta:x509-certificates}? | | | {ta:x509-certificates}?
| | +--rw pinned-client-certs? | | +--rw pinned-client-certs?
skipping to change at page 20, line 21 skipping to change at page 20, line 26
| +--rw name string | +--rw name string
| +--rw (transport) | +--rw (transport)
| +--:(tls) {tls-call-home}? | +--:(tls) {tls-call-home}?
| +--rw tls | +--rw tls
| +--rw address inet:host | +--rw address inet:host
| +--rw port? inet:port-number | +--rw port? inet:port-number
| +--rw server-identity | +--rw server-identity
| | +--rw (local-or-keystore) | | +--rw (local-or-keystore)
| | +--:(local) {local-keys-supported}? | | +--:(local) {local-keys-supported}?
| | | +--rw algorithm? | | | +--rw algorithm?
| | | | ct:key-algorithm-ref | | | | asymmetric-key-encryption\
-algorithm-ref
| | | +--rw public-key? | | | +--rw public-key?
| | | | binary | | | | binary
| | | +--rw private-key? | | | +--rw private-key?
| | | | union | | | | union
| | | +---x generate-hidden-key | | | +---x generate-hidden-key
| | | | +---w input | | | | +---w input
| | | | +---w algorithm | | | | +---w algorithm
| | | | ct:key-algorithm-ref | | | | asymmetric-key-encr\
yption-algorithm-ref
| | | +---x install-hidden-key | | | +---x install-hidden-key
| | | | +---w input | | | | +---w input
| | | | +---w algorithm | | | | +---w algorithm
| | | | | ct:key-algorithm-ref | | | | | asymmetric-key-encr\
yption-algorithm-ref
| | | | +---w public-key? binary | | | | +---w public-key? binary
| | | | +---w private-key? binary | | | | +---w private-key? binary
| | | +--rw cert | | | +--rw cert?
| | | | ct: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
| | +--:(keystore) {keystore-supported}? | | +--:(keystore) {keystore-supported}?
| | +--rw reference? | | +--rw reference?
| | ks:asymmetric-key-certifi\ | | ks:asymmetric-key-certifi\
cate-ref cate-ref
| +--rw client-auth | +--rw client-auth
| | +--rw pinned-ca-certs? | | +--rw pinned-ca-certs?
| | | ta:pinned-certificates-ref | | | ta:pinned-certificates-ref
| | | {ta:x509-certificates}? | | | {ta:x509-certificates}?
| | +--rw pinned-client-certs? | | +--rw pinned-client-certs?
| | | ta:pinned-certificates-ref | | | ta:pinned-certificates-ref
| | | {ta:x509-certificates}? | | | {ta:x509-certificates}?
| | +--rw cert-maps | | +--rw cert-maps
| | +--rw cert-to-name* [id] | | +--rw cert-to-name* [id]
skipping to change at page 22, line 9 skipping to change at page 22, line 16
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>
<tls> <tls>
<address>11.22.33.44</address> <address>11.22.33.44</address>
<server-identity> <server-identity>
<algorithm xmlns:ct="urn:ietf:params:xml:ns:yang:ietf-cryp\ <algorithm xmlns:ct="urn:ietf:params:xml:ns:yang:ietf-cryp\
to-types">ct:secp521r1</algorithm> to-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>
</server-identity> </server-identity>
<client-auth> <client-auth>
<pinned-ca-certs>explicitly-trusted-client-ca-certs</pinne\ <pinned-ca-certs>explicitly-trusted-client-ca-certs</pinne\
d-ca-certs> d-ca-certs>
<pinned-client-certs>explicitly-trusted-client-certs</pinn\ <pinned-client-certs>explicitly-trusted-client-certs</pinn\
ed-client-certs> ed-client-certs>
<cert-maps> <cert-maps>
skipping to change at page 22, line 48 skipping to change at page 23, line 7
<call-home> <call-home>
<restconf-client> <restconf-client>
<name>config-manager</name> <name>config-manager</name>
<endpoints> <endpoints>
<endpoint> <endpoint>
<name>east-data-center</name> <name>east-data-center</name>
<tls> <tls>
<address>22.33.44.55</address> <address>22.33.44.55</address>
<server-identity> <server-identity>
<algorithm xmlns:ct="urn:ietf:params:xml:ns:yang:ietf-\ <algorithm xmlns:ct="urn:ietf:params:xml:ns:yang:ietf-\
crypto-types">ct:secp521r1</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>
</server-identity> </server-identity>
<client-auth> <client-auth>
<pinned-ca-certs>explicitly-trusted-client-ca-certs</p\ <pinned-ca-certs>explicitly-trusted-client-ca-certs</p\
inned-ca-certs> inned-ca-certs>
<pinned-client-certs>explicitly-trusted-client-certs</\ <pinned-client-certs>explicitly-trusted-client-certs</\
pinned-client-certs> pinned-client-certs>
<cert-maps> <cert-maps>
<cert-to-name> <cert-to-name>
<id>1</id> <id>1</id>
<fingerprint>11:0A:05:11:00</fingerprint> <fingerprint>11:0A:05:11:00</fingerprint>
skipping to change at page 23, line 33 skipping to change at page 23, line 39
</cert-maps> </cert-maps>
</client-auth> </client-auth>
</tls> </tls>
</endpoint> </endpoint>
<endpoint> <endpoint>
<name>west-data-center</name> <name>west-data-center</name>
<tls> <tls>
<address>33.44.55.66</address> <address>33.44.55.66</address>
<server-identity> <server-identity>
<algorithm xmlns:ct="urn:ietf:params:xml:ns:yang:ietf-\ <algorithm xmlns:ct="urn:ietf:params:xml:ns:yang:ietf-\
crypto-types">ct:secp521r1</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>
</server-identity> </server-identity>
<client-auth> <client-auth>
<pinned-ca-certs>explicitly-trusted-client-ca-certs</p\ <pinned-ca-certs>explicitly-trusted-client-ca-certs</p\
inned-ca-certs> inned-ca-certs>
<pinned-client-certs>explicitly-trusted-client-certs</\ <pinned-client-certs>explicitly-trusted-client-certs</\
pinned-client-certs> pinned-client-certs>
<cert-maps> <cert-maps>
skipping to change at page 24, line 30 skipping to change at page 24, line 37
</reconnect-strategy> </reconnect-strategy>
</restconf-client> </restconf-client>
</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], and [I-D.ietf-netconf-tls-client-server]. [RFC8040], [RFC8071], and [I-D.ietf-netconf-tls-client-server].
<CODE BEGINS> file "ietf-restconf-server@2018-09-20.yang" <CODE BEGINS> file "ietf-restconf-server@2018-10-22.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 10 skipping to change at page 25, line 17
} }
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-tls-server { import ietf-tls-server {
prefix ts; prefix ts;
revision-date 2018-09-20; // stable grouping definitions revision-date 2018-10-22; // stable grouping definitions
reference reference
"RFC ZZZZ: YANG Groupings for TLS Clients and TLS Servers"; "RFC ZZZZ: YANG Groupings for TLS Clients and TLS Servers";
} }
organization organization
"IETF NETCONF (Network Configuration) Working Group"; "IETF NETCONF (Network Configuration) Working Group";
contact contact
"WG Web: <http://datatracker.ietf.org/wg/netconf/> "WG Web: <http://datatracker.ietf.org/wg/netconf/>
WG List: <mailto:netconf@ietf.org> WG List: <mailto:netconf@ietf.org>
skipping to change at page 25, line 44 skipping to change at page 26, line 4
Copyright (c) 2017 IETF Trust and the persons identified as Copyright (c) 2017 IETF Trust and the persons identified as
authors of the code. All rights reserved. authors of the code. All rights reserved.
Redistribution and use in source and binary forms, with or Redistribution and use in source and binary forms, with or
without modification, is permitted pursuant to, and subject without modification, is permitted pursuant to, and subject
to the license terms contained in, the Simplified BSD to the license terms contained in, the Simplified BSD
License set forth in Section 4.c of the IETF Trust's License set forth in Section 4.c of the IETF Trust's
Legal Provisions Relating to IETF Documents Legal Provisions Relating to IETF Documents
(http://trustee.ietf.org/license-info). (http://trustee.ietf.org/license-info).
This version of this YANG module is part of RFC XXXX; see This version of this YANG module is part of RFC XXXX; see
the RFC itself for full legal notices."; the RFC itself for full legal notices.";
revision "2018-09-20" { revision "2018-10-22" {
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 listen { feature listen {
description description
"The 'listen' feature indicates that the RESTCONF server "The 'listen' feature indicates that the RESTCONF server
supports opening a port to accept RESTCONF client connections supports opening a port to accept RESTCONF client connections
skipping to change at page 36, line 16 skipping to change at page 36, line 26
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., "YANG Data Model for a Centralized Keystore
Mechanism", draft-ietf-netconf-keystore-06 (work in Mechanism", draft-ietf-netconf-keystore-06 (work in
progress), September 2018. progress), September 2018.
[I-D.ietf-netconf-tls-client-server] [I-D.ietf-netconf-tls-client-server]
Watsen, K. and G. Wu, "YANG Groupings for TLS Clients and Watsen, K. and G. Wu, "YANG Groupings for TLS Clients and
TLS Servers", draft-ietf-netconf-tls-client-server-06 TLS Servers", draft-ietf-netconf-tls-client-server-07
(work in progress), June 2018. (work in progress), September 2018.
[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>.
[RFC6020] Bjorklund, M., Ed., "YANG - A Data Modeling Language for [RFC6020] Bjorklund, M., Ed., "YANG - A Data Modeling Language for
the Network Configuration Protocol (NETCONF)", RFC 6020, the Network Configuration Protocol (NETCONF)", RFC 6020,
DOI 10.17487/RFC6020, October 2010, DOI 10.17487/RFC6020, October 2010,
<https://www.rfc-editor.org/info/rfc6020>. <https://www.rfc-editor.org/info/rfc6020>.
skipping to change at page 37, line 8 skipping to change at page 37, line 20
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-netconf-client-server] [I-D.ietf-netconf-netconf-client-server]
Watsen, K. and G. Wu, "NETCONF Client and Server Models", Watsen, K., "NETCONF Client and Server Models", draft-
draft-ietf-netconf-netconf-client-server-06 (work in ietf-netconf-netconf-client-server-07 (work in progress),
progress), June 2018. September 2018.
[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 29 skipping to change at page 39, line 29
enum. enum.
o Replaced "connection-type" choice default (persistent) with o Replaced "connection-type" choice default (persistent) with
"mandatory true". "mandatory true".
o Reduced the periodic-connection's "idle-timeout" from 5 to 2 o Reduced the periodic-connection's "idle-timeout" from 5 to 2
minutes. minutes.
o Replaced reconnect-timeout with period/anchor-time combo. o Replaced reconnect-timeout with period/anchor-time combo.
A.8. 07 to 08
o Modified examples to be compatible with new crypto-types algs
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 last name): Andy Bierman, Martin
Bjorklund, Benoit Claise, Mehmet Ersue, Balazs Kovacs, David Bjorklund, Benoit Claise, Mehmet Ersue, Balazs Kovacs, David
Lamparter, Alan Luchuk, Ladislav Lhotka, Radek Krejci, Tom Petch, Lamparter, Alan Luchuk, Ladislav Lhotka, Radek Krejci, Tom Petch,
Juergen Schoenwaelder, Phil Shafer, Sean Turner, and Bert Wijnen. Juergen Schoenwaelder, Phil Shafer, Sean Turner, and Bert Wijnen.
Author's Address Author's Address
 End of changes. 45 change blocks. 
55 lines changed or deleted 66 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/