kunsi/bundlewrap
1
0
Fork 0
Code Issues 1 Pull requests 1 Releases Activity

libs/tools: resolve_identifier supports ip networks, not ip addresses

Browse source
This commit is contained in:
Franzi 2021-02-15 13:44:21 +01:00
parent 6527c985a7
commit 9a2f9038c4
Signed by: kunsi
GPG key ID: 12E3D2136B818350
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libs/tools.py
View file

@ -1,4 +1,4 @@
from ipaddress import ip_address, IPv4Address from ipaddress import ip_address, ip_network, IPv4Address, IPv4Network
from bundlewrap.exceptions import NoSuchGroup, NoSuchNode from bundlewrap.exceptions import NoSuchGroup, NoSuchNode
from bundlewrap.utils.text import bold, red from bundlewrap.utils.text import bold, red
@ -16,9 +16,9 @@ def resolve_identifier(repo, identifier):
nodes = repo.nodes_in_group(identifier) nodes = repo.nodes_in_group(identifier)
except NoSuchGroup: except NoSuchGroup:
try: try:
ip = ip_address(identifier) ip = ip_network(identifier)
if isinstance(ip, IPv4Address): if isinstance(ip, IPv4Network):
return {'ipv4': {ip}, 'ipv6': set()} return {'ipv4': {ip}, 'ipv6': set()}
else: else:
return {'ipv4': set(), 'ipv6': {ip}} return {'ipv4': set(), 'ipv6': {ip}}
@ -29,7 +29,7 @@ def resolve_identifier(repo, identifier):
i=identifier, i=identifier,
e=str(e), e=str(e),
)) ))
return {'ipv4': set(), 'ipv6': set()} raise
found_ips = set() found_ips = set()
for node in nodes: for node in nodes: