valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

salt/modules/win_ip.py: remove raw string formatting

Browse Source
This commit is contained in:
Erik Johnson 2015-09-10 21:57:06 -05:00
parent 7588d14361
commit 95bf0429ed
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
salt/modules/win_ip.py
View File

@ -157,7 +157,9 @@ def is_enabled(iface):
iface_found = True
return line.split()[-1] == 'Connected'
if not iface_found:
raise CommandExecutionError('Interface {0!r} not found'.format(iface))
raise CommandExecutionError(
'Interface \'{0}\' not found'.format(iface)
)
return False
@ -219,7 +221,9 @@ def get_subnet_length(mask):
salt -G 'os_family:Windows' ip.get_subnet_length 255.255.255.0
'''
if not salt.utils.validate.net.netmask(mask):
raise SaltInvocationError('{0!r} is not a valid netmask'.format(mask))
raise SaltInvocationError(
'\'{0}\' is not a valid netmask'.format(mask)
)
return salt.utils.network.get_net_size(mask)
@ -262,11 +266,11 @@ def set_static_ip(iface, addr, gateway=None, append=False):
return {}
if not salt.utils.validate.net.ipv4_addr(addr):
raise SaltInvocationError('Invalid address {0!r}'.format(addr))
raise SaltInvocationError('Invalid address \'{0}\''.format(addr))
if gateway and not salt.utils.validate.net.ipv4_addr(addr):
raise SaltInvocationError(
'Invalid default gateway {0!r}'.format(gateway)
'Invalid default gateway \'{0}\''.format(gateway)
)
if '/' not in addr:
@ -274,8 +278,8 @@ def set_static_ip(iface, addr, gateway=None, append=False):
if append and _find_addr(iface, addr):
raise CommandExecutionError(
'Address {0!r} already exists on interface '
'{1!r}'.format(addr, iface)
'Address \'{0}\' already exists on interface '
'\'{1}\''.format(addr, iface)
)
cmd = ['netsh', 'interface', 'ip']