From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: location@lists.ipfire.org
Subject: Re: [PATCH] location-exporter: Allow exporting by family
Date: Mon, 09 Dec 2019 17:14:42 +0000
Message-ID: <F05B7A20-6509-49E2-9709-F4E39BEEE9C3@ipfire.org>
In-Reply-To: <20191208101156.27524-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2033726510677445875=="
List-Id: <location.lists.ipfire.org>

--===============2033726510677445875==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Thank you. Merged.

> On 8 Dec 2019, at 10:11, Stefan Schantl <stefan.schantl(a)ipfire.org> wrote:
>=20
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> src/python/location-exporter.in | 17 ++++++++++++++---
> 1 file changed, 14 insertions(+), 3 deletions(-)
>=20
> 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"), choi=
ces=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=3Dfa=
milies)
>=20
>=20
> def main():
> --=20
> 2.20.1
>=20


--===============2033726510677445875==--