From c8d26417c6f66ce3bf5389f046cc8dd3aa5bf64e Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Tue, 12 Apr 2016 20:28:02 +0000 Subject: Pull rpkic fix from trunk. I think Subversion's merge tracking data is turning into cream cheese. svn path=/branches/tk705/; revision=6360 --- ca/tests/smoketest.1.yaml | 4 ++++ ca/tests/yamltest.py | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'ca') 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) -- cgit v1.2.3