From 436645c2b66bd71ab2c0feaaf0491500979701b6 Mon Sep 17 00:00:00 2001 From: Helge Sychla Date: Tue, 13 May 2014 14:18:00 +0200 Subject: [PATCH] Update IETF YANG modules to latest versions. Summary: modified: opencpe-tree.pdf modified: opencpe-tree.txt new file: specs/iana-crypt-hash@2014-04-04.yang modified: specs/iana-if-type.yang renamed: specs/iana-timezones@2012-07-09.yang -> specs/iana-timezones@2013-11-19.yang renamed: specs/ietf-interfaces@2013-07-04.yang -> specs/ietf-interfaces@2013-12-23.yang renamed: specs/ietf-ip@2013-10-18.yang -> specs/ietf-ip@2014-03-28.yang renamed: specs/ietf-system@2013-11-07.yang -> specs/ietf-system@2014-04-04.yang renamed: specs/opencpe-deviations@2014-01-12.yang -> specs/opencpe-deviations@2014-05-13.yang modified: specs/opencpe-firmware-mgmt@2014-02-06.yang modified: specs/opencpe-system@2014-01-27.yang Test Plan: * read Reviewers: aschultz, skattelmann CC: mkraemer, druss Differential Revision: https://review.tpip.net/D1329 --- opencpe-tree.pdf | Bin 20478 -> 20473 bytes opencpe-tree.txt | 47 +- specs/iana-crypt-hash@2014-04-04.yang | 124 +++ specs/iana-if-type.yang | 15 +- ...09.yang => iana-timezones@2013-11-19.yang} | 818 +++++++++--------- ...4.yang => ietf-interfaces@2013-12-23.yang} | 39 +- ...013-10-18.yang => ietf-ip@2014-03-28.yang} | 40 +- ...11-07.yang => ietf-system@2014-04-04.yang} | 150 +--- ...ang => opencpe-deviations@2014-05-13.yang} | 13 +- specs/opencpe-firmware-mgmt@2014-02-06.yang | 2 +- specs/opencpe-system@2014-01-27.yang | 2 +- 11 files changed, 656 insertions(+), 594 deletions(-) create mode 100644 specs/iana-crypt-hash@2014-04-04.yang rename specs/{iana-timezones@2012-07-09.yang => iana-timezones@2013-11-19.yang} (97%) rename specs/{ietf-interfaces@2013-07-04.yang => ietf-interfaces@2013-12-23.yang} (95%) rename specs/{ietf-ip@2013-10-18.yang => ietf-ip@2014-03-28.yang} (94%) rename specs/{ietf-system@2013-11-07.yang => ietf-system@2014-04-04.yang} (84%) rename specs/{opencpe-deviations@2014-01-12.yang => opencpe-deviations@2014-05-13.yang} (88%) diff --git a/opencpe-tree.pdf b/opencpe-tree.pdf index d62a430afb9ea2d8f1d0a72f967cec4aa03cf4a4..90ad3e9d60b2c655cba39dca136ad8619d8ea793 100644 GIT binary patch delta 18310 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 delta 18251 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 VmYY_SOoK2X#G?fS$fD)6UjfIo^NRog diff --git a/opencpe-tree.txt b/opencpe-tree.txt index 124e83c..b8c2fda 100644 --- a/opencpe-tree.txt +++ b/opencpe-tree.txt @@ -1,12 +1,12 @@ -pyang ietf-system@2013-11-07.yang ietf-interfaces@2013-07-04.yang\ - ietf-ip@2013-10-18.yang opencpe-system@2014-01-27.yang\ - opencpe-firmware-mgmt@2014-01-27.yang\ - --features ietf-system:authentication,local-users,timezone-location,\ -crypt-hash-md5,crypt-hash-sha-256,crypt-hash-sha-512,ntp\ +pyang ietf-system@2014-04-04.yang ietf-interfaces@2013-12-23.yang\ + ietf-ip@2014-03-28.yang opencpe-system@2014-01-27.yang\ + opencpe-firmware-mgmt@2014-02-06.yang\ + --features ietf-system:authentication,local-users,timezone-name,ntp\ + --features iana-crypt-hash:crypt-hash-md5,crypt-hash-sha-256,crypt-hash-sha-512\ --features opencpe-firmware-mgmt:firmware-slots,firmware-download-ftp,\ firmware-download-http,firmware-download-https,firmware-download-scp\ --features last-boot-status-report\ - --deviation-module opencpe-deviations@2014-01-12.yang\ + --deviation-module opencpe-deviations@2014-05-13.yang\ -f tree module: ietf-system @@ -16,8 +16,8 @@ module: ietf-system | +--rw location? string | +--rw clock | | +--rw (timezone)? - | | +--:(timezone-location) {timezone-location}? - | | | +--rw timezone-location? ianatz:iana-timezone + | | +--:(timezone-name) {timezone-name}? + | | | +--rw timezone-name? timezone-name | | +--:(timezone-utc-offset) | | +--rw timezone-utc-offset? int16 | +--rw ntp! {ntp}? @@ -43,7 +43,7 @@ module: ietf-system | +--rw user-authentication-order* identityref | +--rw user* [name] {local-users}? | +--rw name string - | +--rw password? crypt-hash + | +--rw password? ianach:crypt-hash | +--rw ssh-key* [name] | +--rw name string | +--rw algorithm string @@ -174,23 +174,10 @@ module: opencpe-firmware-mgmt rpcs: +---x firmware-download | +--ro input - | | +--ro (transport)? - | | | +--:(ftp) {firmware-download-ftp}? - | | | | +--ro ftp! - | | | | +--ro address inet:uri - | | | +--:(http) {firmware-download-http}? - | | | | +--ro http! - | | | | +--ro address inet:uri - | | | +--:(https) {firmware-download-https}? - | | | | +--ro https! - | | | | +--ro address inet:uri - | | | +--:(scp) {firmware-download-scp}? - | | | +--ro scp! - | | | +--ro address inet:uri + | | +--ro address inet:uri | | +--ro (credentials)? - | | | +--:(user-pass) - | | | | +--ro user-pass! - | | | | +--ro username string + | | | +--:(password) + | | | | +--ro password! | | | | +--ro password string | | | +--:(certificate) | | | | +--ro certificate! @@ -208,16 +195,6 @@ rpcs: +---x firmware-commit | +--ro input | +--ro job-id int32 - +---x get-job-status - | +--ro input - | | +--ro job-id int32 - | +--ro output - | +--ro job-id int32 - | +--ro install-target leafref {firmware-slots}? - | +--ro status - | +--ro status enumeration - | +--ro status-msg? string - | +--ro progress percent +---x set-bootorder {firmware-slots}? +--ro input +--ro bootorder* leafref diff --git a/specs/iana-crypt-hash@2014-04-04.yang b/specs/iana-crypt-hash@2014-04-04.yang new file mode 100644 index 0000000..eaf6258 --- /dev/null +++ b/specs/iana-crypt-hash@2014-04-04.yang @@ -0,0 +1,124 @@ +module iana-crypt-hash { + namespace "urn:ietf:params:xml:ns:yang:iana-crypt-hash"; + prefix ianach; + + organization "IANA"; + contact + " Internet Assigned Numbers Authority + + Postal: ICANN + 4676 Admiralty Way, Suite 330 + Marina del Rey, CA 90292 + + Tel: +1 310 823 9358 + E-Mail: iana&iana.org"; + description + "This YANG module defines a typedef for storing passwords + using a hash function, and features to indicate which hash + functions are supported by an implementation. + + The latest revision of this YANG module can be obtained from + the IANA web site. + + Requests for new values should be made to IANA via + email (iana&iana.org). + + Copyright (c) 2014 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). + + The initial version of this YANG module is part of RFC XXXX; + see the RFC itself for full legal notices."; + // RFC Ed.: replace XXXX with actual RFC number and remove this + // note. + + // RFC Ed.: update the date below with the date of RFC publication + // and remove this note. + revision 2014-04-04 { + description + "Initial revision."; + reference + "RFC XXXX: A YANG Data Model for System Management"; + } + + typedef crypt-hash { + type string { + pattern + '$0$.*' + + '|$1$[a-zA-Z0-9./]{1,8}$[a-zA-Z0-9./]{22}' + + '|$5$(rounds=\d+$)?[a-zA-Z0-9./]{1,16}$[a-zA-Z0-9./]{43}' + + '|$6$(rounds=\d+$)?[a-zA-Z0-9./]{1,16}$[a-zA-Z0-9./]{86}'; + } + description + "The crypt-hash type is used to store passwords using + a hash function. The algorithms for applying the hash + function and encoding the result are implemented in + various UNIX systems as the function crypt(3). + + A value of this type matches one of the forms: + + $0$ + $$$ + $$$$ + + The '$0$' prefix signals that the value is clear text. When + such a value is received by the server, a hash value is + calculated, and the string '$$$' or + $$$$ is prepended to the result. This + value is stored in the configuration data store. + + If a value starting with '$$', where is not '0', is + received, the server knows that the value already represents a + hashed value, and stores it as is in the data store. + + When a server needs to verify a password given by a user, it + finds the stored password hash string for that user, extracts + the salt, and calculates the hash with the salt and given + password as input. If the calculated hash value is the same + as the stored value, the password given by the client is + accepted. + + This type defines the following hash functions: + + id | hash function | feature + ---+---------------+------------------- + 1 | MD5 | crypt-hash-md5 + 5 | SHA-256 | crypt-hash-sha-256 + 6 | SHA-512 | crypt-hash-sha-512 + + The server indicates support for the different hash functions + by advertising the corresponding feature."; + reference + "IEEE Std 1003.1-2008 - crypt() function + RFC 1321: The MD5 Message-Digest Algorithm + FIPS.180-3.2008: Secure Hash Standard"; + } + + feature crypt-hash-md5 { + description + "Indicates that the device supports the MD5 + hash function in 'crypt-hash' values"; + reference "RFC 1321: The MD5 Message-Digest Algorithm"; + } + + feature crypt-hash-sha-256 { + description + "Indicates that the device supports the SHA-256 + hash function in 'crypt-hash' values"; + reference "FIPS.180-3.2008: Secure Hash Standard"; + } + + feature crypt-hash-sha-512 { + description + "Indicates that the device supports the SHA-512 + hash function in 'crypt-hash' values"; + reference "FIPS.180-3.2008: Secure Hash Standard"; + } + +} diff --git a/specs/iana-if-type.yang b/specs/iana-if-type.yang index 8718d2d..714f77e 100644 --- a/specs/iana-if-type.yang +++ b/specs/iana-if-type.yang @@ -29,7 +29,7 @@ module iana-if-type { Requests for new values should be made to IANA via email (iana&iana.org). - Copyright (c) 2011 IETF Trust and the persons identified as + Copyright (c) 2013 IETF Trust and the persons identified as authors of the code. All rights reserved. Redistribution and use in source and binary forms, with or @@ -39,8 +39,8 @@ module iana-if-type { 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."; + The initial version of this YANG module is part of RFC XXXX; + see the RFC itself for full legal notices."; // RFC Ed.: replace XXXX with actual RFC number and remove this // note. reference @@ -49,7 +49,7 @@ module iana-if-type { // RFC Ed.: update the date below with the date of RFC publication // and remove this note. - revision 2013-11-07 { + revision 2014-01-15 { description "Initial revision."; reference @@ -160,10 +160,14 @@ module iana-if-type { identity basicISDN { base iana-interface-type; description - "see also RFC2127"; + "no longer used. + see also RFC2127"; } identity primaryISDN { base iana-interface-type; + description + "no longer used. + see also RFC2127"; } identity propPointToPointSerial { base iana-interface-type; @@ -1508,4 +1512,3 @@ module iana-if-type { } } - diff --git a/specs/iana-timezones@2012-07-09.yang b/specs/iana-timezones@2013-11-19.yang similarity index 97% rename from specs/iana-timezones@2012-07-09.yang rename to specs/iana-timezones@2013-11-19.yang index 7fc1577..04aa522 100644 --- a/specs/iana-timezones@2012-07-09.yang +++ b/specs/iana-timezones@2013-11-19.yang @@ -5,7 +5,6 @@ module iana-timezones { organization "IANA"; contact " Internet Assigned Numbers Authority - Postal: ICANN 4676 Admiralty Way, Suite 330 Marina del Rey, CA 90292 @@ -36,12 +35,13 @@ module iana-timezones { This version of this YANG module is part of RFC XXXX; see the RFC itself for full legal notices."; - revision 2012-07-09 { + revision 2013-11-19 { description - "Initial revision. Using IANA Time Zone Data v. 2012c - (Released 2012-03-27)"; + "Initial revision using IANA Time Zone Data v. 2013h + (Released 2013-10-25)"; reference "RFC XXXX: TITLE"; } + typedef iana-timezone { description "A timezone location as defined by the IANA timezone @@ -74,1243 +74,1245 @@ module iana-timezones { enum "Antarctica/McMurdo" { value 8; description - "McMurdo Station, Ross Island"; - } - enum "Antarctica/South_Pole" { - value 9; - description - "Amundsen-Scott Station, South Pole"; + "McMurdo, South Pole, Scott (New Zealand time)"; } enum "Antarctica/Rothera" { - value 10; + value 9; description "Rothera Station, Adelaide Island"; } enum "Antarctica/Palmer" { - value 11; + value 10; description "Palmer Station, Anvers Island"; } enum "Antarctica/Mawson" { - value 12; + value 11; description "Mawson Station, Holme Bay"; } enum "Antarctica/Davis" { - value 13; + value 12; description "Davis Station, Vestfold Hills"; } enum "Antarctica/Casey" { - value 14; + value 13; description "Casey Station, Bailey Peninsula"; } enum "Antarctica/Vostok" { - value 15; + value 14; description "Vostok Station, Lake Vostok"; } enum "Antarctica/DumontDUrville" { - value 16; + value 15; description "Dumont-d'Urville Station, Terre Adelie"; } enum "Antarctica/Syowa" { - value 17; + value 16; description "Syowa Station, E Ongul I"; } - enum "Antarctica/Macquarie" { - value 18; - description - "Macquarie Island Station, Macquarie Island"; - } enum "America/Argentina/Buenos_Aires" { - value 19; + value 17; description "Buenos Aires (BA, CF)"; } enum "America/Argentina/Cordoba" { - value 20; + value 18; description "most locations (CB, CC, CN, ER, FM, MN, SE, SF)"; } enum "America/Argentina/Salta" { - value 21; + value 19; description "(SA, LP, NQ, RN)"; } enum "America/Argentina/Jujuy" { - value 22; + value 20; description "Jujuy (JY)"; } enum "America/Argentina/Tucuman" { - value 23; + value 21; description "Tucuman (TM)"; } enum "America/Argentina/Catamarca" { - value 24; + value 22; description "Catamarca (CT), Chubut (CH)"; } enum "America/Argentina/La_Rioja" { - value 25; + value 23; description "La Rioja (LR)"; } enum "America/Argentina/San_Juan" { - value 26; + value 24; description "San Juan (SJ)"; } enum "America/Argentina/Mendoza" { - value 27; + value 25; description "Mendoza (MZ)"; } enum "America/Argentina/San_Luis" { - value 28; + value 26; description "San Luis (SL)"; } enum "America/Argentina/Rio_Gallegos" { - value 29; + value 27; description "Santa Cruz (SC)"; } enum "America/Argentina/Ushuaia" { - value 30; + value 28; description "Tierra del Fuego (TF)"; } enum "Pacific/Pago_Pago" { - value 31; + value 29; } enum "Europe/Vienna" { - value 32; + value 30; } enum "Australia/Lord_Howe" { - value 33; + value 31; description "Lord Howe Island"; } + enum "Antarctica/Macquarie" { + value 32; + description + "Macquarie Island"; + } enum "Australia/Hobart" { - value 34; + value 33; description "Tasmania - most locations"; } enum "Australia/Currie" { - value 35; + value 34; description "Tasmania - King Island"; } enum "Australia/Melbourne" { - value 36; + value 35; description "Victoria"; } enum "Australia/Sydney" { - value 37; + value 36; description "New South Wales - most locations"; } enum "Australia/Broken_Hill" { - value 38; + value 37; description "New South Wales - Yancowinna"; } enum "Australia/Brisbane" { - value 39; + value 38; description "Queensland - most locations"; } enum "Australia/Lindeman" { - value 40; + value 39; description "Queensland - Holiday Islands"; } enum "Australia/Adelaide" { - value 41; + value 40; description "South Australia"; } enum "Australia/Darwin" { - value 42; + value 41; description "Northern Territory"; } enum "Australia/Perth" { - value 43; + value 42; description "Western Australia - most locations"; } enum "Australia/Eucla" { - value 44; + value 43; description "Western Australia - Eucla area"; } enum "America/Aruba" { - value 45; + value 44; } enum "Europe/Mariehamn" { - value 46; + value 45; } enum "Asia/Baku" { - value 47; + value 46; } enum "Europe/Sarajevo" { - value 48; + value 47; } enum "America/Barbados" { - value 49; + value 48; } enum "Asia/Dhaka" { - value 50; + value 49; } enum "Europe/Brussels" { - value 51; + value 50; } enum "Africa/Ouagadougou" { - value 52; + value 51; } enum "Europe/Sofia" { - value 53; + value 52; } enum "Asia/Bahrain" { - value 54; + value 53; } enum "Africa/Bujumbura" { - value 55; + value 54; } enum "Africa/Porto-Novo" { - value 56; + value 55; } enum "America/St_Barthelemy" { - value 57; + value 56; } enum "Atlantic/Bermuda" { - value 58; + value 57; } enum "Asia/Brunei" { - value 59; + value 58; } enum "America/La_Paz" { - value 60; + value 59; } enum "America/Kralendijk" { - value 61; + value 60; } enum "America/Noronha" { - value 62; + value 61; description "Atlantic islands"; } enum "America/Belem" { - value 63; + value 62; description "Amapa, E Para"; } enum "America/Fortaleza" { - value 64; + value 63; description "NE Brazil (MA, PI, CE, RN, PB)"; } enum "America/Recife" { - value 65; + value 64; description "Pernambuco"; } enum "America/Araguaina" { - value 66; + value 65; description "Tocantins"; } enum "America/Maceio" { - value 67; + value 66; description "Alagoas, Sergipe"; } enum "America/Bahia" { - value 68; + value 67; description "Bahia"; } enum "America/Sao_Paulo" { - value 69; + value 68; description "S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)"; } enum "America/Campo_Grande" { - value 70; + value 69; description "Mato Grosso do Sul"; } enum "America/Cuiaba" { - value 71; + value 70; description "Mato Grosso"; } enum "America/Santarem" { - value 72; + value 71; description "W Para"; } enum "America/Porto_Velho" { - value 73; + value 72; description "Rondonia"; } enum "America/Boa_Vista" { - value 74; + value 73; description "Roraima"; } enum "America/Manaus" { - value 75; + value 74; description "E Amazonas"; } enum "America/Eirunepe" { - value 76; + value 75; description "W Amazonas"; } enum "America/Rio_Branco" { - value 77; + value 76; description "Acre"; } enum "America/Nassau" { - value 78; + value 77; } enum "Asia/Thimphu" { - value 79; + value 78; } enum "Africa/Gaborone" { - value 80; + value 79; } enum "Europe/Minsk" { - value 81; + value 80; } enum "America/Belize" { - value 82; + value 81; } enum "America/St_Johns" { - value 83; + value 82; description "Newfoundland Time, including SE Labrador"; } enum "America/Halifax" { - value 84; + value 83; description "Atlantic Time - Nova Scotia (most places), PEI"; } enum "America/Glace_Bay" { - value 85; + value 84; description - "Atlantic Time - Nova Scotia - places that did not observe - DST 1966-1971"; + "Atlantic Time - Nova Scotia - places that did not observe DST + 1966-1971"; } enum "America/Moncton" { - value 86; + value 85; description "Atlantic Time - New Brunswick"; } enum "America/Goose_Bay" { - value 87; + value 86; description "Atlantic Time - Labrador - most locations"; } enum "America/Blanc-Sablon" { - value 88; + value 87; description "Atlantic Standard Time - Quebec - Lower North Shore"; } - enum "America/Montreal" { - value 89; - description - "Eastern Time - Quebec - most locations"; - } enum "America/Toronto" { - value 90; + value 88; description - "Eastern Time - Ontario - most locations"; + "Eastern Time - Ontario & Quebec - most locations"; } enum "America/Nipigon" { - value 91; + value 89; description - "Eastern Time - Ontario & Quebec - places that did not - observe DST 1967-1973"; + "Eastern Time - Ontario & Quebec - places that did not observe + DST 1967-1973"; } enum "America/Thunder_Bay" { - value 92; + value 90; description "Eastern Time - Thunder Bay, Ontario"; } enum "America/Iqaluit" { - value 93; + value 91; description "Eastern Time - east Nunavut - most locations"; } enum "America/Pangnirtung" { - value 94; + value 92; description "Eastern Time - Pangnirtung, Nunavut"; } enum "America/Resolute" { - value 95; + value 93; description "Central Standard Time - Resolute, Nunavut"; } enum "America/Atikokan" { - value 96; + value 94; description "Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut"; } enum "America/Rankin_Inlet" { - value 97; + value 95; description "Central Time - central Nunavut"; } enum "America/Winnipeg" { - value 98; + value 96; description "Central Time - Manitoba & west Ontario"; } enum "America/Rainy_River" { - value 99; + value 97; description "Central Time - Rainy River & Fort Frances, Ontario"; } enum "America/Regina" { - value 100; + value 98; description "Central Standard Time - Saskatchewan - most locations"; } enum "America/Swift_Current" { - value 101; + value 99; description "Central Standard Time - Saskatchewan - midwest"; } enum "America/Edmonton" { - value 102; + value 100; description "Mountain Time - Alberta, east British Columbia & west Saskatchewan"; } enum "America/Cambridge_Bay" { - value 103; + value 101; description "Mountain Time - west Nunavut"; } enum "America/Yellowknife" { - value 104; + value 102; description "Mountain Time - central Northwest Territories"; } enum "America/Inuvik" { - value 105; + value 103; description "Mountain Time - west Northwest Territories"; } enum "America/Creston" { - value 106; + value 104; description "Mountain Standard Time - Creston, British Columbia"; } enum "America/Dawson_Creek" { - value 107; + value 105; description "Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia"; } enum "America/Vancouver" { - value 108; + value 106; description "Pacific Time - west British Columbia"; } enum "America/Whitehorse" { - value 109; + value 107; description "Pacific Time - south Yukon"; } enum "America/Dawson" { - value 110; + value 108; description "Pacific Time - north Yukon"; } enum "Indian/Cocos" { - value 111; + value 109; } enum "Africa/Kinshasa" { - value 112; + value 110; description "west Dem. Rep. of Congo"; } enum "Africa/Lubumbashi" { - value 113; + value 111; description "east Dem. Rep. of Congo"; } enum "Africa/Bangui" { - value 114; + value 112; } enum "Africa/Brazzaville" { - value 115; + value 113; } enum "Europe/Zurich" { - value 116; + value 114; } enum "Africa/Abidjan" { - value 117; + value 115; } enum "Pacific/Rarotonga" { - value 118; + value 116; } enum "America/Santiago" { - value 119; + value 117; description "most locations"; } enum "Pacific/Easter" { - value 120; + value 118; description "Easter Island & Sala y Gomez"; } enum "Africa/Douala" { - value 121; + value 119; } enum "Asia/Shanghai" { - value 122; + value 120; description "east China - Beijing, Guangdong, Shanghai, etc."; } enum "Asia/Harbin" { - value 123; + value 121; description "Heilongjiang (except Mohe), Jilin"; } enum "Asia/Chongqing" { - value 124; + value 122; description "central China - Sichuan, Yunnan, Guangxi, Shaanxi, Guizhou, etc."; } enum "Asia/Urumqi" { - value 125; + value 123; description "most of Tibet & Xinjiang"; } enum "Asia/Kashgar" { - value 126; + value 124; description "west Tibet & Xinjiang"; } enum "America/Bogota" { - value 127; + value 125; } enum "America/Costa_Rica" { - value 128; + value 126; } enum "America/Havana" { - value 129; + value 127; } enum "Atlantic/Cape_Verde" { - value 130; + value 128; } enum "America/Curacao" { - value 131; + value 129; } enum "Indian/Christmas" { - value 132; + value 130; } enum "Asia/Nicosia" { - value 133; + value 131; } enum "Europe/Prague" { - value 134; + value 132; } enum "Europe/Berlin" { - value 135; + value 133; + description + "most locations"; + } + enum "Europe/Busingen" { + value 134; + description + "Busingen"; } enum "Africa/Djibouti" { - value 136; + value 135; } enum "Europe/Copenhagen" { - value 137; + value 136; } enum "America/Dominica" { - value 138; + value 137; } enum "America/Santo_Domingo" { - value 139; + value 138; } enum "Africa/Algiers" { - value 140; + value 139; } enum "America/Guayaquil" { - value 141; + value 140; description "mainland"; } enum "Pacific/Galapagos" { - value 142; + value 141; description "Galapagos Islands"; } enum "Europe/Tallinn" { - value 143; + value 142; } enum "Africa/Cairo" { - value 144; + value 143; } enum "Africa/El_Aaiun" { - value 145; + value 144; } enum "Africa/Asmara" { - value 146; + value 145; } enum "Europe/Madrid" { - value 147; + value 146; description "mainland"; } enum "Africa/Ceuta" { - value 148; + value 147; description "Ceuta & Melilla"; } enum "Atlantic/Canary" { - value 149; + value 148; description "Canary Islands"; } enum "Africa/Addis_Ababa" { - value 150; + value 149; } enum "Europe/Helsinki" { - value 151; + value 150; } enum "Pacific/Fiji" { - value 152; + value 151; } enum "Atlantic/Stanley" { - value 153; + value 152; } enum "Pacific/Chuuk" { - value 154; + value 153; description "Chuuk (Truk) and Yap"; } enum "Pacific/Pohnpei" { - value 155; + value 154; description "Pohnpei (Ponape)"; } enum "Pacific/Kosrae" { - value 156; + value 155; description "Kosrae"; } enum "Atlantic/Faroe" { - value 157; + value 156; } enum "Europe/Paris" { - value 158; + value 157; } enum "Africa/Libreville" { - value 159; + value 158; } enum "Europe/London" { - value 160; + value 159; } enum "America/Grenada" { - value 161; + value 160; } enum "Asia/Tbilisi" { - value 162; + value 161; } enum "America/Cayenne" { - value 163; + value 162; } enum "Europe/Guernsey" { - value 164; + value 163; } enum "Africa/Accra" { - value 165; + value 164; } enum "Europe/Gibraltar" { - value 166; + value 165; } enum "America/Godthab" { - value 167; + value 166; description "most locations"; } enum "America/Danmarkshavn" { - value 168; + value 167; description "east coast, north of Scoresbysund"; } enum "America/Scoresbysund" { - value 169; + value 168; description "Scoresbysund / Ittoqqortoormiit"; } enum "America/Thule" { - value 170; + value 169; description "Thule / Pituffik"; } enum "Africa/Banjul" { - value 171; + value 170; } enum "Africa/Conakry" { - value 172; + value 171; } enum "America/Guadeloupe" { - value 173; + value 172; } enum "Africa/Malabo" { - value 174; + value 173; } enum "Europe/Athens" { - value 175; + value 174; } enum "Atlantic/South_Georgia" { - value 176; + value 175; } enum "America/Guatemala" { - value 177; + value 176; } enum "Pacific/Guam" { - value 178; + value 177; } enum "Africa/Bissau" { - value 179; + value 178; } enum "America/Guyana" { - value 180; + value 179; } enum "Asia/Hong_Kong" { - value 181; + value 180; } enum "America/Tegucigalpa" { - value 182; + value 181; } enum "Europe/Zagreb" { - value 183; + value 182; } enum "America/Port-au-Prince" { - value 184; + value 183; } enum "Europe/Budapest" { - value 185; + value 184; } enum "Asia/Jakarta" { - value 186; + value 185; description "Java & Sumatra"; } enum "Asia/Pontianak" { - value 187; + value 186; description "west & central Borneo"; } enum "Asia/Makassar" { - value 188; + value 187; description - "east & south Borneo, Sulawesi (Celebes), Bali, Nusa - Tengarra, west Timor"; + "east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, + west Timor"; } enum "Asia/Jayapura" { - value 189; + value 188; description "west New Guinea (Irian Jaya) & Malukus (Moluccas)"; } enum "Europe/Dublin" { - value 190; + value 189; } enum "Asia/Jerusalem" { - value 191; + value 190; } enum "Europe/Isle_of_Man" { - value 192; + value 191; } enum "Asia/Kolkata" { - value 193; + value 192; } enum "Indian/Chagos" { - value 194; + value 193; } enum "Asia/Baghdad" { - value 195; + value 194; } enum "Asia/Tehran" { - value 196; + value 195; } enum "Atlantic/Reykjavik" { - value 197; + value 196; } enum "Europe/Rome" { - value 198; + value 197; } enum "Europe/Jersey" { - value 199; + value 198; } enum "America/Jamaica" { - value 200; + value 199; } enum "Asia/Amman" { - value 201; + value 200; } enum "Asia/Tokyo" { - value 202; + value 201; } enum "Africa/Nairobi" { - value 203; + value 202; } enum "Asia/Bishkek" { - value 204; + value 203; } enum "Asia/Phnom_Penh" { - value 205; + value 204; } enum "Pacific/Tarawa" { - value 206; + value 205; description "Gilbert Islands"; } enum "Pacific/Enderbury" { - value 207; + value 206; description "Phoenix Islands"; } enum "Pacific/Kiritimati" { - value 208; + value 207; description "Line Islands"; } enum "Indian/Comoro" { - value 209; + value 208; } enum "America/St_Kitts" { - value 210; + value 209; } enum "Asia/Pyongyang" { - value 211; + value 210; } enum "Asia/Seoul" { - value 212; + value 211; } enum "Asia/Kuwait" { - value 213; + value 212; } enum "America/Cayman" { - value 214; + value 213; } enum "Asia/Almaty" { - value 215; + value 214; description "most locations"; } enum "Asia/Qyzylorda" { - value 216; + value 215; description "Qyzylorda (Kyzylorda, Kzyl-Orda)"; } enum "Asia/Aqtobe" { - value 217; + value 216; description "Aqtobe (Aktobe)"; } enum "Asia/Aqtau" { - value 218; + value 217; description "Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)"; } enum "Asia/Oral" { - value 219; + value 218; description "West Kazakhstan"; } enum "Asia/Vientiane" { - value 220; + value 219; } enum "Asia/Beirut" { - value 221; + value 220; } enum "America/St_Lucia" { - value 222; + value 221; } enum "Europe/Vaduz" { - value 223; + value 222; } enum "Asia/Colombo" { - value 224; + value 223; } enum "Africa/Monrovia" { - value 225; + value 224; } enum "Africa/Maseru" { - value 226; + value 225; } enum "Europe/Vilnius" { - value 227; + value 226; } enum "Europe/Luxembourg" { - value 228; + value 227; } enum "Europe/Riga" { - value 229; + value 228; } enum "Africa/Tripoli" { - value 230; + value 229; } enum "Africa/Casablanca" { - value 231; + value 230; } enum "Europe/Monaco" { - value 232; + value 231; } enum "Europe/Chisinau" { - value 233; + value 232; } enum "Europe/Podgorica" { - value 234; + value 233; } enum "America/Marigot" { - value 235; + value 234; } enum "Indian/Antananarivo" { - value 236; + value 235; } enum "Pacific/Majuro" { - value 237; + value 236; description "most locations"; } enum "Pacific/Kwajalein" { - value 238; + value 237; description "Kwajalein"; } enum "Europe/Skopje" { - value 239; + value 238; } enum "Africa/Bamako" { - value 240; + value 239; } enum "Asia/Rangoon" { - value 241; + value 240; } enum "Asia/Ulaanbaatar" { - value 242; + value 241; description "most locations"; } enum "Asia/Hovd" { - value 243; + value 242; description "Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan"; } enum "Asia/Choibalsan" { - value 244; + value 243; description "Dornod, Sukhbaatar"; } enum "Asia/Macau" { - value 245; + value 244; } enum "Pacific/Saipan" { - value 246; + value 245; } enum "America/Martinique" { - value 247; + value 246; } enum "Africa/Nouakchott" { - value 248; + value 247; } enum "America/Montserrat" { - value 249; + value 248; } enum "Europe/Malta" { - value 250; + value 249; } enum "Indian/Mauritius" { - value 251; + value 250; } enum "Indian/Maldives" { - value 252; + value 251; } enum "Africa/Blantyre" { - value 253; + value 252; } enum "America/Mexico_City" { - value 254; + value 253; description "Central Time - most locations"; } enum "America/Cancun" { - value 255; + value 254; description "Central Time - Quintana Roo"; } enum "America/Merida" { - value 256; + value 255; description "Central Time - Campeche, Yucatan"; } enum "America/Monterrey" { - value 257; + value 256; description "Mexican Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas away from US border"; } enum "America/Matamoros" { - value 258; + value 257; description "US Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas near US border"; } enum "America/Mazatlan" { - value 259; + value 258; description "Mountain Time - S Baja, Nayarit, Sinaloa"; } enum "America/Chihuahua" { - value 260; + value 259; description "Mexican Mountain Time - Chihuahua away from US border"; } enum "America/Ojinaga" { - value 261; + value 260; description "US Mountain Time - Chihuahua near US border"; } enum "America/Hermosillo" { - value 262; + value 261; description "Mountain Standard Time - Sonora"; } enum "America/Tijuana" { - value 263; + value 262; description "US Pacific Time - Baja California near US border"; } enum "America/Santa_Isabel" { - value 264; + value 263; description "Mexican Pacific Time - Baja California away from US border"; } enum "America/Bahia_Banderas" { - value 265; + value 264; description "Mexican Central Time - Bahia de Banderas"; } enum "Asia/Kuala_Lumpur" { - value 266; + value 265; description "peninsular Malaysia"; } enum "Asia/Kuching" { - value 267; + value 266; description "Sabah & Sarawak"; } enum "Africa/Maputo" { - value 268; + value 267; } enum "Africa/Windhoek" { - value 269; + value 268; } enum "Pacific/Noumea" { - value 270; + value 269; } enum "Africa/Niamey" { - value 271; + value 270; } enum "Pacific/Norfolk" { - value 272; + value 271; } enum "Africa/Lagos" { - value 273; + value 272; } enum "America/Managua" { - value 274; + value 273; } enum "Europe/Amsterdam" { - value 275; + value 274; } enum "Europe/Oslo" { - value 276; + value 275; } enum "Asia/Kathmandu" { - value 277; + value 276; } enum "Pacific/Nauru" { - value 278; + value 277; } enum "Pacific/Niue" { - value 279; + value 278; } enum "Pacific/Auckland" { - value 280; + value 279; description "most locations"; } enum "Pacific/Chatham" { - value 281; + value 280; description "Chatham Islands"; } enum "Asia/Muscat" { - value 282; + value 281; } enum "America/Panama" { - value 283; + value 282; } enum "America/Lima" { - value 284; + value 283; } enum "Pacific/Tahiti" { - value 285; + value 284; description "Society Islands"; } enum "Pacific/Marquesas" { - value 286; + value 285; description "Marquesas Islands"; } enum "Pacific/Gambier" { - value 287; + value 286; description "Gambier Islands"; } enum "Pacific/Port_Moresby" { - value 288; + value 287; } enum "Asia/Manila" { - value 289; + value 288; } enum "Asia/Karachi" { - value 290; + value 289; } enum "Europe/Warsaw" { - value 291; + value 290; } enum "America/Miquelon" { - value 292; + value 291; } enum "Pacific/Pitcairn" { - value 293; + value 292; } enum "America/Puerto_Rico" { - value 294; + value 293; } enum "Asia/Gaza" { - value 295; + value 294; description "Gaza Strip"; } enum "Asia/Hebron" { - value 296; + value 295; description "West Bank"; } enum "Europe/Lisbon" { - value 297; + value 296; description "mainland"; } enum "Atlantic/Madeira" { - value 298; + value 297; description "Madeira Islands"; } enum "Atlantic/Azores" { - value 299; + value 298; description "Azores"; } enum "Pacific/Palau" { - value 300; + value 299; } enum "America/Asuncion" { - value 301; + value 300; } enum "Asia/Qatar" { - value 302; + value 301; } enum "Indian/Reunion" { - value 303; + value 302; } enum "Europe/Bucharest" { - value 304; + value 303; } enum "Europe/Belgrade" { - value 305; + value 304; } enum "Europe/Kaliningrad" { - value 306; + value 305; description "Moscow-01 - Kaliningrad"; } enum "Europe/Moscow" { - value 307; + value 306; description "Moscow+00 - west Russia"; } enum "Europe/Volgograd" { - value 308; + value 307; description "Moscow+00 - Caspian Sea"; } enum "Europe/Samara" { - value 309; + value 308; description "Moscow+00 - Samara, Udmurtia"; } enum "Asia/Yekaterinburg" { - value 310; + value 309; description "Moscow+02 - Urals"; } enum "Asia/Omsk" { - value 311; + value 310; description "Moscow+03 - west Siberia"; } enum "Asia/Novosibirsk" { - value 312; + value 311; description "Moscow+03 - Novosibirsk"; } enum "Asia/Novokuznetsk" { - value 313; + value 312; description "Moscow+03 - Novokuznetsk"; } enum "Asia/Krasnoyarsk" { - value 314; + value 313; description "Moscow+04 - Yenisei River"; } enum "Asia/Irkutsk" { - value 315; + value 314; description "Moscow+05 - Lake Baikal"; } enum "Asia/Yakutsk" { - value 316; + value 315; description "Moscow+06 - Lena River"; } + enum "Asia/Khandyga" { + value 316; + description + "Moscow+06 - Tomponsky, Ust-Maysky"; + } enum "Asia/Vladivostok" { value 317; description @@ -1321,280 +1323,280 @@ module iana-timezones { description "Moscow+07 - Sakhalin Island"; } - enum "Asia/Magadan" { + enum "Asia/Ust-Nera" { value 319; + description + "Moscow+07 - Oymyakonsky"; + } + enum "Asia/Magadan" { + value 320; description "Moscow+08 - Magadan"; } enum "Asia/Kamchatka" { - value 320; + value 321; description "Moscow+08 - Kamchatka"; } enum "Asia/Anadyr" { - value 321; + value 322; description "Moscow+08 - Bering Sea"; } enum "Africa/Kigali" { - value 322; + value 323; } enum "Asia/Riyadh" { - value 323; + value 324; } enum "Pacific/Guadalcanal" { - value 324; + value 325; } enum "Indian/Mahe" { - value 325; + value 326; } enum "Africa/Khartoum" { - value 326; + value 327; } enum "Europe/Stockholm" { - value 327; + value 328; } enum "Asia/Singapore" { - value 328; + value 329; } enum "Atlantic/St_Helena" { - value 329; + value 330; } enum "Europe/Ljubljana" { - value 330; + value 331; } enum "Arctic/Longyearbyen" { - value 331; + value 332; } enum "Europe/Bratislava" { - value 332; + value 333; } enum "Africa/Freetown" { - value 333; + value 334; } enum "Europe/San_Marino" { - value 334; + value 335; } enum "Africa/Dakar" { - value 335; + value 336; } enum "Africa/Mogadishu" { - value 336; + value 337; } enum "America/Paramaribo" { - value 337; + value 338; } enum "Africa/Juba" { - value 338; + value 339; } enum "Africa/Sao_Tome" { - value 339; + value 340; } enum "America/El_Salvador" { - value 340; + value 341; } enum "America/Lower_Princes" { - value 341; + value 342; } enum "Asia/Damascus" { - value 342; + value 343; } enum "Africa/Mbabane" { - value 343; + value 344; } enum "America/Grand_Turk" { - value 344; + value 345; } enum "Africa/Ndjamena" { - value 345; + value 346; } enum "Indian/Kerguelen" { - value 346; + value 347; } enum "Africa/Lome" { - value 347; + value 348; } enum "Asia/Bangkok" { - value 348; + value 349; } enum "Asia/Dushanbe" { - value 349; + value 350; } enum "Pacific/Fakaofo" { - value 350; + value 351; } enum "Asia/Dili" { - value 351; + value 352; } enum "Asia/Ashgabat" { - value 352; + value 353; } enum "Africa/Tunis" { - value 353; + value 354; } enum "Pacific/Tongatapu" { - value 354; + value 355; } enum "Europe/Istanbul" { - value 355; + value 356; } enum "America/Port_of_Spain" { - value 356; + value 357; } enum "Pacific/Funafuti" { - value 357; + value 358; } enum "Asia/Taipei" { - value 358; + value 359; } enum "Africa/Dar_es_Salaam" { - value 359; + value 360; } enum "Europe/Kiev" { - value 360; + value 361; description "most locations"; } enum "Europe/Uzhgorod" { - value 361; + value 362; description "Ruthenia"; } enum "Europe/Zaporozhye" { - value 362; + value 363; description "Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk"; } enum "Europe/Simferopol" { - value 363; + value 364; description "central Crimea"; } enum "Africa/Kampala" { - value 364; + value 365; } enum "Pacific/Johnston" { - value 365; + value 366; description "Johnston Atoll"; } enum "Pacific/Midway" { - value 366; + value 367; description "Midway Islands"; } enum "Pacific/Wake" { - value 367; + value 368; description "Wake Island"; } enum "America/New_York" { - value 368; + value 369; description "Eastern Time"; } enum "America/Detroit" { - value 369; + value 370; description "Eastern Time - Michigan - most locations"; } enum "America/Kentucky/Louisville" { - value 370; + value 371; description "Eastern Time - Kentucky - Louisville area"; } enum "America/Kentucky/Monticello" { - value 371; + value 372; description "Eastern Time - Kentucky - Wayne County"; } enum "America/Indiana/Indianapolis" { - value 372; + value 373; description "Eastern Time - Indiana - most locations"; } enum "America/Indiana/Vincennes" { - value 373; + value 374; description "Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties"; } enum "America/Indiana/Winamac" { - value 374; + value 375; description "Eastern Time - Indiana - Pulaski County"; } enum "America/Indiana/Marengo" { - value 375; + value 376; description "Eastern Time - Indiana - Crawford County"; } enum "America/Indiana/Petersburg" { - value 376; + value 377; description "Eastern Time - Indiana - Pike County"; } enum "America/Indiana/Vevay" { - value 377; + value 378; description "Eastern Time - Indiana - Switzerland County"; } enum "America/Chicago" { - value 378; + value 379; description "Central Time"; } enum "America/Indiana/Tell_City" { - value 379; + value 380; description "Central Time - Indiana - Perry County"; } enum "America/Indiana/Knox" { - value 380; + value 381; description "Central Time - Indiana - Starke County"; } enum "America/Menominee" { - value 381; + value 382; description - "Central Time - Michigan - Dickinson, Gogebic, Iron & - Menominee Counties"; + "Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee + Counties"; } enum "America/North_Dakota/Center" { - value 382; + value 383; description "Central Time - North Dakota - Oliver County"; } enum "America/North_Dakota/New_Salem" { - value 383; + value 384; description "Central Time - North Dakota - Morton County (except Mandan area)"; } enum "America/North_Dakota/Beulah" { - value 384; + value 385; description "Central Time - North Dakota - Mercer County"; } enum "America/Denver" { - value 385; + value 386; description "Mountain Time"; } enum "America/Boise" { - value 386; - description - "Mountain Time - south Idaho & east Oregon"; - } - enum "America/Shiprock" { value 387; description - "Mountain Time - Navajo"; + "Mountain Time - south Idaho & east Oregon"; } enum "America/Phoenix" { value 388; description - "Mountain Standard Time - Arizona"; + "Mountain Standard Time - Arizona (except Navajo)"; } enum "America/Los_Angeles" { value 389; diff --git a/specs/ietf-interfaces@2013-07-04.yang b/specs/ietf-interfaces@2013-12-23.yang similarity index 95% rename from specs/ietf-interfaces@2013-07-04.yang rename to specs/ietf-interfaces@2013-12-23.yang index 2240085..66e9cf3 100644 --- a/specs/ietf-interfaces@2013-07-04.yang +++ b/specs/ietf-interfaces@2013-12-23.yang @@ -45,11 +45,11 @@ module ietf-interfaces { // RFC Ed.: update the date below with the date of RFC publication // and remove this note. - revision 2013-07-04 { + revision 2013-12-23 { description "Initial revision."; reference - "Draft draft-ietf-netmod-interfaces-cfg-13"; + "RFC XXXX: A YANG Data Model for Interface Management"; } /* @@ -129,7 +129,7 @@ module ietf-interfaces { (e.g., the interface hardware present does not match the interface type), then the configuration is not applied to the system-controlled interface shown in the - /interfaces-state/interface list. If the the configuration + /interfaces-state/interface list. If the configuration of a user-controlled interface cannot be used by the system, the configured interface is not instantiated in the /interfaces-state/interface list."; @@ -164,15 +164,7 @@ module ietf-interfaces { When a configured user-controlled interface is created by the system, it is instantiated with the same name in the - /interface-state/interface list. Since the name in that - list MAY be mapped to ifName by an implementation, such an - implementation MUST restrict the allowed values for this - leaf so that it matches the restrictions of ifName. - - If a NETCONF server that implements this restriction is - sent a value that doesn't match the restriction, it MUST - reply with an rpc-error with the error-tag - 'invalid-value'."; + /interface-state/interface list."; } leaf description { @@ -180,15 +172,11 @@ module ietf-interfaces { description "A textual description of the interface. - This leaf MAY be mapped to ifAlias by an implementation. - Such an implementation MUST restrict the allowed values - for this leaf so that it matches the restrictions of - ifAlias. - - If a NETCONF server that implements this restriction is - sent a value that doesn't match the restriction, it MUST - reply with an rpc-error with the error-tag - 'invalid-value'. + A server implementation MAY map this leaf to the ifAlias + MIB object. Such an implementation needs to use some + mechanism to handle the differences in size and characters + allowed between this leaf and ifAlias. The definition of + such a mechanism is outside the scope of this document. Since ifAlias is defined to be stored in non-volatile storage, the MIB implementation MUST map ifAlias to the @@ -277,6 +265,7 @@ module ietf-interfaces { } } } + /* * Operational state data nodes */ @@ -288,7 +277,6 @@ module ietf-interfaces { list interface { key "name"; - description "The list of interfaces on the device. @@ -301,7 +289,11 @@ module ietf-interfaces { description "The name of the interface. - This leaf MAY be mapped to ifName by an implementation."; + A server implementation MAY map this leaf to the ifName + MIB object. Such an implementation needs to use some + mechanism to handle the differences in size and characters + allowed between this leaf and ifName. The definition of + such a mechanism is outside the scope of this document."; reference "RFC 2863: The Interfaces Group MIB - ifName"; } @@ -613,6 +605,7 @@ module ietf-interfaces { requested be transmitted, and which were not addressed to a multicast or broadcast address at this sub-layer, including those that were discarded or not sent. + Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of diff --git a/specs/ietf-ip@2013-10-18.yang b/specs/ietf-ip@2014-03-28.yang similarity index 94% rename from specs/ietf-ip@2013-10-18.yang rename to specs/ietf-ip@2014-03-28.yang index a18362d..bc060b6 100644 --- a/specs/ietf-ip@2013-10-18.yang +++ b/specs/ietf-ip@2014-03-28.yang @@ -20,8 +20,8 @@ module ietf-ip { "WG Web: WG List: - WG Chair: David Kessens - + WG Chair: Thomas Nadeau + WG Chair: Juergen Schoenwaelder @@ -35,6 +35,7 @@ module ietf-ip { Copyright (c) 2013 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 @@ -50,11 +51,11 @@ module ietf-ip { // RFC Ed.: update the date below with the date of RFC publication // and remove this note. - revision 2013-10-18 { + revision 2014-03-28 { description "Initial revision."; reference - "Draft draft-ietf-netmod-ip-cfg-11"; + "RFC XXXX: A YANG Data Model for IP Management"; } /* @@ -100,13 +101,15 @@ module ietf-ip { enum link-layer { description "Indicates an address created by IPv6 stateless - auto-configuration."; + auto-configuration that embeds a link-layer address in its + interface identifier."; } enum random { description "Indicates an address chosen by the system at - random, e.g., an IPv4 address within 169.254/16, or an - RFC 4941 privacy address."; + random, e.g., an IPv4 address within 169.254/16, an + RFC 4941 temporary address, or a semantically opaque + address [I-D.ietf-6man-stable-privacy-addresses]"; } } description @@ -159,14 +162,18 @@ module ietf-ip { default true; description "Controls if IPv4 is enabled or disabled on this - interface."; + interface. When IPv4 is enabled, this interface is + connected to an IPv4 stack, and the interface can send + and receive IPv4 packets."; } leaf forwarding { type boolean; default false; description - "Controls if IPv4 packet forwarding is enabled or disabled - on this interface."; + "Controls IPv4 packet forwarding of datagrams received by, + but not addressed to, this interface. IPv4 routers + forward datagrams. IPv4 hosts do not (except those + source-routed via the host)"; } leaf mtu { type uint16 { @@ -179,6 +186,7 @@ module ietf-ip { The server may restrict the allowed values for this leaf depending on the interface's type. + If this leaf is not configured, the operationally used mtu depends on the interface's type."; reference @@ -252,14 +260,18 @@ module ietf-ip { default true; description "Controls if IPv6 is enabled or disabled on this - interface."; + interface. When IPv6 is enabled, this interface is + connected to an IPv6 stack, and the interface can send + and receive IPv6 packets."; } leaf forwarding { type boolean; default false; description - "Controls if IPv6 packet forwarding is enabled or disabled - on this interface."; + "Controls IPv6 packet forwarding of datagrams received by, + but not addressed to, this interface. IPv6 routers + forward datagrams. IPv6 hosts do not (except those + source-routed via the host)"; reference "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) Section 6.2.1, IsRouter"; @@ -275,6 +287,7 @@ module ietf-ip { The server may restrict the allowed values for this leaf depending on the interface's type. + If this leaf is not configured, the operationally used mtu depends on the interface's type."; reference @@ -674,4 +687,3 @@ module ietf-ip { } } } - diff --git a/specs/ietf-system@2013-11-07.yang b/specs/ietf-system@2014-04-04.yang similarity index 84% rename from specs/ietf-system@2013-11-07.yang rename to specs/ietf-system@2014-04-04.yang index 2563099..876e7dc 100644 --- a/specs/ietf-system@2013-11-07.yang +++ b/specs/ietf-system@2014-04-04.yang @@ -14,8 +14,8 @@ module ietf-system { prefix nacm; } - import iana-timezones { - prefix ianatz; + import iana-crypt-hash { + prefix ianach; } organization @@ -25,8 +25,8 @@ module ietf-system { "WG Web: WG List: - WG Chair: David Kessens - + WG Chair: Thomas Nadeau + WG Chair: Juergen Schoenwaelder @@ -46,7 +46,7 @@ module ietf-system { configuration, and some protocol operations for system management. - Copyright (c) 2013 IETF Trust and the persons identified as + Copyright (c) 2014 IETF Trust and the persons identified as authors of the code. All rights reserved. Redistribution and use in source and binary forms, with or @@ -67,7 +67,7 @@ module ietf-system { // RFC Ed.: update the date below with the date of RFC publication // and remove this note. - revision "2013-11-07" { + revision "2014-04-04" { description "Initial revision."; reference @@ -78,59 +78,18 @@ module ietf-system { * Typedefs */ - typedef crypt-hash { - type string { - pattern - '$0$.*' - + '|$1$[a-zA-Z0-9./]{1,8}$[a-zA-Z0-9./]{22}' - + '|$5$(rounds=\d+$)?[a-zA-Z0-9./]{1,16}$[a-zA-Z0-9./]{43}' - + '|$6$(rounds=\d+$)?[a-zA-Z0-9./]{1,16}$[a-zA-Z0-9./]{86}'; - } + typedef timezone-name { + type string; description - "The crypt-hash type is used to store passwords using - a hash function. The algorithms for applying the hash - function and encoding the result are implemented in - various UNIX systems as the function crypt(3). - - A value of this type matches one of the forms: - - $0$ - $$$ - $$$$ - - The '$0$' prefix signals that the value is clear text. When - such a value is received by the server, a hash value is - calculated, and the string '$$$' or - $$$$ is prepended to the result. This - value is stored in the configuration data store. - - If a value starting with '$$', where is not '0', is - received, the server knows that the value already represents a - hashed value, and stores it as is in the data store. - - When a server needs to verify a password given by a user, it - finds the stored password hash string for that user, extracts - the salt, and calculates the hash with the salt and given - password as input. If the calculated hash value is the same - as the stored value, the password given by the client is - accepted. - - This type defines the following hash functions: - - id | hash function | feature - ---+---------------+------------------- - 1 | MD5 | crypt-hash-md5 - 5 | SHA-256 | crypt-hash-sha-256 - 6 | SHA-512 | crypt-hash-sha-512 - - The server indicates support for the different hash functions - by advertising the corresponding feature."; + "A timezone name as used by the Time Zone Database, sometimes + referred to as the 'Olson Database'. + The exact set of valid values is an implementation-specific + matter. Client discovery of the exact set of time zone names + for a particular server is out of scope."; reference - "IEEE Std 1003.1-2008 - crypt() function - Wikipedia: http://en.wikipedia.org/wiki/Crypt_(C) - RFC 1321: The MD5 Message-Digest Algorithm - FIPS.180-3.2008: Secure Hash Standard"; - } + "RFC 6557: Procedures for Maintaining the Time Zone Database"; + } + /* * Features @@ -171,27 +130,6 @@ module ietf-system { Management"; } - feature crypt-hash-md5 { - description - "Indicates that the device supports the MD5 - hash function in 'crypt-hash' values"; - reference "RFC 1321: The MD5 Message-Digest Algorithm"; - } - - feature crypt-hash-sha-256 { - description - "Indicates that the device supports the SHA-256 - hash function in 'crypt-hash' values"; - reference "FIPS.180-3.2008: Secure Hash Standard"; - } - - feature crypt-hash-sha-512 { - description - "Indicates that the device supports the SHA-512 - hash function in 'crypt-hash' values"; - reference "FIPS.180-3.2008: Secure Hash Standard"; - } - feature ntp { description "Indicates that the device can be configured @@ -200,6 +138,7 @@ module ietf-system { } feature ntp-udp-port { + if-feature ntp; description "Indicates that the device supports the configuration of the UDP port for NTP servers. @@ -208,15 +147,13 @@ module ietf-system { any other port than the default port."; } - feature timezone-location { + feature timezone-name { description "Indicates that the local timezone on the device can be configured to use the TZ database to set the timezone and manage daylight savings time."; reference - "TZ Database http://www.twinsun.com/tz/tz-link.htm - Maintaining the Timezone Database - RFC 6557 (BCP 175)"; + "RFC 6557: Procedures for Maintaining the Time Zone Database"; } feature dns-udp-tcp-port { @@ -290,9 +227,11 @@ module ietf-system { type string; description "The administrator contact information for the system. - The server MAY restrict the size and characters in - order to maintain compatibility with the sysContact - MIB object."; + A server implementation MAY map this leaf to the sysContact + MIB object. Such an implementation needs to use some + mechanism to handle the differences in size and characters + allowed between this leaf and sysContact. The definition of + such a mechanism is outside the scope of this document."; reference "RFC 3418: Management Information Base (MIB) for the Simple Network Management Protocol (SNMP) @@ -307,9 +246,13 @@ module ietf-system { leaf location { type string; description - "The system location. The server MAY restrict the size - and characters in order to maintain compatibility with - the sysLocation MIB object."; + "The system location. + + A server implementation MAY map this leaf to the sysLocation + MIB object. Such an implementation needs to use some + mechanism to handle the differences in size and characters + allowed between this leaf and sysLocation. The definition + of such a mechanism is outside the scope of this document."; reference "RFC 3418: Management Information Base (MIB) for the Simple Network Management Protocol (SNMP) @@ -324,13 +267,13 @@ module ietf-system { description "The system timezone information."; - case timezone-location { - if-feature timezone-location; - leaf timezone-location { - type ianatz:iana-timezone; + case timezone-name { + if-feature timezone-name; + leaf timezone-name { + type timezone-name; description - "The TZ database location identifier string - to use for the system, such as 'Europe/Stockholm'."; + "The TZ database name to use for the system, such + as 'Europe/Stockholm'."; } } case timezone-utc-offset { @@ -466,6 +409,7 @@ module ietf-system { ordered-by user; description "List of the DNS servers that the resolver should query. + When the resolver is invoked by a calling application, it sends the query to the first name server in this list. If no response has been received within 'timeout' seconds, @@ -475,7 +419,6 @@ module ietf-system { has traversed the list 'attempts' times without receiving any response, it gives up and returns an error to the calling application. - Implementations MAY limit the number of entries in this list."; @@ -669,11 +612,15 @@ module ietf-system { ordered-by user; description - "When the device authenticates a user with - a password, it tries the authentication methods in this - leaf-list in order. If authentication with one method - fails, the next method is used. If no method succeeds, - the user is denied access. + "When the device authenticates a user with a password, + it tries the authentication methods in this leaf-list in + order. If authentication with one method fails, the next + method is used. If no method succeeds, the user is + denied access. + + An empty user-authentication-order leaf-list still allows + authentication of users using mechanisms that do not + involve a password. If the 'radius-authentication' feature is advertised by the NETCONF server, the 'radius' identity can be added to @@ -696,7 +643,7 @@ module ietf-system { "The user name string identifying this entry."; } leaf password { - type crypt-hash; + type ianach:crypt-hash; description "The password for this entry."; } @@ -845,4 +792,3 @@ module ietf-system { } } - diff --git a/specs/opencpe-deviations@2014-01-12.yang b/specs/opencpe-deviations@2014-05-13.yang similarity index 88% rename from specs/opencpe-deviations@2014-01-12.yang rename to specs/opencpe-deviations@2014-05-13.yang index f553bca..3970633 100644 --- a/specs/opencpe-deviations@2014-01-12.yang +++ b/specs/opencpe-deviations@2014-05-13.yang @@ -8,17 +8,17 @@ module opencpe-deviations { import ietf-system { prefix "sys"; - revision-date 2013-11-07; + revision-date 2014-04-04; } import ietf-interfaces { prefix "if"; - revision-date 2013-07-04; + revision-date 2013-12-23; } import ietf-ip { prefix "ip"; - revision-date 2013-10-18; + revision-date 2014-03-28; } organization @@ -32,10 +32,15 @@ module opencpe-deviations { description "This module defines a home gateway for the TeraStream project."; + revision "2014-05-13" { + description + "Version 0.1.3 + Adapt to new IETF-module revisions."; + } revision "2014-01-12" { description "Version 0.1.2 - Fix wording of IPv6 neighbor state deviation"; + Fix wording of IPv6 neighbor state deviation."; } revision "2013-12-19" { description diff --git a/specs/opencpe-firmware-mgmt@2014-02-06.yang b/specs/opencpe-firmware-mgmt@2014-02-06.yang index d4eea97..42b1106 100644 --- a/specs/opencpe-firmware-mgmt@2014-02-06.yang +++ b/specs/opencpe-firmware-mgmt@2014-02-06.yang @@ -8,7 +8,7 @@ module opencpe-firmware-mgmt { import ietf-system { prefix "sys"; - revision-date 2013-11-07; + revision-date 2014-04-04; } import ietf-inet-types { diff --git a/specs/opencpe-system@2014-01-27.yang b/specs/opencpe-system@2014-01-27.yang index 5993c4d..4850bcb 100644 --- a/specs/opencpe-system@2014-01-27.yang +++ b/specs/opencpe-system@2014-01-27.yang @@ -8,7 +8,7 @@ module opencpe-system { import ietf-system { prefix "sys"; - revision-date 2013-11-07; + revision-date 2014-04-04; } import opencpe-firmware-mgmt {