From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Schantl To: location@lists.ipfire.org Subject: [PATCH] location-exporter: Allow exporting by family Date: Sun, 08 Dec 2019 11:11:56 +0100 Message-ID: <20191208101156.27524-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3286841196084454532==" List-Id: --===============3286841196084454532== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Stefan Schantl --- src/python/location-exporter.in | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/python/location-exporter.in b/src/python/location-exporter.in index 421ed02..3074b90 100644 --- a/src/python/location-exporter.in +++ b/src/python/location-exporter.in @@ -177,8 +177,8 @@ class Exporter(object): self.db =3D db self.writer =3D writer =20 - def export(self, directory, countries, asns): - for family in (socket.AF_INET6, socket.AF_INET): + def export(self, directory, families, countries, asns): + for family in families: log.debug("Exporting family %s" % family) =20 writers =3D {} @@ -242,6 +242,9 @@ class CLI(object): # directory parser.add_argument("--directory", help=3D_("Output directory"), required= =3DTrue) =20 + # family + parser.add_argument("--family", help=3D_("Specify address family"), choice= s=3D("ipv6", "ipv4")) + # Countries and Autonomous Systems parser.add_argument("objects", nargs=3D"+") =20 @@ -270,6 +273,14 @@ class CLI(object): def handle_export(self, ns): countries, asns =3D [], [] =20 + # Translate family + if ns.family =3D=3D "ipv6": + families =3D [ socket.AF_INET6 ] + elif ns.family =3D=3D "ipv4": + families =3D [ socket.AF_INET ] + else: + families =3D [ socket.AF_INET6, socket.AF_INET ] + for object in ns.objects: if object.startswith("AS"): try: @@ -299,7 +310,7 @@ class CLI(object): assert writer =20 e =3D Exporter(db, writer) - e.export(ns.directory, countries=3Dcountries, asns=3Dasns) + e.export(ns.directory, countries=3Dcountries, asns=3Dasns, families=3Dfami= lies) =20 =20 def main(): --=20 2.20.1 --===============3286841196084454532==--