Checkpoint

svn path=/scripts/left-right-schema.rnc; revision=784

1 files changed, 34 insertions, 13 deletions

diff --git a/scripts/left-right-schema.rnc b/scripts/left-right-schema.rnc
index a0401d35..69739caa 100644
--- a/scripts/left-right-schema.rnc
+++ b/scripts/left-right-schema.rnc
@@ -9,7 +9,8 @@ default namespace = "http://www.hactrn.net/uris/rpki/left-right-spec/"
 
 start = element msg {
   attribute version { xsd:positiveInteger { maxInclusive="1" } },
-  ( self_elt | bsc_elt | parent_elt | child_elt | repository_elt | route_origin_elt | list_resources_elt | report_error_elt )*
+  ( self_elt | bsc_elt | parent_elt | child_elt | repository_elt | route_origin_elt |
+    list_resources_elt | report_error_elt )*
 }
 
 action = attribute action { "create" | "set" | "get" | "list" | "destroy" }
@@ -22,7 +23,18 @@ peer_ta = element peer_ta { base64 }
 
 sql_id = xsd:token { maxLength="1024" }
 
-self_ctls = (attribute rekey { "yes" }?,
+ctl_cq = attribute action { "create"  }, attribute type { "query" }
+ctl_sq = attribute action { "set"     }, attribute type { "query" }
+ctl_gq = attribute action { "get"     }, attribute type { "query" }
+ctl_lq = attribute action { "list"    }, attribute type { "query" }
+ctl_dq = attribute action { "destroy" }, attribute type { "query" }
+ctl_cr = attribute action { "create"  }, attribute type { "reply" }
+ctl_sr = attribute action { "set"     }, attribute type { "reply" }
+ctl_gr = attribute action { "get"     }, attribute type { "reply" }
+ctl_lr = attribute action { "list"    }, attribute type { "reply" }
+ctl_dr = attribute action { "destroy" }, attribute type { "reply" }
+
+self_bool = (attribute rekey { "yes" }?,
              attribute reissue { "yes" }?,
              attribute revoke { "yes" }?,
              attribute run_now { "yes" }?,
@@ -35,11 +47,20 @@ self_payload = element extension_preference {
 
 self_id = attribute self_id { sql_id }
 
-self_elt = element self {
-  action, type, self_id?, self_ctls, self_payload
-}
+self_elt = element self { action, type, self_id?, self_bool, self_payload }
+
+#self_elt |= element self { ctl_cq, self_bool, self_payload }
+#self_elt |= element self { ctl_cr, self_id }
+#self_elt |= element self { ctl_sq, self_id, self_bool, self_payload }
+#self_elt |= element self { ctl_sr, self_id }
+#self_elt |= element self { ctl_gq, self_id }
+#self_elt |= element self { ctl_gr, self_id, self_payload }
+#self_elt |= element self { ctl_lq }
+#self_elt |= element self { ctl_lr, self_id, self_payload }
+#self_elt |= element self { ctl_dq, self_id }
+#self_elt |= element self { ctl_dr, self_id }
 
-bsc_ctls = (attribute generate_keypair { "yes" },
+bsc_bool = (attribute generate_keypair { "yes" },
             attribute key_type { xsd:token { maxLength="1024" } }?,
             attribute hash_alg { xsd:token { maxLength="1024" } }?,
             attribute key_length { xsd:token { maxLength="1024" } }?)
@@ -51,12 +72,12 @@ bsc_payload = (element signing_cert { base64 }*,
                element public_key { base64 }?)
 
 bsc_elt = element bsc {
-  action, type, self_id, bsc_id?, bsc_ctls?, bsc_payload
+  action, type, self_id, bsc_id?, bsc_bool?, bsc_payload
 }
 
 parent_id = attribute parent_id { sql_id }
 
-parent_ctls = (attribute rekey { "yes" }?,
+parent_bool = (attribute rekey { "yes" }?,
                attribute reissue { "yes" }?,
                attribute revoke { "yes" }?)
 
@@ -67,19 +88,19 @@ parent_payload = (attribute peer_contact { xsd:anyURI { maxLength="1024" } }?,
                   peer_ta?)
 
 parent_elt = element parent {
-  action, type, self_id, parent_id?,  parent_ctls, parent_payload
+  action, type, self_id, parent_id?,  parent_bool, parent_payload
 }
 
 child_id = attribute child_id { sql_id }
 
-child_ctls = attribute reissue { "yes" }?
+child_bool = attribute reissue { "yes" }?
 
 child_payload = (attribute bsc_link { xsd:token { maxLength="1024" } }?,
                  attribute child_db_id { xsd:token { maxLength="1024" } }?,
                  peer_ta?)
 
 child_elt = element child {
-  action, type, self_id, child_id?, child_ctls, child_payload
+  action, type, self_id, child_id?, child_bool, child_payload
 }
 
 repository_id = attribute repository_id { sql_id }
@@ -94,14 +115,14 @@ repository_elt = element repository {
 
 route_origin_id = attribute route_origin_id { sql_id }
 
-route_origin_ctls = attribute suppress_publication { "yes" }?
+route_origin_bool = attribute suppress_publication { "yes" }?
 
 route_origin_payload = (attribute asn { xsd:token { maxLength="1024" } }?,
                         attribute ipv4 { xsd:token { maxLength="1024" } }?,
                         attribute ipv6 { xsd:token { maxLength="1024" } }?)
 
 route_origin_elt = element route_origin {
-  action, type, self_id, route_origin_id?, route_origin_ctls, route_origin_payload
+  action, type, self_id, route_origin_id?, route_origin_bool, route_origin_payload
 }
 
 list_resources_payload = (attribute valid_until { xsd:token { maxLength="1024" } }?,