diff --git a/changelogs/fragments/netaddr_is_private_deprecation.yaml b/changelogs/fragments/netaddr_is_private_deprecation.yaml new file mode 100644 index 0000000..6afe366 --- /dev/null +++ b/changelogs/fragments/netaddr_is_private_deprecation.yaml @@ -0,0 +1,6 @@ +--- +minor_changes: + - Use netaddr is_global() function instead of the deprecated is_private() function. + (https://netaddr.readthedocs.io/en/latest/changes.html#release-1-0-0) + - Remove reserved IPv6 from integration test expected results. + - Set netaddr minimum version required to 0.10.1 diff --git a/plugins/plugin_utils/base/ipaddr_utils.py b/plugins/plugin_utils/base/ipaddr_utils.py index 0d75199..a427a94 100644 --- a/plugins/plugin_utils/base/ipaddr_utils.py +++ b/plugins/plugin_utils/base/ipaddr_utils.py @@ -289,7 +289,7 @@ def _previous_usable_query(v, vtype): def _private_query(v, value): - if v.is_private(): + if not v.ip.is_global(): return value @@ -298,7 +298,7 @@ def _public_query(v, value): if all( [ v_ip.is_unicast(), - not v_ip.is_private(), + v_ip.is_global(), not v_ip.is_loopback(), not v_ip.is_netmask(), not v_ip.is_hostmask(), diff --git a/requirements.txt b/requirements.txt index e6f5da1..5b6603d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ jsonschema textfsm ttp xmltodict -netaddr==0.10.1 +netaddr>=0.10.1 diff --git a/tests/integration/targets/utils_ipaddr_filter/vars/main.yaml b/tests/integration/targets/utils_ipaddr_filter/vars/main.yaml index 6c28bde..aa44955 100644 --- a/tests/integration/targets/utils_ipaddr_filter/vars/main.yaml +++ b/tests/integration/targets/utils_ipaddr_filter/vars/main.yaml @@ -26,7 +26,6 @@ ipaddr_result2: ipaddr_result3: - 192.24.2.1 - - 2001:db8:32c:faad::/64 ipaddr_result4: - 192.168.32.0/24