diff options
| -rw-r--r-- | docs/left-right-protocol | 1 | ||||
| -rw-r--r-- | scripts/left-right-schema.rnc | 4 | ||||
| -rw-r--r-- | scripts/left-right-schema.rng | 8 | ||||
| -rw-r--r-- | scripts/rpki/relaxng.py | 10 |
4 files changed, 7 insertions, 16 deletions
diff --git a/docs/left-right-protocol b/docs/left-right-protocol index b1fe8947..7f7c0b17 100644 --- a/docs/left-right-protocol +++ b/docs/left-right-protocol @@ -367,7 +367,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (list-resources :self-id 42 ; issuer id - &optional ; If left off, we're asking about self rather than child :child id) ; subject id => (resources :valid-until 2008-04-01T00:00:00Z ((:ipv4-prefix 10.0.0.44 32) diff --git a/scripts/left-right-schema.rnc b/scripts/left-right-schema.rnc index 831cd4a6..31c6348c 100644 --- a/scripts/left-right-schema.rnc +++ b/scripts/left-right-schema.rnc @@ -182,8 +182,8 @@ ro_elt |= element route_origin { ctl_dr, self_id, ro_id } # <list_resources/> element list_resources_elt = element list_resources { - ( attribute type { "query" }, self_id, child_id? ) | - ( attribute type { "reply" }, self_id, child_id?, + ( attribute type { "query" }, self_id, child_id ) | + ( attribute type { "reply" }, self_id, child_id, attribute valid_until { xsd:token { maxLength="1024" } }?, attribute subject_name { xsd:token { maxLength="1024" } }?, attribute as { xsd:token { maxLength="1024" } }?, diff --git a/scripts/left-right-schema.rng b/scripts/left-right-schema.rng index 9a413afa..7bf0de92 100644 --- a/scripts/left-right-schema.rng +++ b/scripts/left-right-schema.rng @@ -832,18 +832,14 @@ <value>query</value> </attribute> <ref name="self_id"/> - <optional> - <ref name="child_id"/> - </optional> + <ref name="child_id"/> </group> <group> <attribute name="type"> <value>reply</value> </attribute> <ref name="self_id"/> - <optional> - <ref name="child_id"/> - </optional> + <ref name="child_id"/> <optional> <attribute name="valid_until"> <data type="token"> diff --git a/scripts/rpki/relaxng.py b/scripts/rpki/relaxng.py index e0f2568e..72211ded 100644 --- a/scripts/rpki/relaxng.py +++ b/scripts/rpki/relaxng.py @@ -6,7 +6,7 @@ import lxml.etree ## Parsed RelaxNG left_right schema left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" encoding="UTF-8"?> <!-- - $Id: left-right-schema.rng 1088 2007-10-04 03:06:25Z sra $ + $Id: left-right-schema.rnc 1088 2007-10-04 03:06:25Z sra $ RelaxNG (Compact Syntax) Schema for RPKI left-right protocol. @@ -838,18 +838,14 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc <value>query</value> </attribute> <ref name="self_id"/> - <optional> - <ref name="child_id"/> - </optional> + <ref name="child_id"/> </group> <group> <attribute name="type"> <value>reply</value> </attribute> <ref name="self_id"/> - <optional> - <ref name="child_id"/> - </optional> + <ref name="child_id"/> <optional> <attribute name="valid_until"> <data type="token"> |