Skip to content

Commit

Permalink
Merge pull request #523 from yang-catalog/master
Browse files Browse the repository at this point in the history
Cronjob - every day pull and update of ietf draft yang files.
  • Loading branch information
einarnn committed Dec 13, 2018
2 parents 6c3300b + 786a061 commit 31e5082
Show file tree
Hide file tree
Showing 5 changed files with 109 additions and 121 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,35 +23,33 @@ module iana-tunnel-type {

description
"This module contains a collection of YANG identities defined
by IANA and used as interface types for tunnel interfaces.
by IANA and used as interface types for tunnel interfaces.
Copyright (c) 2018 IETF Trust and the persons identified as
authors of the code. All rights reserved.
Copyright (c) 2018 IETF Trust and the persons identified as
authors of the code. All rights reserved.
Redistribution and use in source and binary forms, with or
without modification, is permitted pursuant to, and subject
to the license terms contained in, the Simplified BSD License
set forth in Section 4.c of the IETF Trust's Legal Provisions
Relating to IETF Documents
(http://trustee.ietf.org/license-info).
Redistribution and use in source and binary forms, with or
without modification, is permitted pursuant to, and subject
to the license terms contained in, the Simplified BSD License
set forth in Section 4.c of the IETF Trust's Legal Provisions
Relating to IETF Documents
(http://trustee.ietf.org/license-info).
This version of this YANG module is part of RFC XXXX; see
the RFC itself for full legal notices.";
This version of this YANG module is part of RFC XXXX; see
the RFC itself for full legal notices.";

revision 2018-10-23 {
description
"Initial revision.";
reference
"RFC XXXX: YANG Modules for IPv4-in-IPv6 Address plus Port
Softwires";
"RFC XXXX: Tunnel Interface Types YANG Module";
}

identity other {
identity other {
base ift:tunnel;
description
"None of the following values.";
reference
"RFC 4087: IP Tunnel MIB";
"RFC 4087: IP Tunnel MIB";
}
identity direct {
base ift:tunnel;
Expand All @@ -64,113 +62,113 @@ module iana-tunnel-type {
base ift:tunnel;
description
"GRE encapsulation.";
reference
reference
"RFC 4087: IP Tunnel MIB";
}
identity minimal {
base ift:tunnel;
description
"Minimal encapsulation.";
}
identity minimal {
base ift:tunnel;
description
"Minimal encapsulation.";
reference
"RFC 4087: IP Tunnel MIB";
}
identity l2tp {
base ift:tunnel;
description
"L2TP encapsulation.";
}
identity l2tp {
base ift:tunnel;
description
"L2TP encapsulation.";
reference
"RFC 4087: IP Tunnel MIB";
}
identity pptp {
base ift:tunnel;
description
"PPTP encapsulation.";
reference
"RFC 4087: IP Tunnel MIB";
}
identity pptp {
base ift:tunnel;
description
"PPTP encapsulation.";
}
identity l2f {
base ift:tunnel;
description
"L2F encapsulation.";
reference
"RFC 4087: IP Tunnel MIB";
}
identity l2f {
base ift:tunnel;
description
"L2F encapsulation.";
}
identity udp {
base ift:tunnel;
description
"UDP encapsulation.";
reference
"RFC 4087: IP Tunnel MIB";
}
identity udp {
base ift:tunnel;
description
"UDP encapsulation.";
}
identity atmp {
base ift:tunnel;
description
"ATMP encapsulation.";
reference
"RFC 4087: IP Tunnel MIB";
}
identity atmp {
base ift:tunnel;
description
"ATMP encapsulation.";
}
identity msdp {
base ift:tunnel;
description
"MSDP encapsulation.";
reference
"RFC 4087: IP Tunnel MIB";
}
identity msdp {
base ift:tunnel;
description
"MSDP encapsulation.";
}
identity sixtofour {
base ift:tunnel;
description
"6to4 encapsulation.";
reference
"RFC 4087: IP Tunnel MIB";
}
identity sixtofour {
base ift:tunnel;
description
"6to4 encapsulation.";
}
identity sixoverfour {
base ift:tunnel;
description
"6over4 encapsulation.";
reference
"RFC 4087: IP Tunnel MIB";
}
identity sixoverfour {
base ift:tunnel;
description
"6over4 encapsulation.";
}
identity isatap {
base ift:tunnel;
description
"ISATAP encapsulation.";
reference
"RFC 4087: IP Tunnel MIB";
}
identity isatap {
base ift:tunnel;
description
"ISATAP encapsulation.";
}
identity teredo {
base ift:tunnel;
description
"Teredo encapsulation.";
reference
"RFC 4087: IP Tunnel MIB";
}
identity teredo {
base ift:tunnel;
description
"Teredo encapsulation.";
}
identity iphttps {
base ift:tunnel;
description
"IP over HTTPS (IP-HTTPS) Tunneling Protocol.";
}
identity softwiremesh {
base ift:tunnel;
description
"softwire mesh tunnel.";
reference
"RFC 4087: IP Tunnel MIB";
}
identity iphttps {
base ift:tunnel;
description
"IP over HTTPS (IP-HTTPS) Tunneling Protocol.";
}
identity softwiremesh {
base ift:tunnel;
description
"softwire mesh tunnel.";
reference
"RFC 7856: Softwire Mesh Management Information Base (MIB)";
}
identity dslite {
base ift:tunnel;
description
"DS-Lite tunnel.";
reference
"RFC 7870: Dual-Stack Lite (DS-Lite) Management Information
Base (MIB) for Address Family Transition Routers
"RFC 7856: Softwire Mesh Management Information Base (MIB)";
}
identity dslite {
base ift:tunnel;
description
"DS-Lite tunnel.";
reference
"RFC 7870: Dual-Stack Lite (DS-Lite) Management Information
Base (MIB) for Address Family Transition Routers
(AFTRs)";
}
identity aplusp {
base ift:tunnel;
description
"A+P encapsulation.";
reference
"RFC XXXX: YANG Modules for IPv4-in-IPv6 Address plus Port
Softwires";
"RFC 6346: The Address plus Port (A+P) Approach to the IPv4
Address Shortage";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,26 @@ module ietf-extension-example {
reference
"RFC 8343: A YANG Data Model for Interface Management";
}

import iana-tunnel-type {
prefix iana-tunnel-type;
reference
"RFC XXXX: A Tunnel Extension to the Interface Management
YANG Module";
}

import ietf-interface-tunnel {
prefix ift;
reference
"RFC XXXX: A Tunnel Extension to the Interface Management
YANG Module";
}
organization "IETF xxxx Working Group";
organization "IETF Softwire Working Group";

contact

"WG Web: <https://datatracker.ietf.org/wg/xxx/>
WG List: <mailto:xxx@ietf.org>
"WG Web: <https://datatracker.ietf.org/wg/softwire/>
WG List: <mailto:softwire@ietf.org>
Editor: Mohamed Boucadair
Author: Mohamed Boucadair
<mailto:mohamed.boucadair@orange.com>";

description
"This is an exampel YANG module.
"This is an example YANG module to extend the Interface YANG
module with tunnel-specific parameters.
Copyright (c) 2018 IETF Trust and the persons identified as
authors of the code. All rights reserved.
Expand All @@ -55,16 +49,15 @@ module ietf-extension-example {
This version of this YANG module is part of RFC XXXX; see
the RFC itself for full legal notices.";

revision 2018-10-19 {
revision 2018-11-30 {
description
"Initial revision.";
reference
"RFC XXXX: A Tunnel Extension to the Interface Management
YANG Module";
"RFC XXXX: Tunnel Interface Types YANG Module";
}

augment "/if:interfaces/if:interface" {
when "derived-from(ift:tunnel-type, 'iana-tunnel-type:gre')";
when "derived-from(if:type, 'iana-tunnel-type:gre')";
description
"Augments Interface module with specific tunnel parameters.";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ module ietf-softwire-br {
Author: Yong Cui
<mailto:yong@csnet1.cs.tsinghua.edu.cn>
Author: Ian Farrer
Editor: Ian Farrer
<mailto:ian.farrer@telekom.de>
Author: Sladjana Zoric
<mailto:sladjana.zoric@telekom.de>
Author: Mohamed Boucadair
Editor: Mohamed Boucadair
<mailto:mohamed.boucadair@orange.com>
Author: Rajiv Asati
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ module ietf-softwire-ce {
prefix inet;
reference "Section 4 of RFC 6991";
}

import ietf-interfaces {
prefix if;
reference "RFC 8343: A YANG Data Model for Interface Management";
Expand All @@ -21,8 +20,7 @@ module ietf-softwire-ce {
import iana-tunnel-type {
prefix iana-tunnel-type;
reference
"RFC XXXX: YANG Modules for IPv4-in-IPv6 Address plus Port
Softwires";
"RFC YYYY: Tunnel Interface Types YANG Module";
}

organization
Expand All @@ -40,13 +38,13 @@ module ietf-softwire-ce {
Author: Yong Cui
<mailto:yong@csnet1.cs.tsinghua.edu.cn>
Author: Ian Farrer
Editor: Ian Farrer
<mailto:ian.farrer@telekom.de>
Author: Sladjana Zoric
<mailto:sladjana.zoric@telekom.de>
Author: Mohamed Boucadair
Editor: Mohamed Boucadair
<mailto:mohamed.boucadair@orange.com>
Author: Rajiv Asati
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ module ietf-softwire-common {
contact
"WG Web: <https://datatracker.ietf.org/wg/softwire/>
WG List: <mailto:softwire@ietf.org>
Author: Qi Sun
<mailto:sunqi.ietf@gmail.com>
Expand All @@ -27,13 +26,13 @@ module ietf-softwire-common {
Author: Yong Cui
<mailto:yong@csnet1.cs.tsinghua.edu.cn>
Author: Ian Farrer
Editor: Ian Farrer
<mailto:ian.farrer@telekom.de>
Author: Sladjana Zoric
<mailto:sladjana.zoric@telekom.de>
Author: Mohamed Boucadair
Editor: Mohamed Boucadair
<mailto:mohamed.boucadair@orange.com>
Author: Rajiv Asati
Expand Down

0 comments on commit 31e5082

Please sign in to comment.