Bump ietf-yang-library module to newest draft

Bump ietf-yang-library yang module to confrom to
draft-ietf-netconf-yang-library-06 described in
https://tools.ietf.org/html/draft-ietf-netconf-yang-library-06

Change-Id: I765d14f1401f06aec33fe08299cc6df1413df0b4
Signed-off-by: Jakub Morvay <jmorvay@cisco.com>

diff --git a/netconf/models/ietf-netconf-yang-library/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/library/rev160201/OptionalRevisionBuilder.java b/netconf/models/ietf-netconf-yang-library/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/library/rev160409/OptionalRevisionBuilder.java
similarity index 96%
rename from netconf/models/ietf-netconf-yang-library/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/library/rev160201/OptionalRevisionBuilder.java
rename to netconf/models/ietf-netconf-yang-library/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/library/rev160409/OptionalRevisionBuilder.java
index 653dc03aff5722dc0901667ffa127066e287f1dd..54ee117be75bd06a87de579cbfdfb90c7f25193b 100644 (file)
--- a/netconf/models/ietf-netconf-yang-library/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/library/rev160201/OptionalRevisionBuilder.java
+++ b/netconf/models/ietf-netconf-yang-library/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/library/rev160409/OptionalRevisionBuilder.java
@@ -1,4 +1,4 @@
-package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160201;
+package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409;
 
 
 /**

diff --git a/netconf/models/ietf-netconf-yang-library/src/main/yang/ietf-netconf-yang-library.yang b/netconf/models/ietf-netconf-yang-library/src/main/yang/ietf-yang-library@2016-04-09.yang
similarity index 84%
rename from netconf/models/ietf-netconf-yang-library/src/main/yang/ietf-netconf-yang-library.yang
rename to netconf/models/ietf-netconf-yang-library/src/main/yang/ietf-yang-library@2016-04-09.yang
index ed6b2e36082abf7f74f98c021c9c2a5d548f2507..d82d8081885cd80361fddc259085c55748724f2b 100644 (file)
--- a/netconf/models/ietf-netconf-yang-library/src/main/yang/ietf-netconf-yang-library.yang
+++ b/netconf/models/ietf-netconf-yang-library/src/main/yang/ietf-yang-library@2016-04-09.yang
@@ -1,41 +1,35 @@
 module ietf-yang-library {
-
-    yang-version 1;
     namespace "urn:ietf:params:xml:ns:yang:ietf-yang-library";
     prefix "yanglib";
 
     import ietf-yang-types {
       prefix yang;
-      revision-date "2013-07-15";
     }
-
     import ietf-inet-types {
       prefix inet;
-      revision-date "2010-09-24";
     }
 
-
     organization
       "IETF NETCONF (Network Configuration) Working Group";
 
     contact
       "WG Web:   <http://tools.ietf.org/wg/netconf/>
-      WG List:  <mailto:netconf@ietf.org>
+       WG List:  <mailto:netconf@ietf.org>
 
-      WG Chair: Mehmet Ersue
-                <mailto:mehmet.ersue@nsn.com>
+       WG Chair: Mehmet Ersue
+                 <mailto:mehmet.ersue@nsn.com>
 
-      WG Chair: Mahesh Jethanandani
-                <mailto:mjethanandani@gmail.com>
+       WG Chair: Mahesh Jethanandani
+                 <mailto:mjethanandani@gmail.com>
 
-      Editor:   Andy Bierman
-                <mailto:andy@yumaworks.com>
+       Editor:   Andy Bierman
+                 <mailto:andy@yumaworks.com>
 
-      Editor:   Martin Bjorklund
-                <mailto:mbj@tail-f.com>
+       Editor:   Martin Bjorklund
+                 <mailto:mbj@tail-f.com>
 
-      Editor:   Kent Watsen
-                <mailto:kwatsen@juniper.net>";
+       Editor:   Kent Watsen
+                 <mailto:kwatsen@juniper.net>";
 
     description
       "This module contains monitoring information about the YANG
@@ -55,16 +49,15 @@ module ietf-yang-library {
        This 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.: replace XXXX with actual RFC number and remove this
+    // note.
 
-       // RFC Ed.: remove this note
-       // Note: extracted from draft-ietf-netconf-yang-library-04.txt
+    // RFC Ed.: remove this note
+    // Note: extracted from draft-ietf-netconf-yang-library-06.txt
 
-       // RFC Ed.: update the date below with the date of RFC publication
-       // and remove this note.
-
-    revision 2016-02-01 {
+    // RFC Ed.: update the date below with the date of RFC publication
+    // and remove this note.
+    revision 2016-04-09 {
       description
         "Initial revision.";
       reference
@@ -74,12 +67,17 @@ module ietf-yang-library {
     /*
      * Typedefs
      */
+
     // FIXME inline this union after https://bugs.opendaylight.org/show_bug.cgi?id=5826 is fixed
     typedef optional-revision {
       type union {
         type revision-identifier;
         type string { length 0; }
       }
+      description
+        "The YANG module or submodule revision date.
+         A zero-length string is used if no revision statement
+         is present in the YANG module or submodule.";
     }
 
     typedef revision-identifier {
@@ -93,13 +91,13 @@ module ietf-yang-library {
     /*
      * Groupings
      */
+
     grouping module-list {
       description
         "The module data structure is represented as a grouping
          so it can be reused in configuration or another monitoring
          data structure.";
 
-
       grouping common-leafs {
         description
           "Common parameters for YANG modules and submodules.";
@@ -111,10 +109,6 @@ module ietf-yang-library {
         }
         leaf revision {
           type optional-revision;
-            description
-              "The YANG module or submodule revision date.
-               A zero-length string is used if no revision statement
-               is present in the YANG module or submodule.";
         }
       }
 
@@ -136,8 +130,8 @@ module ietf-yang-library {
       list module {
         key "name revision";
         description
-          "Each entry represents one module currently
-           supported by the server.";
+          "Each entry represents one revision of one module
+           currently supported by the server.";
 
         uses common-leafs;
         uses schema-leaf;
@@ -216,8 +210,8 @@ module ietf-yang-library {
             description
               "Each entry represents one submodule within the
                parent module.";
-             uses common-leafs;
-             uses schema-leaf;
+            uses common-leafs;
+            uses schema-leaf;
           }
         }
       }
@@ -249,10 +243,11 @@ module ietf-yang-library {
     /*
      * Notifications
      */
+
     notification yang-library-change {
       description
-        "Generated when the set of modules and submodules supported
-         by the server has changed.";
+       "Generated when the set of modules and submodules supported
+        by the server has changed.";
       leaf module-set-id {
         type leafref {
           path "/yanglib:modules-state/yanglib:module-set-id";

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemas.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemas.java
index 020b443d2546574cc96f6f41afd9f299f617cef1..6106a758eb96f92dac17f3155043af9ddabbf6e0 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemas.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemas.java
@@ -25,8 +25,8 @@ import java.util.AbstractMap;
 import java.util.Collections;
 import java.util.Map;
 import org.opendaylight.controller.config.util.xml.XmlUtil;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160201.ModulesState;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160201.module.list.Module;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.ModulesState;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.module.list.Module;
 import org.opendaylight.yangtools.sal.binding.generator.impl.ModuleInfoBackedContext;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
@@ -64,7 +64,7 @@ public class LibraryModulesSchemas {
     static {
         final ModuleInfoBackedContext moduleInfoBackedContext = ModuleInfoBackedContext.create();
         moduleInfoBackedContext.registerModuleInfo(
-                org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160201.
+                org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.
                         $YangModuleInfoImpl.getInstance());
         libraryContext = moduleInfoBackedContext.tryToCreateSchemaContext().get();
     }

diff --git a/netconf/yanglib/src/main/java/org/opendaylight/yanglib/impl/YangLibProvider.java b/netconf/yanglib/src/main/java/org/opendaylight/yanglib/impl/YangLibProvider.java
index aeab04a37b74f2a20ebcb479d0ac351b18619b84..d2876fe9e98ba085b6bb93ed3dc64c8355b2c1a5 100644 (file)
--- a/netconf/yanglib/src/main/java/org/opendaylight/yanglib/impl/YangLibProvider.java
+++ b/netconf/yanglib/src/main/java/org/opendaylight/yanglib/impl/YangLibProvider.java
@@ -21,13 +21,13 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160201.ModulesState;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160201.ModulesStateBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160201.OptionalRevision;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160201.RevisionIdentifier;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160201.module.list.Module;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160201.module.list.ModuleBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160201.module.list.ModuleKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.ModulesState;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.ModulesStateBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.OptionalRevision;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.RevisionIdentifier;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.module.list.Module;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.module.list.ModuleBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.module.list.ModuleKey;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.YangIdentifier;
 import org.opendaylight.yanglib.api.YangLibRestAppService;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;

diff --git a/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibProviderTest.java b/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibProviderTest.java
index ab3dffa737e29aaef0892c5f3bc8b341f1738081..66114e21191f7496a83a0815288bf0dacd06d1ab 100644 (file)
--- a/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibProviderTest.java
+++ b/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibProviderTest.java
@@ -32,13 +32,13 @@ import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160201.ModulesState;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160201.ModulesStateBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160201.OptionalRevision;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160201.RevisionIdentifier;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160201.module.list.Module;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160201.module.list.ModuleBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160201.module.list.ModuleKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.ModulesState;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.ModulesStateBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.OptionalRevision;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.RevisionIdentifier;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.module.list.Module;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.module.list.ModuleBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.module.list.ModuleKey;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.YangIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;