Oops, tested all the myrpki/ => rpkid/ changes but didn't commit them

all.

svn path=/README; revision=3216

1 files changed, 18 insertions, 18 deletions

diff --git a/scripts/convert-from-csv-to-entitydb.py b/scripts/convert-from-csv-to-entitydb.py
index 282d2e75..51cb323d 100644
--- a/scripts/convert-from-csv-to-entitydb.py
+++ b/scripts/convert-from-csv-to-entitydb.py
@@ -19,7 +19,7 @@ PERFORMANCE OF THIS SOFTWARE.
 """
 
 import subprocess, csv, re, os, getopt, sys, base64, urlparse
-import rpki.sundial, myrpki, rpki.config
+import rpki.sundial, rpki.myrpki, rpki.config
 
 from lxml.etree import Element, SubElement, ElementTree
 
@@ -165,7 +165,7 @@ for d in map(entitydb, ("children", "parents", "repositories", "pubclients")):
 one_year_from_now = str(rpki.sundial.now() + rpki.sundial.timedelta(days = 365))
 
 if os.path.exists(children_csv):
-  for child_handle, valid_until, child_resource_pemfile in myrpki.csv_reader(children_csv, columns = 3):
+  for child_handle, valid_until, child_resource_pemfile in rpki.myrpki.csv_reader(children_csv, columns = 3):
     try:
 
       e = Element("parent",
@@ -173,16 +173,16 @@ if os.path.exists(children_csv):
                   service_uri = "https://%s:%s/up-down/%s/%s" % (rpkid_server_host, rpkid_server_port, handle, child_handle),
                   child_handle = child_handle,
                   parent_handle = handle)
-      myrpki.PEMElement(e, "bpki_resource_ta", bpki_resources_pemfile)
-      myrpki.PEMElement(e, "bpki_server_ta",   bpki_servers_pemfile)
-      myrpki.PEMElement(e, "bpki_child_ta",    child_resource_pemfile)
-      myrpki.etree_write(e, entitydb("children", "%s.xml" % child_handle))
+      rpki.myrpki.PEMElement(e, "bpki_resource_ta", bpki_resources_pemfile)
+      rpki.myrpki.PEMElement(e, "bpki_server_ta",   bpki_servers_pemfile)
+      rpki.myrpki.PEMElement(e, "bpki_child_ta",    child_resource_pemfile)
+      rpki.myrpki.etree_write(e, entitydb("children", "%s.xml" % child_handle))
 
     except IOError:
       pass
 
 if os.path.exists(parents_csv):
-  for parent_handle, parent_service_uri, parent_cms_pemfile, parent_https_pemfile, parent_myhandle, parent_sia_base in myrpki.csv_reader(parents_csv, columns = 6):
+  for parent_handle, parent_service_uri, parent_cms_pemfile, parent_https_pemfile, parent_myhandle, parent_sia_base in rpki.myrpki.csv_reader(parents_csv, columns = 6):
     try:
 
       e = Element("parent",
@@ -190,10 +190,10 @@ if os.path.exists(parents_csv):
                   service_uri = parent_service_uri,
                   child_handle = parent_myhandle,
                   parent_handle = parent_handle)
-      myrpki.PEMElement(e, "bpki_resource_ta", parent_cms_pemfile)
-      myrpki.PEMElement(e, "bpki_server_ta",   parent_https_pemfile)
-      myrpki.PEMElement(e, "bpki_child_ta",    bpki_resources_pemfile)
-      myrpki.etree_write(e, entitydb("parents", "%s.xml" % parent_handle))
+      rpki.myrpki.PEMElement(e, "bpki_resource_ta", parent_cms_pemfile)
+      rpki.myrpki.PEMElement(e, "bpki_server_ta",   parent_https_pemfile)
+      rpki.myrpki.PEMElement(e, "bpki_child_ta",    bpki_resources_pemfile)
+      rpki.myrpki.etree_write(e, entitydb("parents", "%s.xml" % parent_handle))
 
       client_handle = "/".join(parent_sia_base.rstrip("/").split("/")[3:])
       assert client_handle.startswith(repository_handle)
@@ -204,16 +204,16 @@ if os.path.exists(parents_csv):
                   service_uri = "%s/client/%s" % (pubd_base.rstrip("/"), client_handle),
                   sia_base = parent_sia_base,
                   type = "confirmed")
-      myrpki.PEMElement(e, "bpki_server_ta", repository_bpki_certificate)
-      myrpki.PEMElement(e, "bpki_client_ta", bpki_resources_pemfile)
+      rpki.myrpki.PEMElement(e, "bpki_server_ta", repository_bpki_certificate)
+      rpki.myrpki.PEMElement(e, "bpki_client_ta", bpki_resources_pemfile)
       SubElement(e, "contact_info").text = "Automatically generated by convert-csv.py"
-      myrpki.etree_write(e, entitydb("repositories", "%s.xml" % parent_handle))
+      rpki.myrpki.etree_write(e, entitydb("repositories", "%s.xml" % parent_handle))
 
     except IOError:
       pass
 
 if os.path.exists(pubclients_csv):
-  for client_handle, client_resource_pemfile, client_sia_base in myrpki.csv_reader(pubclients_csv, columns = 3):
+  for client_handle, client_resource_pemfile, client_sia_base in rpki.myrpki.csv_reader(pubclients_csv, columns = 3):
     try:
 
       parent_handle = client_handle.split("/")[-2] if "/" in client_handle else handle
@@ -224,10 +224,10 @@ if os.path.exists(pubclients_csv):
                   service_uri = "https://%s:%s/client/%s" % (pubd_server_host, pubd_server_port, client_handle),
                   sia_base = client_sia_base,
                   type = "confirmed")
-      myrpki.PEMElement(e, "bpki_server_ta", bpki_servers_pemfile)
-      myrpki.PEMElement(e, "bpki_client_ta", client_resource_pemfile)
+      rpki.myrpki.PEMElement(e, "bpki_server_ta", bpki_servers_pemfile)
+      rpki.myrpki.PEMElement(e, "bpki_client_ta", client_resource_pemfile)
       SubElement(e, "contact_info").text = "Automatically generated by convert-csv.py"
-      myrpki.etree_write(e, entitydb("pubclients", "%s.xml" % client_handle.replace("/", ".")))
+      rpki.myrpki.etree_write(e, entitydb("pubclients", "%s.xml" % client_handle.replace("/", ".")))
 
     except IOError:
       pass