Skip to content

Commit

Permalink
Merge pull request #54 from QiufangMa/main
Browse files Browse the repository at this point in the history
fix pyang errors & update author list in yang files
  • Loading branch information
mcr authored Jul 3, 2024
2 parents 69d8c8b + 5868787 commit df2ada7
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 48 deletions.
53 changes: 29 additions & 24 deletions ietf-voucher-request.yang
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@ module ietf-voucher-request {
"IETF ANIMA Working Group";

contact
"WG Web: <https://datatracker.ietf.org/wg/anima/>
WG List: <mailto:[email protected]>
Author: Kent Watsen
<mailto:[email protected]>
Author: Michael H. Behringer
<mailto:[email protected]>
Author: Toerless Eckert
<mailto:[email protected]>
Author: Max Pritikin
<mailto:[email protected]>
Author: Michael Richardson
<mailto:[email protected]>";
"WG Web: <https://datatracker.ietf.org/wg/anima/>
WG List: <mailto:[email protected]>
Author: Kent Watsen
<mailto:[email protected]>
Author: Michael Richardson
<mailto:[email protected]>
Author: Max Pritikin
<mailto:[email protected]>
Author: Toerless Eckert
<mailto:[email protected]>
Author: Qiufang Ma
<mailto:[email protected]>";

description
"This module defines the format for a voucher request.
Expand All @@ -50,18 +50,25 @@ module ietf-voucher-request {
described in BCP 14 (RFC 2119) (RFC 8174) when, and only when,
they appear in all capitals, as shown here.
Copyright (c) 2019 IETF Trust and the persons identified as
authors of the code. All rights reserved.
Copyright (c) 2024 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 Revised BSD License set
forth in Section 4.c of the IETF Trust's Legal Provisions
Relating to IETF Documents
(https://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
(https://www.rfc-editor.org/info/rfcXXXX); see the RFC itself
for full legal notices.
The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL
NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'NOT RECOMMENDED',
'MAY', and 'OPTIONAL' in this document are to be interpreted as
described in BCP 14 (RFC 2119) (RFC 8174) when, and only when,
they appear in all capitals, as shown here.";

revision "YYYY-MM-DD" {
description
Expand Down Expand Up @@ -254,6 +261,4 @@ module ietf-voucher-request {
}
}
}

}

56 changes: 32 additions & 24 deletions ietf-voucher.yang
Original file line number Diff line number Diff line change
Expand Up @@ -20,41 +20,45 @@ module ietf-voucher {
organization
"IETF ANIMA Working Group";
contact
"WG Web: <https://datatracker.ietf.org/wg/anima/>
WG List: <mailto:[email protected]>
Author: Kent Watsen
<mailto:[email protected]>
Author: Max Pritikin
<mailto:[email protected]>
Author: Michael Richardson
<mailto:[email protected]>
Author: Toerless Eckert
<mailto:[email protected]>";
"WG Web: <https://datatracker.ietf.org/wg/anima/>
WG List: <mailto:[email protected]>
Author: Kent Watsen
<mailto:[email protected]>
Author: Michael Richardson
<mailto:[email protected]>
Author: Max Pritikin
<mailto:[email protected]>
Author: Toerless Eckert
<mailto:[email protected]>
Author: Qiufang Ma
<mailto:[email protected]>";

description
"This module defines the format for a voucher, which is
produced by a pledge's manufacturer or delegate (MASA)
to securely assign a pledge to an 'owner', so that the
pledge may establish a secure connection to the owner's
network infrastructure.
The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL
NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'NOT RECOMMENDED',
'MAY', and 'OPTIONAL' in this document are to be interpreted as
described in BCP 14 (RFC 2119) (RFC 8174) when, and only when,
they appear in all capitals, as shown here.
Copyright (c) 2023 IETF Trust and the persons identified as
Copyright (c) 2024 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
without modification, is permitted pursuant to, and subject to
the license terms contained in, the Revised BSD License set
forth in Section 4.c of the IETF Trust's Legal Provisions
Relating to IETF Documents
(https://trustee.ietf.org/license-info).
This version of this YANG module is part of RFC 8366; see the
RFC itself for full legal notices.";
This version of this YANG module is part of RFC XXXX
(https://www.rfc-editor.org/info/rfcXXXX); see the RFC itself
for full legal notices.
The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL
NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'NOT RECOMMENDED',
'MAY', and 'OPTIONAL' in this document are to be interpreted as
described in BCP 14 (RFC 2119) (RFC 8174) when, and only when,
they appear in all capitals, as shown here.";

revision YYYY-MM-DD {
description
Expand All @@ -79,7 +83,6 @@ module ietf-voucher {

leaf created-on {
type yang:date-and-time;
mandatory false;
description
"A value indicating the date this voucher was created.
This node is primarily for human consumption and auditing.
Expand Down Expand Up @@ -140,6 +143,12 @@ module ietf-voucher {
a registrar agent has made contact with the device.";
}
}
description
"The assertion is a statement from the MASA regarding how
the owner was verified. This statement enables pledges
to support more detailed policy checks. Pledges MUST
ensure that the assertion provided is acceptable, per
local policy, before processing the voucher.";
}
leaf serial-number {
type string;
Expand Down Expand Up @@ -170,7 +179,6 @@ module ietf-voucher {
}
leaf pinned-domain-cert {
type binary;
mandatory false;
description
"An X.509 v3 certificate structure, as specified by
RFC 5280, using Distinguished Encoding Rules (DER)
Expand Down

0 comments on commit df2ada7

Please sign in to comment.