diff options
author | Rob Austein <sra@hactrn.net> | 2015-10-10 01:37:43 +0000 |
---|---|---|
committer | Rob Austein <sra@hactrn.net> | 2015-10-10 01:37:43 +0000 |
commit | a6998f3ad05e5dcc04dce0fe1c519ef5644fdf81 (patch) | |
tree | 6f6d356d653eafa1d26ae5c6f80a43f676bae083 /rpki/left_right.py | |
parent | ba0ee92b80646633c50b24700b04515cc563487a (diff) |
Clean still more old XML-related classes.
At this point, all the classes remaining in rpki.left_right pertain
are the pre-Django equivalents of models, and they're the only things
left still using rpki.xml_utils.
Some old test code remains broken (not yet converted). GUI code that
I know about has been converted but not tested (not all that much to
convert there, mostly the GUI just invokes the Zookeeper.
svn path=/branches/tk705/; revision=6107
Diffstat (limited to 'rpki/left_right.py')
-rw-r--r-- | rpki/left_right.py | 125 |
1 files changed, 0 insertions, 125 deletions
diff --git a/rpki/left_right.py b/rpki/left_right.py index 653a2eaf..fff3404d 100644 --- a/rpki/left_right.py +++ b/rpki/left_right.py @@ -1276,131 +1276,6 @@ class child_elt(data_elt): lose(e) -class list_resources_elt(rpki.xml_utils.base_elt, left_right_namespace): - """ - <list_resources/> element. - """ - - element_name = "list_resources" - - valid_until = None - - attributes = dict(valid_until = rpki.sundial.datetime.fromXMLtime, - asn = rpki.resource_set.resource_set_as, - ipv4 = rpki.resource_set.resource_set_ipv4, - ipv6 = rpki.resource_set.resource_set_ipv6) - attributes.update((_, None) for _ in ("self_handle", "tag", "child_handle")) - - def __repr__(self): - return rpki.log.log_repr(self, self.self_handle, self.child_handle, self.asn, self.ipv4, self.ipv6) - - def toXML(self): - """ - Generate <list_resources/> element. This requires special - handling due to the data types of some of the attributes. - """ - - elt = self.make_elt() - if isinstance(self.valid_until, int): - elt.set("valid_until", self.valid_until.toXMLtime()) - return elt - -class list_roa_requests_elt(rpki.xml_utils.base_elt, left_right_namespace): - """ - <list_roa_requests/> element. - """ - - element_name = "list_roa_requests" - - attributes = dict(asn = rpki.resource_set.resource_set_as, - ipv4 = rpki.resource_set.resource_set_ipv4, - ipv6 = rpki.resource_set.resource_set_ipv6) - attributes.update((_, None) for _ in ("self_handle", "tag")) - - def __repr__(self): - return rpki.log.log_repr(self, self.self_handle, self.asn, self.ipv4, self.ipv6) - -class list_ghostbuster_requests_elt(rpki.xml_utils.text_elt, left_right_namespace): - """ - <list_ghostbuster_requests/> element. - """ - - element_name = "list_ghostbuster_requests" - attributes = ("self_handle", "tag", "parent_handle") - text_attribute = "vcard" - - vcard = None - - def __repr__(self): - return rpki.log.log_repr(self, self.self_handle, self.parent_handle) - -class list_ee_certificate_requests_elt(rpki.xml_utils.base_elt, left_right_namespace): - """ - <list_ee_certificate_requests/> element. - """ - - element_name = "list_ee_certificate_requests" - - attributes = dict(valid_until = rpki.sundial.datetime.fromXMLtime, - asn = rpki.resource_set.resource_set_as, - ipv4 = rpki.resource_set.resource_set_ipv4, - ipv6 = rpki.resource_set.resource_set_ipv6, - eku = lambda x: x.split(",")) - attributes.update((_, None) for _ in ("self_handle", "tag", "gski", "cn", "sn")) - - elements = collections.OrderedDict(( - ("pkcs10", rpki.x509.PKCS10),)) - - pkcs10 = None - valid_until = None - eku = None - - def __repr__(self): - return rpki.log.log_repr(self, self.self_handle, self.gski, self.cn, self.sn, self.asn, self.ipv4, self.ipv6) - - def toXML(self): - """ - Generate <list_ee_certificate_requests/> element. This requires special - handling due to the data types of some of the attributes. - """ - - if isinstance(self.eku, (tuple, list)): - self.eku = ",".join(self.eku) - elt = self.make_elt() - for i in self.elements: - self.make_b64elt(elt, i, getattr(self, i, None)) - if isinstance(self.valid_until, int): - elt.set("valid_until", self.valid_until.toXMLtime()) - return elt - -class report_error_elt(rpki.xml_utils.text_elt, left_right_namespace): - """ - <report_error/> element. - """ - - element_name = "report_error" - attributes = ("tag", "self_handle", "error_code") - text_attribute = "error_text" - - error_text = None - - def __repr__(self): - return rpki.log.log_repr(self, self.self_handle, self.error_code) - - @classmethod - def from_exception(cls, e, self_handle = None, tag = None): - """ - Generate a <report_error/> element from an exception. - """ - - self = cls() - self.self_handle = self_handle - self.tag = tag - self.error_code = e.__class__.__name__ - self.error_text = str(e) - return self - - class cms_msg(rpki.x509.XML_CMS_object): """ CMS-signed left-right PDU. |