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

1 files changed, 95 insertions, 95 deletions

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"/>