From a34358cecd49a9b7d6b77ace89f9e63497b2c562 Mon Sep 17 00:00:00 2001 From: Michael Elkins Date: Sun, 11 Jul 2010 19:59:14 +0000 Subject: properly handle ipv6 addresses in load_csv svn path=/portal-gui/scripts/load_csv.py; revision=3389 --- portal-gui/scripts/load_csv.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'portal-gui/scripts') diff --git a/portal-gui/scripts/load_csv.py b/portal-gui/scripts/load_csv.py index 665dc0f4..ad1452b9 100755 --- a/portal-gui/scripts/load_csv.py +++ b/portal-gui/scripts/load_csv.py @@ -100,9 +100,9 @@ def do_prefixes(): for child_handle, prefix in csv_reader(prefix_csv, columns=2): child = conf.children.get(handle=child_handle) try: - rs = rpki.resource_set.resource_set_ipv4().parse_str(prefix) - except socket.error: - rs = rpki.resource_set.resource_set_ipv6().parse_str(prefix) + rs = rpki.resource_set.resource_range_ipv4.parse_str(prefix) + except ValueError, err: + rs = rpki.resource_set.resource_range_ipv6.parse_str(prefix) obj = get_or_create_prefix(rs) obj.allocated = child obj.save() @@ -110,9 +110,9 @@ def do_prefixes(): def do_roas(): for prefix, asn, group in csv_reader(roa_csv, columns=3): try: - rs = rpki.resource_set.roa_prefix_set_ipv4().parse_str(prefix) - except socket.error: - rs = rpki.resource_set.roa_prefix_set_ipv6().parse_str(prefix) + rs = rpki.resource_set.roa_prefix_ipv4.parse_str(prefix) + except ValueError, err: + rs = rpki.resource_set.roa_prefix_ipv6.parse_str(prefix) print str(rs.min()), str(rs.max()), rs.max_prefixlen obj = get_or_create_prefix(rs.to_resource_range()) -- cgit v1.2.3