From b13d25453d202ad346e5f962370979b737aeeb39 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Sun, 18 May 2008 00:11:59 +0000 Subject: Convert to generating new ROA format svn path=/rpkid/left-right-schema.rnc; revision=1800 --- rpkid/testbed.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'rpkid/testbed.py') diff --git a/rpkid/testbed.py b/rpkid/testbed.py index 3d01c7d1..2c697b42 100644 --- a/rpkid/testbed.py +++ b/rpkid/testbed.py @@ -255,8 +255,8 @@ class route_origin(object): def __init__(self, asn, ipv4, ipv6, exact_match): self.asn = asn - self.v4 = rpki.resource_set.resource_set_ipv4("".join(ipv4.split())) if ipv4 else None - self.v6 = rpki.resource_set.resource_set_ipv6("".join(ipv6.split())) if ipv6 else None + self.v4 = rpki.resource_set.roa_prefix_set_ipv4("".join(ipv4.split())) if ipv4 else None + self.v6 = rpki.resource_set.roa_prefix_set_ipv6("".join(ipv6.split())) if ipv6 else None self.exact_match = exact_match def __eq__(self, other): @@ -308,6 +308,8 @@ class allocation_db(list): def apply_delta(self, delta): """Apply a delta or run a command.""" + if delta is None: + return for d in delta: if isinstance(d, str): c = d.split() -- cgit v1.2.3