Whack SQL and left-right XML into alignment

svn path=/docs/left-right-xml; revision=977

12 files changed, 44 insertions, 54 deletions

diff --git a/scripts/left-right-protocol-samples/pdu.021.xml b/scripts/left-right-protocol-samples/pdu.021.xml
index 07d6eb76..340a29b9 100644
--- a/scripts/left-right-protocol-samples/pdu.021.xml
+++ b/scripts/left-right-protocol-samples/pdu.021.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1">
-  <parent action="create" type="query" self_id="42" peer_contact="https://re.bar.example/bandicoot/" sia_base="rsync://repo.foo.example/wombat/" bsc_id="17" repository_id="120">
+  <parent action="create" type="query" self_id="42" peer_contact_uri="https://re.bar.example/bandicoot/" sia_base="rsync://repo.foo.example/wombat/" bsc_id="17" repository_id="120">
     <peer_ta>
 		MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 		BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-protocol-samples/pdu.023.xml b/scripts/left-right-protocol-samples/pdu.023.xml
index 3adab3d6..e3416865 100644
--- a/scripts/left-right-protocol-samples/pdu.023.xml
+++ b/scripts/left-right-protocol-samples/pdu.023.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1">
-  <parent action="set" type="query" self_id="42" parent_id="666" peer_contact="https://re.bar.example/bandicoot/" sia_base="rsync://repo.foo.example/wombat/" bsc_id="17" repository_id="120" rekey="yes" reissue="yes" revoke="yes">
+  <parent action="set" type="query" self_id="42" parent_id="666" peer_contact_uri="https://re.bar.example/bandicoot/" sia_base="rsync://repo.foo.example/wombat/" bsc_id="17" repository_id="120" rekey="yes" reissue="yes" revoke="yes">
     <peer_ta>
 		MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 		BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-protocol-samples/pdu.026.xml b/scripts/left-right-protocol-samples/pdu.026.xml
index 471dfb1f..33248794 100644
--- a/scripts/left-right-protocol-samples/pdu.026.xml
+++ b/scripts/left-right-protocol-samples/pdu.026.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1">
-  <parent action="get" type="reply" self_id="42" parent_id="666" peer_contact="https://re.bar.example/bandicoot/" sia_base="rsync://repo.foo.example/wombat/" bsc_id="17" repository_id="120">
+  <parent action="get" type="reply" self_id="42" parent_id="666" peer_contact_uri="https://re.bar.example/bandicoot/" sia_base="rsync://repo.foo.example/wombat/" bsc_id="17" repository_id="120">
     <peer_ta>
 		MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 		BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-protocol-samples/pdu.028.xml b/scripts/left-right-protocol-samples/pdu.028.xml
index bcc4bb0d..7fa47da4 100644
--- a/scripts/left-right-protocol-samples/pdu.028.xml
+++ b/scripts/left-right-protocol-samples/pdu.028.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1">
-  <parent action="list" type="reply" self_id="42" parent_id="666" peer_contact="https://re.bar.example/bandicoot/" sia_base="rsync://repo.foo.example/wombat/" bsc_id="17" repository_id="120">
+  <parent action="list" type="reply" self_id="42" parent_id="666" peer_contact_uri="https://re.bar.example/bandicoot/" sia_base="rsync://repo.foo.example/wombat/" bsc_id="17" repository_id="120">
     <peer_ta>
 		MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 		BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-protocol-samples/pdu.041.xml b/scripts/left-right-protocol-samples/pdu.041.xml
index c2ece7f5..c47fde5b 100644
--- a/scripts/left-right-protocol-samples/pdu.041.xml
+++ b/scripts/left-right-protocol-samples/pdu.041.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1">
-  <repository action="create" type="query" self_id="42" peer_contact="https://re.bar.example/bandicoot/" bsc_id="17">
+  <repository action="create" type="query" self_id="42" peer_contact_uri="https://re.bar.example/bandicoot/" bsc_id="17">
     <peer_ta>
 		MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 		BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-protocol-samples/pdu.043.xml b/scripts/left-right-protocol-samples/pdu.043.xml
index c74b8aa6..719215ed 100644
--- a/scripts/left-right-protocol-samples/pdu.043.xml
+++ b/scripts/left-right-protocol-samples/pdu.043.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1">
-  <repository action="set" type="query" self_id="42" repository_id="120" peer_contact="https://re.bar.example/bandicoot/" bsc_id="17">
+  <repository action="set" type="query" self_id="42" repository_id="120" peer_contact_uri="https://re.bar.example/bandicoot/" bsc_id="17">
     <peer_ta>
 		MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 		BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-protocol-samples/pdu.046.xml b/scripts/left-right-protocol-samples/pdu.046.xml
index 48ba58f6..402b5e1f 100644
--- a/scripts/left-right-protocol-samples/pdu.046.xml
+++ b/scripts/left-right-protocol-samples/pdu.046.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1">
-  <repository action="get" type="reply" self_id="42" repository_id="120" peer_contact="https://re.bar.example/bandicoot/" bsc_id="17">
+  <repository action="get" type="reply" self_id="42" repository_id="120" peer_contact_uri="https://re.bar.example/bandicoot/" bsc_id="17">
     <peer_ta>
 		MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 		BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-protocol-samples/pdu.048.xml b/scripts/left-right-protocol-samples/pdu.048.xml
index 339755f8..2cd2cb23 100644
--- a/scripts/left-right-protocol-samples/pdu.048.xml
+++ b/scripts/left-right-protocol-samples/pdu.048.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1">
-  <repository action="list" type="reply" self_id="42" repository_id="120" peer_contact="https://re.bar.example/bandicoot/" bsc_id="17">
+  <repository action="list" type="reply" self_id="42" repository_id="120" peer_contact_uri="https://re.bar.example/bandicoot/" bsc_id="17">
     <peer_ta>
 		MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 		BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-schema.rnc b/scripts/left-right-schema.rnc
index bb86c766..9ba5c7a8 100644
--- a/scripts/left-right-schema.rnc
+++ b/scripts/left-right-schema.rnc
@@ -97,7 +97,7 @@ parent_bool = (attribute rekey { "yes" }?,
                attribute reissue { "yes" }?,
                attribute revoke { "yes" }?)
 
-parent_payload = (attribute peer_contact { xsd:anyURI { maxLength="1024" } }?,
+parent_payload = (attribute peer_contact_uri { xsd:anyURI { maxLength="1024" } }?,
                   attribute sia_base { xsd:anyURI { maxLength="1024" } }?,
                   attribute bsc_id { xsd:token { maxLength="1024" } }?,
                   attribute repository_id { xsd:token { maxLength="1024" } }?,
@@ -139,7 +139,7 @@ child_elt |= element child { ctl_dr, self_id, child_id }
 
 repository_id = attribute repository_id { sql_id }
 
-repository_payload = (attribute peer_contact { xsd:anyURI { maxLength="1024" } }?,
+repository_payload = (attribute peer_contact_uri { xsd:anyURI { maxLength="1024" } }?,
                       attribute bsc_id { xsd:token { maxLength="1024" } }?,
                       peer_ta?)
 
diff --git a/scripts/left-right-schema.rng b/scripts/left-right-schema.rng
index 39c6e365..209f53ad 100644
--- a/scripts/left-right-schema.rng
+++ b/scripts/left-right-schema.rng
@@ -397,7 +397,7 @@
   </define>
   <define name="parent_payload">
     <optional>
-      <attribute name="peer_contact">
+      <attribute name="peer_contact_uri">
         <data type="anyURI">
           <param name="maxLength">1024</param>
         </data>
@@ -616,7 +616,7 @@
   </define>
   <define name="repository_payload">
     <optional>
-      <attribute name="peer_contact">
+      <attribute name="peer_contact_uri">
         <data type="anyURI">
           <param name="maxLength">1024</param>
         </data>
diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py
index e8be1809..67449644 100644
--- a/scripts/rpki/left_right.py
+++ b/scripts/rpki/left_right.py
@@ -94,7 +94,7 @@ class bsc_elt(data_elt):
   attributes = ("action", "type", "self_id", "bsc_id", "key_type", "hash_alg", "key_length")
   booleans = ("generate_keypair",)
 
-  sql_template = rpki.sql.template("bsc", "bsc_id", "self_id", "pub_key", "priv_key_id")
+  sql_template = rpki.sql.template("bsc", "bsc_id", "self_id", "public_key", "private_key_id")
 
   pkcs10_cert_request = None
   public_key = None
@@ -103,16 +103,6 @@ class bsc_elt(data_elt):
   def __init__(self):
     self.signing_cert = []
 
-  def sql_decode(self, vals):
-    self.self_id = vals["self_id"]
-    self.public_key = vals["pub_key"]
-    self.private_key_id = vals["priv_key_id"]
-
-  def sql_encode(self):
-    return { "self_id"     : self.self_id,
-             "pub_key"     : self.public_key,
-             "priv_key_id" : self.private_key_id }
-
   def sql_fetch_hook(self, db, cur):
     cur.execute("SELECT cert FROM bsc_cert WHERE bsc_id = %s", self.bsc_id)
     self.signing_cert = [rpki.x509.X509(DER=x) for (x,) in cur.fetchall()]
@@ -156,27 +146,27 @@ class parent_elt(data_elt):
   """<parent/> element."""
 
   element_name = "parent"
-  attributes = ("action", "type", "self_id", "parent_id", "bsc_id", "repository_id", "peer_contact", "sia_base")
+  attributes = ("action", "type", "self_id", "parent_id", "bsc_id", "repository_id", "peer_contact_uri", "sia_base")
   booleans = ("rekey", "reissue", "revoke")
 
-  sql_template = rpki.sql.template("parent", "parent_id", "self_id", "bsc_id", "repos_id", "ta", "uri", "sia_base")
+  sql_template = rpki.sql.template("parent", "parent_id", "self_id", "bsc_id", "repository_id", "peer_ta", "peer_contact_uri", "sia_base")
 
   def sql_decode(self, vals):
     self.self_id       = vals["self_id"]
     self.bsc_id        = vals["bsc_id"]
-    self.repository_id = vals["repos_id"]
+    self.repository_id = vals["repository_id"]
     self.parent_id     = vals["parent_id"]
-    self.peer_contact  = vals["uri"]
-    self.peer_ta       = rpki.x509.X509(DER=vals["ta"])
+    self.peer_contact_uri  = vals["peer_contact_uri"]
+    self.peer_ta       = rpki.x509.X509(DER=vals["peer_ta"])
 
   def sql_encode(self):
-    return { "self_id"   : self.self_id,
-             "bsc_id"    : self.bsc_id,
-             "repos_id"  : self.repository_id,
-             "parent_id" : self.parent_id,
-             "uri"       : self.peer_contact,
-             "ta"        : get_ta_DER(self.peer_ta),
-             "sia_head"  : self.sia_head }
+    return { "self_id"       : self.self_id,
+             "bsc_id"        : self.bsc_id,
+             "repository_id" : self.repository_id,
+             "parent_id"     : self.parent_id,
+             "peer_contact_uri"  : self.peer_contact_uri,
+             "peer_ta"       : get_ta_DER(self.peer_ta),
+             "sia_base"      : self.sia_base }
 
   peer_ta = None
 
@@ -208,19 +198,19 @@ class child_elt(data_elt):
   attributes = ("action", "type", "self_id", "child_id", "bsc_id", "child_db_id")
   booleans = ("reissue", )
 
-  sql_template = rpki.sql.template("child", "child_id", "self_id", "bsc_id", "ta")
+  sql_template = rpki.sql.template("child", "child_id", "self_id", "bsc_id", "peer_ta")
 
   def sql_decode(self, vals):
     self.self_id = vals["self_id"]
     self.bsc_id = vals["bsc_id"]
     self.child_id = vals["child_id"]
-    self.peer_ta = rpki.x509.X509(DER=vals["ta"])
+    self.peer_ta = rpki.x509.X509(DER=vals["peer_ta"])
 
   def sql_encode(self):
     return { "self_id"  : self.self_id,
              "bsc_id"   : self.bsc_id,
              "child_id" : self.child_id,
-             "ta"       : get_ta_DER(self.peer_ta) }
+             "peer_ta"       : get_ta_DER(self.peer_ta) }
 
   def sql_fetch_hook(self, db, cur):
     self.cas = rpki.sql.get_column(db, cur, "SELECT ca_id FROM child_ca_link WHERE child_id = %s", self.child_id)
@@ -266,23 +256,23 @@ class repository_elt(data_elt):
   """<repository/> element."""
 
   element_name = "repository"
-  attributes = ("action", "type", "self_id", "repository_id", "bsc_id", "peer_contact")
+  attributes = ("action", "type", "self_id", "repository_id", "bsc_id", "peer_contact_uri")
 
-  sql_template = rpki.sql.template("repos", "repos_id", "self_id", "bsc_id", "ta", "uri")
+  sql_template = rpki.sql.template("repository", "repository_id", "self_id", "bsc_id", "peer_ta", "peer_contact_uri")
 
   def sql_decode(self, vals):
     self.self_id = vals["self_id"]
     self.bsc_id = vals["bsc_id"]
-    self.repository_id = vals["repos_id"]
-    self.peer_contact = vals["uri"]
-    self.peer_ta = rpki.x509.X509(DER=vals["ta"])
+    self.repository_id = vals["repository_id"]
+    self.peer_contact_uri = vals["peer_contact_uri"]
+    self.peer_ta = rpki.x509.X509(DER=vals["peer_ta"])
 
   def sql_encode(self):
-    return { "self_id"  : self.self_id,
-             "bsc_id"   : self.bsc_id,
-             "repos_id" : self.repository_id,
-             "uri"      : self.peer_contact,
-             "ta"       : get_ta_DER(self.peer_ta) }
+    return { "self_id"       : self.self_id,
+             "bsc_id"        : self.bsc_id,
+             "repository_id" : self.repository_id,
+             "peer_contact_uri"  : self.peer_contact_uri,
+             "peer_ta"            : get_ta_DER(self.peer_ta) }
 
   peer_ta = None
 
@@ -331,9 +321,9 @@ class route_origin_elt(data_elt):
 
   def sql_fetch_hook(self, db, cur):
     self.ipv4 = rpki.resource_set.resource_set_ipv4()
-    self.ipv4.from_sql(cur, "SELECT start_ip, end_ip FROM route_origin_prefix WHERE route_origin_id = %s AND start_ip NOT LIKE '%:%'", self.route_origin_id)
+    self.ipv4.from_sql(cur, "SELECT start_ip, end_ip FROM route_origin_range WHERE route_origin_id = %s AND start_ip NOT LIKE '%:%'", self.route_origin_id)
     self.ipv6 = rpki.resource_set.resource_set_ipv6()
-    self.ipv4.from_sql(cur, "SELECT start_ip, end_ip FROM route_origin_prefix WHERE route_origin_id = %s AND start_ip LIKE '%:%'", self.route_origin_id)
+    self.ipv4.from_sql(cur, "SELECT start_ip, end_ip FROM route_origin_range WHERE route_origin_id = %s AND start_ip LIKE '%:%'", self.route_origin_id)
     cur.execute("SELECT roa, ca_detail_id FROM roa WHERE route_origin_id = %s", self.route_origin_id)
     roas = cur.fetchall()
     if len(roas) == 1:
@@ -344,14 +334,14 @@ class route_origin_elt(data_elt):
     
   def sql_insert_hook(self, db, cur):
     if self.ipv4 + self.ipv6:
-      cur.executemany("INSERT route_origin_prefix (route_origin_id, start_ip, end_ip) VALUES (%s, %s, %s)",
+      cur.executemany("INSERT route_origin_range (route_origin_id, start_ip, end_ip) VALUES (%s, %s, %s)",
                       ((self.route_origin_id, x.min, x.max) for x in self.ipv4 + self.ipv6))
     if self.roa:
       cur.execute("INSERT roa (route_origin_id, roa, ca_detail_id) VALUES (%s, %s, %s)",
                   self.route_origin_id, self.roa, self.ca_detail_id)
   
   def sql_delete_hook(self, db, cur):
-    cur.execute("DELETE FROM route_origin_prefix WHERE route_origin_id = %s", self.route_origin_id)
+    cur.execute("DELETE FROM route_origin_range WHERE route_origin_id = %s", self.route_origin_id)
     cur.execute("DELETE FROM roa WHERE route_origin_id = %s", self.route_origin_id)
 
   def startElement(self, stack, name, attrs):
diff --git a/scripts/rpki/sql.py b/scripts/rpki/sql.py
index 028f2632..29058174 100644
--- a/scripts/rpki/sql.py
+++ b/scripts/rpki/sql.py
@@ -137,8 +137,8 @@ class sql_persistant(object):
 class ca_detail_obj(sql_persistant):
   """Internal CA detail object."""
 
-  sql_template = template("ca", "ca_detail_id", "priv_key_handle", "pub_key", "latest_ca_cert_over_pubkey", "manifest_ee_priv_key_handle", "manifest_ee_pub_key",
-                          "latest_manifest_ee_cert", "latest_manifest", "latest_crl", "ca_id")
+  sql_template = template("ca", "ca_detail_id", "private_key_handle", "public_key", "latest_ca_cert_over_public_key", "manifest_ee_private_key_handle",
+                          "manifest_ee_public_key", "latest_manifest_ee_cert", "latest_manifest", "latest_crl", "ca_id")
 
   def __init__(self):
     self.certs = []