From d2d6f41af4c470e1a5100dbe94cd23b3db6888ff Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Thu, 19 Apr 2012 15:38:13 +0000 Subject: Report what file script is reading to make it easier to track down things like schema validation errors. svn path=/trunk/; revision=4437 --- scripts/convert-from-entitydb-to-sql.py | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'scripts/convert-from-entitydb-to-sql.py') diff --git a/scripts/convert-from-entitydb-to-sql.py b/scripts/convert-from-entitydb-to-sql.py index 95e8e985..ba073730 100644 --- a/scripts/convert-from-entitydb-to-sql.py +++ b/scripts/convert-from-entitydb-to-sql.py @@ -94,9 +94,14 @@ tag_identity = xmlns + "identity" tag_parent = xmlns + "parent" tag_repository = xmlns + "repository" -e = ElementTree(file = os.path.join(entitydb, "identity.xml")).getroot() -rpki.relaxng.myrpki.assertValid(e) -assert e.tag == tag_identity +def read_element_tree(filename, tag): + print "Reading file %s, tag %s\n" % (filename, tag) + e = ElementTree(file = filename).getroot() + rpki.relaxng.myrpki.assertValid(e) + assert e.tag == tag + return e + +e = read_element_tree(os.path.join(entitydb, "identity.xml"), tag_identity) self_handle = e.get("handle") assert self_handle == cfg.get("handle", section = "myrpki") @@ -230,9 +235,7 @@ xcert_filenames = set(glob.iglob(os.path.join(bpki, "*", "xcert.*.cer"))) for filename in glob.iglob(os.path.join(entitydb, "children", "*.xml")): child_handle = os.path.splitext(os.path.split(filename)[1])[0] - e = ElementTree(file = filename).getroot() - rpki.relaxng.myrpki.assertValid(e) - assert e.tag == tag_parent + e = read_element_tree(filename, tag_parent) ta = rpki.x509.X509(Base64 = e.findtext(tag_bpki_child_ta)) xcfn = os.path.join(bpki, "resources", "xcert.%s.cer" % xcert_hash(ta)) @@ -286,9 +289,7 @@ for filename in glob.iglob(os.path.join(entitydb, "children", "*.xml")): for filename in glob.iglob(os.path.join(entitydb, "parents", "*.xml")): parent_handle = os.path.splitext(os.path.split(filename)[1])[0] - e = ElementTree(file = filename).getroot() - rpki.relaxng.myrpki.assertValid(e) - assert e.tag == tag_parent + e = read_element_tree(filename, tag_parent) if parent_handle == self_handle: assert run_rootd @@ -341,9 +342,7 @@ for filename in glob.iglob(os.path.join(entitydb, "parents", "*.xml")): for filename in glob.iglob(os.path.join(entitydb, "repositories", "*.xml")): repository_handle = os.path.splitext(os.path.split(filename)[1])[0] - e = ElementTree(file = filename).getroot() - rpki.relaxng.myrpki.assertValid(e) - assert e.tag == tag_repository + e = read_element_tree(filename, tag_repository) if e.get("type") != "confirmed": continue @@ -374,9 +373,7 @@ for filename in glob.iglob(os.path.join(entitydb, "repositories", "*.xml")): for filename in glob.iglob(os.path.join(entitydb, "pubclients", "*.xml")): client_handle = os.path.splitext(os.path.split(filename)[1])[0].replace(".", "/") - e = ElementTree(file = filename).getroot() - rpki.relaxng.myrpki.assertValid(e) - assert e.tag == tag_repository + e = read_element_tree(filename, tag_repository) assert e.get("type") == "confirmed" -- cgit v1.2.3