diff options
| author | Rob Austein <sra@hactrn.net> | 2016-04-12 19:24:25 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-04-12 19:24:25 +0000 |
| commit | e785735a8792ccbc3ef65cc57e41cffaaeec3be1 (patch) | |
| tree | 55414ff32b2d7a8095fdc9ebf860ebcf3cac666b /rpki | |
| parent | 3f6960a9e36e2be697a1d4311186bb11e5edca97 (diff) | |
Change default handling of <group> when parsing ROA requests from CSV:
if <group> column is omitted, we now use the <pnm> value as the
<group>, in effect requesting a separate ROA for each ROA request,
which is almost certainly what the user wanted. Explictly specifying
the <group> value should still work, in case anybody still needs
multi-prefix ROAs for testing or other purposes.
svn path=/trunk/; revision=6359
Diffstat (limited to 'rpki')
| -rw-r--r-- | rpki/irdb/zookeeper.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rpki/irdb/zookeeper.py b/rpki/irdb/zookeeper.py index 3fba99f9..c7038889 100644 --- a/rpki/irdb/zookeeper.py +++ b/rpki/irdb/zookeeper.py @@ -985,8 +985,8 @@ class Zookeeper(object): grouped = {} # format: p/n-m asn group - for pnm, asn, group in csv_reader(filename, columns = 3): - key = (asn, group) + for pnm, asn, group in csv_reader(filename, columns = 3, min_columns = 2): + key = (asn, group or pnm) if key not in grouped: grouped[key] = [] grouped[key].append(pnm) |