Infra/tiramisu
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

in_network's consistency now verify that IP is not network or broadcast's IP + ip_netmask's consistency now verify that IP is not broadcast's IP

Browse Source
This commit is contained in:
Emmanuel Garette
2014-12-01 23:16:00 +01:00
parent a801951a78
commit 4fde28a15e
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tiramisu/option/option.py
View File

@ -215,6 +215,8 @@ class IPOption(Option):
'netmask {4} ({5})')
raise ValueError(msg.format(ip, opts[0].impl_getname(), network,
opts[1].impl_getname(), netmask, opts[2].impl_getname()))
# test if ip is not network/broadcast IP
opts[2]._cons_ip_netmask((opts[2], opts[0]), (netmask, ip), warnings_only)
class PortOption(Option):
@ -344,16 +346,14 @@ class NetmaskOption(Option):
ip = IP('{0}/{1}'.format(val_ipnetwork, val_netmask),
make_net=make_net)
#if cidr == 32, ip same has network
if ip.prefixlen() != 32:
try:
IP('{0}/{1}'.format(val_ipnetwork, val_netmask),
make_net=not make_net)
except ValueError:
pass
else:
if make_net: # pragma: optional cover
msg = _("invalid IP {0} ({1}) with netmask {2},"
" this IP is a network")
if make_net and ip.prefixlen() != 32:
val_ip = IP(val_ipnetwork)
if ip.net() == val_ip:
msg = _("invalid IP {0} ({1}) with netmask {2},"
" this IP is a network")
if ip.broadcast() == val_ip:
msg = _("invalid IP {0} ({1}) with netmask {2},"
" this IP is a broadcast")
except ValueError: # pragma: optional cover
if not make_net: