aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/left-right-xml10
-rw-r--r--scripts/left-right-protocol-samples/pdu.031.xml2
-rw-r--r--scripts/left-right-protocol-samples/pdu.033.xml2
-rw-r--r--scripts/left-right-protocol-samples/pdu.036.xml2
-rw-r--r--scripts/left-right-protocol-samples/pdu.038.xml2
-rw-r--r--scripts/left-right-schema.rnc1
-rw-r--r--scripts/left-right-schema.rng7
-rw-r--r--scripts/rpki/left_right.py2
8 files changed, 8 insertions, 20 deletions
diff --git a/docs/left-right-xml b/docs/left-right-xml
index 99c743d3..4d9c9ed8 100644
--- a/docs/left-right-xml
+++ b/docs/left-right-xml
@@ -398,8 +398,7 @@
<msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
<child action="create" type="query" self_id="42"
- bsc_id="17"
- child_db_id="child_db_id">
+ bsc_id="17">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
@@ -429,7 +428,6 @@
<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_id="17"
- child_db_id="child_db_id"
reissue="yes">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
@@ -463,8 +461,7 @@
<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_id="17"
- child_db_id="child_db_id">
+ bsc_id="17">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
@@ -493,8 +490,7 @@
<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_id="17"
- child_db_id="child_db_id">
+ bsc_id="17">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-protocol-samples/pdu.031.xml b/scripts/left-right-protocol-samples/pdu.031.xml
index fd56a6d8..87f97c8b 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">
- <child action="create" type="query" self_id="42" bsc_id="17" child_db_id="child_db_id">
+ <child action="create" type="query" self_id="42" bsc_id="17">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-protocol-samples/pdu.033.xml b/scripts/left-right-protocol-samples/pdu.033.xml
index c3e373e1..a3120e2b 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">
- <child action="set" type="query" self_id="42" child_id="3" bsc_id="17" child_db_id="child_db_id" reissue="yes">
+ <child action="set" type="query" self_id="42" child_id="3" bsc_id="17" reissue="yes">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-protocol-samples/pdu.036.xml b/scripts/left-right-protocol-samples/pdu.036.xml
index 35240faf..905c7bef 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">
- <child action="get" type="reply" self_id="42" child_id="3" bsc_id="17" child_db_id="child_db_id">
+ <child action="get" type="reply" self_id="42" child_id="3" bsc_id="17">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-protocol-samples/pdu.038.xml b/scripts/left-right-protocol-samples/pdu.038.xml
index 1bb5f882..bd451feb 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">
- <child action="list" type="reply" self_id="42" child_id="3" bsc_id="17" child_db_id="child_db_id">
+ <child action="list" type="reply" self_id="42" child_id="3" bsc_id="17">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-schema.rnc b/scripts/left-right-schema.rnc
index 7b3ab24f..afc843c0 100644
--- a/scripts/left-right-schema.rnc
+++ b/scripts/left-right-schema.rnc
@@ -121,7 +121,6 @@ child_id = attribute child_id { sql_id }
child_bool = attribute reissue { "yes" }?
child_payload = (attribute bsc_id { xsd:token { maxLength="1024" } }?,
- attribute child_db_id { xsd:token { maxLength="1024" } }?,
peer_ta?)
child_elt |= element child { ctl_cq, self_id, child_bool, child_payload }
diff --git a/scripts/left-right-schema.rng b/scripts/left-right-schema.rng
index b794e5ea..87182778 100644
--- a/scripts/left-right-schema.rng
+++ b/scripts/left-right-schema.rng
@@ -524,13 +524,6 @@
</attribute>
</optional>
<optional>
- <attribute name="child_db_id">
- <data type="token">
- <param name="maxLength">1024</param>
- </data>
- </attribute>
- </optional>
- <optional>
<ref name="peer_ta"/>
</optional>
</define>
diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py
index bc04868c..18923b3a 100644
--- a/scripts/rpki/left_right.py
+++ b/scripts/rpki/left_right.py
@@ -187,7 +187,7 @@ class child_elt(data_elt):
"""<child/> element."""
element_name = "child"
- attributes = ("action", "type", "self_id", "child_id", "bsc_id", "child_db_id")
+ attributes = ("action", "type", "self_id", "child_id", "bsc_id")
booleans = ("reissue", )
sql_template = rpki.sql.template("child", "child_id", "self_id", "bsc_id", "peer_ta")