diff options
| author | Rob Austein <sra@hactrn.net> | 2009-10-26 22:31:16 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2009-10-26 22:31:16 +0000 |
| commit | 1e11a8aa6905c02a4695313d5d6a6bd3ba3732dc (patch) | |
| tree | 050348593d46a04e00970cc02f74f8ac87881847 /rpkid | |
| parent | 076297fd151dce8bd496e13855e23d47d45850bc (diff) | |
Refactor publication code, step 1: clean up
rpki.left_right.repository_elt.call_pubd() and methods in
rpki.xmlutils.msg class that were (mis)designed to fit.
svn path=/myrpki/myirbe.py; revision=2836
Diffstat (limited to 'rpkid')
| -rw-r--r-- | rpkid/rpki/left_right.py | 8 | ||||
| -rw-r--r-- | rpkid/rpki/xml_utils.py | 4 | ||||
| -rw-r--r-- | rpkid/testbed.py | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/rpkid/rpki/left_right.py b/rpkid/rpki/left_right.py index da7247b7..d8a8f633 100644 --- a/rpkid/rpki/left_right.py +++ b/rpkid/rpki/left_right.py @@ -652,8 +652,8 @@ class repository_elt(data_elt): errback(e) rpki.log.trace() rpki.log.info("Publishing %r as %r" % (obj, uri)) - q_msg = rpki.publication.msg.query() - q_msg.append(rpki.publication.publication_object_elt.make_publish(uri = uri, obj = obj)) + q_msg = rpki.publication.msg.query( + rpki.publication.publication_object_elt.make_publish(uri = uri, obj = obj)) self.call_pubd(callback, fail, q_msg) def withdraw(self, obj, uri, callback, errback, allow_failure = False): @@ -668,8 +668,8 @@ class repository_elt(data_elt): errback(e) rpki.log.trace() rpki.log.info("Withdrawing %r from %r" % (obj, uri)) - q_msg = rpki.publication.msg.query() - q_msg.append(rpki.publication.publication_object_elt.make_withdraw(uri = uri, obj = obj)) + q_msg = rpki.publication.msg.query( + rpki.publication.publication_object_elt.make_withdraw(uri = uri, obj = obj)) self.call_pubd(callback, fail, q_msg) class parent_elt(data_elt): diff --git a/rpkid/rpki/xml_utils.py b/rpkid/rpki/xml_utils.py index e3b9a7f0..274eeea0 100644 --- a/rpkid/rpki/xml_utils.py +++ b/rpkid/rpki/xml_utils.py @@ -454,14 +454,14 @@ class msg(list): @classmethod def query(cls, *args): """Create a query PDU.""" - self = cls(*args) + self = cls(args) self.type = "query" return self @classmethod def reply(cls, *args): """Create a reply PDU.""" - self = cls(*args) + self = cls(args) self.type = "reply" return self diff --git a/rpkid/testbed.py b/rpkid/testbed.py index a9e6e3c5..c2dfd4ea 100644 --- a/rpkid/testbed.py +++ b/rpkid/testbed.py @@ -770,7 +770,7 @@ class allocation(object): assert isinstance(pdus, (list, tuple)) assert self.rpki_port is not None - msg = rpki.left_right.msg.query(pdus) + msg = rpki.left_right.msg.query(*pdus) cms, xml = rpki.left_right.cms_msg.wrap(msg, self.irbe_key, self.irbe_cert, pretty_print = True) rpki.log.debug(xml) @@ -1167,7 +1167,7 @@ def call_pubd(pdus, cb): response. """ rpki.log.info("Calling pubd") - msg = rpki.publication.msg.query(pdus) + msg = rpki.publication.msg.query(*pdus) cms, xml = rpki.publication.cms_msg.wrap(msg, pubd_irbe_key, pubd_irbe_cert, pretty_print = True) rpki.log.debug(xml) |