From f314e533ea4848a2193b85a950a4d44cf23a120f Mon Sep 17 00:00:00 2001 From: Matt Love Date: Tue, 9 Jul 2019 14:46:02 -0700 Subject: [PATCH] =?UTF-8?q?:heavy=5Fminus=5Fsign:=20Netaddr=20=E2=86=92=20?= =?UTF-8?q?ipaddress?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hyperglass/command/construct.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hyperglass/command/construct.py b/hyperglass/command/construct.py index 6e715e5..f99e3c8 100644 --- a/hyperglass/command/construct.py +++ b/hyperglass/command/construct.py @@ -6,10 +6,10 @@ hyperglass API modules. # Standard Imports import json import operator +import ipaddress # Module Imports from logzero import logger -from netaddr import IPNetwork, IPAddress # pylint: disable=unused-import # Project Imports from hyperglass.configuration import ( # pylint: disable=unused-import @@ -55,7 +55,7 @@ class Construct: query_type = "ping" logger.debug(f"Constructing {query_type} query for {target} via {transport}...") query = None - ip_version = IPNetwork(target).ip.version + ip_version = ipaddress.ip_network(target).version afi = f"ipv{ip_version}" source = self.get_src(ip_version) if transport == "rest": @@ -81,7 +81,7 @@ class Construct: query_type = "traceroute" logger.debug(f"Constructing {query_type} query for {target} via {transport}...") query = None - ip_version = IPNetwork(target).ip.version + ip_version = ipaddress.ip_network(target).version afi = f"ipv{ip_version}" source = self.get_src(ip_version) if transport == "rest": @@ -108,7 +108,7 @@ class Construct: query_type = "bgp_route" logger.debug(f"Constructing {query_type} query for {target} via {transport}...") query = None - ip_version = IPNetwork(target).ip.version + ip_version = ipaddress.ip_network(target).version afi = f"ipv{ip_version}" if transport == "rest": query = json.dumps({"query_type": query_type, "afi": afi, "target": target})