Add sender_name and recipient_name to parent object

svn path=/docs/left-right-xml; revision=1358

3 files changed, 23 insertions, 6 deletions

diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py
index 73e4222a..94022985 100644
--- a/scripts/rpki/left_right.py
+++ b/scripts/rpki/left_right.py
@@ -485,13 +485,13 @@ class parent_elt(data_elt):
 
   element_name = "parent"
   attributes = ("action", "type", "self_id", "parent_id", "bsc_id", "repository_id",
-                "peer_contact_uri", "sia_base")
+                "peer_contact_uri", "sia_base", "sender_name", "recipient_name")
   elements = ("cms_ta", "https_ta")
   booleans = ("rekey", "reissue", "revoke")
 
   sql_template = rpki.sql.template("parent", "parent_id", "self_id", "bsc_id", "repository_id",
                                    ("cms_ta", rpki.x509.X509), ("https_ta", rpki.x509.X509),
-                                   "peer_contact_uri", "sia_base")
+                                   "peer_contact_uri", "sia_base", "sender_name", "recipient_name")
 
   cms_ta = None
   https_ta = None
@@ -577,7 +577,10 @@ class parent_elt(data_elt):
     bsc = self.bsc(gctx)
     if bsc is None:
       raise rpki.exceptions.BSCNotFound, "Could not find BSC %s" % self.bsc_id
-    q_msg = rpki.up_down.message_pdu.make_query(q_pdu)
+    q_msg = rpki.up_down.message_pdu.make_query(
+      payload = q_pdu,
+      sender = self.sender_name,
+      recipient = self.recipient_name)
     q_elt = q_msg.toXML()
     rpki.relaxng.up_down.assertValid(q_elt)
     q_cms = rpki.cms.xml_sign(q_elt, bsc.private_key_id, bsc.signing_cert, encoding = "UTF-8")
diff --git a/scripts/rpki/relaxng.py b/scripts/rpki/relaxng.py
index 31874eb8..290b1da3 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 1287 2007-11-14 04:17:16Z sra $
+  $Id: left-right-schema.rnc 1287 2007-11-14 04:17:16Z sra $
   
   RelaxNG (Compact Syntax) Schema for RPKI left-right protocol.
   
@@ -455,6 +455,20 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc
       </attribute>
     </optional>
     <optional>
+      <attribute name="sender_name">
+        <data type="token">
+          <param name="maxLength">1024</param>
+        </data>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="recipient_name">
+        <data type="token">
+          <param name="maxLength">1024</param>
+        </data>
+      </attribute>
+    </optional>
+    <optional>
       <ref name="cms_ta"/>
     </optional>
     <optional>
@@ -921,7 +935,7 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc
 ## Parsed RelaxNG up_down schema
 up_down = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  $Id: up-down-schema.rnc 1353 2007-12-04 06:19:01Z sra $
+  $Id: up-down-schema.rng 1354 2007-12-04 06:20:10Z sra $
   
   RelaxNG (Compact Syntax) Scheme for up-down protocol, extracted
   from APNIC Wiki.
diff --git a/scripts/rpki/up_down.py b/scripts/rpki/up_down.py
index b241a30f..1e14a422 100644
--- a/scripts/rpki/up_down.py
+++ b/scripts/rpki/up_down.py
@@ -478,7 +478,7 @@ class message_pdu(base_elt):
     return r_msg
 
   @classmethod
-  def make_query(cls, payload, sender = "CHILD", recipient = "PARENT"):
+  def make_query(cls, payload, sender, recipient):
     """Construct one message PDU."""
     assert not cls.type2name[type(payload)].endswith("_response")
     self = cls()