1 files changed, 46 insertions, 43 deletions
diff --git a/rp/utils/print_roa b/rp/utils/print_roa
index d5db0c3c..c5b7793a 100755
--- a/rp/utils/print_roa
+++ b/rp/utils/print_roa
@@ -21,53 +21,56 @@ Pretty-print the content of a ROA.  Does NOT attempt to verify the
 signature.
 """
 
-import argparse
+import rpki.config
 import rpki.POW
 
-class ROA(rpki.POW.ROA):
+class ROA(rpki.POW.ROA):                # pylint: disable=W0232
 
-  @staticmethod
-  def _format_prefix(prefix):
-    if prefix[2] is None or prefix[1] == prefix[2]:
-      return "%s/%d" % (prefix[0], prefix[1])
-    else:
-      return "%s/%d-%d" % (prefix[0], prefix[1], prefix[2])
+    v4_prefixes = None
+    v6_prefixes = None
+
+    @staticmethod
+    def _format_prefix(p):
+        if p[2] in (None, p[1]):
+            return "%s/%d" % (p[0], p[1])
+        else:
+            return "%s/%d-%d" % (p[0], p[1], p[2])
 
-  def parse(self):
-    self.extractWithoutVerifying()
-    v4, v6 = self.getPrefixes()
-    self.v4_prefixes = [self._format_prefix(p) for p in (v4 or ())]
-    self.v6_prefixes = [self._format_prefix(p) for p in (v6 or ())]
+    def parse(self):
+        self.extractWithoutVerifying()  # pylint: disable=E1101
+        v4, v6 = self.getPrefixes()     # pylint: disable=E1101
+        self.v4_prefixes = [self._format_prefix(p) for p in (v4 or ())]
+        self.v6_prefixes = [self._format_prefix(p) for p in (v6 or ())]
 
-parser = argparse.ArgumentParser(description = __doc__)
-parser.add_argument("-b", "--brief", action = "store_true", help = "show only ASN and prefix(es)")
-parser.add_argument("-c", "--cms", action = "store_true", help = "print text representation of entire CMS blob")
-parser.add_argument("-s", "--signing-time", action = "store_true", help = "show SigningTime in brief mode")
-parser.add_argument("roas", nargs = "+", type = ROA.derReadFile, help = "ROA(s) to print")
-args = parser.parse_args()
+cfg = rpki.config.argparser(doc = __doc__)
+cfg.argparser.add_argument("--brief", action = "store_true", help = "show only ASN and prefix(es)")
+cfg.argparser.add_argument("--cms", action = "store_true", help = "print text representation of entire CMS blob")
+cfg.argparser.add_argument("--signing-time", action = "store_true", help = "show SigningTime in brief mode")
+cfg.argparser.add_argument("roas", nargs = "+", type = ROA.derReadFile, help = "ROA(s) to print") # pylint: disable=E1101
+args = cfg.argparser.parse_args()
 
 for roa in args.roas:
-  roa.parse()
-  if args.brief:
-    if args.signing_time:
-      print roa.signingTime(),
-    print roa.getASID(), " ".join(roa.v4_prefixes + roa.v6_prefixes)
-  else:
-    print "ROA Version:   ", roa.getVersion()
-    print "SigningTime:   ", roa.signingTime()
-    print "asID:          ", roa.getASID()
-    if roa.v4_prefixes:
-      print " addressFamily:", 1
-      for p in roa.v4_prefixes:
-        print "     IPAddress:", p
-    if roa.v6_prefixes:
-      print " addressFamily:", 2
-      for p in roa.v6_prefixes:
-        print "     IPAddress:", p
-    if args.cms:
-      print roa.pprint()
-      for cer in roa.certs():
-        print cer.pprint()
-      for crl in roa.crls():
-        print crl.pprint()
-    print
+    roa.parse()
+    if args.brief:
+        if args.signing_time:
+            print roa.signingTime(),
+        print roa.getASID(), " ".join(roa.v4_prefixes + roa.v6_prefixes)
+    else:
+        print "ROA Version:   ", roa.getVersion()
+        print "SigningTime:   ", roa.signingTime()
+        print "asID:          ", roa.getASID()
+        if roa.v4_prefixes:
+            print " addressFamily:", 1
+            for prefix in roa.v4_prefixes:
+                print "     IPAddress:", prefix
+        if roa.v6_prefixes:
+            print " addressFamily:", 2
+            for prefix in roa.v6_prefixes:
+                print "     IPAddress:", prefix
+        if args.cms:
+            print roa.pprint()
+            for cer in roa.certs():
+                print cer.pprint()
+            for crl in roa.crls():
+                print crl.pprint()
+        print