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

5 files changed, 6 insertions, 6 deletions

diff --git a/rpki/gui/app/check_expired.py b/rpki/gui/app/check_expired.py
index 62292e66..61c9e8c8 100644
--- a/rpki/gui/app/check_expired.py
+++ b/rpki/gui/app/check_expired.py
@@ -108,7 +108,7 @@ def check_child_certs(conf, errs):
     z = Zookeeper(handle=conf.handle)
     req = Element(tag_msg, nsmap=nsmap, type="query", version=version)
     SubElement(req, tag_list_published_objects,
-               tag="list_published_objects", self_handle=conf.handle)
+               tag="list_published_objects", tenant_handle=conf.handle)
     pdus = z.call_rpkid(req)
     for pdu in pdus:
         if pdu.get("uri").endswith('.cer'):
diff --git a/rpki/gui/app/glue.py b/rpki/gui/app/glue.py
index bfade6d8..330e014b 100644
--- a/rpki/gui/app/glue.py
+++ b/rpki/gui/app/glue.py
@@ -79,7 +79,7 @@ def list_received_resources(log, conf):
 
     z = Zookeeper(handle=conf.handle, disable_signal_handlers=True)
     req = Element(tag_msg, nsmap=nsmap, type="query", version=version)
-    SubElement(req, tag_list_received_resources, self_handle=conf.handle)
+    SubElement(req, tag_list_received_resources, tenant_handle=conf.handle)
     pdus = z.call_rpkid(req)
     # pdus is sometimes None (see https://trac.rpki.net/ticket/681)
     if pdus is None:
diff --git a/rpki/gui/app/models.py b/rpki/gui/app/models.py
index c49e6d43..56ada2ab 100644
--- a/rpki/gui/app/models.py
+++ b/rpki/gui/app/models.py
@@ -122,7 +122,7 @@ class Alert(models.Model):
 
 class Conf(rpki.irdb.models.ResourceHolderCA):
     """This is the center of the universe, also known as a place to
-    have a handle on a resource-holding entity.  It's the <self>
+    have a handle on a resource-holding entity.  It's the <tenant/>
     in the rpkid schema.
 
     """
diff --git a/rpki/gui/app/views.py b/rpki/gui/app/views.py
index d9b3fee3..28b8a498 100644
--- a/rpki/gui/app/views.py
+++ b/rpki/gui/app/views.py
@@ -1215,7 +1215,7 @@ def resource_holder_delete(request, pk):
         form = forms.Empty(request.POST)
         if form.is_valid():
             z = Zookeeper(handle=conf.handle, logstream=log)
-            z.delete_self()
+            z.delete_tenant()
             z.synchronize_deleted_ca()
             return redirect(resource_holder_list)
     else:
diff --git a/rpki/gui/cacheview/util.py b/rpki/gui/cacheview/util.py
index 21430091..7ab4837a 100644
--- a/rpki/gui/cacheview/util.py
+++ b/rpki/gui/cacheview/util.py
@@ -321,7 +321,7 @@ def fetch_published_objects():
     q_msg = Element(rpki.left_right.tag_msg, nsmap = rpki.left_right.nsmap,
                     type = "query", version = rpki.left_right.version)
     for h in handles:
-        SubElement(q_msg, rpki.left_right.tag_list_published_objects, action="list", self_handle=h, tag=h)
+        SubElement(q_msg, rpki.left_right.tag_list_published_objects, action="list", tenant_handle=h, tag=h)
     z = Zookeeper()
     r_msg = z.call_rpkid(q_msg)
     for r_pdu in r_msg:
@@ -331,7 +331,7 @@ def fetch_published_objects():
             if qs:
                 # get the current validity state
                 valid = qs[0].statuses.filter(status=object_accepted).exists()
-                uris[r_pdu.get("uri")] = (r_pdu.get("self_handle"), valid, False, None)
+                uris[r_pdu.get("uri")] = (r_pdu.get("tenant_handle"), valid, False, None)
                 logger.debug('adding %s', r_pdu.get("uri"))
             else:
                 # this object is not in the cache.  it was either published