saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

refactor dump in blockdev exec module

Browse source
This commit is contained in:
Justin Findlay 2015-10-23 13:57:33 -06:00
parent 88acc9356d
commit 359df1bcf7
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
salt/modules/blockdev.py
View file

@ -96,21 +96,38 @@ def dump(device, args=None):
'''
Return all contents of dumpe2fs for a specified device
args
a list containing only the desired arguments to return
CLI Example:
.. code-block:: bash
salt '*' blockdev.dump /dev/sda1
'''
cmd = 'blockdev --getro --getsz --getss --getpbsz --getiomin --getioopt --getalignoff --getmaxsect --getsize --getsize64 --getra --getfra {0}'.format(device)
cmd = ['blockdev',
'--getro',
'--getsz',
'--getss',
'--getpbsz',
'--getiomin',
'--getioopt',
'--getalignoff',
'--getmaxsect',
'--getsize',
'--getsize64',
'--getra',
'--getfra',
str(device)]
ret = {}
opts = [c[2:] for c in cmd.split() if c.startswith('--')]
opts = [c[2:] for c in cmd if c.startswith('--')]
out = __salt__['cmd.run_all'](cmd, python_shell=False)
if out['retcode'] == 0:
lines = [line for line in out['stdout'].splitlines() if line]
count = 0
for line in lines:
ret[opts[count]] = line
count = count+1
count += 1
if args:
temp_ret = {}
for arg in args: