diff --git a/opencpe-tree.pdf b/opencpe-tree.pdf index d62a430..90ad3e9 100644 Binary files a/opencpe-tree.pdf and b/opencpe-tree.pdf differ 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 {