Skip to content

Refactoring Ip.py to return proper boolean values #1043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
securestep9 merged 5 commits into from
May 27, 2025
Merged

Refactoring Ip.py to return proper boolean values #1043

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d04b00d
added bool to netaddr instances, removed redundant imports
pUrGe12 Mar 11, 2025
2399b04
created test file for ip.py
pUrGe12 Mar 11, 2025
fef75c5
Merge branch 'master' into ip-tests
pUrGe12 Mar 19, 2025
8092ddd
refactoring ip.py
pUrGe12 Mar 19, 2025
2f106d7
Merge branch 'master' into ip-tests
pUrGe12 May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions nettacker/core/ip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import netaddr
import requests
from netaddr import iprange_to_cidrs, IPNetwork


def generate_ip_range(ip_range):
Expand All @@ -16,11 +15,11 @@ def generate_ip_range(ip_range):
an array with CIDRs
"""
if "/" in ip_range:
return [ip.format() for ip in [cidr for cidr in IPNetwork(ip_range)]]
return [ip.format() for ip in [cidr for cidr in netaddr.IPNetwork(ip_range)]]
else:
ips = []
for generator_ip_range in [
cidr.iter_hosts() for cidr in iprange_to_cidrs(*ip_range.rsplit("-"))
cidr.iter_hosts() for cidr in netaddr.iprange_to_cidrs(*ip_range.rsplit("-"))
]:
for ip in generator_ip_range:
ips.append(ip.format())
Expand Down Expand Up @@ -68,7 +67,7 @@ def is_ipv4_range(ip_range):
"/" in ip_range
and "." in ip_range
and "-" not in ip_range
and netaddr.IPNetwork(ip_range)
and bool(netaddr.IPNetwork(ip_range))
)
except Exception:
return False
Expand All @@ -80,7 +79,7 @@ def is_ipv4_cidr(ip_range):
"/" not in ip_range
and "." in ip_range
and "-" in ip_range
and iprange_to_cidrs(*ip_range.split("-"))
and bool(netaddr.iprange_to_cidrs(*ip_range.split("-")))
)
except Exception:
return False
Expand All @@ -96,7 +95,7 @@ def is_single_ipv6(ip):
Returns:
True if it's IPv6 otherwise False
"""
return netaddr.valid_ipv6(str(ip))
return netaddr.valid_ipv6(ip)


def is_ipv6_range(ip_range):
Expand All @@ -105,7 +104,7 @@ def is_ipv6_range(ip_range):
"/" not in ip_range
and ":" in ip_range
and "-" in ip_range
and iprange_to_cidrs(*ip_range.split("-"))
and bool(netaddr.iprange_to_cidrs(*ip_range.split("-")))
)
except Exception:
return False
Expand All @@ -117,7 +116,7 @@ def is_ipv6_cidr(ip_range):
"/" in ip_range
and ":" in ip_range
and "-" not in ip_range
and netaddr.IPNetwork(ip_range)
and bool(netaddr.IPNetwork(ip_range))
)
except Exception:
return False