From 1f2e16571a15e763aa5c1abb5240fe6049956fe1 Mon Sep 17 00:00:00 2001 From: Lorand Jakab Date: Thu, 23 Jun 2016 17:14:35 -0500 Subject: [PATCH] Bug 6102: Upgrade ietf-{inet,yang}-types to 2013-07-15 Change-Id: Id434ae938946ff0b4a7b0798d538149f6bf6b15c Signed-off-by: Lorand Jakab --- opendaylight/commons/opendaylight/pom.xml | 4 +- .../test/resources/config-jmx-it-impl.yang | 2 +- ...nfig-test-duplicate-attribute-in-list.yang | 2 +- ...icate-attribute-in-runtime-and-mxbean.yang | 4 +- ...test-duplicate-attribute-runtime-bean.yang | 2 +- .../config-test-duplicate-attribute.yang | 2 +- ...st-generated-attributes-name-conflict.yang | 2 +- ...-test-runtime-bean-list-name-conflict.yang | 2 +- ...test-runtime-bean-list-name-conflict2.yang | 2 +- ...onfig-test-runtime-bean-name-conflict.yang | 2 +- ...nfig-test-runtime-bean-name-conflict2.yang | 2 +- .../src/test/resources/ietf-inet-types.yang | 157 +++++++++++------- .../src/test/resources/test-config-files.yang | 2 +- .../test/resources/test-config-files1.yang | 2 +- opendaylight/config/yang-test/pom.xml | 2 +- .../src/main/yang/config-test-impl.yang | 2 +- .../md-sal/sal-binding-config/pom.xml | 2 +- .../md-sal/sal-dom-broker-config/pom.xml | 2 +- .../samples/clustering-test-app/model/pom.xml | 4 +- .../model/src/main/yang/car-people.yang | 4 +- .../model/src/main/yang/car-purchase.yang | 4 +- .../model/src/main/yang/car.yang | 4 +- .../model/src/main/yang/people.yang | 4 +- .../src/main/yang/opendaylight-inventory.yang | 2 +- opendaylight/model/pom.xml | 4 +- 25 files changed, 130 insertions(+), 91 deletions(-) diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 9c95733c40..98e957e38d 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -80,10 +80,10 @@ 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT 0.3.0-SNAPSHOT - 2010.09.24.9-SNAPSHOT + 1.1.0-SNAPSHOT 2013.10.19.9-SNAPSHOT 2013.10.21.9-SNAPSHOT - 2010.09.24.9-SNAPSHOT + 2013.07.15.9-SNAPSHOT 2.0-beta-2 target/generated-sources/config-binding 0.3.0-SNAPSHOT diff --git a/opendaylight/config/yang-jmx-generator/src/test/resources/config-jmx-it-impl.yang b/opendaylight/config/yang-jmx-generator/src/test/resources/config-jmx-it-impl.yang index f00623e02e..b9388c64f3 100644 --- a/opendaylight/config/yang-jmx-generator/src/test/resources/config-jmx-it-impl.yang +++ b/opendaylight/config/yang-jmx-generator/src/test/resources/config-jmx-it-impl.yang @@ -5,7 +5,7 @@ module config-jmx-it-impl { import config-jmx-it { prefix jmxIt; revision-date 2013-06-13;} import config { prefix config; revision-date 2013-04-05; } - import ietf-inet-types { prefix inet; revision-date 2010-09-24;} + import ietf-inet-types { prefix inet; revision-date 2013-07-15;} import config-threads { prefix th; revision-date 2013-04-09; } description diff --git a/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-duplicate-attribute-in-list.yang b/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-duplicate-attribute-in-list.yang index 97fca03877..ed1f5d62f1 100644 --- a/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-duplicate-attribute-in-list.yang +++ b/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-duplicate-attribute-in-list.yang @@ -5,7 +5,7 @@ module config-test-duplicate-attribute-in-list { prefix "it-duplicate"; import config { prefix config; revision-date 2013-04-05; } - import ietf-inet-types { prefix inet; revision-date 2010-09-24;} + import ietf-inet-types { prefix inet; revision-date 2013-07-15;} description "Testing IMPL"; diff --git a/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-duplicate-attribute-in-runtime-and-mxbean.yang b/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-duplicate-attribute-in-runtime-and-mxbean.yang index 58c3af262c..4f18961eec 100644 --- a/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-duplicate-attribute-in-runtime-and-mxbean.yang +++ b/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-duplicate-attribute-in-runtime-and-mxbean.yang @@ -6,7 +6,7 @@ module config-test-duplicate-attribute-in-runtime-and-mxbean { import config { prefix config; revision-date 2013-04-05; } import rpc-context { prefix rpcx; revision-date 2013-06-17; } - import ietf-inet-types { prefix inet; revision-date 2010-09-24;} + import ietf-inet-types { prefix inet; revision-date 2013-07-15;} description @@ -54,4 +54,4 @@ module config-test-duplicate-attribute-in-runtime-and-mxbean { } } } -} \ No newline at end of file +} diff --git a/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-duplicate-attribute-runtime-bean.yang b/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-duplicate-attribute-runtime-bean.yang index 44e6dd0b2b..8703185d78 100644 --- a/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-duplicate-attribute-runtime-bean.yang +++ b/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-duplicate-attribute-runtime-bean.yang @@ -6,7 +6,7 @@ module config-test-duplicate-attribute-runtime-bean { import config { prefix config; revision-date 2013-04-05; } import rpc-context { prefix rpcx; revision-date 2013-06-17; } - import ietf-inet-types { prefix inet; revision-date 2010-09-24;} + import ietf-inet-types { prefix inet; revision-date 2013-07-15;} description diff --git a/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-duplicate-attribute.yang b/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-duplicate-attribute.yang index d2d4dc534d..8f9116044a 100644 --- a/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-duplicate-attribute.yang +++ b/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-duplicate-attribute.yang @@ -5,7 +5,7 @@ module config-test-duplicate-attribute { prefix "it-duplicate"; import config { prefix config; revision-date 2013-04-05; } - import ietf-inet-types { prefix inet; revision-date 2010-09-24;} + import ietf-inet-types { prefix inet; revision-date 2013-07-15;} description "Testing IMPL"; diff --git a/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-generated-attributes-name-conflict.yang b/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-generated-attributes-name-conflict.yang index b437b6416a..2b46046615 100644 --- a/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-generated-attributes-name-conflict.yang +++ b/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-generated-attributes-name-conflict.yang @@ -5,7 +5,7 @@ module config-test-generated-attributes-name-conflict { prefix "th-java"; import config { prefix config; revision-date 2013-04-05; } - import ietf-inet-types { prefix inet; revision-date 2010-09-24;} + import ietf-inet-types { prefix inet; revision-date 2013-07-15;} description "This module contains the base YANG definitions for NS-OS diff --git a/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-runtime-bean-list-name-conflict.yang b/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-runtime-bean-list-name-conflict.yang index c39692ddcf..790f0cc866 100644 --- a/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-runtime-bean-list-name-conflict.yang +++ b/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-runtime-bean-list-name-conflict.yang @@ -5,7 +5,7 @@ module config-test-runtime-bean-list-name-conflict { prefix "th-java"; import config { prefix config; revision-date 2013-04-05; } - import ietf-inet-types { prefix inet; revision-date 2010-09-24;} + import ietf-inet-types { prefix inet; revision-date 2013-07-15;} description "This module contains the base YANG definitions for NS-OS diff --git a/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-runtime-bean-list-name-conflict2.yang b/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-runtime-bean-list-name-conflict2.yang index 1acba7314e..45672ec766 100644 --- a/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-runtime-bean-list-name-conflict2.yang +++ b/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-runtime-bean-list-name-conflict2.yang @@ -5,7 +5,7 @@ module config-test-runtime-bean-list-name-conflict2 { prefix "th-java"; import config { prefix config; revision-date 2013-04-05; } - import ietf-inet-types { prefix inet; revision-date 2010-09-24;} + import ietf-inet-types { prefix inet; revision-date 2013-07-15;} description "This module contains the base YANG definitions of diff --git a/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-runtime-bean-name-conflict.yang b/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-runtime-bean-name-conflict.yang index b9f21402f9..896eb27782 100644 --- a/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-runtime-bean-name-conflict.yang +++ b/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-runtime-bean-name-conflict.yang @@ -5,7 +5,7 @@ module config-test-runtime-bean-name-conflict { prefix "th-java"; import config { prefix config; revision-date 2013-04-05; } - import ietf-inet-types { prefix inet; revision-date 2010-09-24;} + import ietf-inet-types { prefix inet; revision-date 2013-07-15;} description "This module contains the base YANG definitions for diff --git a/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-runtime-bean-name-conflict2.yang b/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-runtime-bean-name-conflict2.yang index 9f90480b50..8be30e1c51 100644 --- a/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-runtime-bean-name-conflict2.yang +++ b/opendaylight/config/yang-jmx-generator/src/test/resources/duplicates/config-test-runtime-bean-name-conflict2.yang @@ -5,7 +5,7 @@ module config-test-runtime-bean-name-conflict2 { prefix "th-java"; import config { prefix config; revision-date 2013-04-05; } - import ietf-inet-types { prefix inet; revision-date 2010-09-24;} + import ietf-inet-types { prefix inet; revision-date 2013-07-15;} description diff --git a/opendaylight/config/yang-jmx-generator/src/test/resources/ietf-inet-types.yang b/opendaylight/config/yang-jmx-generator/src/test/resources/ietf-inet-types.yang index c3ada6c688..5c6f139a27 100644 --- a/opendaylight/config/yang-jmx-generator/src/test/resources/ietf-inet-types.yang +++ b/opendaylight/config/yang-jmx-generator/src/test/resources/ietf-inet-types.yang @@ -10,12 +10,12 @@ module ietf-inet-types { "WG Web: WG List: - WG Chair: David Partain - - WG Chair: David Kessens + WG Chair: Juergen Schoenwaelder + + Editor: Juergen Schoenwaelder "; @@ -23,18 +23,29 @@ module ietf-inet-types { "This module contains a collection of generally useful derived YANG data types for Internet addresses and related things. - Copyright (c) 2010 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 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 + Redistribution and use in source and binary forms, with or + without modification, is permitted pursuant to, and subject + to the license terms contained in, the Simplified BSD License + set forth in Section 4.c of the IETF Trust's Legal Provisions + Relating to IETF Documents (http://trustee.ietf.org/license-info). - This version of this YANG module is part of RFC 6021; see + This version of this YANG module is part of RFC 6991; see the RFC itself for full legal notices."; + revision 2013-07-15 { + description + "This revision adds the following new data types: + - ip-address-no-zone + - ipv4-address-no-zone + - ipv6-address-no-zone"; + reference + "RFC 6991: Common YANG Data Types"; + } + revision 2010-09-24 { description "Initial revision."; @@ -42,14 +53,15 @@ module ietf-inet-types { "RFC 6021: Common YANG Data Types"; } - /*** collection of protocol field related types ***/ + /*** collection of types related to protocol fields ***/ typedef ip-version { type enumeration { enum unknown { value "0"; description - "An unknown or unspecified version of the Internet protocol."; + "An unknown or unspecified version of the Internet + protocol."; } enum ipv4 { value "1"; @@ -78,9 +90,8 @@ module ietf-inet-types { range "0..63"; } description - "The dscp type represents a Differentiated Services Code-Point + "The dscp type represents a Differentiated Services Code Point that may be used for marking packets in a traffic stream. - In the value set and its semantics, this type is equivalent to the Dscp textual convention of the SMIv2."; reference @@ -97,9 +108,9 @@ module ietf-inet-types { range "0..1048575"; } description - "The flow-label type represents flow identifier or Flow Label - in an IPv6 packet header that may be used to discriminate - traffic flows. + "The ipv6-flow-label type represents the flow identifier or Flow + Label in an IPv6 packet header that may be used to + discriminate traffic flows. In the value set and its semantics, this type is equivalent to the IPv6FlowLabel textual convention of the SMIv2."; @@ -114,14 +125,13 @@ module ietf-inet-types { } description "The port-number type represents a 16-bit port number of an - Internet transport layer protocol such as UDP, TCP, DCCP, or + Internet transport-layer protocol such as UDP, TCP, DCCP, or SCTP. Port numbers are assigned by IANA. A current list of all assignments is available from . Note that the port number value zero is reserved by IANA. In situations where the value zero does not make sense, it can be excluded by subtyping the port-number type. - In the value set and its semantics, this type is equivalent to the InetPortNumber textual convention of the SMIv2."; reference @@ -132,7 +142,7 @@ module ietf-inet-types { RFC 4001: Textual Conventions for Internet Network Addresses"; } - /*** collection of autonomous system related types ***/ + /*** collection of types related to autonomous systems ***/ typedef as-number { type uint32; @@ -142,7 +152,7 @@ module ietf-inet-types { of routers under a single technical administration, using an interior gateway protocol and common metrics to route packets within the AS, and using an exterior gateway - protocol to route packets to other ASs'. IANA maintains + protocol to route packets to other ASes. IANA maintains the AS number space and has delegated large parts to the regional registries. @@ -159,11 +169,12 @@ module ietf-inet-types { "RFC 1930: Guidelines for creation, selection, and registration of an Autonomous System (AS) RFC 4271: A Border Gateway Protocol 4 (BGP-4) - RFC 4893: BGP Support for Four-octet AS Number Space - RFC 4001: Textual Conventions for Internet Network Addresses"; + RFC 4001: Textual Conventions for Internet Network Addresses + RFC 6793: BGP Support for Four-Octet Autonomous System (AS) + Number Space"; } - /*** collection of IP address and hostname related types ***/ + /*** collection of types related to IP addresses and hostnames ***/ typedef ip-address { type union { @@ -172,8 +183,11 @@ module ietf-inet-types { } description "The ip-address type represents an IP address and is IP - version neutral. The format of the textual representations - implies the IP version."; + version neutral. The format of the textual representation + implies the IP version. This type supports scoped addresses + by allowing zone identifiers in the address format."; + reference + "RFC 4007: IPv6 Scoped Address Architecture"; } typedef ipv4-address { @@ -220,21 +234,55 @@ module ietf-inet-types { interface. If the zone index is not present, the default zone of the device will be used. - The canonical format of IPv6 addresses uses the compressed - format described in RFC 4291, Section 2.2, item 2 with the - following additional rules: the :: substitution must be - applied to the longest sequence of all-zero 16-bit chunks - in an IPv6 address. If there is a tie, the first sequence - of all-zero 16-bit chunks is replaced by ::. Single - all-zero 16-bit chunks are not compressed. The canonical - format uses lowercase characters and leading zeros are - not allowed. The canonical format for the zone index is - the numerical format as described in RFC 4007, Section - 11.2."; + The canonical format of IPv6 addresses uses the textual + representation defined in Section 4 of RFC 5952. The + canonical format for the zone index is the numerical + format as described in Section 11.2 of RFC 4007."; + reference + "RFC 4291: IP Version 6 Addressing Architecture + RFC 4007: IPv6 Scoped Address Architecture + RFC 5952: A Recommendation for IPv6 Address Text + Representation"; + } + + typedef ip-address-no-zone { + type union { + type inet:ipv4-address-no-zone; + type inet:ipv6-address-no-zone; + } + description + "The ip-address-no-zone type represents an IP address and is + IP version neutral. The format of the textual representation + implies the IP version. This type does not support scoped + addresses since it does not allow zone identifiers in the + address format."; + reference + "RFC 4007: IPv6 Scoped Address Architecture"; + } + + typedef ipv4-address-no-zone { + type inet:ipv4-address { + pattern '[0-9\.]*'; + } + description + "An IPv4 address without a zone index. This type, derived from + ipv4-address, may be used in situations where the zone is + known from the context and hence no zone index is needed."; + } + + typedef ipv6-address-no-zone { + type inet:ipv6-address { + pattern '[0-9a-fA-F:\.]*'; + } + description + "An IPv6 address without a zone index. This type, derived from + ipv6-address, may be used in situations where the zone is + known from the context and hence no zone index is needed."; reference "RFC 4291: IP Version 6 Addressing Architecture RFC 4007: IPv6 Scoped Address Architecture - RFC 5952: A Recommendation for IPv6 Address Text Representation"; + RFC 5952: A Recommendation for IPv6 Address Text + Representation"; } typedef ip-prefix { @@ -283,7 +331,7 @@ module ietf-inet-types { description "The ipv6-prefix type represents an IPv6 address prefix. The prefix length is given by the number following the - slash character and must be less than or equal 128. + slash character and must be less than or equal to 128. A prefix length value of n corresponds to an IP address mask that has n contiguous 1-bits from the most @@ -294,26 +342,21 @@ module ietf-inet-types { The canonical format of an IPv6 prefix has all bits of the IPv6 address set to zero that are not part of the - IPv6 prefix. Furthermore, IPv6 address is represented - in the compressed format described in RFC 4291, Section - 2.2, item 2 with the following additional rules: the :: - substitution must be applied to the longest sequence of - all-zero 16-bit chunks in an IPv6 address. If there is - a tie, the first sequence of all-zero 16-bit chunks is - replaced by ::. Single all-zero 16-bit chunks are not - compressed. The canonical format uses lowercase - characters and leading zeros are not allowed."; + IPv6 prefix. Furthermore, the IPv6 address is represented + as defined in Section 4 of RFC 5952."; reference - "RFC 4291: IP Version 6 Addressing Architecture"; + "RFC 5952: A Recommendation for IPv6 Address Text + Representation"; } /*** collection of domain name and URI types ***/ typedef domain-name { type string { - pattern '((([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.)*' - + '([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.?)' - + '|\.'; + pattern + '((([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.)*' + + '([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.?)' + + '|\.'; length "1..253"; } description @@ -345,13 +388,12 @@ module ietf-inet-types { may require to query multiple DNS records (e.g., A for IPv4 and AAAA for IPv6). The order of the resolution process and which DNS record takes precedence can either be defined - explicitely or it may depend on the configuration of the + explicitly or may depend on the configuration of the resolver. Domain-name values use the US-ASCII encoding. Their canonical format uses lowercase US-ASCII characters. Internationalized - domain names MUST be encoded in punycode as described in RFC - 3492"; + domain names MUST be A-labels as per RFC 5890."; reference "RFC 952: DoD Internet Host Table Specification RFC 1034: Domain Names - Concepts and Facilities @@ -359,11 +401,8 @@ module ietf-inet-types { and Support RFC 2782: A DNS RR for specifying the location of services (DNS SRV) - RFC 3492: Punycode: A Bootstring encoding of Unicode for - Internationalized Domain Names in Applications - (IDNA) - RFC 5891: Internationalizing Domain Names in Applications - (IDNA): Protocol"; + RFC 5890: Internationalized Domain Names in Applications + (IDNA): Definitions and Document Framework"; } typedef host { diff --git a/opendaylight/config/yang-jmx-generator/src/test/resources/test-config-files.yang b/opendaylight/config/yang-jmx-generator/src/test/resources/test-config-files.yang index f6a0b888bd..4ad5b74fe9 100644 --- a/opendaylight/config/yang-jmx-generator/src/test/resources/test-config-files.yang +++ b/opendaylight/config/yang-jmx-generator/src/test/resources/test-config-files.yang @@ -4,7 +4,7 @@ module test-config-files { prefix "it-duplicate"; import config { prefix config; revision-date 2013-04-05; } - import ietf-inet-types { prefix inet; revision-date 2010-09-24;} + import ietf-inet-types { prefix inet; revision-date 2013-07-15;} description diff --git a/opendaylight/config/yang-jmx-generator/src/test/resources/test-config-files1.yang b/opendaylight/config/yang-jmx-generator/src/test/resources/test-config-files1.yang index fc0e0730df..ac34088347 100644 --- a/opendaylight/config/yang-jmx-generator/src/test/resources/test-config-files1.yang +++ b/opendaylight/config/yang-jmx-generator/src/test/resources/test-config-files1.yang @@ -4,7 +4,7 @@ module test-config-files1 { prefix "it-duplicate"; import config { prefix config; revision-date 2013-04-05; } - import ietf-inet-types { prefix inet; revision-date 2010-09-24;} + import ietf-inet-types { prefix inet; revision-date 2013-07-15;} description diff --git a/opendaylight/config/yang-test/pom.xml b/opendaylight/config/yang-test/pom.xml index f212fbd089..c549eb1f63 100644 --- a/opendaylight/config/yang-test/pom.xml +++ b/opendaylight/config/yang-test/pom.xml @@ -26,7 +26,7 @@ org.opendaylight.mdsal.model - ietf-inet-types + ietf-inet-types-2013-07-15 org.slf4j diff --git a/opendaylight/config/yang-test/src/main/yang/config-test-impl.yang b/opendaylight/config/yang-test/src/main/yang/config-test-impl.yang index 06b874c9b5..c0c6846d63 100644 --- a/opendaylight/config/yang-test/src/main/yang/config-test-impl.yang +++ b/opendaylight/config/yang-test/src/main/yang/config-test-impl.yang @@ -5,7 +5,7 @@ module config-test-impl { import config-test { prefix test; revision-date 2013-06-13;} import config { prefix config; revision-date 2013-04-05; } - import ietf-inet-types { prefix inet; revision-date 2010-09-24;} + import ietf-inet-types { prefix inet; revision-date 2013-07-15;} import rpc-context { prefix rpcx; revision-date 2013-06-17; } import test-types { prefix tt; revision-date 2013-11-27; } import test-groups { prefix tg; revision-date 2014-12-08; } diff --git a/opendaylight/md-sal/sal-binding-config/pom.xml b/opendaylight/md-sal/sal-binding-config/pom.xml index 1d2c66fc0d..62b74e63ab 100644 --- a/opendaylight/md-sal/sal-binding-config/pom.xml +++ b/opendaylight/md-sal/sal-binding-config/pom.xml @@ -32,7 +32,7 @@ org.opendaylight.mdsal.model - ietf-yang-types + ietf-yang-types-20130715 diff --git a/opendaylight/md-sal/sal-dom-broker-config/pom.xml b/opendaylight/md-sal/sal-dom-broker-config/pom.xml index 1266a9ee23..5db2ed0c7c 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/pom.xml +++ b/opendaylight/md-sal/sal-dom-broker-config/pom.xml @@ -24,7 +24,7 @@ org.opendaylight.mdsal.model - ietf-yang-types + ietf-yang-types-20130715 diff --git a/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml index 7d1faa0cd5..2bd1b7f034 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml @@ -99,12 +99,12 @@ org.opendaylight.mdsal.model - ietf-inet-types + ietf-inet-types-2013-07-15 ${ietf-inet-types.version} org.opendaylight.mdsal.model - ietf-yang-types + ietf-yang-types-20130715 ${ietf-yang-types.version} diff --git a/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/car-people.yang b/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/car-people.yang index 899724658f..34ffb1cfbf 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/car-people.yang +++ b/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/car-people.yang @@ -6,7 +6,7 @@ module car-people { prefix car; - import ietf-inet-types { prefix "inet"; revision-date 2010-09-24; } + import ietf-inet-types { prefix "inet"; revision-date 2013-07-15; } import car { prefix "c"; revision-date 2014-08-18; } import people { prefix "people"; revision-date 2014-08-18; } @@ -39,4 +39,4 @@ module car-people { } } } -} \ No newline at end of file +} diff --git a/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/car-purchase.yang b/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/car-purchase.yang index f6a8797098..b771346112 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/car-purchase.yang +++ b/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/car-purchase.yang @@ -6,7 +6,7 @@ module car-purchase { prefix cp; - import ietf-inet-types { prefix "inet"; revision-date 2010-09-24; } + import ietf-inet-types { prefix "inet"; revision-date 2013-07-15; } import car { prefix "car"; revision-date 2014-08-18; } import people { prefix "person"; revision-date 2014-08-18; } import yang-ext {prefix "ext"; revision-date "2013-07-09";} @@ -57,4 +57,4 @@ module car-purchase { description "identifier of person."; } } -} \ No newline at end of file +} diff --git a/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/car.yang b/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/car.yang index f279949b5e..2d552f447d 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/car.yang +++ b/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/car.yang @@ -6,7 +6,7 @@ module car { prefix car; - import ietf-inet-types { prefix "inet"; revision-date 2010-09-24; } + import ietf-inet-types { prefix "inet"; revision-date 2013-07-15; } organization "Netconf Central"; @@ -116,4 +116,4 @@ module car { rpc unregister-logging-dtcls { description "Unregisters the logging DTCL(s) for the cars container."; } -} \ No newline at end of file +} diff --git a/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/people.yang b/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/people.yang index 6c8f24703f..4efc218dff 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/people.yang +++ b/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/people.yang @@ -6,7 +6,7 @@ module people { prefix people; - import ietf-inet-types { prefix "inet"; revision-date 2010-09-24; } + import ietf-inet-types { prefix "inet"; revision-date 2013-07-15; } organization "Netconf Central"; @@ -77,4 +77,4 @@ module people { uses person; } } -} \ No newline at end of file +} diff --git a/opendaylight/model/model-inventory/src/main/yang/opendaylight-inventory.yang b/opendaylight/model/model-inventory/src/main/yang/opendaylight-inventory.yang index 9dc61ebe6b..bf025f415a 100644 --- a/opendaylight/model/model-inventory/src/main/yang/opendaylight-inventory.yang +++ b/opendaylight/model/model-inventory/src/main/yang/opendaylight-inventory.yang @@ -3,7 +3,7 @@ module opendaylight-inventory { prefix inv; import yang-ext {prefix ext; revision-date "2013-07-09";} - import ietf-inet-types {prefix inet; revision-date "2010-09-24";} + import ietf-inet-types {prefix inet; revision-date "2013-07-15";} revision "2013-08-19" { diff --git a/opendaylight/model/pom.xml b/opendaylight/model/pom.xml index 68fb1e5659..b1893e5f8b 100644 --- a/opendaylight/model/pom.xml +++ b/opendaylight/model/pom.xml @@ -59,11 +59,11 @@ org.opendaylight.mdsal.model - ietf-inet-types + ietf-inet-types-2013-07-15 org.opendaylight.mdsal.model - ietf-yang-types + ietf-yang-types-20130715 org.opendaylight.mdsal.model -- 2.36.6