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

error message for ip/broadcast/netmask/network validation

Browse Source
This commit is contained in:
Emmanuel Garette
2013-09-26 22:27:39 +02:00
parent a004f30e34
commit 1d2008fd84
3 changed files with 240 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tiramisu/option.py
View File

@ -782,7 +782,10 @@ class IPOption(Option):
only_warning=only_warning)
def _validate(self, value):
IP('{0}/32'.format(value))
try:
IP('{0}/32'.format(value))
except ValueError:
raise ValueError(_('invalid IP {0}').format(self._name))
def _second_level_validation(self, value):
ip = IP('{0}/32'.format(value))
@ -868,7 +871,10 @@ class NetworkOption(Option):
_opt_type = 'network'
def _validate(self, value):
IP(value)
try:
IP(value)
except ValueError:
raise ValueError(_('invalid network address {0}').format(self._name))
def _second_level_validation(self, value):
ip = IP(value)
@ -882,7 +888,10 @@ class NetmaskOption(Option):
_opt_type = 'netmask'
def _validate(self, value):
IP('0.0.0.0/{0}'.format(value))
try:
IP('0.0.0.0/{0}'.format(value))
except ValueError:
raise ValueError(_('invalid netmask address {0}').format(self._name))
def _cons_network_netmask(self, optname, value, value_):
#opts must be (netmask, network) options
@ -924,7 +933,10 @@ class NetmaskOption(Option):
class BroadcastOption(Option):
def _validate(self, value):
IP('{0}/32'.format(value))
try:
IP('{0}/32'.format(value))
except ValueError:
raise ValueError(_('invalid broadcast address {0}').format(self._name))
class DomainnameOption(Option):