diff options
| -rwxr-xr-x | ca/tests/test-rrdp.py | 8 | ||||
| -rw-r--r-- | rpki/pubd.py | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ca/tests/test-rrdp.py b/ca/tests/test-rrdp.py index cff17a87..9702c04a 100755 --- a/ca/tests/test-rrdp.py +++ b/ca/tests/test-rrdp.py @@ -46,10 +46,10 @@ def dataglob(pattern): return glob.iglob(os.path.join(("smoketest.dir" if args.use_smoketest else "yamltest.dir/RIR"), pattern)) def snapshot_to_serial(fn): - return os.path.splitext(os.path.basename(fn))[0] + return int(os.path.splitext(os.path.basename(fn))[0]) def delta_to_serial(fn): - return os.path.splitext(os.path.basename(fn))[0].split("-")[1] + return int(os.path.splitext(os.path.basename(fn))[0].split("-")[1]) top = os.path.expanduser("~/rpki/subvert-rpki.hactrn.net/branches/tk705") @@ -84,8 +84,8 @@ else: time.sleep(args.delay) yamltest.terminate() -snapshots = dict((int(snapshot_to_serial(fn)), fn) for fn in dataglob("rrdp-publication/*/snapshot/*.xml")) -deltas = dict((int(delta_to_serial(fn)), fn) for fn in dataglob("rrdp-publication/*/deltas/*.xml")) +snapshots = dict((snapshot_to_serial(fn), fn) for fn in dataglob("rrdp-publication/snapshot/*/*.xml")) +deltas = dict((delta_to_serial(fn), fn) for fn in dataglob("rrdp-publication/deltas/*/*.xml")) for snapshot in sorted(snapshots): diff --git a/rpki/pubd.py b/rpki/pubd.py index 8b58747e..4f1ea417 100644 --- a/rpki/pubd.py +++ b/rpki/pubd.py @@ -347,7 +347,7 @@ class session_obj(rpki.sql.sql_persistent): Write current session snapshot to disk. """ - self.write_rrdp_file("%s/snapshot/%s.xml" % (self.uuid, self.serial), self.snapshot) + self.write_rrdp_file("snapshot/%s/%s.xml" % (self.uuid, self.serial), self.snapshot) def write_deltas(self): """ @@ -367,7 +367,7 @@ class session_obj(rpki.sql.sql_persistent): session_id = self.uuid, serial = str(self.serial)) SubElement(xml, rrdp_xmlns + "snapshot", - uri = "%s/%s/snapshot/%d.xml" % (self.gctx.rrdp_uri_base, self.uuid, self.serial), + uri = "%s/snapshot/%s/%d.xml" % (self.gctx.rrdp_uri_base, self.uuid, self.serial), hash = self.hash) for delta in self.deltas: se = SubElement(xml, rrdp_xmlns + "delta", @@ -376,7 +376,7 @@ class session_obj(rpki.sql.sql_persistent): hash = delta.hash) se.set("from", str(delta.serial - 1)) rpki.relaxng.rrdp.assertValid(xml) - self.write_rrdp_file("%s/notification.xml" % self.uuid, + self.write_rrdp_file("notification/%s.xml" % self.uuid, ElementToString(xml, pretty_print = True), overwrite = True) @@ -402,7 +402,7 @@ class delta_obj(rpki.sql.sql_persistent): @property def fn(self): - return "%s/deltas/%s-%s.xml" % (self.session.uuid, self.serial - 1, self.serial) + return "deltas/%s/%s-%s.xml" % (self.session.uuid, self.serial - 1, self.serial) @classmethod def create(cls, session): |