Checkpoint

svn path=/rpkid/pubd.py; revision=1822

1 files changed, 0 insertions, 172 deletions

diff --git a/rpkid/rpki/relaxng.py b/rpkid/rpki/relaxng.py
index 08908a95..7fe7ba2e 100644
--- a/rpkid/rpki/relaxng.py
+++ b/rpkid/rpki/relaxng.py
@@ -1455,9 +1455,6 @@ publication = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" en
       <optional>
         <ref name="tag"/>
       </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
       <ref name="uri"/>
       <ref name="base64"/>
     </element>
@@ -1470,54 +1467,17 @@ publication = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" en
       <optional>
         <ref name="tag"/>
       </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
       <ref name="uri"/>
     </element>
   </define>
   <define name="certificate_query" combine="choice">
     <element name="certificate">
       <attribute name="action">
-        <value>retrieve</value>
-      </attribute>
-      <optional>
-        <ref name="tag"/>
-      </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
-      <optional>
-        <ref name="uri"/>
-      </optional>
-    </element>
-  </define>
-  <define name="certificate_reply" combine="choice">
-    <element name="certificate">
-      <attribute name="action">
-        <value>retrieve</value>
-      </attribute>
-      <optional>
-        <ref name="tag"/>
-      </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
-      <ref name="uri"/>
-      <ref name="base64"/>
-    </element>
-  </define>
-  <define name="certificate_query" combine="choice">
-    <element name="certificate">
-      <attribute name="action">
         <value>withdraw</value>
       </attribute>
       <optional>
         <ref name="tag"/>
       </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
       <ref name="uri"/>
     </element>
   </define>
@@ -1529,9 +1489,6 @@ publication = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" en
       <optional>
         <ref name="tag"/>
       </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
       <ref name="uri"/>
     </element>
   </define>
@@ -1544,9 +1501,6 @@ publication = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" en
       <optional>
         <ref name="tag"/>
       </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
       <ref name="uri"/>
       <ref name="base64"/>
     </element>
@@ -1559,54 +1513,17 @@ publication = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" en
       <optional>
         <ref name="tag"/>
       </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
       <ref name="uri"/>
     </element>
   </define>
   <define name="crl_query" combine="choice">
     <element name="crl">
       <attribute name="action">
-        <value>retrieve</value>
-      </attribute>
-      <optional>
-        <ref name="tag"/>
-      </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
-      <optional>
-        <ref name="uri"/>
-      </optional>
-    </element>
-  </define>
-  <define name="crl_reply" combine="choice">
-    <element name="crl">
-      <attribute name="action">
-        <value>retrieve</value>
-      </attribute>
-      <optional>
-        <ref name="tag"/>
-      </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
-      <ref name="uri"/>
-      <ref name="base64"/>
-    </element>
-  </define>
-  <define name="crl_query" combine="choice">
-    <element name="crl">
-      <attribute name="action">
         <value>withdraw</value>
       </attribute>
       <optional>
         <ref name="tag"/>
       </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
       <ref name="uri"/>
     </element>
   </define>
@@ -1618,9 +1535,6 @@ publication = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" en
       <optional>
         <ref name="tag"/>
       </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
       <ref name="uri"/>
     </element>
   </define>
@@ -1633,9 +1547,6 @@ publication = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" en
       <optional>
         <ref name="tag"/>
       </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
       <ref name="uri"/>
       <ref name="base64"/>
     </element>
@@ -1648,54 +1559,17 @@ publication = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" en
       <optional>
         <ref name="tag"/>
       </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
       <ref name="uri"/>
     </element>
   </define>
   <define name="manifest_query" combine="choice">
     <element name="manifest">
       <attribute name="action">
-        <value>retrieve</value>
-      </attribute>
-      <optional>
-        <ref name="tag"/>
-      </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
-      <optional>
-        <ref name="uri"/>
-      </optional>
-    </element>
-  </define>
-  <define name="manifest_reply" combine="choice">
-    <element name="manifest">
-      <attribute name="action">
-        <value>retrieve</value>
-      </attribute>
-      <optional>
-        <ref name="tag"/>
-      </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
-      <ref name="uri"/>
-      <ref name="base64"/>
-    </element>
-  </define>
-  <define name="manifest_query" combine="choice">
-    <element name="manifest">
-      <attribute name="action">
         <value>withdraw</value>
       </attribute>
       <optional>
         <ref name="tag"/>
       </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
       <ref name="uri"/>
     </element>
   </define>
@@ -1707,9 +1581,6 @@ publication = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" en
       <optional>
         <ref name="tag"/>
       </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
       <ref name="uri"/>
     </element>
   </define>
@@ -1722,9 +1593,6 @@ publication = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" en
       <optional>
         <ref name="tag"/>
       </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
       <ref name="uri"/>
       <ref name="base64"/>
     </element>
@@ -1737,54 +1605,17 @@ publication = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" en
       <optional>
         <ref name="tag"/>
       </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
       <ref name="uri"/>
     </element>
   </define>
   <define name="roa_query" combine="choice">
     <element name="roa">
       <attribute name="action">
-        <value>retrieve</value>
-      </attribute>
-      <optional>
-        <ref name="tag"/>
-      </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
-      <optional>
-        <ref name="uri"/>
-      </optional>
-    </element>
-  </define>
-  <define name="roa_reply" combine="choice">
-    <element name="roa">
-      <attribute name="action">
-        <value>retrieve</value>
-      </attribute>
-      <optional>
-        <ref name="tag"/>
-      </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
-      <ref name="uri"/>
-      <ref name="base64"/>
-    </element>
-  </define>
-  <define name="roa_query" combine="choice">
-    <element name="roa">
-      <attribute name="action">
         <value>withdraw</value>
       </attribute>
       <optional>
         <ref name="tag"/>
       </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
       <ref name="uri"/>
     </element>
   </define>
@@ -1796,9 +1627,6 @@ publication = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" en
       <optional>
         <ref name="tag"/>
       </optional>
-      <optional>
-        <ref name="client_id"/>
-      </optional>
       <ref name="uri"/>
     </element>
   </define>