diff options
| author | Rob Austein <sra@hactrn.net> | 2016-04-12 20:28:02 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-04-12 20:28:02 +0000 |
| commit | c8d26417c6f66ce3bf5389f046cc8dd3aa5bf64e (patch) | |
| tree | 951510c3f368a02a0978148d0784a733d767ca5c /ca | |
| parent | d753ca696172c297245410830e7b63326a85ec29 (diff) | |
Pull rpkic <group> fix from trunk.
I think Subversion's merge tracking data is turning into cream cheese.
svn path=/branches/tk705/; revision=6360
Diffstat (limited to 'ca')
| -rw-r--r-- | ca/tests/smoketest.1.yaml | 4 | ||||
| -rwxr-xr-x | ca/tests/yamltest.py | 6 |
2 files changed, 7 insertions, 3 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) |