move 'configuration' from anytype to binary leaf

netconf-wg · Jan 27, 2018 · 14d92ee · 14d92ee
1 parent 259df4d
commit 14d92ee
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 103 deletions.
diff --git a/draft-ietf-netconf-zerotouch.xml b/draft-ietf-netconf-zerotouch.xml
@@ -242,7 +242,7 @@
 
         <section title="Tree Diagrams">
           <t>Tree diagrams used in this document follow the notation
-          defined in ^I-D.ietf-netmod-yang-tree-diagrams^.</t>
+          defined in <xref target="I-D.ietf-netmod-yang-tree-diagrams"/>.</t>
         </section>
       </section>  <!-- end Introduction -->
 
@@ -1063,6 +1063,7 @@ INSERT_TEXT_FROM_FILE(refs/ietf-zerotouch-information-tree.txt)
           <t>The following example illustrates how redirect information
           (<xref target="redirect-information"/>) can be encoded using JSON,
           as is needed by the zero touch information artifact.</t>
+
           <figure>
             <artwork><![CDATA[
 INSERT_TEXT_FROM_FILE(refs/ex-file-redirect-information.json)
@@ -1072,15 +1073,6 @@ INSERT_TEXT_FROM_FILE(refs/ex-file-redirect-information.json)
           <t>The following example illustrates how onboarding information
           (<xref target="onboarding-information"/>) can be encoded using JSON,
           as is needed by the zero touch information artifact.</t>
-
-          <t>Note: the sample configuration used in the below example configures an
-          administrator account with an SSH public key, configures keystore with an
-          authentication certificate, configures NETCONF Call Home and, lastly, 
-          disables the zerotouch bootstrapping service.  This is acheived through use
-          of YANG modules "ietf-system" from <xref target="RFC7317"/>, "ietf-keystore"
-          from <xref target="I-D.ietf-netconf-keystore"/>, "ietf-netconf-server" from
-          <xref target="I-D.ietf-netconf-netconf-client-server"/> and
-          "ietf-zerotouch-device" from this document.</t>
           <figure>
             <artwork><![CDATA[
 INSERT_TEXT_FROM_FILE(refs/ex-file-onboarding-information.json,68)
@@ -1756,10 +1748,8 @@ reference: RFC XXXX
           <?rfc include="reference.RFC.6536.xml"?>
           <?rfc include="reference.RFC.6960.xml"?>
           <?rfc include="reference.RFC.6698.xml"?>
-          <?rfc include="reference.RFC.7317.xml"?>
           <?rfc include="reference.RFC.8071.xml"?>
           <?rfc include="reference.I-D.ietf-netmod-yang-tree-diagrams"?>
-          <?rfc include="reference.I-D.ietf-netconf-netconf-client-server"?>
           <?rfc include="reference.I-D.ietf-netconf-keystore"?>
         </references>
 

diff --git a/ietf-zerotouch-information.yang b/ietf-zerotouch-information.yang
@@ -238,8 +238,9 @@ module ietf-zerotouch-information {
             "A script that, when present, is executed before the
              configuration has been processed.";
         }
-        anydata configuration {
+        leaf configuration {
           must '../configuration-handling';
+          type binary;
           description
             "Any configuration data model known to the device.  It may
              contain manufacturer-specific and/or standards-based data

diff --git a/refs/ex-file-onboarding-information.json b/refs/ex-file-onboarding-information.json
@@ -13,96 +13,7 @@
     },
     "configuration-handling" : "merge",
     "pre-configuration-script" : "base64encodedvalue==",
-    "configuration" : {
-      "ietf-system:system" : {
-        "authentication" : {
-          "user" : {
-            "name" : "admin",
-            "authorized-key" : {
-              "name" : "admin's rsa ssh host-key",
-              "algorithm" : "ssh-rsa",
-              "key-data" : "base64encodedvalue=="
-            }
-          }
-        }
-      },
-      "ietf-keystore:keystore" : {
-        "pinned-certificates" : {
-          "name" : "deployment-specific-ca-certs",
-          "description" : "Certs used to auth client connections.",
-          "pinned-certificate" : {
-            "name" : "ca.example.com",
-            "data" : "base64encodedvalue=="
-          }
-        },
-        "pinned-certificates" : {
-          "name" : "explicitly-trusted-client-certs",
-          "description" : "Certs for explicitly-trusted clients.",
-          "pinned-certificate" : {
-            "name" : "Fred Flintstone",
-            "data" : "base64encodedvalue=="
-          }
-        }
-      },
-      "ietf-netconf-server:netconf-server" : {
-        "call-home" : {
-          "netconf-client" : {
-            "name" : "config-mgr",
-            "endpoints" : {
-              "endpoint" : {
-                "name" : "east-data-center", 
-                "ssh" : {
-                  "address" : "east.config-mgr.example.com",
-                  "host-keys" : {
-                    "host-key" : {
-                      "name" : "certificate",
-                      "certificate" : "builtin-idevid-cert"
-                    }
-                  },
-                  "client-cert-auth" : {
-                    "trusted-ca-certs" :
-                                    "deployment-specific-ca-certs",
-                    "trusted-client-certs" :
-                                  "explicitly-trusted-client-certs"
-                  }
-                }
-              },
-              "endpoint" : {
-                "name" : "west-data-center", 
-                "ssh" : {
-                  "address" : "west.config-mgr.example.com",
-                  "host-keys" : {
-                    "host-key" : {
-                      "name" : "certificate",
-                      "certificate" : "builtin-idevid-cert"
-                    }
-                  },
-                  "client-cert-auth" : {
-                    "trusted-ca-certs" :
-                                    "deployment-specific-ca-certs",
-                    "trusted-client-certs" :
-                                  "explicitly-trusted-client-certs"
-                  }
-                }
-              }
-            },
-            "connection-type" : {
-              "periodic" : {
-                "idle-timeout" : 300,
-                "reconnect-timeout" : 60
-              }
-            },
-            "reconnect-strategy" : {
-              "start-with" : "last-connected",
-              "max-attempts" : 3
-            }
-          }
-        }
-      },
-      "ietf-zerotouch-device:zerotouch" : {
-        "enabled" : false
-      }
-    },
+    "configuration" : "base64encodedvalue==",
     "post-configuration-script" : "base64encodedvalue=="
   }
 }