diff options
| -rw-r--r-- | ca/tests/smoketest.1.yaml | 4 | ||||
| -rwxr-xr-x | ca/tests/yamltest.py | 6 | ||||
| -rw-r--r-- | rpki/irdb/zookeeper.py | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/ca/tests/smoketest.1.yaml b/ca/tests/smoketest.1.yaml index edcf42a9..ddb45705 100644 --- a/ca/tests/smoketest.1.yaml +++ b/ca/tests/smoketest.1.yaml @@ -49,6 +49,10 @@ kids: roa_request: - asn: 666 ipv4: 10.3.0.44/32 + - asn: 666 + ipv4: 10.3.0.6/32 + - asn: 666 + ipv4: 10.3.0.77/32 --- - shell set -x; diff --git a/ca/tests/yamltest.py b/ca/tests/yamltest.py index f8f441e7..38b5bdac 100755 --- a/ca/tests/yamltest.py +++ b/ca/tests/yamltest.py @@ -400,9 +400,9 @@ class allocation(object): fn = "%s.roas.csv" % d.name if not args.skip_config: with self.csvout(fn) as f: - for g1, r in enumerate(self.roa_requests): - f.writerows((p, r.asn, "G%08d%08d" % (g1, g2)) - for g2, p in enumerate((r.v4 + r.v6 if r.v4 and r.v6 else r.v4 or r.v6 or ()))) + for r in self.roa_requests: + f.writerows((p, r.asn) + for p in (r.v4 + r.v6 if r.v4 and r.v6 else r.v4 or r.v6 or ())) if not args.stop_after_config: self.run_rpkic("load_roa_requests", fn) diff --git a/rpki/irdb/zookeeper.py b/rpki/irdb/zookeeper.py index 0ce91800..e4a04869 100644 --- a/rpki/irdb/zookeeper.py +++ b/rpki/irdb/zookeeper.py @@ -1046,8 +1046,8 @@ class Zookeeper(object): grouped = {} # format: p/n-m asn group - for pnm, asn, group in csv_reader(csv_file, 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) |