Checkpoint

svn path=/myrpki/Makefile; revision=2536

1 files changed, 10 insertions, 18 deletions

diff --git a/myrpki/xml-parse-test.py b/myrpki/xml-parse-test.py
index 3afb38a7..6fb9b583 100755
--- a/myrpki/xml-parse-test.py
+++ b/myrpki/xml-parse-test.py
@@ -7,23 +7,15 @@ rng = lxml.etree.RelaxNG(lxml.etree.parse("myrpki.rng"))
 tree = lxml.etree.parse("myrpki.xml").getroot()
 
 if False:
-  print lxml.etree.tostring(
-    tree,
-    pretty_print = True,
-    encoding = "us-ascii",
-    xml_declaration = True)
+  print lxml.etree.tostring(tree, pretty_print = True, encoding = "us-ascii", xml_declaration = True)
 
 rng.assertValid(tree)
 
-if False:
-  for x in tree.getiterator():
-    print x
-  # print x.get("handle")
+def showitems(x):
+  if False:
     for k, v in x.items():
       if v:
         print " ", k, v
-    if x.text:
-      print " ", x.text
 
 def tag(t):
   return "{http://www.hactrn.net/uris/rpki/myrpki/}" + t
@@ -36,16 +28,16 @@ for x in tree.getiterator(tag("child")):
   print "  Handle:", x.get("handle")
   print "  ASNS:  ", rpki.resource_set.resource_set_as(x.get("asns"))
   print "  IPv4:  ", rpki.resource_set.resource_set_ipv4(x.get("v4"))
-  for k, v in x.items():
-    if v:
-      print " ", k, v
+  print "  Valid: ", x.get("valid_until")
+  showitems(x)
 
 print "ROA requests:"
 for x in tree.getiterator(tag("roa_request")):
-  print x
-  for k, v in x.items():
-    if v:
-      print " ", k, v
+  print " ", x
+  print "  ASN: ", x.get("asn")
+  print "  IPv4:", rpki.resource_set.roa_prefix_set_ipv4(x.get("v4"))
+  print "  IPv6:", rpki.resource_set.roa_prefix_set_ipv6(x.get("v6"))
+  showitems(x)
 
 ca = tree.findtext(tag("bpki_ca_certificate"))
 if ca: