diff options
| author | Rob Austein <sra@hactrn.net> | 2007-07-21 04:06:12 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2007-07-21 04:06:12 +0000 |
| commit | 3728c083a8cd5a7b914a32924153f9c8dbf1b818 (patch) | |
| tree | e2f7844323a4ed8437124c5fe9820a16c81c831b | |
| parent | e185041e5c49d271222ce700dad84557a3b949a5 (diff) | |
Schema hacking on an airplane
svn path=/docs/left-right-xml; revision=781
67 files changed, 344 insertions, 373 deletions
diff --git a/docs/left-right-xml b/docs/left-right-xml index e85066e4..906aa229 100644 --- a/docs/left-right-xml +++ b/docs/left-right-xml @@ -8,19 +8,19 @@ <completely_gratuitous_wrapper_element_to_let_me_run_this_through_xmllint> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <self action="create"> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <self action="create" type="query"> <extension_preference name="name">Launcelot</extension_preference> <extension_preference name="quest">Holy Grail</extension_preference> </self> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <self action="create" self_id="42"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <self action="create" type="reply" self_id="42"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <self action="set" self_id="42" + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <self action="set" type="query" self_id="42" rekey="yes" reissue="yes" revoke="yes" @@ -30,51 +30,51 @@ </self> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <self action="set" self_id="42"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <self action="set" type="reply" self_id="42"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <self action="get" self_id="42"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <self action="get" type="query" self_id="42"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <self action="get" self_id="42"> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <self action="get" type="reply" self_id="42"> <extension_preference name="name">Launcelot</extension_preference> <extension_preference name="quest">Holy Grail</extension_preference> <extension_preference name="color">Blue</extension_preference> </self> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <self action="list"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <self action="list" type="query"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <self action="list" self_id="42"> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <self action="list" type="reply" self_id="42"> <extension_preference name="name">Launcelot</extension_preference> <extension_preference name="quest">Holy Grail</extension_preference> <extension_preference name="color">Blue</extension_preference> </self> - <self action="list" self_id="99"> + <self action="list" type="query" self_id="99"> <extension_preference name="name">Arthur, King of the Britons</extension_preference> <extension_preference name="quest">Holy Grail</extension_preference> <extension_preference name="airspeed_velocity_of_an_unladen_swallow">African or European swallow?</extension_preference> </self> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <self action="destroy" self_id="42"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <self action="destroy" type="query" self_id="42"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <self action="destroy" self_id="42"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <self action="destroy" type="reply" self_id="42"/> </msg> <!-- ==== --> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <bsc action="create" self_id="42" + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <bsc action="create" type="query" self_id="42" generate_keypair="yes" key_type="rsa" hash_alg="sha1" @@ -83,58 +83,58 @@ </bsc> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <bsc action="create" self_id="42" bsc_id="17"> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <bsc action="create" type="reply" self_id="42" bsc_id="17"> <pkcs10_cert_request>cmVxdWVzdAo=</pkcs10_cert_request> </bsc> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <bsc action="set" self_id="42" bsc_id="17"> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <bsc action="set" type="query" self_id="42" bsc_id="17"> <signing_cert>Y2VydDIK</signing_cert> </bsc> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <bsc action="set" self_id="42" bsc_id="17"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <bsc action="set" type="reply" self_id="42" bsc_id="17"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <bsc action="get" self_id="42" bsc_id="17"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <bsc action="get" type="query" self_id="42" bsc_id="17"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <bsc action="get" self_id="42" bsc_id="17"> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <bsc action="get" type="reply" self_id="42" bsc_id="17"> <signing_cert>Y2VydDEK</signing_cert> <signing_cert>Y2VydDIK</signing_cert> <public_key>cHVibGljX2tleQo=</public_key> </bsc> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <bsc action="list" self_id="42"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <bsc action="list" type="query" self_id="42"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <bsc action="list" self_id="42" bsc_id="17"> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <bsc action="list" type="reply" self_id="42" bsc_id="17"> <signing_cert>Y2VydDEK</signing_cert> <signing_cert>Y2VydDIK</signing_cert> <public_key>cHVibGljX2tleQo=</public_key> </bsc> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <bsc action="destroy" self_id="42" bsc_id="17"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <bsc action="destroy" type="query" self_id="42" bsc_id="17"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <bsc action="destroy" self_id="42" bsc_id="17"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <bsc action="destroy" type="reply" self_id="42" bsc_id="17"/> </msg> <!-- ==== --> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <parent action="create" self_id="42" + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <parent action="create" type="query" self_id="42" peer_contact="https://re.bar.example/bandicoot/" sia_base="rsync://repo.foo.example/wombat/" bsc_link="17" @@ -143,12 +143,12 @@ </parent> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <parent action="create" self_id="42" parent_id="666"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <parent action="create" type="reply" self_id="42" parent_id="666"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <parent action="set" self_id="42" parent_id="666" + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <parent action="set" type="query" self_id="42" parent_id="666" peer_contact="https://re.bar.example/bandicoot/" sia_base="rsync://repo.foo.example/wombat/" bsc_link="17" @@ -160,16 +160,16 @@ </parent> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <parent action="set" self_id="42" parent_id="666"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <parent action="set" type="reply" self_id="42" parent_id="666"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <parent action="get" self_id="42" parent_id="666"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <parent action="get" type="query" self_id="42" parent_id="666"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <parent action="get" self_id="42" parent_id="666" + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <parent action="get" type="reply" self_id="42" parent_id="666" peer_contact="https://re.bar.example/bandicoot/" sia_base="rsync://repo.foo.example/wombat/" bsc_link="17" @@ -178,12 +178,12 @@ </parent> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <parent action="list" self_id="42"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <parent action="list" type="query" self_id="42"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <parent action="list" self_id="42" parent_id="666" + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <parent action="list" type="reply" self_id="42" parent_id="666" peer_contact="https://re.bar.example/bandicoot/" sia_base="rsync://repo.foo.example/wombat/" bsc_link="17" @@ -192,30 +192,30 @@ </parent> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <parent action="destroy" self_id="42" parent_id="666"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <parent action="destroy" type="query" self_id="42" parent_id="666"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <parent action="destroy" self_id="42" parent_id="666"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <parent action="destroy" type="reply" self_id="42" parent_id="666"/> </msg> <!-- ==== --> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <child action="create" self_id="42" + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <child action="create" type="query" self_id="42" bsc_link="17" child_db_id="child_db_id"> <peer_ta>cGVlcl90YQo=</peer_ta> </child> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <child action="create" self_id="42" child_id="3"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <child action="create" type="reply" self_id="42" child_id="3"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <child action="set" self_id="42" child_id="3" + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <child action="set" type="query" self_id="42" child_id="3" bsc_link="17" child_db_id="child_db_id" reissue="yes"> @@ -223,154 +223,154 @@ </child> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <child action="set" self_id="42" child_id="3"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <child action="set" type="reply" self_id="42" child_id="3"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <child action="get" self_id="42" child_id="3"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <child action="get" type="query" self_id="42" child_id="3"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <child action="get" self_id="42" child_id="3" + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <child action="get" type="reply" self_id="42" child_id="3" bsc_link="17" child_db_id="child_db_id"> <peer_ta>cGVlcl90YQo=</peer_ta> </child> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <child action="list" self_id="42"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <child action="list" type="query" self_id="42"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <child action="list" self_id="42" child_id="3" + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <child action="list" type="reply" self_id="42" child_id="3" bsc_link="17" child_db_id="child_db_id"> <peer_ta>cGVlcl90YQo=</peer_ta> </child> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <child action="destroy" self_id="42" child_id="3"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <child action="destroy" type="query" self_id="42" child_id="3"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <child action="destroy" self_id="42" child_id="3"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <child action="destroy" type="reply" self_id="42" child_id="3"/> </msg> <!-- ==== --> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <repository action="create" self_id="42" + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <repository action="create" type="query" self_id="42" peer_contact="https://re.bar.example/bandicoot/" bsc_link="17"> <peer_ta>cGVlcl90YQo=</peer_ta> </repository> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <repository action="create" self_id="42" repository_id="120"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <repository action="create" type="reply" self_id="42" repository_id="120"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <repository action="set" self_id="42" repository_id="120" + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <repository action="set" type="query" self_id="42" repository_id="120" peer_contact="https://re.bar.example/bandicoot/" bsc_link="17"> <peer_ta>cGVlcl90YQo=</peer_ta> </repository> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <repository action="set" self_id="42" repository_id="120"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <repository action="set" type="reply" self_id="42" repository_id="120"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <repository action="get" self_id="42" repository_id="120"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <repository action="get" type="query" self_id="42" repository_id="120"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <repository action="get" self_id="42" repository_id="120" + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <repository action="get" type="reply" self_id="42" repository_id="120" peer_contact="https://re.bar.example/bandicoot/" bsc_link="17"> <peer_ta>cGVlcl90YQo=</peer_ta> </repository> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <repository action="list" self_id="42"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <repository action="list" type="query" self_id="42"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <repository action="list" self_id="42" repository_id="120" + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <repository action="list" type="reply" self_id="42" repository_id="120" peer_contact="https://re.bar.example/bandicoot/" bsc_link="17"> <peer_ta>cGVlcl90YQo=</peer_ta> </repository> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <repository action="destroy" self_id="42" repository_id="120"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <repository action="destroy" type="query" self_id="42" repository_id="120"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <repository action="destroy" self_id="42" repository_id="120"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <repository action="destroy" type="reply" self_id="42" repository_id="120"/> </msg> <!-- ==== --> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <route_origin action="create" self_id="42"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <route_origin action="create" type="query" self_id="42"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <route_origin action="create" self_id="42" route_origin_id="88"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <route_origin action="create" type="reply" self_id="42" route_origin_id="88"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <route_origin action="set" self_id="42" route_origin_id="88" + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <route_origin action="set" type="query" 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> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <route_origin action="set" self_id="42" route_origin_id="88"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <route_origin action="set" type="reply" self_id="42" route_origin_id="88"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <route_origin action="get" self_id="42" route_origin_id="88"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <route_origin action="get" type="query" self_id="42" route_origin_id="88"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <route_origin action="get" self_id="42" route_origin_id="88" + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <route_origin action="get" type="reply" 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> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <route_origin action="list" self_id="42"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <route_origin action="list" type="query" self_id="42"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <route_origin action="list" self_id="42" route_origin_id="88" + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <route_origin action="list" type="reply" 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> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> - <route_origin action="destroy" self_id="42" route_origin_id="88"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <route_origin action="destroy" type="query" self_id="42" route_origin_id="88"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <route_origin action="destroy" self_id="42" route_origin_id="88"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <route_origin action="destroy" type="reply" self_id="42" route_origin_id="88"/> </msg> <!-- ==== --> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="data_request"> - <list_resources self_id="42" child_id="id"/> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <list_resources type="query" self_id="42" child_id="id"/> </msg> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="data_response"> - <list_resources self_id="42" child_id="id" valid_until="2008_04_01T00:00:00Z"> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> + <list_resources type="reply" self_id="42" child_id="id" valid_until="2008_04_01T00:00:00Z"> <resource_class ipv4="10.0.0.44/32,10.3.0.44/32" ipv6="fe80:dead:beef::/48" as="666"/> @@ -384,7 +384,7 @@ <!-- === --> - <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="error"> + <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/"> <report_error self_id="42" error_code="your_hair_is_on_fire">bag_of_data</report_error> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.001.xml b/scripts/left-right-protocol-samples/pdu.001.xml index 95bc5e46..e859c7ed 100644 --- a/scripts/left-right-protocol-samples/pdu.001.xml +++ b/scripts/left-right-protocol-samples/pdu.001.xml @@ -1,7 +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="create"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <self action="create" type="query"> <extension_preference name="name">Launcelot</extension_preference> <extension_preference name="quest">Holy Grail</extension_preference> </self> diff --git a/scripts/left-right-protocol-samples/pdu.002.xml b/scripts/left-right-protocol-samples/pdu.002.xml index d0469a10..577f77f0 100644 --- a/scripts/left-right-protocol-samples/pdu.002.xml +++ b/scripts/left-right-protocol-samples/pdu.002.xml @@ -1,5 +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"> - <self action="create" self_id="42"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <self action="create" type="reply" self_id="42"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.003.xml b/scripts/left-right-protocol-samples/pdu.003.xml index 927f6636..96ae3d05 100644 --- a/scripts/left-right-protocol-samples/pdu.003.xml +++ b/scripts/left-right-protocol-samples/pdu.003.xml @@ -1,7 +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" rekey="yes" reissue="yes" revoke="yes" run_now="yes" publish_world_now="yes"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <self action="set" type="query" self_id="42" rekey="yes" reissue="yes" revoke="yes" run_now="yes" publish_world_now="yes"> <extension_preference name="color">Blue</extension_preference> </self> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.004.xml b/scripts/left-right-protocol-samples/pdu.004.xml index e742e9dd..ae9a2f54 100644 --- a/scripts/left-right-protocol-samples/pdu.004.xml +++ b/scripts/left-right-protocol-samples/pdu.004.xml @@ -1,5 +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"> - <self action="set" self_id="42"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <self action="set" type="reply" self_id="42"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.005.xml b/scripts/left-right-protocol-samples/pdu.005.xml index 1f78e0e4..f039e484 100644 --- a/scripts/left-right-protocol-samples/pdu.005.xml +++ b/scripts/left-right-protocol-samples/pdu.005.xml @@ -1,5 +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"> - <self action="get" self_id="42"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <self action="get" type="query" self_id="42"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.006.xml b/scripts/left-right-protocol-samples/pdu.006.xml index 6915d4ed..7f51884a 100644 --- a/scripts/left-right-protocol-samples/pdu.006.xml +++ b/scripts/left-right-protocol-samples/pdu.006.xml @@ -1,7 +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"> - <self action="get" self_id="42"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <self action="get" type="reply" self_id="42"> <extension_preference name="name">Launcelot</extension_preference> <extension_preference name="quest">Holy Grail</extension_preference> <extension_preference name="color">Blue</extension_preference> diff --git a/scripts/left-right-protocol-samples/pdu.007.xml b/scripts/left-right-protocol-samples/pdu.007.xml index 808279d9..19e8d75e 100644 --- a/scripts/left-right-protocol-samples/pdu.007.xml +++ b/scripts/left-right-protocol-samples/pdu.007.xml @@ -1,5 +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"> - <self action="list"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <self action="list" type="query"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.008.xml b/scripts/left-right-protocol-samples/pdu.008.xml index 020dcc09..48ea89e1 100644 --- a/scripts/left-right-protocol-samples/pdu.008.xml +++ b/scripts/left-right-protocol-samples/pdu.008.xml @@ -1,12 +1,12 @@ <?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"> - <self action="list" self_id="42"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <self action="list" type="reply" self_id="42"> <extension_preference name="name">Launcelot</extension_preference> <extension_preference name="quest">Holy Grail</extension_preference> <extension_preference name="color">Blue</extension_preference> </self> - <self action="list" self_id="99"> + <self action="list" type="query" self_id="99"> <extension_preference name="name">Arthur, King of the Britons</extension_preference> <extension_preference name="quest">Holy Grail</extension_preference> <extension_preference name="airspeed_velocity_of_an_unladen_swallow">African or European swallow?</extension_preference> diff --git a/scripts/left-right-protocol-samples/pdu.009.xml b/scripts/left-right-protocol-samples/pdu.009.xml index 0d5db746..bc7da935 100644 --- a/scripts/left-right-protocol-samples/pdu.009.xml +++ b/scripts/left-right-protocol-samples/pdu.009.xml @@ -1,5 +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"> - <self action="destroy" self_id="42"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <self action="destroy" type="query" self_id="42"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.010.xml b/scripts/left-right-protocol-samples/pdu.010.xml index a6d280e7..1fd0bb69 100644 --- a/scripts/left-right-protocol-samples/pdu.010.xml +++ b/scripts/left-right-protocol-samples/pdu.010.xml @@ -1,5 +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"> - <self action="destroy" self_id="42"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <self action="destroy" type="reply" self_id="42"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.011.xml b/scripts/left-right-protocol-samples/pdu.011.xml index 46b6a952..372222b8 100644 --- a/scripts/left-right-protocol-samples/pdu.011.xml +++ b/scripts/left-right-protocol-samples/pdu.011.xml @@ -1,7 +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" generate_keypair="yes" key_type="rsa" hash_alg="sha1" key_length="2048"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <bsc action="create" type="query" self_id="42" generate_keypair="yes" key_type="rsa" hash_alg="sha1" key_length="2048"> <signing_cert>Y2VydDEK</signing_cert> </bsc> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.012.xml b/scripts/left-right-protocol-samples/pdu.012.xml index 88286caa..cca6c8c7 100644 --- a/scripts/left-right-protocol-samples/pdu.012.xml +++ b/scripts/left-right-protocol-samples/pdu.012.xml @@ -1,7 +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"> - <bsc action="create" self_id="42" bsc_id="17"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <bsc action="create" type="reply" self_id="42" bsc_id="17"> <pkcs10_cert_request>cmVxdWVzdAo=</pkcs10_cert_request> </bsc> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.013.xml b/scripts/left-right-protocol-samples/pdu.013.xml index 11e079b0..eeeb1672 100644 --- a/scripts/left-right-protocol-samples/pdu.013.xml +++ b/scripts/left-right-protocol-samples/pdu.013.xml @@ -1,7 +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="set" self_id="42" bsc_id="17"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <bsc action="set" type="query" self_id="42" bsc_id="17"> <signing_cert>Y2VydDIK</signing_cert> </bsc> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.014.xml b/scripts/left-right-protocol-samples/pdu.014.xml index 128099af..dbb00bf7 100644 --- a/scripts/left-right-protocol-samples/pdu.014.xml +++ b/scripts/left-right-protocol-samples/pdu.014.xml @@ -1,5 +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"> - <bsc action="set" self_id="42" bsc_id="17"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <bsc action="set" type="reply" self_id="42" bsc_id="17"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.015.xml b/scripts/left-right-protocol-samples/pdu.015.xml index d81f0569..25137d90 100644 --- a/scripts/left-right-protocol-samples/pdu.015.xml +++ b/scripts/left-right-protocol-samples/pdu.015.xml @@ -1,5 +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"> - <bsc action="get" self_id="42" bsc_id="17"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <bsc action="get" type="query" self_id="42" bsc_id="17"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.016.xml b/scripts/left-right-protocol-samples/pdu.016.xml index 3f039496..4dd4bfd8 100644 --- a/scripts/left-right-protocol-samples/pdu.016.xml +++ b/scripts/left-right-protocol-samples/pdu.016.xml @@ -1,7 +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"> - <bsc action="get" self_id="42" bsc_id="17"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <bsc action="get" type="reply" self_id="42" bsc_id="17"> <signing_cert>Y2VydDEK</signing_cert> <signing_cert>Y2VydDIK</signing_cert> <public_key>cHVibGljX2tleQo=</public_key> diff --git a/scripts/left-right-protocol-samples/pdu.017.xml b/scripts/left-right-protocol-samples/pdu.017.xml index de66645d..dc882a50 100644 --- a/scripts/left-right-protocol-samples/pdu.017.xml +++ b/scripts/left-right-protocol-samples/pdu.017.xml @@ -1,5 +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"> - <bsc action="list" self_id="42"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <bsc action="list" type="query" self_id="42"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.018.xml b/scripts/left-right-protocol-samples/pdu.018.xml index ed1c2242..6c1ce83a 100644 --- a/scripts/left-right-protocol-samples/pdu.018.xml +++ b/scripts/left-right-protocol-samples/pdu.018.xml @@ -1,7 +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"> - <bsc action="list" self_id="42" bsc_id="17"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <bsc action="list" type="reply" self_id="42" bsc_id="17"> <signing_cert>Y2VydDEK</signing_cert> <signing_cert>Y2VydDIK</signing_cert> <public_key>cHVibGljX2tleQo=</public_key> diff --git a/scripts/left-right-protocol-samples/pdu.019.xml b/scripts/left-right-protocol-samples/pdu.019.xml index 34f127d4..62c3e9de 100644 --- a/scripts/left-right-protocol-samples/pdu.019.xml +++ b/scripts/left-right-protocol-samples/pdu.019.xml @@ -1,5 +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"> - <bsc action="destroy" self_id="42" bsc_id="17"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <bsc action="destroy" type="query" self_id="42" bsc_id="17"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.020.xml b/scripts/left-right-protocol-samples/pdu.020.xml index f71c0d39..75375dad 100644 --- a/scripts/left-right-protocol-samples/pdu.020.xml +++ b/scripts/left-right-protocol-samples/pdu.020.xml @@ -1,5 +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"> - <bsc action="destroy" self_id="42" bsc_id="17"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <bsc action="destroy" type="reply" self_id="42" bsc_id="17"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.021.xml b/scripts/left-right-protocol-samples/pdu.021.xml index b267db4e..757e80d1 100644 --- a/scripts/left-right-protocol-samples/pdu.021.xml +++ b/scripts/left-right-protocol-samples/pdu.021.xml @@ -1,7 +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" peer_contact="https://re.bar.example/bandicoot/" sia_base="rsync://repo.foo.example/wombat/" bsc_link="17" repository_link="120"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <parent action="create" type="query" 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> </parent> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.022.xml b/scripts/left-right-protocol-samples/pdu.022.xml index cb984560..8c0a8d7d 100644 --- a/scripts/left-right-protocol-samples/pdu.022.xml +++ b/scripts/left-right-protocol-samples/pdu.022.xml @@ -1,5 +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"> - <parent action="create" self_id="42" parent_id="666"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <parent action="create" type="reply" self_id="42" parent_id="666"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.023.xml b/scripts/left-right-protocol-samples/pdu.023.xml index d6db2e95..d7e1b7e9 100644 --- a/scripts/left-right-protocol-samples/pdu.023.xml +++ b/scripts/left-right-protocol-samples/pdu.023.xml @@ -1,7 +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" 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"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <parent action="set" type="query" 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> </parent> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.024.xml b/scripts/left-right-protocol-samples/pdu.024.xml index 4a452e7c..902e89ef 100644 --- a/scripts/left-right-protocol-samples/pdu.024.xml +++ b/scripts/left-right-protocol-samples/pdu.024.xml @@ -1,5 +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"> - <parent action="set" self_id="42" parent_id="666"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <parent action="set" type="reply" self_id="42" parent_id="666"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.025.xml b/scripts/left-right-protocol-samples/pdu.025.xml index ca5fc99b..51e077ba 100644 --- a/scripts/left-right-protocol-samples/pdu.025.xml +++ b/scripts/left-right-protocol-samples/pdu.025.xml @@ -1,5 +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"> - <parent action="get" self_id="42" parent_id="666"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <parent action="get" type="query" self_id="42" parent_id="666"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.026.xml b/scripts/left-right-protocol-samples/pdu.026.xml index 589cbc63..9e94a249 100644 --- a/scripts/left-right-protocol-samples/pdu.026.xml +++ b/scripts/left-right-protocol-samples/pdu.026.xml @@ -1,7 +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" peer_contact="https://re.bar.example/bandicoot/" sia_base="rsync://repo.foo.example/wombat/" bsc_link="17" repository_link="120"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <parent action="get" type="reply" 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> </parent> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.027.xml b/scripts/left-right-protocol-samples/pdu.027.xml index 31fd1552..6c417adb 100644 --- a/scripts/left-right-protocol-samples/pdu.027.xml +++ b/scripts/left-right-protocol-samples/pdu.027.xml @@ -1,5 +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"> - <parent action="list" self_id="42"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <parent action="list" type="query" self_id="42"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.028.xml b/scripts/left-right-protocol-samples/pdu.028.xml index 2430e1fb..63bcd565 100644 --- a/scripts/left-right-protocol-samples/pdu.028.xml +++ b/scripts/left-right-protocol-samples/pdu.028.xml @@ -1,7 +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" peer_contact="https://re.bar.example/bandicoot/" sia_base="rsync://repo.foo.example/wombat/" bsc_link="17" repository_link="120"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <parent action="list" type="reply" 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> </parent> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.029.xml b/scripts/left-right-protocol-samples/pdu.029.xml index 85b9a81e..2cb9dc8b 100644 --- a/scripts/left-right-protocol-samples/pdu.029.xml +++ b/scripts/left-right-protocol-samples/pdu.029.xml @@ -1,5 +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"> - <parent action="destroy" self_id="42" parent_id="666"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <parent action="destroy" type="query" self_id="42" parent_id="666"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.030.xml b/scripts/left-right-protocol-samples/pdu.030.xml index 2b3491d0..8e3d4c65 100644 --- a/scripts/left-right-protocol-samples/pdu.030.xml +++ b/scripts/left-right-protocol-samples/pdu.030.xml @@ -1,5 +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"> - <parent action="destroy" self_id="42" parent_id="666"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <parent action="destroy" type="reply" self_id="42" parent_id="666"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.031.xml b/scripts/left-right-protocol-samples/pdu.031.xml index 547eb8ca..47c3115f 100644 --- a/scripts/left-right-protocol-samples/pdu.031.xml +++ b/scripts/left-right-protocol-samples/pdu.031.xml @@ -1,7 +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" bsc_link="17" child_db_id="child_db_id"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <child action="create" type="query" self_id="42" bsc_link="17" child_db_id="child_db_id"> <peer_ta>cGVlcl90YQo=</peer_ta> </child> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.032.xml b/scripts/left-right-protocol-samples/pdu.032.xml index d249239a..f5b3dbe9 100644 --- a/scripts/left-right-protocol-samples/pdu.032.xml +++ b/scripts/left-right-protocol-samples/pdu.032.xml @@ -1,5 +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"> - <child action="create" self_id="42" child_id="3"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <child action="create" type="reply" self_id="42" child_id="3"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.033.xml b/scripts/left-right-protocol-samples/pdu.033.xml index 3894ee54..1d92776a 100644 --- a/scripts/left-right-protocol-samples/pdu.033.xml +++ b/scripts/left-right-protocol-samples/pdu.033.xml @@ -1,7 +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" bsc_link="17" child_db_id="child_db_id" reissue="yes"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <child action="set" type="query" self_id="42" child_id="3" bsc_link="17" child_db_id="child_db_id" reissue="yes"> <peer_ta>cGVlcl90YQo=</peer_ta> </child> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.034.xml b/scripts/left-right-protocol-samples/pdu.034.xml index 702f9058..f3332bb6 100644 --- a/scripts/left-right-protocol-samples/pdu.034.xml +++ b/scripts/left-right-protocol-samples/pdu.034.xml @@ -1,5 +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"> - <child action="set" self_id="42" child_id="3"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <child action="set" type="reply" self_id="42" child_id="3"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.035.xml b/scripts/left-right-protocol-samples/pdu.035.xml index b1e4c483..1fa3192c 100644 --- a/scripts/left-right-protocol-samples/pdu.035.xml +++ b/scripts/left-right-protocol-samples/pdu.035.xml @@ -1,5 +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"> - <child action="get" self_id="42" child_id="3"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <child action="get" type="query" self_id="42" child_id="3"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.036.xml b/scripts/left-right-protocol-samples/pdu.036.xml index 4603c071..d78979cf 100644 --- a/scripts/left-right-protocol-samples/pdu.036.xml +++ b/scripts/left-right-protocol-samples/pdu.036.xml @@ -1,7 +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" bsc_link="17" child_db_id="child_db_id"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <child action="get" type="reply" self_id="42" child_id="3" bsc_link="17" child_db_id="child_db_id"> <peer_ta>cGVlcl90YQo=</peer_ta> </child> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.037.xml b/scripts/left-right-protocol-samples/pdu.037.xml index 4dd4a4c5..fcfe3199 100644 --- a/scripts/left-right-protocol-samples/pdu.037.xml +++ b/scripts/left-right-protocol-samples/pdu.037.xml @@ -1,5 +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"> - <child action="list" self_id="42"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <child action="list" type="query" self_id="42"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.038.xml b/scripts/left-right-protocol-samples/pdu.038.xml index 12c84f1d..ef1cf53d 100644 --- a/scripts/left-right-protocol-samples/pdu.038.xml +++ b/scripts/left-right-protocol-samples/pdu.038.xml @@ -1,7 +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="list" self_id="42" child_id="3" bsc_link="17" child_db_id="child_db_id"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <child action="list" type="reply" self_id="42" child_id="3" bsc_link="17" child_db_id="child_db_id"> <peer_ta>cGVlcl90YQo=</peer_ta> </child> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.039.xml b/scripts/left-right-protocol-samples/pdu.039.xml index a4e9791d..dc4fb285 100644 --- a/scripts/left-right-protocol-samples/pdu.039.xml +++ b/scripts/left-right-protocol-samples/pdu.039.xml @@ -1,5 +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"> - <child action="destroy" self_id="42" child_id="3"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <child action="destroy" type="query" self_id="42" child_id="3"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.040.xml b/scripts/left-right-protocol-samples/pdu.040.xml index 7713f6c7..82f28511 100644 --- a/scripts/left-right-protocol-samples/pdu.040.xml +++ b/scripts/left-right-protocol-samples/pdu.040.xml @@ -1,5 +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"> - <child action="destroy" self_id="42" child_id="3"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <child action="destroy" type="reply" self_id="42" child_id="3"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.041.xml b/scripts/left-right-protocol-samples/pdu.041.xml index ed9d1656..b378a2f0 100644 --- a/scripts/left-right-protocol-samples/pdu.041.xml +++ b/scripts/left-right-protocol-samples/pdu.041.xml @@ -1,7 +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="https://re.bar.example/bandicoot/" bsc_link="17"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <repository action="create" type="query" self_id="42" peer_contact="https://re.bar.example/bandicoot/" bsc_link="17"> <peer_ta>cGVlcl90YQo=</peer_ta> </repository> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.042.xml b/scripts/left-right-protocol-samples/pdu.042.xml index 0c0eabed..e7398c7f 100644 --- a/scripts/left-right-protocol-samples/pdu.042.xml +++ b/scripts/left-right-protocol-samples/pdu.042.xml @@ -1,5 +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"> - <repository action="create" self_id="42" repository_id="120"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <repository action="create" type="reply" self_id="42" repository_id="120"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.043.xml b/scripts/left-right-protocol-samples/pdu.043.xml index 2475b409..d4645bb0 100644 --- a/scripts/left-right-protocol-samples/pdu.043.xml +++ b/scripts/left-right-protocol-samples/pdu.043.xml @@ -1,7 +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="https://re.bar.example/bandicoot/" bsc_link="17"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <repository action="set" type="query" self_id="42" repository_id="120" peer_contact="https://re.bar.example/bandicoot/" bsc_link="17"> <peer_ta>cGVlcl90YQo=</peer_ta> </repository> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.044.xml b/scripts/left-right-protocol-samples/pdu.044.xml index 15286500..d7506e3d 100644 --- a/scripts/left-right-protocol-samples/pdu.044.xml +++ b/scripts/left-right-protocol-samples/pdu.044.xml @@ -1,5 +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"> - <repository action="set" self_id="42" repository_id="120"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <repository action="set" type="reply" self_id="42" repository_id="120"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.045.xml b/scripts/left-right-protocol-samples/pdu.045.xml index 0b9f9c3d..78866dad 100644 --- a/scripts/left-right-protocol-samples/pdu.045.xml +++ b/scripts/left-right-protocol-samples/pdu.045.xml @@ -1,5 +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"> - <repository action="get" self_id="42" repository_id="120"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <repository action="get" type="query" self_id="42" repository_id="120"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.046.xml b/scripts/left-right-protocol-samples/pdu.046.xml index 85b45d3c..7b31bc61 100644 --- a/scripts/left-right-protocol-samples/pdu.046.xml +++ b/scripts/left-right-protocol-samples/pdu.046.xml @@ -1,7 +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="https://re.bar.example/bandicoot/" bsc_link="17"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <repository action="get" type="reply" self_id="42" repository_id="120" peer_contact="https://re.bar.example/bandicoot/" bsc_link="17"> <peer_ta>cGVlcl90YQo=</peer_ta> </repository> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.047.xml b/scripts/left-right-protocol-samples/pdu.047.xml index 57c1a9fa..5ca17d89 100644 --- a/scripts/left-right-protocol-samples/pdu.047.xml +++ b/scripts/left-right-protocol-samples/pdu.047.xml @@ -1,5 +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"> - <repository action="list" self_id="42"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <repository action="list" type="query" self_id="42"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.048.xml b/scripts/left-right-protocol-samples/pdu.048.xml index bf9aad50..0c3f2052 100644 --- a/scripts/left-right-protocol-samples/pdu.048.xml +++ b/scripts/left-right-protocol-samples/pdu.048.xml @@ -1,7 +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="https://re.bar.example/bandicoot/" bsc_link="17"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <repository action="list" type="reply" self_id="42" repository_id="120" peer_contact="https://re.bar.example/bandicoot/" bsc_link="17"> <peer_ta>cGVlcl90YQo=</peer_ta> </repository> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.049.xml b/scripts/left-right-protocol-samples/pdu.049.xml index 2afd38d4..b89ad078 100644 --- a/scripts/left-right-protocol-samples/pdu.049.xml +++ b/scripts/left-right-protocol-samples/pdu.049.xml @@ -1,5 +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"> - <repository action="destroy" self_id="42" repository_id="120"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <repository action="destroy" type="query" self_id="42" repository_id="120"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.050.xml b/scripts/left-right-protocol-samples/pdu.050.xml index c6f190f5..92f1ce11 100644 --- a/scripts/left-right-protocol-samples/pdu.050.xml +++ b/scripts/left-right-protocol-samples/pdu.050.xml @@ -1,5 +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"> - <repository action="destroy" self_id="42" repository_id="120"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <repository action="destroy" type="reply" self_id="42" repository_id="120"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.051.xml b/scripts/left-right-protocol-samples/pdu.051.xml index 88bc6456..afbbc82a 100644 --- a/scripts/left-right-protocol-samples/pdu.051.xml +++ b/scripts/left-right-protocol-samples/pdu.051.xml @@ -1,5 +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="create" self_id="42"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <route_origin action="create" type="query" self_id="42"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.052.xml b/scripts/left-right-protocol-samples/pdu.052.xml index 41d8c9d3..87ab3b1d 100644 --- a/scripts/left-right-protocol-samples/pdu.052.xml +++ b/scripts/left-right-protocol-samples/pdu.052.xml @@ -1,5 +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="create" self_id="42" route_origin_id="88"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <route_origin action="create" type="reply" self_id="42" route_origin_id="88"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.053.xml b/scripts/left-right-protocol-samples/pdu.053.xml index 17cfa222..e2dd6d6a 100644 --- a/scripts/left-right-protocol-samples/pdu.053.xml +++ b/scripts/left-right-protocol-samples/pdu.053.xml @@ -1,5 +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="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 xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <route_origin action="set" type="query" 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.054.xml b/scripts/left-right-protocol-samples/pdu.054.xml index e1aa65b6..263b189c 100644 --- a/scripts/left-right-protocol-samples/pdu.054.xml +++ b/scripts/left-right-protocol-samples/pdu.054.xml @@ -1,5 +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="set" self_id="42" route_origin_id="88"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <route_origin action="set" type="reply" self_id="42" route_origin_id="88"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.055.xml b/scripts/left-right-protocol-samples/pdu.055.xml index 2888ad13..44a6af0b 100644 --- a/scripts/left-right-protocol-samples/pdu.055.xml +++ b/scripts/left-right-protocol-samples/pdu.055.xml @@ -1,5 +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="get" self_id="42" route_origin_id="88"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <route_origin action="get" type="query" self_id="42" route_origin_id="88"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.056.xml b/scripts/left-right-protocol-samples/pdu.056.xml index 27f15914..fb88d50b 100644 --- a/scripts/left-right-protocol-samples/pdu.056.xml +++ b/scripts/left-right-protocol-samples/pdu.056.xml @@ -1,5 +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" 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 xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <route_origin action="get" type="reply" 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.057.xml b/scripts/left-right-protocol-samples/pdu.057.xml index a7c8a42c..3eaa4d01 100644 --- a/scripts/left-right-protocol-samples/pdu.057.xml +++ b/scripts/left-right-protocol-samples/pdu.057.xml @@ -1,5 +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="list" self_id="42"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <route_origin action="list" type="query" self_id="42"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.058.xml b/scripts/left-right-protocol-samples/pdu.058.xml index 43382d69..537f805f 100644 --- a/scripts/left-right-protocol-samples/pdu.058.xml +++ b/scripts/left-right-protocol-samples/pdu.058.xml @@ -1,5 +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" 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 xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <route_origin action="list" type="reply" 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.059.xml b/scripts/left-right-protocol-samples/pdu.059.xml index 3473ab10..1d352b83 100644 --- a/scripts/left-right-protocol-samples/pdu.059.xml +++ b/scripts/left-right-protocol-samples/pdu.059.xml @@ -1,5 +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="destroy" self_id="42" route_origin_id="88"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <route_origin action="destroy" type="query" self_id="42" route_origin_id="88"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.060.xml b/scripts/left-right-protocol-samples/pdu.060.xml index ccd179ce..5e651518 100644 --- a/scripts/left-right-protocol-samples/pdu.060.xml +++ b/scripts/left-right-protocol-samples/pdu.060.xml @@ -1,5 +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="destroy" self_id="42" route_origin_id="88"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <route_origin action="destroy" type="reply" self_id="42" route_origin_id="88"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.061.xml b/scripts/left-right-protocol-samples/pdu.061.xml index 53427454..569d908a 100644 --- a/scripts/left-right-protocol-samples/pdu.061.xml +++ b/scripts/left-right-protocol-samples/pdu.061.xml @@ -1,5 +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="data_request"> - <list_resources self_id="42" child_id="id"/> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <list_resources type="query" self_id="42" child_id="id"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.062.xml b/scripts/left-right-protocol-samples/pdu.062.xml index 8003dacc..cbbc9071 100644 --- a/scripts/left-right-protocol-samples/pdu.062.xml +++ b/scripts/left-right-protocol-samples/pdu.062.xml @@ -1,7 +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="data_response"> - <list_resources self_id="42" child_id="id" valid_until="2008_04_01T00:00:00Z"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> + <list_resources type="reply" self_id="42" child_id="id" valid_until="2008_04_01T00:00:00Z"> <resource_class ipv4="10.0.0.44/32,10.3.0.44/32" ipv6="fe80:dead:beef::/48" as="666"/> <resource_class subject_name="wombats are us" req_ipv4="10.0.0.0/8" ipv4="10.2.0.6/32" ipv6="fe80:deed:f00d::/48,fe80:dead:beef:2::-fe80:dead:beef:2::49" as="666"/> </list_resources> diff --git a/scripts/left-right-protocol-samples/pdu.063.xml b/scripts/left-right-protocol-samples/pdu.063.xml index 4dc3c24d..6b9f5cb2 100644 --- a/scripts/left-right-protocol-samples/pdu.063.xml +++ b/scripts/left-right-protocol-samples/pdu.063.xml @@ -1,5 +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="error"> +<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1"> <report_error self_id="42" error_code="your_hair_is_on_fire">bag_of_data</report_error> </msg> diff --git a/scripts/left-right-schema.rnc b/scripts/left-right-schema.rnc index 70df19f7..5b6779b1 100644 --- a/scripts/left-right-schema.rnc +++ b/scripts/left-right-schema.rnc @@ -10,14 +10,19 @@ grammar { start = element msg { attribute version { xsd:positiveInteger { maxInclusive="1" } }, - attribute type { "control_request" | "control_response" | "data_request" | "data_response" | "error" }, - \payload + ( self | bsc | \parent | child | repository | route_origin | list_resources | report_error )* } - \payload = ( \self | \bsc | \parent | \child | \repository | \route_origin | \list_resources | \report_error )* + action = attribute action { "create" | "set" | "get" | "list" | "destroy" } - \self = element self { - attribute action { xsd:token { maxLength="1024" } }, + type = attribute type { "query" | "reply" } + + base64 = xsd:base64Binary { maxLength="512000" } + + peer_ta = element peer_ta { base64 } + + self = element self { + action, type, attribute self_id { xsd:token { maxLength="1024" } }?, attribute rekey { "yes" }?, attribute reissue { "yes" }?, @@ -30,27 +35,21 @@ }* } - \bsc = element bsc { - attribute action { xsd:token { maxLength="1024" } }, + bsc = element bsc { + action, type, attribute self_id { xsd:token { maxLength="1024" } }, attribute bsc_id { xsd:token { maxLength="1024" } }?, attribute generate_keypair { "yes" }?, attribute key_type { xsd:token { maxLength="1024" } }?, attribute hash_alg { xsd:token { maxLength="1024" } }?, attribute key_length { xsd:token { maxLength="1024" } }?, - element signing_cert { - xsd:base64Binary { maxLength="512000" } - }*, - element pkcs10_cert_request { - xsd:base64Binary { maxLength="512000" } - }?, - element public_key { - xsd:base64Binary { maxLength="512000" } - }? + element signing_cert { base64 }*, + element pkcs10_cert_request { base64 }?, + element public_key { base64 }? } \parent = element parent { - attribute action { xsd:token { maxLength="1024" } }, + action, type, attribute self_id { xsd:token { maxLength="1024" } }, attribute parent_id { xsd:token { maxLength="1024" } }?, attribute peer_contact { xsd:anyURI { maxLength="1024" } }?, @@ -60,36 +59,30 @@ attribute rekey { "yes" }?, attribute reissue { "yes" }?, attribute revoke { "yes" }?, - element peer_ta { - xsd:base64Binary { maxLength="512000" } - }? + peer_ta? } - \child = element child { - attribute action { xsd:token { maxLength="1024" } }, + child = element child { + action, type, attribute self_id { xsd:token { maxLength="1024" } }, attribute child_id { xsd:token { maxLength="1024" } }?, attribute bsc_link { xsd:token { maxLength="1024" } }?, attribute child_db_id { xsd:token { maxLength="1024" } }?, attribute reissue { "yes" }?, - element peer_ta { - xsd:base64Binary { maxLength="512000" } - }? + peer_ta? } - \repository = element repository { - attribute action { xsd:token { maxLength="1024" } }, + repository = element repository { + action, type, attribute self_id { xsd:token { maxLength="1024" } }, attribute repository_id { xsd:token { maxLength="1024" } }?, attribute peer_contact { xsd:anyURI { maxLength="1024" } }?, attribute bsc_link { xsd:token { maxLength="1024" } }?, - element peer_ta { - xsd:base64Binary { maxLength="512000" } - }? + peer_ta? } - \route_origin = element route_origin { - attribute action { xsd:token { maxLength="1024" } }, + route_origin = element route_origin { + action, type, attribute self_id { xsd:token { maxLength="1024" } }, attribute route_origin_id { xsd:token { maxLength="1024" } }?, attribute suppress_publication { "yes" }?, @@ -98,7 +91,8 @@ attribute ipv6 { xsd:token { maxLength="1024" } }? } - \list_resources = element list_resources { + list_resources = element list_resources { + type, attribute self_id { xsd:token { maxLength="1024" } }, attribute child_id { xsd:token { maxLength="1024" } }?, attribute valid_until { xsd:token { maxLength="1024" } }?, @@ -113,7 +107,7 @@ }* } - \report_error = element report_error { + report_error = element report_error { attribute self_id { xsd:token { maxLength="1024" } }, attribute error_code { xsd:token { maxLength="1024" } }, xsd:string { maxLength="512000" } diff --git a/scripts/left-right-schema.rng b/scripts/left-right-schema.rng index 041e04b4..7456c806 100644 --- a/scripts/left-right-schema.rng +++ b/scripts/left-right-schema.rng @@ -15,39 +15,53 @@ <param name="maxInclusive">1</param> </data> </attribute> - <attribute name="type"> + <zeroOrMore> <choice> - <value>control_request</value> - <value>control_response</value> - <value>data_request</value> - <value>data_response</value> - <value>error</value> + <ref name="self"/> + <ref name="bsc"/> + <ref name="parent"/> + <ref name="child"/> + <ref name="repository"/> + <ref name="route_origin"/> + <ref name="list_resources"/> + <ref name="report_error"/> </choice> - </attribute> - <ref name="payload"/> + </zeroOrMore> </element> </start> - <define name="payload"> - <zeroOrMore> + <define name="action"> + <attribute name="action"> + <choice> + <value>create</value> + <value>set</value> + <value>get</value> + <value>list</value> + <value>destroy</value> + </choice> + </attribute> + </define> + <define name="type"> + <attribute name="type"> <choice> - <ref name="self"/> - <ref name="bsc"/> - <ref name="parent"/> - <ref name="child"/> - <ref name="repository"/> - <ref name="route_origin"/> - <ref name="list_resources"/> - <ref name="report_error"/> + <value>query</value> + <value>reply</value> </choice> - </zeroOrMore> + </attribute> + </define> + <define name="base64"> + <data type="base64Binary"> + <param name="maxLength">512000</param> + </data> + </define> + <define name="peer_ta"> + <element name="peer_ta"> + <ref name="base64"/> + </element> </define> <define name="self"> <element name="self"> - <attribute name="action"> - <data type="token"> - <param name="maxLength">1024</param> - </data> - </attribute> + <ref name="action"/> + <ref name="type"/> <optional> <attribute name="self_id"> <data type="token"> @@ -96,11 +110,8 @@ </define> <define name="bsc"> <element name="bsc"> - <attribute name="action"> - <data type="token"> - <param name="maxLength">1024</param> - </data> - </attribute> + <ref name="action"/> + <ref name="type"/> <attribute name="self_id"> <data type="token"> <param name="maxLength">1024</param> @@ -141,34 +152,25 @@ </optional> <zeroOrMore> <element name="signing_cert"> - <data type="base64Binary"> - <param name="maxLength">512000</param> - </data> + <ref name="base64"/> </element> </zeroOrMore> <optional> <element name="pkcs10_cert_request"> - <data type="base64Binary"> - <param name="maxLength">512000</param> - </data> + <ref name="base64"/> </element> </optional> <optional> <element name="public_key"> - <data type="base64Binary"> - <param name="maxLength">512000</param> - </data> + <ref name="base64"/> </element> </optional> </element> </define> <define name="parent"> <element name="parent"> - <attribute name="action"> - <data type="token"> - <param name="maxLength">1024</param> - </data> - </attribute> + <ref name="action"/> + <ref name="type"/> <attribute name="self_id"> <data type="token"> <param name="maxLength">1024</param> @@ -225,21 +227,14 @@ </attribute> </optional> <optional> - <element name="peer_ta"> - <data type="base64Binary"> - <param name="maxLength">512000</param> - </data> - </element> + <ref name="peer_ta"/> </optional> </element> </define> <define name="child"> <element name="child"> - <attribute name="action"> - <data type="token"> - <param name="maxLength">1024</param> - </data> - </attribute> + <ref name="action"/> + <ref name="type"/> <attribute name="self_id"> <data type="token"> <param name="maxLength">1024</param> @@ -272,21 +267,14 @@ </attribute> </optional> <optional> - <element name="peer_ta"> - <data type="base64Binary"> - <param name="maxLength">512000</param> - </data> - </element> + <ref name="peer_ta"/> </optional> </element> </define> <define name="repository"> <element name="repository"> - <attribute name="action"> - <data type="token"> - <param name="maxLength">1024</param> - </data> - </attribute> + <ref name="action"/> + <ref name="type"/> <attribute name="self_id"> <data type="token"> <param name="maxLength">1024</param> @@ -314,21 +302,14 @@ </attribute> </optional> <optional> - <element name="peer_ta"> - <data type="base64Binary"> - <param name="maxLength">512000</param> - </data> - </element> + <ref name="peer_ta"/> </optional> </element> </define> <define name="route_origin"> <element name="route_origin"> - <attribute name="action"> - <data type="token"> - <param name="maxLength">1024</param> - </data> - </attribute> + <ref name="action"/> + <ref name="type"/> <attribute name="self_id"> <data type="token"> <param name="maxLength">1024</param> @@ -371,6 +352,7 @@ </define> <define name="list_resources"> <element name="list_resources"> + <ref name="type"/> <attribute name="self_id"> <data type="token"> <param name="maxLength">1024</param> diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py index 9e345556..1b872e3f 100644 --- a/scripts/rpki/left_right.py +++ b/scripts/rpki/left_right.py @@ -2,9 +2,6 @@ import base64, sax_utils, resource_set -# This is still pretty nasty, feels much too complex for a relatively -# simple task. - class base_elt(object): """ Base type for left-right message elements. @@ -55,7 +52,7 @@ class extension_preference_elt(base_elt): class self_elt(base_elt): - attributes = ("action", "self_id") + attributes = ("action", "type", "self_id") booleans = ("rekey", "reissue", "revoke", "run_now", "publish_world_now") def __init__(self): @@ -83,7 +80,7 @@ class self_elt(base_elt): class bsc_elt(base_elt): - attributes = ("action", "self_id", "bsc_id", "key_type", "hash_alg", "key_length") + attributes = ("action", "type", "self_id", "bsc_id", "key_type", "hash_alg", "key_length") booleans = ("generate_keypair",) pkcs10_cert_request = None @@ -120,7 +117,7 @@ class bsc_elt(base_elt): class parent_elt(base_elt): - attributes = ("action", "self_id", "parent_id", "bsc_link", "repository_link", "peer_contact", "sia_base") + attributes = ("action", "type", "self_id", "parent_id", "bsc_link", "repository_link", "peer_contact", "sia_base") booleans = ("rekey", "reissue", "revoke") peer_ta = None @@ -145,7 +142,7 @@ class parent_elt(base_elt): class child_elt(base_elt): - attributes = ("action", "self_id", "child_id", "bsc_link", "child_db_id") + attributes = ("action", "type", "self_id", "child_id", "bsc_link", "child_db_id") booleans = ("reissue", ) peer_ta = None @@ -171,7 +168,7 @@ class child_elt(base_elt): class repository_elt(base_elt): - attributes = ("action", "self_id", "repository_id", "bsc_link", "peer_contact") + attributes = ("action", "type", "self_id", "repository_id", "bsc_link", "peer_contact") peer_ta = None @@ -195,7 +192,7 @@ class repository_elt(base_elt): class route_origin_elt(base_elt): - attributes = ("action", "self_id", "route_origin_id", "asn", "ipv4", "ipv6") + attributes = ("action", "type", "self_id", "route_origin_id", "asn", "ipv4", "ipv6") booleans = ("suppress_publication",) def startElement(self, stack, name, attrs): @@ -244,7 +241,7 @@ class resource_class_elt(base_elt): class list_resources_elt(base_elt): - attributes = ("self_id", "child_id", "valid_until") + attributes = ("type", "self_id", "child_id", "valid_until") def __init__(self): self.resources = [] @@ -287,7 +284,6 @@ class msg(list): def startElement(self, stack, name, attrs): if name == "msg": self.version = int(attrs["version"]) - self.type = attrs["type"] assert self.version == 1 else: elt = { @@ -311,10 +307,9 @@ class msg(list): def __str__(self): return ('<?xml version="1.0" encoding="US-ASCII" ?>\n' - '<msg xmlns="%s" version="%d" type="%s">\n' + '<msg xmlns="%s" version="%d">\n' '%s</msg>\n' - % (self.spec_uri, self.version, self.type, - "".join(map(str, self)))) + % (self.spec_uri, self.version, "".join(map(str, self)))) class sax_handler(sax_utils.handler): """ |