Add Root model to rpki.rpkidb and root-related attributes to

left-right schema.  Not really using of this stuff yet, but haven't
broken existing code yet either.

svn path=/branches/tk705/; revision=6371

2 files changed, 36 insertions, 5 deletions

diff --git a/schemas/relaxng/left-right.rnc b/schemas/relaxng/left-right.rnc
index 1d132443..c2592c0f 100644
--- a/schemas/relaxng/left-right.rnc
+++ b/schemas/relaxng/left-right.rnc
@@ -162,17 +162,22 @@ parent_payload = (attribute peer_contact_uri { uri }?,
                   repository_handle?,
                   attribute sender_name { up_down_name }?,
                   attribute recipient_name { up_down_name }?,
+                  attribute root_asn_resources  { asn_list }?,
+                  attribute root_ipv4_resources { ipv4_list }?,
+                  attribute root_ipv6_resources { ipv6_list }?,
                   element bpki_cert { base64 }?,
                   element bpki_glue { base64 }?)
 
+parent_readonly = element rpki_root_cert { base64 }?
+
 parent_query |= element parent { ctl_create,  tenant_handle, parent_handle, parent_bool, parent_payload }
-parent_reply |= element parent { ctl_create,  tenant_handle, parent_handle }
+parent_reply |= element parent { ctl_create,  tenant_handle, parent_handle, parent_readonly }
 parent_query |= element parent { ctl_set,     tenant_handle, parent_handle, parent_bool, parent_payload }
-parent_reply |= element parent { ctl_set,     tenant_handle, parent_handle }
+parent_reply |= element parent { ctl_set,     tenant_handle, parent_handle, parent_readonly }
 parent_query |= element parent { ctl_get,     tenant_handle, parent_handle }
-parent_reply |= element parent { ctl_get,     tenant_handle, parent_handle, parent_payload }
+parent_reply |= element parent { ctl_get,     tenant_handle, parent_handle, parent_payload, parent_readonly }
 parent_query |= element parent { ctl_list,    tenant_handle }
-parent_reply |= element parent { ctl_list,    tenant_handle, parent_handle, parent_payload }
+parent_reply |= element parent { ctl_list,    tenant_handle, parent_handle, parent_payload, parent_readonly }
 parent_query |= element parent { ctl_destroy, tenant_handle, parent_handle }
 parent_reply |= element parent { ctl_destroy, tenant_handle, parent_handle }
 
diff --git a/schemas/relaxng/left-right.rng b/schemas/relaxng/left-right.rng
index 82ae1d63..cd8c1896 100644
--- a/schemas/relaxng/left-right.rng
+++ b/schemas/relaxng/left-right.rng
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  $Id: left-right.rnc 6137 2015-10-20 19:21:37Z sra $
+  $Id$
   
   RelaxNG schema for RPKI left-right protocol.
   
@@ -546,6 +546,21 @@
       </attribute>
     </optional>
     <optional>
+      <attribute name="root_asn_resources">
+        <ref name="asn_list"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="root_ipv4_resources">
+        <ref name="ipv4_list"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="root_ipv6_resources">
+        <ref name="ipv6_list"/>
+      </attribute>
+    </optional>
+    <optional>
       <element name="bpki_cert">
         <ref name="base64"/>
       </element>
@@ -556,6 +571,13 @@
       </element>
     </optional>
   </define>
+  <define name="parent_readonly">
+    <optional>
+      <element name="rpki_root_cert">
+        <ref name="base64"/>
+      </element>
+    </optional>
+  </define>
   <define name="parent_query" combine="choice">
     <element name="parent">
       <ref name="ctl_create"/>
@@ -570,6 +592,7 @@
       <ref name="ctl_create"/>
       <ref name="tenant_handle"/>
       <ref name="parent_handle"/>
+      <ref name="parent_readonly"/>
     </element>
   </define>
   <define name="parent_query" combine="choice">
@@ -586,6 +609,7 @@
       <ref name="ctl_set"/>
       <ref name="tenant_handle"/>
       <ref name="parent_handle"/>
+      <ref name="parent_readonly"/>
     </element>
   </define>
   <define name="parent_query" combine="choice">
@@ -601,6 +625,7 @@
       <ref name="tenant_handle"/>
       <ref name="parent_handle"/>
       <ref name="parent_payload"/>
+      <ref name="parent_readonly"/>
     </element>
   </define>
   <define name="parent_query" combine="choice">
@@ -615,6 +640,7 @@
       <ref name="tenant_handle"/>
       <ref name="parent_handle"/>
       <ref name="parent_payload"/>
+      <ref name="parent_readonly"/>
     </element>
   </define>
   <define name="parent_query" combine="choice">