Skip to content

Commit 81c229c

Browse files
authored
Remove ansible.netcommon dependency and use standard ipaddress library(#453)
1 parent bb6d7d5 commit 81c229c

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

galaxy.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ tags:
4646
# L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version
4747
# range specifiers can be set and are separated by ','
4848
dependencies:
49-
# Required for ipaddress python library
50-
ansible.netcommon: ">=1.0.0"
51-
5249
# Required for json_query used in lookup plugin integration tests
5350
community.general: ">=1.0.0"
5451

plugins/inventory/nb_inventory.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@
248248
from typing import Iterable
249249
from itertools import chain
250250
from collections import defaultdict
251+
from ipaddress import ip_interface
251252

252253
from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable
253254
from ansible.module_utils.ansible_release import __version__ as ansible_version
@@ -256,9 +257,6 @@
256257
from ansible.module_utils.urls import open_url
257258
from ansible.module_utils.six.moves.urllib import error as urllib_error
258259
from ansible.module_utils.six.moves.urllib.parse import urlencode
259-
from ansible_collections.ansible.netcommon.plugins.module_utils.compat.ipaddress import (
260-
ip_interface,
261-
)
262260

263261

264262
class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):

plugins/module_utils/netbox_ipam.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
# Import necessary packages
99
import traceback
10-
from ansible_collections.ansible.netcommon.plugins.module_utils.compat import ipaddress
10+
from ipaddress import ip_interface
1111
from ansible.module_utils._text import to_text
1212
from ansible.module_utils.basic import missing_required_lib
1313

@@ -169,7 +169,9 @@ def run(self):
169169
if self.endpoint == "ip_addresses":
170170
if data.get("address"):
171171
try:
172-
data["address"] = to_text(ipaddress.ip_network(data["address"]))
172+
data["address"] = to_text(
173+
ip_interface(data["address"]).with_prefixlen
174+
)
173175
except ValueError:
174176
pass
175177
name = data.get("address")

plugins/module_utils/netbox_utils.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515

1616
from itertools import chain
1717

18-
from ansible_collections.ansible.netcommon.plugins.module_utils.compat import ipaddress
19-
2018
from ansible.module_utils.common.text.converters import to_text
2119

2220
from ansible.module_utils._text import to_native

0 commit comments

Comments
 (0)