minor wrap to YANG to keep RFC8792 wrapper at bay

Author: mcr

Makefile

@@ -87,4 +87,4 @@ settings:
 	echo pyang: ${PYANG}
 
 redosid:
-	rm *-sid.txt && rm -rf yang && make
+	rm *-sid.txt && make

ietf-voucher-request-sid.txt

@@ -1,25 +1,25 @@
       SID Assigned to
 --------- -------------------------------------------------- 
-     2501 data /ietf-voucher-request:voucher
-     2502 data /ietf-voucher-request:voucher/assertion
-     2503 data /ietf-voucher-request:voucher/created-on
-     2504 data .../domain-cert-revocation-checks
-     2505 data /ietf-voucher-request:voucher/expires-on
-     2506 data /ietf-voucher-request:voucher/idevid-issuer
-     2507 data /ietf-voucher-request:voucher/last-renewal-date
-     2508 data /ietf-voucher-request:voucher/nonce
-     2509 data /ietf-voucher-request:voucher/pinned-domain-cert
-     2510 data .../prior-signed-voucher-request
-     2511 data .../proximity-registrar-cert
-     2512 data .../proximity-registrar-pubk-sha256
-     2513 data .../proximity-registrar-pubk
-     2514 data /ietf-voucher-request:voucher/serial-number
-     2515 data .../agent-provided-proximity-registrar-cert
-     2516 data /ietf-voucher-request:voucher/agent-sign-cert
-     2517 data /ietf-voucher-request:voucher/agent-signed-data
-     2518 data /ietf-voucher-request:voucher/pinned-domain-pubk
-     2519 data .../pinned-domain-pubk-sha256
-     2520 data .../additional-configuration-url
-     2521 data /ietf-voucher-request:voucher/est-domain
-     2522 data /ietf-voucher-request:voucher/extensions
-     2523 data .../manufacturer-private
+     2501   data .../ietf-voucher-request:voucher
+     2502   data .../assertion
+     2503   data .../created-on
+     2504   data .../domain-cert-revocation-checks
+     2505   data .../expires-on
+     2506   data .../idevid-issuer
+     2507   data .../last-renewal-date
+     2508   data .../nonce
+     2509   data .../pinned-domain-cert
+     2510   data .../prior-signed-voucher-request
+     2511   data .../proximity-registrar-cert
+     2512   data .../proximity-registrar-pubk-sha256
+     2513   data .../proximity-registrar-pubk
+     2514   data .../serial-number
+     2515   data .../agent-provided-proximity-registrar-cert
+     2516   data .../agent-sign-cert
+     2517   data .../agent-signed-data
+     2518   data .../pinned-domain-pubk
+     2519   data .../pinned-domain-pubk-sha256
+     2520   data .../additional-configuration-url
+     2521   data .../est-domain
+     2522   data .../extensions
+     2523   data .../manufacturer-private

ietf-voucher-request.yang

@@ -180,14 +180,14 @@ RFCEDITOR: please replace XXXX with the RFC number assigned.
     leaf agent-signed-data {
         type binary;
         description
-          "The agent-signed-data field contains a data artifact provided
-          by the Registrar-Agent to the Pledge for inclusion into the
-          voucher request.
+          "The agent-signed-data field contains a data artifact
+          provided by the Registrar-Agent to the Pledge for
+          inclusion into the voucher request.
 
           This artifact is signed by the Registrar-Agent and contains
           data, which can be verified by the pledge and the registrar.
-          This data contains the pledge's serial-number and a created-on
-          information of the agent-signed-data.
+          This data contains the pledge's serial-number and a
+          created-on information of the agent-signed-data.
 
           The format is intentionally defined as binary to allow
           the document using this leaf to determine the encoding.";

ietf-voucher-sid.txt

@@ -1,18 +1,18 @@
       SID Assigned to
 --------- -------------------------------------------------- 
-     2451 data /ietf-voucher:voucher
-     2452 data /ietf-voucher:voucher/assertion
-     2453 data /ietf-voucher:voucher/created-on
-     2454 data .../domain-cert-revocation-checks
-     2455 data /ietf-voucher:voucher/expires-on
-     2456 data /ietf-voucher:voucher/idevid-issuer
-     2457 data /ietf-voucher:voucher/last-renewal-date
-     2458 data /ietf-voucher:voucher/nonce
-     2459 data /ietf-voucher:voucher/pinned-domain-cert
-     2460 data /ietf-voucher:voucher/pinned-domain-pubk
-     2461 data /ietf-voucher:voucher/pinned-domain-pubk-sha256
-     2462 data /ietf-voucher:voucher/serial-number
-     2463 data .../additional-configuration-url
-     2464 data /ietf-voucher:voucher/est-domain
-     2465 data /ietf-voucher:voucher/manufacturer-private
-     2466 data /ietf-voucher:voucher/extensions
+     2451   data .../ietf-voucher:voucher
+     2452   data .../assertion
+     2453   data .../created-on
+     2454   data .../domain-cert-revocation-checks
+     2455   data .../expires-on
+     2456   data .../idevid-issuer
+     2457   data .../last-renewal-date
+     2458   data .../nonce
+     2459   data .../pinned-domain-cert
+     2460   data .../pinned-domain-pubk
+     2461   data .../pinned-domain-pubk-sha256
+     2462   data .../serial-number
+     2463   data .../additional-configuration-url
+     2464   data .../est-domain
+     2465   data .../manufacturer-private
+     2466   data .../extensions

truncate-sid-table

@@ -1,9 +1,12 @@
 #!/usr/bin/perl
 
 # process the table SID output from pyang and make it fit into 70 columns.
-# do this by truncating the left-hand side of the third column.
+# do this by truncating the left-hand side of the third column, except for the module
+# name, which is the first entry.
 # first two columns are allocated 22 characters, so 70-22 = 48.
 
+my $first = 1;
+
 while(<ARGV>) {
     chomp;
 
@@ -17,13 +20,15 @@ while(<ARGV>) {
 
     ($sid, $type, $object) = split;
 
-    if(length($object) > 48) {
+    unless($first) {
+    print STDERR "FIRST: $first\n";
         $object = substr($object, -48);
         # now actually align it on the /.
         $object =~ s,.*(/[^/]+),...\1,;
     }
 
-    print sprintf("%9s %s %s\n", $sid, $type, $object);
+    print sprintf("%9s %6s %s\n", $sid, $type, $object);
+    $first = 0;
 }