aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/left-right-xml32
-rw-r--r--scripts/left-right-protocol-samples/pdu.021.xml2
-rw-r--r--scripts/left-right-protocol-samples/pdu.023.xml2
-rw-r--r--scripts/left-right-protocol-samples/pdu.026.xml2
-rw-r--r--scripts/left-right-protocol-samples/pdu.028.xml2
-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-protocol-samples/pdu.041.xml2
-rw-r--r--scripts/left-right-protocol-samples/pdu.043.xml2
-rw-r--r--scripts/left-right-protocol-samples/pdu.046.xml2
-rw-r--r--scripts/left-right-protocol-samples/pdu.048.xml2
-rw-r--r--scripts/left-right-schema.rnc8
-rw-r--r--scripts/left-right-schema.rng8
-rw-r--r--scripts/rpki/left_right.py26
16 files changed, 49 insertions, 49 deletions
diff --git a/docs/left-right-xml b/docs/left-right-xml
index efe98915..e4aeb073 100644
--- a/docs/left-right-xml
+++ b/docs/left-right-xml
@@ -259,8 +259,8 @@
<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">
+ bsc_id="17"
+ repository_id="120">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
@@ -291,8 +291,8 @@
<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"
+ bsc_id="17"
+ repository_id="120"
rekey="yes"
reissue="yes"
revoke="yes">
@@ -330,8 +330,8 @@
<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">
+ bsc_id="17"
+ repository_id="120">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
@@ -362,8 +362,8 @@
<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">
+ bsc_id="17"
+ repository_id="120">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
@@ -398,7 +398,7 @@
<msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
<child action="create" type="query" self_id="42"
- bsc_link="17"
+ bsc_id="17"
child_db_id="child_db_id">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
@@ -428,7 +428,7 @@
<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"
+ bsc_id="17"
child_db_id="child_db_id"
reissue="yes">
<peer_ta>
@@ -463,7 +463,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_link="17"
+ bsc_id="17"
child_db_id="child_db_id">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
@@ -493,7 +493,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_link="17"
+ bsc_id="17"
child_db_id="child_db_id">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
@@ -530,7 +530,7 @@
<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">
+ bsc_id="17">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
@@ -560,7 +560,7 @@
<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">
+ bsc_id="17">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
@@ -594,7 +594,7 @@
<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">
+ bsc_id="17">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
@@ -624,7 +624,7 @@
<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">
+ bsc_id="17">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-protocol-samples/pdu.021.xml b/scripts/left-right-protocol-samples/pdu.021.xml
index e19ff512..07d6eb76 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">
- <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">
+ <parent action="create" type="query" self_id="42" peer_contact="https://re.bar.example/bandicoot/" sia_base="rsync://repo.foo.example/wombat/" bsc_id="17" repository_id="120">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-protocol-samples/pdu.023.xml b/scripts/left-right-protocol-samples/pdu.023.xml
index 8579fd35..3adab3d6 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">
- <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">
+ <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_id="17" repository_id="120" rekey="yes" reissue="yes" revoke="yes">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-protocol-samples/pdu.026.xml b/scripts/left-right-protocol-samples/pdu.026.xml
index 71284b3a..471dfb1f 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">
- <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">
+ <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_id="17" repository_id="120">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-protocol-samples/pdu.028.xml b/scripts/left-right-protocol-samples/pdu.028.xml
index e12db9cd..bcc4bb0d 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">
- <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">
+ <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_id="17" repository_id="120">
<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 7f9f5e2d..fd56a6d8 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_link="17" child_db_id="child_db_id">
+ <child action="create" type="query" self_id="42" bsc_id="17" child_db_id="child_db_id">
<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 c74604ba..c3e373e1 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_link="17" child_db_id="child_db_id" reissue="yes">
+ <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
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-protocol-samples/pdu.036.xml b/scripts/left-right-protocol-samples/pdu.036.xml
index 09c4873c..35240faf 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_link="17" child_db_id="child_db_id">
+ <child action="get" type="reply" self_id="42" child_id="3" bsc_id="17" child_db_id="child_db_id">
<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 7df0d35e..1bb5f882 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_link="17" child_db_id="child_db_id">
+ <child action="list" type="reply" self_id="42" child_id="3" bsc_id="17" child_db_id="child_db_id">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-protocol-samples/pdu.041.xml b/scripts/left-right-protocol-samples/pdu.041.xml
index d3c5ac88..c2ece7f5 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">
- <repository action="create" type="query" self_id="42" peer_contact="https://re.bar.example/bandicoot/" bsc_link="17">
+ <repository action="create" type="query" self_id="42" peer_contact="https://re.bar.example/bandicoot/" bsc_id="17">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-protocol-samples/pdu.043.xml b/scripts/left-right-protocol-samples/pdu.043.xml
index 3d40de3a..c74b8aa6 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">
- <repository action="set" type="query" self_id="42" repository_id="120" peer_contact="https://re.bar.example/bandicoot/" bsc_link="17">
+ <repository action="set" type="query" self_id="42" repository_id="120" peer_contact="https://re.bar.example/bandicoot/" bsc_id="17">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-protocol-samples/pdu.046.xml b/scripts/left-right-protocol-samples/pdu.046.xml
index a19bf238..48ba58f6 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">
- <repository action="get" type="reply" self_id="42" repository_id="120" peer_contact="https://re.bar.example/bandicoot/" bsc_link="17">
+ <repository action="get" type="reply" self_id="42" repository_id="120" peer_contact="https://re.bar.example/bandicoot/" bsc_id="17">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-protocol-samples/pdu.048.xml b/scripts/left-right-protocol-samples/pdu.048.xml
index 70b3998d..339755f8 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">
- <repository action="list" type="reply" self_id="42" repository_id="120" peer_contact="https://re.bar.example/bandicoot/" bsc_link="17">
+ <repository action="list" type="reply" self_id="42" repository_id="120" peer_contact="https://re.bar.example/bandicoot/" bsc_id="17">
<peer_ta>
MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
diff --git a/scripts/left-right-schema.rnc b/scripts/left-right-schema.rnc
index 6cc222c7..bb86c766 100644
--- a/scripts/left-right-schema.rnc
+++ b/scripts/left-right-schema.rnc
@@ -99,8 +99,8 @@ parent_bool = (attribute rekey { "yes" }?,
parent_payload = (attribute peer_contact { xsd:anyURI { maxLength="1024" } }?,
attribute sia_base { xsd:anyURI { maxLength="1024" } }?,
- attribute bsc_link { xsd:token { maxLength="1024" } }?,
- attribute repository_link { xsd:token { maxLength="1024" } }?,
+ attribute bsc_id { xsd:token { maxLength="1024" } }?,
+ attribute repository_id { xsd:token { maxLength="1024" } }?,
peer_ta?)
parent_elt |= element parent { ctl_cq, self_id, parent_bool, parent_payload }
@@ -120,7 +120,7 @@ child_id = attribute child_id { sql_id }
child_bool = attribute reissue { "yes" }?
-child_payload = (attribute bsc_link { xsd:token { maxLength="1024" } }?,
+child_payload = (attribute bsc_id { xsd:token { maxLength="1024" } }?,
attribute child_db_id { xsd:token { maxLength="1024" } }?,
peer_ta?)
@@ -140,7 +140,7 @@ child_elt |= element child { ctl_dr, self_id, child_id }
repository_id = attribute repository_id { sql_id }
repository_payload = (attribute peer_contact { xsd:anyURI { maxLength="1024" } }?,
- attribute bsc_link { xsd:token { maxLength="1024" } }?,
+ attribute bsc_id { xsd:token { maxLength="1024" } }?,
peer_ta?)
repository_elt |= element repository { ctl_cq, self_id, repository_payload }
diff --git a/scripts/left-right-schema.rng b/scripts/left-right-schema.rng
index a0d826a3..39c6e365 100644
--- a/scripts/left-right-schema.rng
+++ b/scripts/left-right-schema.rng
@@ -411,14 +411,14 @@
</attribute>
</optional>
<optional>
- <attribute name="bsc_link">
+ <attribute name="bsc_id">
<data type="token">
<param name="maxLength">1024</param>
</data>
</attribute>
</optional>
<optional>
- <attribute name="repository_link">
+ <attribute name="repository_id">
<data type="token">
<param name="maxLength">1024</param>
</data>
@@ -517,7 +517,7 @@
</define>
<define name="child_payload">
<optional>
- <attribute name="bsc_link">
+ <attribute name="bsc_id">
<data type="token">
<param name="maxLength">1024</param>
</data>
@@ -623,7 +623,7 @@
</attribute>
</optional>
<optional>
- <attribute name="bsc_link">
+ <attribute name="bsc_id">
<data type="token">
<param name="maxLength">1024</param>
</data>
diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py
index b60a27a8..3da5b453 100644
--- a/scripts/rpki/left_right.py
+++ b/scripts/rpki/left_right.py
@@ -149,23 +149,23 @@ class parent_elt(data_elt):
"""<parent/> element."""
element_name = "parent"
- attributes = ("action", "type", "self_id", "parent_id", "bsc_link", "repository_link", "peer_contact", "sia_base")
+ attributes = ("action", "type", "self_id", "parent_id", "bsc_id", "repository_id", "peer_contact", "sia_base")
booleans = ("rekey", "reissue", "revoke")
sql_template = rpki.sql.template("parent", "parent_id", "self_id", "bsc_id", "repos_id", "ta", "uri", "sia_base")
def sql_decode(self, vals):
- self.self_id = vals["self_id"]
- self.bsc_link = vals["bsc_id"]
- self.repository_link = vals["repos_id"]
- self.parent_id = vals["parent_id"]
- self.peer_contact = vals["uri"]
- self.peer_ta = rpki.x509.X509(DER=vals["ta"])
+ self.self_id = vals["self_id"]
+ self.bsc_id = vals["bsc_id"]
+ self.repository_id = vals["repos_id"]
+ self.parent_id = vals["parent_id"]
+ self.peer_contact = vals["uri"]
+ self.peer_ta = rpki.x509.X509(DER=vals["ta"])
def sql_encode(self):
return { "self_id" : self.self_id,
- "bsc_id" : self.bsc_link,
- "repos_id" : self.repository_link,
+ "bsc_id" : self.bsc_id,
+ "repos_id" : self.repository_id,
"parent_id" : self.parent_id,
"uri" : self.peer_contact,
"ta" : self.peer_ta.get_DER(),
@@ -198,14 +198,14 @@ class child_elt(data_elt):
"""<child/> element."""
element_name = "child"
- attributes = ("action", "type", "self_id", "child_id", "bsc_link", "child_db_id")
+ attributes = ("action", "type", "self_id", "child_id", "bsc_id", "child_db_id")
booleans = ("reissue", )
sql_template = rpki.sql.template("child", "child_id", "self_id", "bsc_id", "ta")
def sql_decode(self, vals):
self.self_id = vals["self_id"]
- self.bsc_link = vals["bsc_id"]
+ self.bsc_id = vals["bsc_id"]
self.child_id = vals["child_id"]
self.peer_ta = rpki.x509.X509(DER=vals["ta"])
@@ -270,13 +270,13 @@ class repository_elt(data_elt):
"""<repository/> element."""
element_name = "repository"
- attributes = ("action", "type", "self_id", "repository_id", "bsc_link", "peer_contact")
+ attributes = ("action", "type", "self_id", "repository_id", "bsc_id", "peer_contact")
sql_template = rpki.sql.template("repository", "repos_id", "self_id", "bsc_id", "ta", "uri")
def sql_decode(self, vals):
self.self_id = vals["self_id"]
- self.bsc_link = vals["bsc_id"]
+ self.bsc_id = vals["bsc_id"]
self.repository_id = vals["repos_id"]
self.peer_contact = vals["uri"]
self.peer_ta = rpki.x509.X509(DER=vals["ta"])
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-13 17:15:26 +0000