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

1 files changed, 3 insertions, 3 deletions

diff --git a/ca/tests/yamltest.py b/ca/tests/yamltest.py
index 0932049b..7de7b675 100644
--- a/ca/tests/yamltest.py
+++ b/ca/tests/yamltest.py
@@ -380,9 +380,9 @@ class allocation(object):
     fn = "%s.roas.csv" % d.name
     if not args.skip_config:
       f = self.csvout(fn)
-      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 ()))
       f.close()
     if not args.stop_after_config:
       self.run_rpkic("load_roa_requests", fn)