diff options
Diffstat (limited to 'rpki')
| -rw-r--r-- | rpki/rpkid.py | 8 | ||||
| -rw-r--r-- | rpki/rpkid_tasks.py | 4 | ||||
| -rw-r--r-- | rpki/rpkidb/models.py | 4 |
3 files changed, 6 insertions, 10 deletions
diff --git a/rpki/rpkid.py b/rpki/rpkid.py index 79fbcca2..8b9626cd 100644 --- a/rpki/rpkid.py +++ b/rpki/rpkid.py @@ -796,7 +796,7 @@ class ca_obj(rpki.sql.sql_persistent): "maybe parent certificate went away?", ca_detail.public_key.gSKI(), class_name, parent.self.self_handle, parent.parent_handle) publisher = publication_queue() - ca_detail.delete(ca = ca_detail.ca, publisher = publisher) + ca_detail.destroy(ca = ca_detail.ca, publisher = publisher) return publisher.call_pubd(iterator, eb) else: @@ -897,7 +897,7 @@ class ca_obj(rpki.sql.sql_persistent): logger.debug("Sending issue request to %r from %r", parent, self.create) parent.up_down_issue_query(self, ca_detail, done, eb) - def delete(self, parent, callback): + def destroy(self, parent, callback): """ The list of current resource classes received from parent does not include the class corresponding to this CA, so we need to delete @@ -920,7 +920,7 @@ class ca_obj(rpki.sql.sql_persistent): publisher = publication_queue() for ca_detail in self.ca_details: - ca_detail.delete(ca = self, publisher = publisher, allow_failure = True) + ca_detail.destroy(ca = self, publisher = publisher, allow_failure = True) publisher.call_pubd(done, lose) def next_serial_number(self): @@ -1203,7 +1203,7 @@ class ca_detail_obj(rpki.sql.sql_persistent): publisher.call_pubd(callback, errback) - def delete(self, ca, publisher, allow_failure = False): + def destroy(self, ca, publisher, allow_failure = False): """ Delete this ca_detail and all of the certs it issued. diff --git a/rpki/rpkid_tasks.py b/rpki/rpkid_tasks.py index 30e57ae8..c44b2220 100644 --- a/rpki/rpkid_tasks.py +++ b/rpki/rpkid_tasks.py @@ -210,7 +210,7 @@ class PollParentTask(AbstractTask): def ca_loop(self, iterator, ca): self.gctx.checkpoint() - ca.delete(self.parent, iterator) + ca.destroy(self.parent, iterator) def ca_done(self): self.gctx.checkpoint() @@ -695,7 +695,7 @@ class RegenerateCRLsAndManifestsTask(AbstractTask): try: for ca_detail in ca.revoked_ca_details: if now > ca_detail.latest_crl.getNextUpdate(): - ca_detail.delete(ca = ca, publisher = publisher) + ca_detail.destroy(ca = ca, publisher = publisher) for ca_detail in ca.active_or_deprecated_ca_details: if now + regen_margin > ca_detail.latest_crl.getNextUpdate(): ca_detail.generate_crl(publisher = publisher) diff --git a/rpki/rpkidb/models.py b/rpki/rpkidb/models.py index 3e5bad44..163aee60 100644 --- a/rpki/rpkidb/models.py +++ b/rpki/rpkidb/models.py @@ -560,9 +560,6 @@ class Parent(models.Model): itself. """ - # parent_elt.delete() renamed to .destroy() here to avoid conflict - # with built-in ORM .delete() method. - def loop(iterator, ca): ca.destroy(self, iterator) def revoke(): @@ -792,7 +789,6 @@ class CA(models.Model): parent.up_down_issue_query(self, ca_detail, done, eb) - # Was .delete() def destroy(self, parent, callback): """ The list of current resource classes received from parent does not |