Change <self/> (etc) to <tenant/> (etc). "self" always was a really

bad choice for something implemented in Python, holdover from an older
specification, but Django ORM's troubles with "self" as a keyword
argument were the last straw.  Enough already.  Backwards
compatability should be a straightforward data migration.

svn path=/branches/tk705/; revision=6134

2 files changed, 176 insertions, 176 deletions

diff --git a/schemas/relaxng/left-right.rnc b/schemas/relaxng/left-right.rnc
index b5ab56a7..91e3be28 100644
--- a/schemas/relaxng/left-right.rnc
+++ b/schemas/relaxng/left-right.rnc
@@ -32,7 +32,7 @@ start = element msg {
 }
 
 # PDUs allowed in a query
-query_elt |= self_query
+query_elt |= tenant_query
 query_elt |= bsc_query
 query_elt |= parent_query
 query_elt |= child_query
@@ -45,7 +45,7 @@ query_elt |= list_published_objects_query
 query_elt |= list_received_resources_query
 
 # PDUs allowed in a reply
-reply_elt |= self_reply
+reply_elt |= tenant_reply
 reply_elt |= bsc_reply
 reply_elt |= parent_reply
 reply_elt |= child_reply
@@ -92,34 +92,34 @@ asn_list  = xsd:string { maxLength="512000" pattern="[\-,0-9]*" }
 ipv4_list = xsd:string { maxLength="512000" pattern="[\-,0-9/.]*" }
 ipv6_list = xsd:string { maxLength="512000" pattern="[\-,0-9/:a-fA-F]*" }
 
-# <self/> element
+# <tenant/> element
 
-self_bool = (attribute rekey { "yes" }?,
-             attribute reissue { "yes" }?,
-             attribute revoke { "yes" }?,
-             attribute run_now { "yes" }?,
-             attribute publish_world_now { "yes" }?,
-             attribute revoke_forgotten { "yes" }?,
-             attribute clear_replay_protection { "yes" }?)
+tenant_bool = (attribute rekey { "yes" }?,
+               attribute reissue { "yes" }?,
+               attribute revoke { "yes" }?,
+               attribute run_now { "yes" }?,
+               attribute publish_world_now { "yes" }?,
+               attribute revoke_forgotten { "yes" }?,
+               attribute clear_replay_protection { "yes" }?)
+
+tenant_payload = (attribute use_hsm { "yes" | "no" }?,
+                  attribute crl_interval { xsd:positiveInteger }?,
+                  attribute regen_margin { xsd:positiveInteger }?,
+                  element bpki_cert { base64 }?,
+                  element bpki_glue { base64 }?)
+
+tenant_handle = attribute tenant_handle { object_handle }
 
-self_payload = (attribute use_hsm { "yes" | "no" }?,
-                attribute crl_interval { xsd:positiveInteger }?,
-                attribute regen_margin { xsd:positiveInteger }?,
-                element bpki_cert { base64 }?,
-                element bpki_glue { base64 }?)
-
-self_handle = attribute self_handle { object_handle }
-
-self_query |= element self { ctl_create,  self_handle, self_bool, self_payload }
-self_reply |= element self { ctl_create,  self_handle }
-self_query |= element self { ctl_set,     self_handle, self_bool, self_payload }
-self_reply |= element self { ctl_set,     self_handle }
-self_query |= element self { ctl_get,     self_handle }
-self_reply |= element self { ctl_get,     self_handle, self_payload }
-self_query |= element self { ctl_list }
-self_reply |= element self { ctl_list,    self_handle, self_payload }
-self_query |= element self { ctl_destroy, self_handle }
-self_reply |= element self { ctl_destroy, self_handle }
+tenant_query |= element tenant { ctl_create,  tenant_handle, tenant_bool, tenant_payload }
+tenant_reply |= element tenant { ctl_create,  tenant_handle }
+tenant_query |= element tenant { ctl_set,     tenant_handle, tenant_bool, tenant_payload }
+tenant_reply |= element tenant { ctl_set,     tenant_handle }
+tenant_query |= element tenant { ctl_get,     tenant_handle }
+tenant_reply |= element tenant { ctl_get,     tenant_handle, tenant_payload }
+tenant_query |= element tenant { ctl_list }
+tenant_reply |= element tenant { ctl_list,    tenant_handle, tenant_payload }
+tenant_query |= element tenant { ctl_destroy, tenant_handle }
+tenant_reply |= element tenant { ctl_destroy, tenant_handle }
 
 # <bsc/> element.  Key parameters hardwired for now.
 
@@ -135,16 +135,16 @@ bsc_payload = (element signing_cert { base64 }?,
 
 bsc_readonly = element pkcs10_request { base64 }?
 
-bsc_query |= element bsc { ctl_create,  self_handle, bsc_handle, bsc_bool, bsc_payload }
-bsc_reply |= element bsc { ctl_create,  self_handle, bsc_handle, bsc_readonly }
-bsc_query |= element bsc { ctl_set,     self_handle, bsc_handle, bsc_bool, bsc_payload }
-bsc_reply |= element bsc { ctl_set,     self_handle, bsc_handle, bsc_readonly }
-bsc_query |= element bsc { ctl_get,     self_handle, bsc_handle }
-bsc_reply |= element bsc { ctl_get,     self_handle, bsc_handle, bsc_payload, bsc_readonly }
-bsc_query |= element bsc { ctl_list,    self_handle }
-bsc_reply |= element bsc { ctl_list,    self_handle, bsc_handle, bsc_payload, bsc_readonly }
-bsc_query |= element bsc { ctl_destroy, self_handle, bsc_handle }
-bsc_reply |= element bsc { ctl_destroy, self_handle, bsc_handle }
+bsc_query |= element bsc { ctl_create,  tenant_handle, bsc_handle, bsc_bool, bsc_payload }
+bsc_reply |= element bsc { ctl_create,  tenant_handle, bsc_handle, bsc_readonly }
+bsc_query |= element bsc { ctl_set,     tenant_handle, bsc_handle, bsc_bool, bsc_payload }
+bsc_reply |= element bsc { ctl_set,     tenant_handle, bsc_handle, bsc_readonly }
+bsc_query |= element bsc { ctl_get,     tenant_handle, bsc_handle }
+bsc_reply |= element bsc { ctl_get,     tenant_handle, bsc_handle, bsc_payload, bsc_readonly }
+bsc_query |= element bsc { ctl_list,    tenant_handle }
+bsc_reply |= element bsc { ctl_list,    tenant_handle, bsc_handle, bsc_payload, bsc_readonly }
+bsc_query |= element bsc { ctl_destroy, tenant_handle, bsc_handle }
+bsc_reply |= element bsc { ctl_destroy, tenant_handle, bsc_handle }
 
 # <parent/> element
 
@@ -165,16 +165,16 @@ parent_payload = (attribute peer_contact_uri { uri }?,
                   element bpki_cert { base64 }?,
                   element bpki_glue { base64 }?)
 
-parent_query |= element parent { ctl_create,  self_handle, parent_handle, parent_bool, parent_payload }
-parent_reply |= element parent { ctl_create,  self_handle, parent_handle }
-parent_query |= element parent { ctl_set,     self_handle, parent_handle, parent_bool, parent_payload }
-parent_reply |= element parent { ctl_set,     self_handle, parent_handle }
-parent_query |= element parent { ctl_get,     self_handle, parent_handle }
-parent_reply |= element parent { ctl_get,     self_handle, parent_handle, parent_payload }
-parent_query |= element parent { ctl_list,    self_handle }
-parent_reply |= element parent { ctl_list,    self_handle, parent_handle, parent_payload }
-parent_query |= element parent { ctl_destroy, self_handle, parent_handle }
-parent_reply |= element parent { ctl_destroy, self_handle, parent_handle }
+parent_query |= element parent { ctl_create,  tenant_handle, parent_handle, parent_bool, parent_payload }
+parent_reply |= element parent { ctl_create,  tenant_handle, parent_handle }
+parent_query |= element parent { ctl_set,     tenant_handle, parent_handle, parent_bool, parent_payload }
+parent_reply |= element parent { ctl_set,     tenant_handle, parent_handle }
+parent_query |= element parent { ctl_get,     tenant_handle, parent_handle }
+parent_reply |= element parent { ctl_get,     tenant_handle, parent_handle, parent_payload }
+parent_query |= element parent { ctl_list,    tenant_handle }
+parent_reply |= element parent { ctl_list,    tenant_handle, parent_handle, parent_payload }
+parent_query |= element parent { ctl_destroy, tenant_handle, parent_handle }
+parent_reply |= element parent { ctl_destroy, tenant_handle, parent_handle }
 
 # <child/> element
 
@@ -187,16 +187,16 @@ child_payload = (bsc_handle?,
                  element bpki_cert { base64 }?,
                  element bpki_glue { base64 }?)
 
-child_query |= element child { ctl_create,  self_handle, child_handle, child_bool, child_payload }
-child_reply |= element child { ctl_create,  self_handle, child_handle }
-child_query |= element child { ctl_set,     self_handle, child_handle, child_bool, child_payload }
-child_reply |= element child { ctl_set,     self_handle, child_handle }
-child_query |= element child { ctl_get,     self_handle, child_handle }
-child_reply |= element child { ctl_get,     self_handle, child_handle, child_payload }
-child_query |= element child { ctl_list,    self_handle }
-child_reply |= element child { ctl_list,    self_handle, child_handle, child_payload }
-child_query |= element child { ctl_destroy, self_handle, child_handle }
-child_reply |= element child { ctl_destroy, self_handle, child_handle }
+child_query |= element child { ctl_create,  tenant_handle, child_handle, child_bool, child_payload }
+child_reply |= element child { ctl_create,  tenant_handle, child_handle }
+child_query |= element child { ctl_set,     tenant_handle, child_handle, child_bool, child_payload }
+child_reply |= element child { ctl_set,     tenant_handle, child_handle }
+child_query |= element child { ctl_get,     tenant_handle, child_handle }
+child_reply |= element child { ctl_get,     tenant_handle, child_handle, child_payload }
+child_query |= element child { ctl_list,    tenant_handle }
+child_reply |= element child { ctl_list,    tenant_handle, child_handle, child_payload }
+child_query |= element child { ctl_destroy, tenant_handle, child_handle }
+child_reply |= element child { ctl_destroy, tenant_handle, child_handle }
 
 # <repository/> element
 
@@ -210,25 +210,25 @@ repository_payload = (attribute peer_contact_uri { uri }?,
                       element bpki_cert { base64 }?,
                       element bpki_glue { base64 }?)
 
-repository_query |= element repository { ctl_create,  self_handle, repository_handle, repository_bool, repository_payload }
-repository_reply |= element repository { ctl_create,  self_handle, repository_handle }
-repository_query |= element repository { ctl_set,     self_handle, repository_handle, repository_bool, repository_payload }
-repository_reply |= element repository { ctl_set,     self_handle, repository_handle }
-repository_query |= element repository { ctl_get,     self_handle, repository_handle }
-repository_reply |= element repository { ctl_get,     self_handle, repository_handle, repository_payload }
-repository_query |= element repository { ctl_list,    self_handle }
-repository_reply |= element repository { ctl_list,    self_handle, repository_handle, repository_payload }
-repository_query |= element repository { ctl_destroy, self_handle, repository_handle }
-repository_reply |= element repository { ctl_destroy, self_handle, repository_handle }
+repository_query |= element repository { ctl_create,  tenant_handle, repository_handle, repository_bool, repository_payload }
+repository_reply |= element repository { ctl_create,  tenant_handle, repository_handle }
+repository_query |= element repository { ctl_set,     tenant_handle, repository_handle, repository_bool, repository_payload }
+repository_reply |= element repository { ctl_set,     tenant_handle, repository_handle }
+repository_query |= element repository { ctl_get,     tenant_handle, repository_handle }
+repository_reply |= element repository { ctl_get,     tenant_handle, repository_handle, repository_payload }
+repository_query |= element repository { ctl_list,    tenant_handle }
+repository_reply |= element repository { ctl_list,    tenant_handle, repository_handle, repository_payload }
+repository_query |= element repository { ctl_destroy, tenant_handle, repository_handle }
+repository_reply |= element repository { ctl_destroy, tenant_handle, repository_handle }
 
 # <list_resources/> element
 
 list_resources_query = element list_resources {
-  tag, self_handle, child_handle
+  tag, tenant_handle, child_handle
 }
 
 list_resources_reply = element list_resources {
-  tag, self_handle, child_handle,
+  tag, tenant_handle, child_handle,
   attribute valid_until { xsd:dateTime { pattern=".*Z" } },
   attribute asn { asn_list }?,
   attribute ipv4 { ipv4_list }?,
@@ -238,11 +238,11 @@ list_resources_reply = element list_resources {
 # <list_roa_requests/> element
 
 list_roa_requests_query = element list_roa_requests {
-  tag, self_handle
+  tag, tenant_handle
 }
 
 list_roa_requests_reply = element list_roa_requests {
-  tag, self_handle,
+  tag, tenant_handle,
   attribute asn { xsd:nonNegativeInteger },
   attribute ipv4 { ipv4_list }?,
   attribute ipv6 { ipv6_list }?
@@ -251,22 +251,22 @@ list_roa_requests_reply = element list_roa_requests {
 # <list_ghostbuster_requests/> element
 
 list_ghostbuster_requests_query = element list_ghostbuster_requests {
-  tag, self_handle, parent_handle
+  tag, tenant_handle, parent_handle
 }
 
 list_ghostbuster_requests_reply = element list_ghostbuster_requests {
-  tag, self_handle, parent_handle,
+  tag, tenant_handle, parent_handle,
   xsd:string
 }
 
 # <list_ee_certificate_requests/> element
 
 list_ee_certificate_requests_query = element list_ee_certificate_requests {
-  tag, self_handle
+  tag, tenant_handle
 }
 
 list_ee_certificate_requests_reply = element list_ee_certificate_requests {
-  tag, self_handle,
+  tag, tenant_handle,
   attribute gski { xsd:token { minLength="27" maxLength="27" } },
   attribute valid_until { xsd:dateTime { pattern=".*Z" } },
   attribute asn  { asn_list }?,
@@ -281,11 +281,11 @@ list_ee_certificate_requests_reply = element list_ee_certificate_requests {
 # <list_published_objects/> element
 
 list_published_objects_query = element list_published_objects {
-  tag, self_handle
+  tag, tenant_handle
 }
 
 list_published_objects_reply = element list_published_objects {
-  tag, self_handle,
+  tag, tenant_handle,
   attribute uri { uri },
   attribute child_handle { object_handle }?,
   base64
@@ -294,11 +294,11 @@ list_published_objects_reply = element list_published_objects {
 # <list_received_resources/> element
 
 list_received_resources_query = element list_received_resources {
-  tag, self_handle
+  tag, tenant_handle
 }
 
 list_received_resources_reply = element list_received_resources {
-  tag, self_handle, parent_handle,
+  tag, tenant_handle, parent_handle,
   attribute notBefore { xsd:dateTime { pattern=".*Z" } },
   attribute notAfter { xsd:dateTime { pattern=".*Z" } },
   attribute uri { uri },
@@ -314,7 +314,7 @@ list_received_resources_reply = element list_received_resources {
 error = xsd:token { maxLength="1024" }
 
 report_error_reply = element report_error {
-  tag, self_handle?,
+  tag, tenant_handle?,
   attribute error_code { error },
   xsd:string { maxLength="512000" }?
 }
diff --git a/schemas/relaxng/left-right.rng b/schemas/relaxng/left-right.rng
index c8864caf..c5e8c127 100644
--- a/schemas/relaxng/left-right.rng
+++ b/schemas/relaxng/left-right.rng
@@ -55,7 +55,7 @@
   </start>
   <!-- PDUs allowed in a query -->
   <define name="query_elt" combine="choice">
-    <ref name="self_query"/>
+    <ref name="tenant_query"/>
   </define>
   <define name="query_elt" combine="choice">
     <ref name="bsc_query"/>
@@ -89,7 +89,7 @@
   </define>
   <!-- PDUs allowed in a reply -->
   <define name="reply_elt" combine="choice">
-    <ref name="self_reply"/>
+    <ref name="tenant_reply"/>
   </define>
   <define name="reply_elt" combine="choice">
     <ref name="bsc_reply"/>
@@ -221,8 +221,8 @@
       <param name="pattern">[\-,0-9/:a-fA-F]*</param>
     </data>
   </define>
-  <!-- <self/> element -->
-  <define name="self_bool">
+  <!-- <tenant/> element -->
+  <define name="tenant_bool">
     <optional>
       <attribute name="rekey">
         <value>yes</value>
@@ -259,7 +259,7 @@
       </attribute>
     </optional>
   </define>
-  <define name="self_payload">
+  <define name="tenant_payload">
     <optional>
       <attribute name="use_hsm">
         <choice>
@@ -289,74 +289,74 @@
       </element>
     </optional>
   </define>
-  <define name="self_handle">
-    <attribute name="self_handle">
+  <define name="tenant_handle">
+    <attribute name="tenant_handle">
       <ref name="object_handle"/>
     </attribute>
   </define>
-  <define name="self_query" combine="choice">
-    <element name="self">
+  <define name="tenant_query" combine="choice">
+    <element name="tenant">
       <ref name="ctl_create"/>
-      <ref name="self_handle"/>
-      <ref name="self_bool"/>
-      <ref name="self_payload"/>
+      <ref name="tenant_handle"/>
+      <ref name="tenant_bool"/>
+      <ref name="tenant_payload"/>
     </element>
   </define>
-  <define name="self_reply" combine="choice">
-    <element name="self">
+  <define name="tenant_reply" combine="choice">
+    <element name="tenant">
       <ref name="ctl_create"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
     </element>
   </define>
-  <define name="self_query" combine="choice">
-    <element name="self">
+  <define name="tenant_query" combine="choice">
+    <element name="tenant">
       <ref name="ctl_set"/>
-      <ref name="self_handle"/>
-      <ref name="self_bool"/>
-      <ref name="self_payload"/>
+      <ref name="tenant_handle"/>
+      <ref name="tenant_bool"/>
+      <ref name="tenant_payload"/>
     </element>
   </define>
-  <define name="self_reply" combine="choice">
-    <element name="self">
+  <define name="tenant_reply" combine="choice">
+    <element name="tenant">
       <ref name="ctl_set"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
     </element>
   </define>
-  <define name="self_query" combine="choice">
-    <element name="self">
+  <define name="tenant_query" combine="choice">
+    <element name="tenant">
       <ref name="ctl_get"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
     </element>
   </define>
-  <define name="self_reply" combine="choice">
-    <element name="self">
+  <define name="tenant_reply" combine="choice">
+    <element name="tenant">
       <ref name="ctl_get"/>
-      <ref name="self_handle"/>
-      <ref name="self_payload"/>
+      <ref name="tenant_handle"/>
+      <ref name="tenant_payload"/>
     </element>
   </define>
-  <define name="self_query" combine="choice">
-    <element name="self">
+  <define name="tenant_query" combine="choice">
+    <element name="tenant">
       <ref name="ctl_list"/>
     </element>
   </define>
-  <define name="self_reply" combine="choice">
-    <element name="self">
+  <define name="tenant_reply" combine="choice">
+    <element name="tenant">
       <ref name="ctl_list"/>
-      <ref name="self_handle"/>
-      <ref name="self_payload"/>
+      <ref name="tenant_handle"/>
+      <ref name="tenant_payload"/>
     </element>
   </define>
-  <define name="self_query" combine="choice">
-    <element name="self">
+  <define name="tenant_query" combine="choice">
+    <element name="tenant">
       <ref name="ctl_destroy"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
     </element>
   </define>
-  <define name="self_reply" combine="choice">
-    <element name="self">
+  <define name="tenant_reply" combine="choice">
+    <element name="tenant">
       <ref name="ctl_destroy"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
     </element>
   </define>
   <!-- <bsc/> element.  Key parameters hardwired for now. -->
@@ -409,7 +409,7 @@
   <define name="bsc_query" combine="choice">
     <element name="bsc">
       <ref name="ctl_create"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="bsc_handle"/>
       <ref name="bsc_bool"/>
       <ref name="bsc_payload"/>
@@ -418,7 +418,7 @@
   <define name="bsc_reply" combine="choice">
     <element name="bsc">
       <ref name="ctl_create"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="bsc_handle"/>
       <ref name="bsc_readonly"/>
     </element>
@@ -426,7 +426,7 @@
   <define name="bsc_query" combine="choice">
     <element name="bsc">
       <ref name="ctl_set"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="bsc_handle"/>
       <ref name="bsc_bool"/>
       <ref name="bsc_payload"/>
@@ -435,7 +435,7 @@
   <define name="bsc_reply" combine="choice">
     <element name="bsc">
       <ref name="ctl_set"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="bsc_handle"/>
       <ref name="bsc_readonly"/>
     </element>
@@ -443,14 +443,14 @@
   <define name="bsc_query" combine="choice">
     <element name="bsc">
       <ref name="ctl_get"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="bsc_handle"/>
     </element>
   </define>
   <define name="bsc_reply" combine="choice">
     <element name="bsc">
       <ref name="ctl_get"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="bsc_handle"/>
       <ref name="bsc_payload"/>
       <ref name="bsc_readonly"/>
@@ -459,13 +459,13 @@
   <define name="bsc_query" combine="choice">
     <element name="bsc">
       <ref name="ctl_list"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
     </element>
   </define>
   <define name="bsc_reply" combine="choice">
     <element name="bsc">
       <ref name="ctl_list"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="bsc_handle"/>
       <ref name="bsc_payload"/>
       <ref name="bsc_readonly"/>
@@ -474,14 +474,14 @@
   <define name="bsc_query" combine="choice">
     <element name="bsc">
       <ref name="ctl_destroy"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="bsc_handle"/>
     </element>
   </define>
   <define name="bsc_reply" combine="choice">
     <element name="bsc">
       <ref name="ctl_destroy"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="bsc_handle"/>
     </element>
   </define>
@@ -559,7 +559,7 @@
   <define name="parent_query" combine="choice">
     <element name="parent">
       <ref name="ctl_create"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="parent_handle"/>
       <ref name="parent_bool"/>
       <ref name="parent_payload"/>
@@ -568,14 +568,14 @@
   <define name="parent_reply" combine="choice">
     <element name="parent">
       <ref name="ctl_create"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="parent_handle"/>
     </element>
   </define>
   <define name="parent_query" combine="choice">
     <element name="parent">
       <ref name="ctl_set"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="parent_handle"/>
       <ref name="parent_bool"/>
       <ref name="parent_payload"/>
@@ -584,21 +584,21 @@
   <define name="parent_reply" combine="choice">
     <element name="parent">
       <ref name="ctl_set"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="parent_handle"/>
     </element>
   </define>
   <define name="parent_query" combine="choice">
     <element name="parent">
       <ref name="ctl_get"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="parent_handle"/>
     </element>
   </define>
   <define name="parent_reply" combine="choice">
     <element name="parent">
       <ref name="ctl_get"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="parent_handle"/>
       <ref name="parent_payload"/>
     </element>
@@ -606,13 +606,13 @@
   <define name="parent_query" combine="choice">
     <element name="parent">
       <ref name="ctl_list"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
     </element>
   </define>
   <define name="parent_reply" combine="choice">
     <element name="parent">
       <ref name="ctl_list"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="parent_handle"/>
       <ref name="parent_payload"/>
     </element>
@@ -620,14 +620,14 @@
   <define name="parent_query" combine="choice">
     <element name="parent">
       <ref name="ctl_destroy"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="parent_handle"/>
     </element>
   </define>
   <define name="parent_reply" combine="choice">
     <element name="parent">
       <ref name="ctl_destroy"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="parent_handle"/>
     </element>
   </define>
@@ -667,7 +667,7 @@
   <define name="child_query" combine="choice">
     <element name="child">
       <ref name="ctl_create"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="child_handle"/>
       <ref name="child_bool"/>
       <ref name="child_payload"/>
@@ -676,14 +676,14 @@
   <define name="child_reply" combine="choice">
     <element name="child">
       <ref name="ctl_create"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="child_handle"/>
     </element>
   </define>
   <define name="child_query" combine="choice">
     <element name="child">
       <ref name="ctl_set"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="child_handle"/>
       <ref name="child_bool"/>
       <ref name="child_payload"/>
@@ -692,21 +692,21 @@
   <define name="child_reply" combine="choice">
     <element name="child">
       <ref name="ctl_set"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="child_handle"/>
     </element>
   </define>
   <define name="child_query" combine="choice">
     <element name="child">
       <ref name="ctl_get"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="child_handle"/>
     </element>
   </define>
   <define name="child_reply" combine="choice">
     <element name="child">
       <ref name="ctl_get"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="child_handle"/>
       <ref name="child_payload"/>
     </element>
@@ -714,13 +714,13 @@
   <define name="child_query" combine="choice">
     <element name="child">
       <ref name="ctl_list"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
     </element>
   </define>
   <define name="child_reply" combine="choice">
     <element name="child">
       <ref name="ctl_list"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="child_handle"/>
       <ref name="child_payload"/>
     </element>
@@ -728,14 +728,14 @@
   <define name="child_query" combine="choice">
     <element name="child">
       <ref name="ctl_destroy"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="child_handle"/>
     </element>
   </define>
   <define name="child_reply" combine="choice">
     <element name="child">
       <ref name="ctl_destroy"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="child_handle"/>
     </element>
   </define>
@@ -780,7 +780,7 @@
   <define name="repository_query" combine="choice">
     <element name="repository">
       <ref name="ctl_create"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="repository_handle"/>
       <ref name="repository_bool"/>
       <ref name="repository_payload"/>
@@ -789,14 +789,14 @@
   <define name="repository_reply" combine="choice">
     <element name="repository">
       <ref name="ctl_create"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="repository_handle"/>
     </element>
   </define>
   <define name="repository_query" combine="choice">
     <element name="repository">
       <ref name="ctl_set"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="repository_handle"/>
       <ref name="repository_bool"/>
       <ref name="repository_payload"/>
@@ -805,21 +805,21 @@
   <define name="repository_reply" combine="choice">
     <element name="repository">
       <ref name="ctl_set"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="repository_handle"/>
     </element>
   </define>
   <define name="repository_query" combine="choice">
     <element name="repository">
       <ref name="ctl_get"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="repository_handle"/>
     </element>
   </define>
   <define name="repository_reply" combine="choice">
     <element name="repository">
       <ref name="ctl_get"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="repository_handle"/>
       <ref name="repository_payload"/>
     </element>
@@ -827,13 +827,13 @@
   <define name="repository_query" combine="choice">
     <element name="repository">
       <ref name="ctl_list"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
     </element>
   </define>
   <define name="repository_reply" combine="choice">
     <element name="repository">
       <ref name="ctl_list"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="repository_handle"/>
       <ref name="repository_payload"/>
     </element>
@@ -841,14 +841,14 @@
   <define name="repository_query" combine="choice">
     <element name="repository">
       <ref name="ctl_destroy"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="repository_handle"/>
     </element>
   </define>
   <define name="repository_reply" combine="choice">
     <element name="repository">
       <ref name="ctl_destroy"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="repository_handle"/>
     </element>
   </define>
@@ -856,14 +856,14 @@
   <define name="list_resources_query">
     <element name="list_resources">
       <ref name="tag"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="child_handle"/>
     </element>
   </define>
   <define name="list_resources_reply">
     <element name="list_resources">
       <ref name="tag"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="child_handle"/>
       <attribute name="valid_until">
         <data type="dateTime">
@@ -891,13 +891,13 @@
   <define name="list_roa_requests_query">
     <element name="list_roa_requests">
       <ref name="tag"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
     </element>
   </define>
   <define name="list_roa_requests_reply">
     <element name="list_roa_requests">
       <ref name="tag"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <attribute name="asn">
         <data type="nonNegativeInteger"/>
       </attribute>
@@ -917,14 +917,14 @@
   <define name="list_ghostbuster_requests_query">
     <element name="list_ghostbuster_requests">
       <ref name="tag"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="parent_handle"/>
     </element>
   </define>
   <define name="list_ghostbuster_requests_reply">
     <element name="list_ghostbuster_requests">
       <ref name="tag"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="parent_handle"/>
       <data type="string"/>
     </element>
@@ -933,13 +933,13 @@
   <define name="list_ee_certificate_requests_query">
     <element name="list_ee_certificate_requests">
       <ref name="tag"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
     </element>
   </define>
   <define name="list_ee_certificate_requests_reply">
     <element name="list_ee_certificate_requests">
       <ref name="tag"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <attribute name="gski">
         <data type="token">
           <param name="minLength">27</param>
@@ -997,13 +997,13 @@
   <define name="list_published_objects_query">
     <element name="list_published_objects">
       <ref name="tag"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
     </element>
   </define>
   <define name="list_published_objects_reply">
     <element name="list_published_objects">
       <ref name="tag"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <attribute name="uri">
         <ref name="uri"/>
       </attribute>
@@ -1019,13 +1019,13 @@
   <define name="list_received_resources_query">
     <element name="list_received_resources">
       <ref name="tag"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
     </element>
   </define>
   <define name="list_received_resources_reply">
     <element name="list_received_resources">
       <ref name="tag"/>
-      <ref name="self_handle"/>
+      <ref name="tenant_handle"/>
       <ref name="parent_handle"/>
       <attribute name="notBefore">
         <data type="dateTime">
@@ -1073,7 +1073,7 @@
     <element name="report_error">
       <ref name="tag"/>
       <optional>
-        <ref name="self_handle"/>
+        <ref name="tenant_handle"/>
       </optional>
       <attribute name="error_code">
         <ref name="error"/>