remove outer container, as sx:structure gives this to us for free, rename sid identifiers. Make sure request document gets generated when base changes

Author: mcr

Makefile

@@ -45,7 +45,7 @@ yang/ietf-voucher@${YANGDATE}.yang: ietf-voucher.yang
 	sed -e 's/YYYY-MM-DD/'${YANGDATE}'/g' ietf-voucher.yang | (cd yang && tee ietf-voucher-sed.yang | ${PYANG} ${PYANGPATH} --keep-comments -f yang >ietf-voucher@${YANGDATE}.yang )
 	ln -s -f ietf-voucher@${YANGDATE}.yang yang/ietf-voucher-latest.yang
 
-yang/ietf-voucher-request@${YANGDATE}.yang: ietf-voucher-request.yang
+yang/ietf-voucher-request@${YANGDATE}.yang: ietf-voucher-request.yang ietf-voucher.yang
 	mkdir -p yang
 	sed -e 's/YYYY-MM-DD/'${YANGDATE}'/g' ietf-voucher-request.yang | (cd yang && ${PYANG} ${PYANGPATH} --keep-comments -f yang >ietf-voucher-request@${YANGDATE}.yang )
 	ln -s -f ietf-voucher-request@${YANGDATE}.yang yang/ietf-voucher-request-latest.yang

ietf-voucher.yang

@@ -71,10 +71,6 @@ RFCEDITOR: please replace XXXX with the RFC number assigned.
   grouping voucher-artifact-grouping {
     description
       "Grouping to allow reuse/extensions in future work.";
-    container voucher {
-      description
-        "A voucher assigns a pledge to an owner using
-         one of the (pinned-domain-*) value.";
 
       leaf created-on {
         type yang:date-and-time;
@@ -320,8 +316,7 @@ RFCEDITOR: please replace XXXX with the RFC number assigned.
              a VoIP phone to point to the correct hosted
              PBX, for example.";
       }
-    }
-  }
+      }
 
   // Top-level statement
   sx:structure voucher {

ietf-voucher@2023-01-10.sid

@@ -2,7 +2,7 @@
   "ietf-sid-file:sid-file": {
     "module-name": "ietf-voucher",
     "module-revision": "2023-01-10",
-    "sid-file-version": 4,
+    "sid-file-version": 5,
     "sid-file-status": "unpublished",
     "dependency-revision": [
       {
@@ -49,6 +49,18 @@
         "module-name": "ietf-inet-types",
         "module-revision": "2013-07-15"
       },
+      {
+        "module-name": "ietf-yang-structure-ext",
+        "module-revision": "2020-06-17"
+      },
+      {
+        "module-name": "ietf-yang-types",
+        "module-revision": "2013-07-15"
+      },
+      {
+        "module-name": "ietf-inet-types",
+        "module-revision": "2013-07-15"
+      },
       {
         "module-name": "ietf-yang-structure-ext",
         "module-revision": "2020-06-17"
@@ -68,38 +80,38 @@
       },
       {
         "namespace": "data",
-        "identifier": "/ietf-voucher:voucher/voucher",
+        "identifier": "/ietf-voucher:voucher",
         "sid": "2451"
       },
       {
         "namespace": "data",
-        "identifier": "/ietf-voucher:voucher/voucher/assertion",
+        "identifier": "/ietf-voucher:voucher/assertion",
         "sid": "2452"
       },
       {
         "namespace": "data",
-        "identifier": "/ietf-voucher:voucher/voucher/created-on",
+        "identifier": "/ietf-voucher:voucher/created-on",
         "sid": "2453"
       },
       {
         "namespace": "data",
-        "identifier": "/ietf-voucher:voucher/voucher/domain-cert-revocation-checks",
+        "identifier": "/ietf-voucher:voucher/domain-cert-revocation-checks",
         "sid": "2454"
       },
       {
         "namespace": "data",
-        "identifier": "/ietf-voucher:voucher/voucher/expires-on",
+        "identifier": "/ietf-voucher:voucher/expires-on",
         "status": "unstable",
         "sid": "2455"
       },
       {
         "namespace": "data",
-        "identifier": "/ietf-voucher:voucher/voucher/idevid-issuer",
+        "identifier": "/ietf-voucher:voucher/idevid-issuer",
         "sid": "2456"
       },
       {
         "namespace": "data",
-        "identifier": "/ietf-voucher:voucher/voucher/last-renewal-date",
+        "identifier": "/ietf-voucher:voucher/last-renewal-date",
         "sid": "2457"
       },
       {
@@ -109,48 +121,48 @@
       },
       {
         "namespace": "data",
-        "identifier": "/ietf-voucher:voucher/voucher/pinned-domain-cert",
+        "identifier": "/ietf-voucher:voucher/pinned-domain-cert",
         "status": "unstable",
         "sid": "2459"
       },
       {
         "namespace": "data",
-        "identifier": "/ietf-voucher:voucher/voucher/pinned-domain-pubk",
+        "identifier": "/ietf-voucher:voucher/pinned-domain-pubk",
         "status": "unstable",
         "sid": "2460"
       },
       {
         "namespace": "data",
-        "identifier": "/ietf-voucher:voucher/voucher/pinned-domain-pubk-sha256",
+        "identifier": "/ietf-voucher:voucher/pinned-domain-pubk-sha256",
         "status": "unstable",
         "sid": "2461"
       },
       {
         "namespace": "data",
-        "identifier": "/ietf-voucher:voucher/voucher/serial-number",
+        "identifier": "/ietf-voucher:voucher/serial-number",
         "sid": "2462"
       },
       {
         "namespace": "data",
-        "identifier": "/ietf-voucher:voucher/voucher/additional-configuration-url",
+        "identifier": "/ietf-voucher:voucher/additional-configuration-url",
         "status": "unstable",
         "sid": "2463"
       },
       {
         "namespace": "data",
-        "identifier": "/ietf-voucher:voucher/voucher/est-domain",
+        "identifier": "/ietf-voucher:voucher/est-domain",
         "status": "unstable",
         "sid": "2464"
       },
       {
         "namespace": "data",
-        "identifier": "/ietf-voucher:voucher/voucher/manufacturer-private",
+        "identifier": "/ietf-voucher:voucher/manufacturer-private",
         "status": "unstable",
         "sid": "2465"
       },
       {
         "namespace": "data",
-        "identifier": "/ietf-voucher:voucher/voucher/nonce",
+        "identifier": "/ietf-voucher:voucher/nonce",
         "status": "unstable",
         "sid": "2466"
       },
@@ -162,7 +174,7 @@
       },
       {
         "namespace": "data",
-        "identifier": "/ietf-voucher:voucher/voucher/extensions",
+        "identifier": "/ietf-voucher:voucher/extensions",
         "status": "unstable",
         "sid": "2468"
       }