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

Merge pull request #5068 from UtahDave/develop

Browse Source 
Remove redundant os check
This commit is contained in:
Colton Myers 2013-05-16 16:52:52 -07:00
commit 13aa96a613
1 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
salt/modules/win_disk.py
View File

@ -33,41 +33,40 @@ def usage():
salt '*' disk.usage
'''
if __grains__['kernel'] == 'Windows':
drives = []
ret = {}
drive_bitmask = ctypes.windll.kernel32.GetLogicalDrives()
for letter in string.uppercase:
if drive_bitmask & 1:
drives.append(letter)
drive_bitmask >>= 1
for drive in drives:
try:
(sectorspercluster,
bytespersector,
freeclusters,
totalclusters) = win32api.GetDiskFreeSpace(
'{0}:\\'.format(drive)
)
totalsize = sectorspercluster * bytespersector * totalclusters
available_space = (
sectorspercluster * bytespersector * freeclusters
)
used = totalsize - available_space
capacity = int(used / float(totalsize) * 100)
ret['{0}:\\'.format(drive)] = {
'filesystem': '{0}:\\'.format(drive),
'1K-blocks': totalsize,
'used': used,
'available': available_space,
'capacity': '{0}%'.format(capacity),
}
except Exception:
ret['{0}:\\'.format(drive)] = {
'filesystem': '{0}:\\'.format(drive),
'1K-blocks': None,
'used': None,
'available': None,
'capacity': None,
}
return ret
drives = []
ret = {}
drive_bitmask = ctypes.windll.kernel32.GetLogicalDrives()
for letter in string.uppercase:
if drive_bitmask & 1:
drives.append(letter)
drive_bitmask >>= 1
for drive in drives:
try:
(sectorspercluster,
bytespersector,
freeclusters,
totalclusters) = win32api.GetDiskFreeSpace(
'{0}:\\'.format(drive)
)
totalsize = sectorspercluster * bytespersector * totalclusters
available_space = (
sectorspercluster * bytespersector * freeclusters
)
used = totalsize - available_space
capacity = int(used / float(totalsize) * 100)
ret['{0}:\\'.format(drive)] = {
'filesystem': '{0}:\\'.format(drive),
'1K-blocks': totalsize,
'used': used,
'available': available_space,
'capacity': '{0}%'.format(capacity),
}
except Exception:
ret['{0}:\\'.format(drive)] = {
'filesystem': '{0}:\\'.format(drive),
'1K-blocks': None,
'used': None,
'available': None,
'capacity': None,
}
return ret