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

DomainnameOption now works with default value

Browse Source
This commit is contained in:
Emmanuel Garette
2013-05-10 09:27:54 +02:00
parent 6de65859b4
commit 6ffd71a43e
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tiramisu/option.py
View File

@ -528,7 +528,6 @@ class NetmaskOption(Option):
class DomainnameOption(Option):
__slots__ = ('_opt_type', '_type', '_allow_ip')
_opt_type = 'domainname'
#allow_ip
def __init__(self, name, doc, default=None, default_multi=None,
requires=None, multi=False, callback=None,
@ -538,6 +537,12 @@ class DomainnameOption(Option):
#hostname: to identify the device
#domainname:
#fqdn: with tld, not supported yet
if type_ not in ['netbios', 'hostname', 'domainname']:
raise ValueError(_('unknown type_ {0} for hostname').format(type_))
self._type = type_
if allow_ip not in [True, False]:
raise ValueError(_('allow_ip must be a boolean'))
self._allow_ip = allow_ip
super(DomainnameOption, self).__init__(name, doc, default=default,
default_multi=default_multi,
callback=callback,
@ -547,10 +552,6 @@ class DomainnameOption(Option):
validator=validator,
validator_args=validator_args,
properties=properties)
if type_ not in ['netbios', 'hostname', 'domainname']:
raise ValueError(_('unknown type_ {0} for hostname').format(type_))
self._type = type_
self._allow_ip = allow_ip
def _validate(self, value):
if self._allow_ip is True: