Update schema

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

4 files changed, 22 insertions, 13 deletions

diff --git a/scripts/up-down-medium-schema.rnc b/scripts/up-down-medium-schema.rnc
index 3fe2c00d..9c1766e6 100644
--- a/scripts/up-down-medium-schema.rnc
+++ b/scripts/up-down-medium-schema.rnc
@@ -12,8 +12,8 @@
 
      grammar {
        start = element message {
-         attribute version   { xsd:positiveInteger { maxInclusive="1" } },
-         attribute sender    { xsd:token { maxLength="1024" } },
+         attribute version { xsd:positiveInteger { maxInclusive="1" } },
+         attribute sender { xsd:token { maxLength="1024" } },
          attribute recipient { xsd:token { maxLength="1024" } },
          payload
        }
@@ -64,7 +64,7 @@
        }
 
        error_response =
-         element status { 
+         element status {
 	    "1101" |	# Already processing request
 	    "1102" |	# version number error
 	    "1103" |	# unrecognised request type
diff --git a/scripts/up-down-medium-schema.rng b/scripts/up-down-medium-schema.rng
index 54492505..7decd23f 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-medium-schema.rnc 682 2007-06-21 02:42:47Z sra $
+  $Id: up-down-medium-schema.rnc 698 2007-06-29 20:01:08Z sra $
   
   RelaxNG (Compact Syntax) Schema
   for RPKI up-down protocol.  This is based on the schema in the APNIC
diff --git a/scripts/up-down-schema.rnc b/scripts/up-down-schema.rnc
index f170d975..282697b3 100644
--- a/scripts/up-down-schema.rnc
+++ b/scripts/up-down-schema.rnc
@@ -33,15 +33,15 @@
        class = element class {
          attribute class_name { xsd:token { maxLength="1024" } },
          attribute cert_url { xsd:anyURI { 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 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:string { maxLength="1024" } }?,
          element certificate {
            attribute cert_url { xsd:anyURI { maxLength="1024" } },
-           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 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]*" } }?,
            xsd:base64Binary { maxLength="512000" }
          }*,
          element issuer { xsd:base64Binary { maxLength="512000" } }
@@ -49,9 +49,9 @@
 
        issue_request = element request {
          attribute class_name { xsd:token { maxLength="1024" } },
-         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 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]*" } }?,
          xsd:base64Binary { maxLength="512000" }
        }
        issue_response = class
diff --git a/scripts/up-down-schema.rng b/scripts/up-down-schema.rng
index b3044378..50425637 100644
--- a/scripts/up-down-schema.rng
+++ b/scripts/up-down-schema.rng
@@ -97,16 +97,19 @@
       <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>
@@ -127,6 +130,7 @@
             <attribute name="req_resource_set_as">
               <data type="string">
                 <param name="maxLength">512000</param>
+                <param name="pattern">[\-,0-9]*</param>
               </data>
             </attribute>
           </optional>
@@ -134,6 +138,7 @@
             <attribute name="req_resource_set_ipv4">
               <data type="string">
                 <param name="maxLength">512000</param>
+                <param name="pattern">[\-,/.0-9]*</param>
               </data>
             </attribute>
           </optional>
@@ -141,6 +146,7 @@
             <attribute name="req_resource_set_ipv6">
               <data type="string">
                 <param name="maxLength">512000</param>
+                <param name="pattern">[\-,/:0-9a-fA-F]*</param>
               </data>
             </attribute>
           </optional>
@@ -167,6 +173,7 @@
         <attribute name="req_resource_set_as">
           <data type="string">
             <param name="maxLength">512000</param>
+            <param name="pattern">[\-,0-9]*</param>
           </data>
         </attribute>
       </optional>
@@ -174,6 +181,7 @@
         <attribute name="req_resource_set_ipv4">
           <data type="string">
             <param name="maxLength">512000</param>
+            <param name="pattern">[\-,/.0-9]*</param>
           </data>
         </attribute>
       </optional>
@@ -181,6 +189,7 @@
         <attribute name="req_resource_set_ipv6">
           <data type="string">
             <param name="maxLength">512000</param>
+            <param name="pattern">[\-,/:0-9a-fA-F]*</param>
           </data>
         </attribute>
       </optional>