Update schemas

svn path=/scripts/up-down-medium-schema.rnc; revision=698

4 files changed, 6 insertions, 139 deletions

diff --git a/scripts/up-down-medium-schema.rnc b/scripts/up-down-medium-schema.rnc
index e74bc489..3fe2c00d 100644
--- a/scripts/up-down-medium-schema.rnc
+++ b/scripts/up-down-medium-schema.rnc
@@ -15,7 +15,6 @@
          attribute version   { xsd:positiveInteger { maxInclusive="1" } },
          attribute sender    { xsd:token { maxLength="1024" } },
          attribute recipient { xsd:token { maxLength="1024" } },
-         attribute msg_ref   { xsd:positiveInteger { maxInclusive="999999999999999" } },
          payload
        }
 
@@ -33,23 +32,15 @@
        class = element class {
          attribute class_name { xsd:token { maxLength="1024" } },
          attribute cert_url { xsd:anyURI { maxLength="1024" } },
-         attribute cert_ski { xsd:token { maxLength="1024" } },
          attribute resource_set_as { xsd:string { maxLength="512000" pattern="[\-,0-9]*" } },
          attribute resource_set_ipv4 { xsd:string { maxLength="512000" pattern="[\-,/.0-9]*" } },
          attribute resource_set_ipv6 { xsd:string { maxLength="512000" pattern="[\-,/:0-9a-fA-F]*" } },
          attribute suggested_sia_head { xsd:anyURI { maxLength="1024" } }?,
          element certificate {
            attribute cert_url { xsd:anyURI { maxLength="1024" } },
-           attribute cert_ski { xsd:token { maxLength="1024" } },
-           attribute cert_aki { xsd:token { maxLength="1024" } },
-           attribute cert_serial { xsd:positiveInteger },
-           attribute resource_set_as { xsd:string { maxLength="512000" pattern="[\-,0-9]*" } },
-           attribute resource_set_ipv4 { xsd:string { maxLength="512000" pattern="[\-,/.0-9]*" } },
-           attribute resource_set_ipv6 { xsd:string { maxLength="512000" pattern="[\-,/:0-9a-fA-F]*" } },
            attribute req_resource_set_as { xsd:string { maxLength="512000" pattern="[\-,0-9]*" } }?,
            attribute req_resource_set_ipv4 { xsd:string { maxLength="512000" pattern="[\-,/.0-9]*" } }?,
            attribute req_resource_set_ipv6 { xsd:string { maxLength="512000" pattern="[\-,/:0-9a-fA-F]*" } }?,
-           attribute status { "undersize" | "match" | "oversize" },
            xsd:base64Binary { maxLength="512000" }
          }*,
          element issuer { xsd:base64Binary { maxLength="512000" } }
@@ -74,11 +65,9 @@
 
        error_response =
          element status { 
-	    "1101" |	# Message too old
-	    "1102" |	# msg_ref value is invalid
-	    "1103" |	# out of order msg_ref value
-	    "1104" |	# version number error
-	    "1105" |	# unrecognised request type
+	    "1101" |	# Already processing request
+	    "1102" |	# version number error
+	    "1103" |	# unrecognised request type
 	    "1201" |	# request - no such resource class
 	    "1202" |	# request - no resources allocated in resource class
 	    "1203" |	# request - badly formed certificate request
@@ -86,6 +75,5 @@
 	    "1302" |	# revoke - no such key
 	    "2001" 	# Internal Server Error - Request not performed
          },
-         element last_msg_processed { xsd:positiveInteger { maxInclusive="999999999999999" } }?,
          element description { attribute xml:lang { xsd:language }, xsd:string { maxLength="1024" } }?
      }
diff --git a/scripts/up-down-medium-schema.rng b/scripts/up-down-medium-schema.rng
index a3a87b7c..54492505 100644
--- a/scripts/up-down-medium-schema.rng
+++ b/scripts/up-down-medium-schema.rng
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  $Id: up-down-tighter-schema.pl 681 2007-06-20 23:50:56Z sra $
+  $Id: up-down-medium-schema.rnc 682 2007-06-21 02:42:47Z sra $
   
   RelaxNG (Compact Syntax) Schema
   for RPKI up-down protocol.  This is based on the schema in the APNIC
@@ -28,11 +28,6 @@
           <param name="maxLength">1024</param>
         </data>
       </attribute>
-      <attribute name="msg_ref">
-        <data type="positiveInteger">
-          <param name="maxInclusive">999999999999999</param>
-        </data>
-      </attribute>
       <ref name="payload"/>
     </element>
   </start>
@@ -98,11 +93,6 @@
           <param name="maxLength">1024</param>
         </data>
       </attribute>
-      <attribute name="cert_ski">
-        <data type="token">
-          <param name="maxLength">1024</param>
-        </data>
-      </attribute>
       <attribute name="resource_set_as">
         <data type="string">
           <param name="maxLength">512000</param>
@@ -135,37 +125,6 @@
               <param name="maxLength">1024</param>
             </data>
           </attribute>
-          <attribute name="cert_ski">
-            <data type="token">
-              <param name="maxLength">1024</param>
-            </data>
-          </attribute>
-          <attribute name="cert_aki">
-            <data type="token">
-              <param name="maxLength">1024</param>
-            </data>
-          </attribute>
-          <attribute name="cert_serial">
-            <data type="positiveInteger"/>
-          </attribute>
-          <attribute name="resource_set_as">
-            <data type="string">
-              <param name="maxLength">512000</param>
-              <param name="pattern">[\-,0-9]*</param>
-            </data>
-          </attribute>
-          <attribute name="resource_set_ipv4">
-            <data type="string">
-              <param name="maxLength">512000</param>
-              <param name="pattern">[\-,/.0-9]*</param>
-            </data>
-          </attribute>
-          <attribute name="resource_set_ipv6">
-            <data type="string">
-              <param name="maxLength">512000</param>
-              <param name="pattern">[\-,/:0-9a-fA-F]*</param>
-            </data>
-          </attribute>
           <optional>
             <attribute name="req_resource_set_as">
               <data type="string">
@@ -190,13 +149,6 @@
               </data>
             </attribute>
           </optional>
-          <attribute name="status">
-            <choice>
-              <value>undersize</value>
-              <value>match</value>
-              <value>oversize</value>
-            </choice>
-          </attribute>
           <data type="base64Binary">
             <param name="maxLength">512000</param>
           </data>
@@ -272,14 +224,10 @@
     <element name="status">
       <choice>
         <value>1101</value>
-        <!-- Message too old -->
+        <!-- Already processing request -->
         <value>1102</value>
-        <!-- msg_ref value is invalid -->
-        <value>1103</value>
-        <!-- out of order msg_ref value -->
-        <value>1104</value>
         <!-- version number error -->
-        <value>1105</value>
+        <value>1103</value>
         <!-- unrecognised request type -->
         <value>1201</value>
         <!-- request - no such resource class -->
@@ -296,13 +244,6 @@
       <!-- Internal Server Error - Request not performed -->
     </element>
     <optional>
-      <element name="last_msg_processed">
-        <data type="positiveInteger">
-          <param name="maxInclusive">999999999999999</param>
-        </data>
-      </element>
-    </optional>
-    <optional>
       <element name="description">
         <attribute name="xml:lang">
           <data type="language"/>
diff --git a/scripts/up-down-schema.rnc b/scripts/up-down-schema.rnc
index 41921b21..f170d975 100644
--- a/scripts/up-down-schema.rnc
+++ b/scripts/up-down-schema.rnc
@@ -16,7 +16,6 @@
          attribute version { xsd:positiveInteger { maxInclusive="1" } },
          attribute sender { xsd:token { maxLength="1024" } },
          attribute recipient { xsd:token { maxLength="1024" } },
-         attribute msg_ref { xsd:positiveInteger { maxInclusive="999999999999999" } },
          payload
        }
 
@@ -34,23 +33,15 @@
        class = element class {
          attribute class_name { xsd:token { maxLength="1024" } },
          attribute cert_url { xsd:anyURI { maxLength="1024" } },
-         attribute cert_ski { xsd:token { maxLength="1024" } },
          attribute resource_set_as { xsd:string { maxLength="512000" } },
          attribute resource_set_ipv4 { xsd:string { maxLength="512000" } },
          attribute resource_set_ipv6 { xsd:string { maxLength="512000" } },
          attribute suggested_sia_head { xsd:string { maxLength="1024" } }?,
          element certificate {
            attribute cert_url { xsd:anyURI { maxLength="1024" } },
-           attribute cert_ski { xsd:token { maxLength="1024" } },
-           attribute cert_aki { xsd:token { maxLength="1024" } },
-           attribute cert_serial { xsd:positiveInteger },
-           attribute resource_set_as { xsd:string { maxLength="512000" } },
-           attribute resource_set_ipv4 { xsd:string { maxLength="512000" } },
-           attribute resource_set_ipv6 { xsd:string { maxLength="512000" } },
            attribute req_resource_set_as { xsd:string { maxLength="512000" } }?,
            attribute req_resource_set_ipv4 { xsd:string { maxLength="512000" } }?,
            attribute req_resource_set_ipv6 { xsd:string { maxLength="512000" } }?,
-           attribute status { "undersize" | "match" | "oversize" },
            xsd:base64Binary { maxLength="512000" }
          }*,
          element issuer { xsd:base64Binary { maxLength="512000" } }
@@ -75,6 +66,5 @@
 
        error_response =
          element status { xsd:positiveInteger { maxInclusive="999999999999999" } },
-         element last_msg_processed { xsd:positiveInteger { maxInclusive="999999999999999" } }?,
          element description { attribute xml:lang { xsd:language }, xsd:string { maxLength="1024" } }?
      }
diff --git a/scripts/up-down-schema.rng b/scripts/up-down-schema.rng
index a968f481..b3044378 100644
--- a/scripts/up-down-schema.rng
+++ b/scripts/up-down-schema.rng
@@ -29,11 +29,6 @@
           <param name="maxLength">1024</param>
         </data>
       </attribute>
-      <attribute name="msg_ref">
-        <data type="positiveInteger">
-          <param name="maxInclusive">999999999999999</param>
-        </data>
-      </attribute>
       <ref name="payload"/>
     </element>
   </start>
@@ -99,11 +94,6 @@
           <param name="maxLength">1024</param>
         </data>
       </attribute>
-      <attribute name="cert_ski">
-        <data type="token">
-          <param name="maxLength">1024</param>
-        </data>
-      </attribute>
       <attribute name="resource_set_as">
         <data type="string">
           <param name="maxLength">512000</param>
@@ -133,34 +123,6 @@
               <param name="maxLength">1024</param>
             </data>
           </attribute>
-          <attribute name="cert_ski">
-            <data type="token">
-              <param name="maxLength">1024</param>
-            </data>
-          </attribute>
-          <attribute name="cert_aki">
-            <data type="token">
-              <param name="maxLength">1024</param>
-            </data>
-          </attribute>
-          <attribute name="cert_serial">
-            <data type="positiveInteger"/>
-          </attribute>
-          <attribute name="resource_set_as">
-            <data type="string">
-              <param name="maxLength">512000</param>
-            </data>
-          </attribute>
-          <attribute name="resource_set_ipv4">
-            <data type="string">
-              <param name="maxLength">512000</param>
-            </data>
-          </attribute>
-          <attribute name="resource_set_ipv6">
-            <data type="string">
-              <param name="maxLength">512000</param>
-            </data>
-          </attribute>
           <optional>
             <attribute name="req_resource_set_as">
               <data type="string">
@@ -182,13 +144,6 @@
               </data>
             </attribute>
           </optional>
-          <attribute name="status">
-            <choice>
-              <value>undersize</value>
-              <value>match</value>
-              <value>oversize</value>
-            </choice>
-          </attribute>
           <data type="base64Binary">
             <param name="maxLength">512000</param>
           </data>
@@ -264,13 +219,6 @@
       </data>
     </element>
     <optional>
-      <element name="last_msg_processed">
-        <data type="positiveInteger">
-          <param name="maxInclusive">999999999999999</param>
-        </data>
-      </element>
-    </optional>
-    <optional>
       <element name="description">
         <attribute name="xml:lang">
           <data type="language"/>