Skip to content
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

Jump to bottom

Added else statements #30391

Merged
merged 2 commits into from
Jan 15, 2016
Merged

Added else statements #30391

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c20f9b6
Added else statements
Jan 15, 2016
345b056
Fixed lint error
Jan 15, 2016
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
22 changes: 13 additions & 9 deletions salt/modules/ipset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,26 +434,28 @@ def check(set=None, entry=None, family='ipv4'):
ipaddress.ip_address(start),
ipaddress.ip_address(end) + 1
)]
entries = [' '.join([str(ipaddress.ip_address(ip))]) for ip in range(
ipaddress.ip_address(start),
ipaddress.ip_address(end) + 1
)]
else:
entries = [' '.join([str(ipaddress.ip_address(ip))]) for ip in range(
ipaddress.ip_address(start),
ipaddress.ip_address(end) + 1
)]

elif settype == 'hash:net':
networks = ipaddress.summarize_address_range(ipaddress.ip_address(start),
ipaddress.ip_address(end))
entries = []
for network in networks:
entries.append(network.with_prefixlen)
_network = [str(ip) for ip in ipaddress.ip_network(network)]
if len(_network) == 1:
if _entry_extra:
__network = ' '.join([str(_network[0]), ' '.join(_entry_extra)])
__network = ' '.join([str(_network[0])])
else:
__network = ' '.join([str(_network[0])])
else:
if _entry_extra:
__network = ' '.join([str(network), ' '.join(_entry_extra)])
__network = ' '.join([str(network)])
else:
__network = ' '.join([str(network)])
entries.append(__network)
else:
entries = [entry]
Expand All @@ -462,13 +464,15 @@ def check(set=None, entry=None, family='ipv4'):
if settype == 'hash:ip':
if _entry_extra:
entries = [' '.join([str(ip), ' '.join(_entry_extra)]) for ip in ipaddress.ip_network(_entry)]
entries = [' '.join([str(ip)]) for ip in ipaddress.ip_network(_entry)]
else:
entries = [' '.join([str(ip)]) for ip in ipaddress.ip_network(_entry)]
elif settype == 'hash:net':
_entries = [str(ip) for ip in ipaddress.ip_network(_entry)]
if len(_entries) == 1:
if _entry_extra:
entries = [' '.join([_entries[0], ' '.join(_entry_extra)])]
entries = [' '.join([_entries[0]])]
else:
entries = [' '.join([_entries[0]])]
else:
entries = [entry]
else:
Expand Down