diff options
| author | Rob Austein <sra@hactrn.net> | 2009-06-09 20:25:16 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2009-06-09 20:25:16 +0000 |
| commit | 48580e7cb64009adf35da58c44b71753b9f0e596 (patch) | |
| tree | b6361c77d776bd3c265bc2070e39cc4becd27f82 /rpkid/testbed.py | |
| parent | 24f133ff269e0a240c081d6c93028a17a555e5c4 (diff) | |
Convert ROA generation code from push model (<route_origin/> objects
in rpkid) to pull model (IRDB for <list_roa_request/> queries).
Still need to clean up old code, but new code seems to work properly.
svn path=/rpkid/Makefile; revision=2510
Diffstat (limited to 'rpkid/testbed.py')
| -rw-r--r-- | rpkid/testbed.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rpkid/testbed.py b/rpkid/testbed.py index 1c942423..ea0e8f05 100644 --- a/rpkid/testbed.py +++ b/rpkid/testbed.py @@ -709,12 +709,12 @@ class allocation(object): cur.execute("INSERT registrant_net (start_ip, end_ip, version, registrant_id) VALUES (%s, %s, 6, %s)", (v6_range.min, v6_range.max, registrant_id)) cur.execute("UPDATE registrant SET valid_until = %s WHERE registrant_id = %s", (kid.resources.valid_until.to_sql(), registrant_id)) for r in s.route_origins: - cur.execute("INSERT roa_request (roa_request_handle, as_number) VALUES (%s, %s)", (s.name, r.asn)) + cur.execute("INSERT roa_request (roa_request_handle, asn) VALUES (%s, %s)", (s.name, r.asn)) roa_request_id = cur.lastrowid for version, prefix_set in ((4, r.v4), (6, r.v6)): if prefix_set: cur.executemany("INSERT roa_request_prefix (roa_request_id, prefix, prefixlen, max_prefixlen, version) VALUES (%s, %s, %s, %s, %s)", - ((roa_request_id, x.address, x.prefixlen, x.max_prefixlen, version) for x in prefix_set)) + ((roa_request_id, x.prefix, x.prefixlen, x.max_prefixlen, version) for x in prefix_set)) db.close() def run_daemons(self): @@ -921,7 +921,7 @@ class allocation(object): action = "create", self_handle = s.name, route_origin_handle = "%s_%d" % (s.name, i), - as_number = r.asn, + asn = r.asn, ipv4 = r.v4, ipv6 = r.v6)) |