saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed usage of ipaddress

Browse source 
ipaddress is imported either directly or from salt.ext. If we
use it, we shouldn't address it with salt.ext.ipaddress.
This commit is contained in:
Jochen Breuer 2018-04-22 23:11:11 +02:00 • committed by rallytime
parent 63b664334b
commit c477b70753
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/network.py
View file

@ -1135,7 +1135,7 @@ def convert_cidr(cidr):
ret = {'network': None,
'netmask': None}
cidr = calc_net(cidr)
network_info = salt.ext.ipaddress.ip_network(cidr)
network_info = ipaddress.ip_network(cidr)
ret['network'] = str(network_info.network_address)
ret['netmask'] = str(network_info.netmask)
return ret