Simplify XML

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

17 files changed, 19 insertions, 67 deletions

diff --git a/scripts/left-right-protocol-samples/pdu.003.xml b/scripts/left-right-protocol-samples/pdu.003.xml
index ab6f2020..927f6636 100644
--- a/scripts/left-right-protocol-samples/pdu.003.xml
+++ b/scripts/left-right-protocol-samples/pdu.003.xml
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_request">
-  <self action="set" self_id="42">
+  <self action="set" self_id="42" rekey="yes" reissue="yes" revoke="yes" run_now="yes" publish_world_now="yes">
     <extension_preference name="color">Blue</extension_preference>
-    <rekey/>
-    <reissue/>
-    <revoke/>
-    <run_now/>
-    <publish_world_now/>
   </self>
 </msg>
diff --git a/scripts/left-right-protocol-samples/pdu.011.xml b/scripts/left-right-protocol-samples/pdu.011.xml
index d7483ac3..46b6a952 100644
--- a/scripts/left-right-protocol-samples/pdu.011.xml
+++ b/scripts/left-right-protocol-samples/pdu.011.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_request">
-  <bsc action="create" self_id="42">
+  <bsc action="create" self_id="42" generate_keypair="yes" key_type="rsa" hash_alg="sha1" key_length="2048">
     <signing_cert>Y2VydDEK</signing_cert>
-    <generate_keypair key_type="rsa" hash_alg="sha1" key_length="2048"/>
   </bsc>
 </msg>
diff --git a/scripts/left-right-protocol-samples/pdu.021.xml b/scripts/left-right-protocol-samples/pdu.021.xml
index e2f7a702..b267db4e 100644
--- a/scripts/left-right-protocol-samples/pdu.021.xml
+++ b/scripts/left-right-protocol-samples/pdu.021.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_request">
-  <parent action="create" self_id="42">
+  <parent action="create" self_id="42" peer_contact="https://re.bar.example/bandicoot/" sia_base="rsync://repo.foo.example/wombat/" bsc_link="17" repository_link="120">
     <peer_ta>cGVlcl90YQo=</peer_ta>
-    <peer_contact uri="https://re.bar.example/bandicoot/"/>
-    <sia_base uri="rsync://repo.foo.example/wombat/"/>
-    <bsc_link id="17"/>
-    <repository_link id="120"/>
   </parent>
 </msg>
diff --git a/scripts/left-right-protocol-samples/pdu.023.xml b/scripts/left-right-protocol-samples/pdu.023.xml
index a49be475..d6db2e95 100644
--- a/scripts/left-right-protocol-samples/pdu.023.xml
+++ b/scripts/left-right-protocol-samples/pdu.023.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_request">
-  <parent action="set" self_id="42" parent_id="666">
+  <parent action="set" self_id="42" parent_id="666" peer_contact="https://re.bar.example/bandicoot/" sia_base="rsync://repo.foo.example/wombat/" bsc_link="17" repository_link="120" rekey="yes" reissue="yes" revoke="yes">
     <peer_ta>cGVlcl90YQo=</peer_ta>
-    <peer_contact uri="https://re.bar.example/bandicoot/"/>
-    <sia_base uri="rsync://repo.foo.example/wombat/"/>
-    <bsc_link id="17"/>
-    <repository_link id="120"/>
-    <rekey/>
-    <reissue/>
-    <revoke/>
   </parent>
 </msg>
diff --git a/scripts/left-right-protocol-samples/pdu.026.xml b/scripts/left-right-protocol-samples/pdu.026.xml
index 4cc1d527..589cbc63 100644
--- a/scripts/left-right-protocol-samples/pdu.026.xml
+++ b/scripts/left-right-protocol-samples/pdu.026.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response">
-  <parent action="get" self_id="42" parent_id="666">
+  <parent action="get" self_id="42" parent_id="666" peer_contact="https://re.bar.example/bandicoot/" sia_base="rsync://repo.foo.example/wombat/" bsc_link="17" repository_link="120">
     <peer_ta>cGVlcl90YQo=</peer_ta>
-    <peer_contact uri="https://re.bar.example/bandicoot/"/>
-    <sia_base uri="rsync://repo.foo.example/wombat/"/>
-    <bsc_link id="17"/>
-    <repository_link id="120"/>
   </parent>
 </msg>
diff --git a/scripts/left-right-protocol-samples/pdu.028.xml b/scripts/left-right-protocol-samples/pdu.028.xml
index 639fac9b..2430e1fb 100644
--- a/scripts/left-right-protocol-samples/pdu.028.xml
+++ b/scripts/left-right-protocol-samples/pdu.028.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response">
-  <parent action="list" self_id="42" parent_id="666">
+  <parent action="list" self_id="42" parent_id="666" peer_contact="https://re.bar.example/bandicoot/" sia_base="rsync://repo.foo.example/wombat/" bsc_link="17" repository_link="120">
     <peer_ta>cGVlcl90YQo=</peer_ta>
-    <peer_contact uri="https://re.bar.example/bandicoot/"/>
-    <sia_base uri="rsync://repo.foo.example/wombat/"/>
-    <bsc_link id="17"/>
-    <repository_link id="120"/>
   </parent>
 </msg>
diff --git a/scripts/left-right-protocol-samples/pdu.031.xml b/scripts/left-right-protocol-samples/pdu.031.xml
index d103a5d5..547eb8ca 100644
--- a/scripts/left-right-protocol-samples/pdu.031.xml
+++ b/scripts/left-right-protocol-samples/pdu.031.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_request">
-  <child action="create" self_id="42">
+  <child action="create" self_id="42" bsc_link="17" child_db_id="child_db_id">
     <peer_ta>cGVlcl90YQo=</peer_ta>
-    <bsc_link id="17"/>
-    <child_db_id id="child_db_id"/>
   </child>
 </msg>
diff --git a/scripts/left-right-protocol-samples/pdu.033.xml b/scripts/left-right-protocol-samples/pdu.033.xml
index ef2da60d..3894ee54 100644
--- a/scripts/left-right-protocol-samples/pdu.033.xml
+++ b/scripts/left-right-protocol-samples/pdu.033.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_request">
-  <child action="set" self_id="42" child_id="3">
+  <child action="set" self_id="42" child_id="3" bsc_link="17" child_db_id="child_db_id" reissue="yes">
     <peer_ta>cGVlcl90YQo=</peer_ta>
-    <bsc_link id="17"/>
-    <child_db_id id="child_db_id"/>
-    <reissue/>
   </child>
 </msg>
diff --git a/scripts/left-right-protocol-samples/pdu.036.xml b/scripts/left-right-protocol-samples/pdu.036.xml
index d2729feb..4603c071 100644
--- a/scripts/left-right-protocol-samples/pdu.036.xml
+++ b/scripts/left-right-protocol-samples/pdu.036.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response">
-  <child action="get" self_id="42" child_id="3">
+  <child action="get" self_id="42" child_id="3" bsc_link="17" child_db_id="child_db_id">
     <peer_ta>cGVlcl90YQo=</peer_ta>
-    <bsc_link id="17"/>
-    <child_db_id id="child_db_id"/>
   </child>
 </msg>
diff --git a/scripts/left-right-protocol-samples/pdu.038.xml b/scripts/left-right-protocol-samples/pdu.038.xml
index 4426db32..3c5c0f42 100644
--- a/scripts/left-right-protocol-samples/pdu.038.xml
+++ b/scripts/left-right-protocol-samples/pdu.038.xml
@@ -2,8 +2,7 @@
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response">
   <child action="list" self_id="42" child_id="3">
-    <peer_ta>cGVlcl90YQo=</peer_ta>
-    <bsc_link id="17"/>
-    <child_db_id id="child_db_id"/>
-  </child>
+                bsc_link="17"
+		child_db_id="child_db_id"&gt;
+            <peer_ta>cGVlcl90YQo=</peer_ta></child>
 </msg>
diff --git a/scripts/left-right-protocol-samples/pdu.041.xml b/scripts/left-right-protocol-samples/pdu.041.xml
index d2146d79..ed9d1656 100644
--- a/scripts/left-right-protocol-samples/pdu.041.xml
+++ b/scripts/left-right-protocol-samples/pdu.041.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_request">
-  <repository action="create" self_id="42">
-    <peer_contact uri="https://re.bar.example/bandicoot/"/>
+  <repository action="create" self_id="42" peer_contact="https://re.bar.example/bandicoot/" bsc_link="17">
     <peer_ta>cGVlcl90YQo=</peer_ta>
-    <bsc_link id="17"/>
   </repository>
 </msg>
diff --git a/scripts/left-right-protocol-samples/pdu.043.xml b/scripts/left-right-protocol-samples/pdu.043.xml
index 89295e3c..2475b409 100644
--- a/scripts/left-right-protocol-samples/pdu.043.xml
+++ b/scripts/left-right-protocol-samples/pdu.043.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_request">
-  <repository action="set" self_id="42" repository_id="120">
-    <peer_contact uri="https://re.bar.example/bandicoot/"/>
+  <repository action="set" self_id="42" repository_id="120" peer_contact="https://re.bar.example/bandicoot/" bsc_link="17">
     <peer_ta>cGVlcl90YQo=</peer_ta>
-    <bsc_link id="17"/>
   </repository>
 </msg>
diff --git a/scripts/left-right-protocol-samples/pdu.046.xml b/scripts/left-right-protocol-samples/pdu.046.xml
index 5647370d..85b45d3c 100644
--- a/scripts/left-right-protocol-samples/pdu.046.xml
+++ b/scripts/left-right-protocol-samples/pdu.046.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response">
-  <repository action="get" self_id="42" repository_id="120">
-    <peer_contact uri="https://re.bar.example/bandicoot/"/>
+  <repository action="get" self_id="42" repository_id="120" peer_contact="https://re.bar.example/bandicoot/" bsc_link="17">
     <peer_ta>cGVlcl90YQo=</peer_ta>
-    <bsc_link id="17"/>
   </repository>
 </msg>
diff --git a/scripts/left-right-protocol-samples/pdu.048.xml b/scripts/left-right-protocol-samples/pdu.048.xml
index 93e02635..bf9aad50 100644
--- a/scripts/left-right-protocol-samples/pdu.048.xml
+++ b/scripts/left-right-protocol-samples/pdu.048.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response">
-  <repository action="list" self_id="42" repository_id="120">
-    <peer_contact uri="https://re.bar.example/bandicoot/"/>
+  <repository action="list" self_id="42" repository_id="120" peer_contact="https://re.bar.example/bandicoot/" bsc_link="17">
     <peer_ta>cGVlcl90YQo=</peer_ta>
-    <bsc_link id="17"/>
   </repository>
 </msg>
diff --git a/scripts/left-right-protocol-samples/pdu.053.xml b/scripts/left-right-protocol-samples/pdu.053.xml
index 5f18578b..17cfa222 100644
--- a/scripts/left-right-protocol-samples/pdu.053.xml
+++ b/scripts/left-right-protocol-samples/pdu.053.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_request">
-  <route_origin action="set" self_id="42" route_origin_id="88">
-    <suppress_publication/>
-    <resources asn="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/>
-  </route_origin>
+  <route_origin action="set" self_id="42" route_origin_id="88" suppress_publication="yes" asn="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/>
 </msg>
diff --git a/scripts/left-right-protocol-samples/pdu.056.xml b/scripts/left-right-protocol-samples/pdu.056.xml
index 2fa85016..27f15914 100644
--- a/scripts/left-right-protocol-samples/pdu.056.xml
+++ b/scripts/left-right-protocol-samples/pdu.056.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response">
-  <route_origin action="get" self_id="42" route_origin_id="88">
-    <resources asn="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/>
-  </route_origin>
+  <route_origin action="get" self_id="42" route_origin_id="88" asn="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/>
 </msg>
diff --git a/scripts/left-right-protocol-samples/pdu.058.xml b/scripts/left-right-protocol-samples/pdu.058.xml
index 7f07fa77..43382d69 100644
--- a/scripts/left-right-protocol-samples/pdu.058.xml
+++ b/scripts/left-right-protocol-samples/pdu.058.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response">
-  <route_origin action="list" self_id="42" route_origin_id="88">
-    <resources asn="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/>
-  </route_origin>
+  <route_origin action="list" self_id="42" route_origin_id="88" asn="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/>
 </msg>