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

let salt do some of the work, less code is better

Browse Source
This commit is contained in:
Jorge Schrauwen 2015-11-05 16:15:44 +00:00
parent c491da1515
commit 376965949f
1 changed files with 14 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
salt/modules/smartos_vmadm.py
View File

@ -158,7 +158,7 @@ def _create_update_from_cfg(mode='create', uuid=None, vmcfg=None):
return True
def start(vm=None, options=None, key='uuid'):
def start(vm, options=None, key='uuid'):
'''
Start a vm
@ -180,9 +180,6 @@ def start(vm=None, options=None, key='uuid'):
'''
ret = {}
vmadm = _check_vmadm()
if vm is None:
ret['Error'] = 'uuid, alias or hostname must be provided'
return ret
if key not in ['uuid', 'alias', 'hostname']:
ret['Error'] = 'Key must be either uuid, alias or hostname'
return ret
@ -203,7 +200,7 @@ def start(vm=None, options=None, key='uuid'):
return True
def stop(vm=None, force=False, key='uuid'):
def stop(vm, force=False, key='uuid'):
'''
Stop a vm
@ -225,9 +222,6 @@ def stop(vm=None, force=False, key='uuid'):
'''
ret = {}
vmadm = _check_vmadm()
if vm is None:
ret['Error'] = 'uuid, alias or hostname must be provided'
return ret
if key not in ['uuid', 'alias', 'hostname']:
ret['Error'] = 'Key must be either uuid, alias or hostname'
return ret
@ -248,7 +242,7 @@ def stop(vm=None, force=False, key='uuid'):
return True
def reboot(vm=None, force=False, key='uuid'):
def reboot(vm, force=False, key='uuid'):
'''
Reboot a vm
@ -270,9 +264,6 @@ def reboot(vm=None, force=False, key='uuid'):
'''
ret = {}
vmadm = _check_vmadm()
if vm is None:
ret['Error'] = 'uuid, alias or hostname must be provided'
return ret
if key not in ['uuid', 'alias', 'hostname']:
ret['Error'] = 'Key must be either uuid, alias or hostname'
return ret
@ -397,13 +388,13 @@ def lookup(search=None, order=None, one=False):
return result
def sysrq(vm=None, action='nmi', key='uuid'):
def sysrq(vm, action='nmi', key='uuid'):
'''
Send non-maskable interupt to vm or capture a screenshot
vm : string
vm to be targetted
action : string
action : string
nmi or screenshot -- Default: nmi
key : string [uuid|alias|hostname]
value type of 'vm' parameter
@ -418,9 +409,6 @@ def sysrq(vm=None, action='nmi', key='uuid'):
'''
ret = {}
vmadm = _check_vmadm()
if vm is None:
ret['Error'] = 'uuid, alias or hostname must be provided'
return ret
if key not in ['uuid', 'alias', 'hostname']:
ret['Error'] = 'Key must be either uuid, alias or hostname'
return ret
@ -444,7 +432,7 @@ def sysrq(vm=None, action='nmi', key='uuid'):
return True
def delete(vm=None, key='uuid'):
def delete(vm, key='uuid'):
'''
Delete a vm
@ -462,9 +450,6 @@ def delete(vm=None, key='uuid'):
'''
ret = {}
vmadm = _check_vmadm()
if vm is None:
ret['Error'] = 'uuid, alias or hostname must be provided'
return ret
if key not in ['uuid', 'alias', 'hostname']:
ret['Error'] = 'Key must be either uuid, alias or hostname'
return ret
@ -484,7 +469,7 @@ def delete(vm=None, key='uuid'):
return True
def get(vm=None, key='uuid'):
def get(vm, key='uuid'):
'''
Output the JSON object describing a VM
@ -502,9 +487,6 @@ def get(vm=None, key='uuid'):
'''
ret = {}
vmadm = _check_vmadm()
if vm is None:
ret['Error'] = 'uuid, alias or hostname must be provided'
return ret
if key not in ['uuid', 'alias', 'hostname']:
ret['Error'] = 'Key must be either uuid, alias or hostname'
return ret
@ -524,7 +506,7 @@ def get(vm=None, key='uuid'):
return json.loads(res['stdout'])
def info(vm=None, info_type='all', key='uuid'):
def info(vm, info_type='all', key='uuid'):
'''
Lookup info on running kvm
@ -546,9 +528,6 @@ def info(vm=None, info_type='all', key='uuid'):
'''
ret = {}
vmadm = _check_vmadm()
if vm is None:
ret['Error'] = 'uuid, alias or hostname must be provided'
return ret
if info_type not in ['all', 'block', 'blockstats', 'chardev', 'cpus', 'kvm', 'pci', 'spice', 'version', 'vnc']:
ret['Error'] = 'Requested info_type is not available'
return ret
@ -572,7 +551,7 @@ def info(vm=None, info_type='all', key='uuid'):
return json.loads(res['stdout'])
def create_snapshot(vm=None, name=None, key='uuid'):
def create_snapshot(vm, name, key='uuid'):
'''
Create snapshot of a vm
@ -595,12 +574,6 @@ def create_snapshot(vm=None, name=None, key='uuid'):
'''
ret = {}
vmadm = _check_vmadm()
if vm is None:
ret['Error'] = 'uuid, alias or hostname must be provided'
return ret
if name is None:
ret['Error'] = 'Snapshot name most be specified'
return ret
if key not in ['uuid', 'alias', 'hostname']:
ret['Error'] = 'Key must be either uuid, alias or hostname'
return ret
@ -631,7 +604,7 @@ def create_snapshot(vm=None, name=None, key='uuid'):
return True
def delete_snapshot(vm=None, name=None, key='uuid'):
def delete_snapshot(vm, name, key='uuid'):
'''
Delete snapshot of a vm
@ -654,12 +627,6 @@ def delete_snapshot(vm=None, name=None, key='uuid'):
'''
ret = {}
vmadm = _check_vmadm()
if vm is None:
ret['Error'] = 'uuid, alias or hostname must be provided'
return ret
if name is None:
ret['Error'] = 'Snapshot name most be specified'
return ret
if key not in ['uuid', 'alias', 'hostname']:
ret['Error'] = 'Key must be either uuid, alias or hostname'
return ret
@ -687,7 +654,7 @@ def delete_snapshot(vm=None, name=None, key='uuid'):
return True
def rollback_snapshot(vm=None, name=None, key='uuid'):
def rollback_snapshot(vm, name, key='uuid'):
'''
Rollback snapshot of a vm
@ -710,12 +677,6 @@ def rollback_snapshot(vm=None, name=None, key='uuid'):
'''
ret = {}
vmadm = _check_vmadm()
if vm is None:
ret['Error'] = 'uuid, alias or hostname must be provided'
return ret
if name is None:
ret['Error'] = 'Snapshot name most be specified'
return ret
if key not in ['uuid', 'alias', 'hostname']:
ret['Error'] = 'Key must be either uuid, alias or hostname'
return ret
@ -743,7 +704,7 @@ def rollback_snapshot(vm=None, name=None, key='uuid'):
return True
def reprovision(vm=None, image=None, key='uuid'):
def reprovision(vm, image, key='uuid'):
'''
Reprovision a vm
@ -763,12 +724,6 @@ def reprovision(vm=None, image=None, key='uuid'):
'''
ret = {}
vmadm = _check_vmadm()
if vm is None:
ret['Error'] = 'uuid, alias or hostname must be provided'
return ret
if image is None:
ret['Error'] = 'Image uuid must be specified'
return ret
if key not in ['uuid', 'alias', 'hostname']:
ret['Error'] = 'Key must be either uuid, alias or hostname'
return ret
@ -874,7 +829,7 @@ def update(**kwargs):
return _create_update_from_cfg('update', uuid, vmcfg=vmcfg)
def send(vm=None, target=None, key='uuid'):
def send(vm, target, key='uuid'):
'''
Send a vm to a directory
@ -895,15 +850,9 @@ def send(vm=None, target=None, key='uuid'):
ret = {}
vmadm = _check_vmadm()
zfs = _check_zfs()
if vm is None:
ret['Error'] = 'uuid, alias or hostname must be provided'
return ret
if key not in ['uuid', 'alias', 'hostname']:
ret['Error'] = 'Key must be either uuid, alias or hostname'
return ret
if target is None:
ret['Error'] = 'Target must be specified'
return ret
if not os.path.isdir(target):
ret['Error'] = 'Target must be a directory or host'
return ret
@ -942,7 +891,7 @@ def send(vm=None, target=None, key='uuid'):
return True
def receive(uuid=None, source=None):
def receive(uuid, source):
'''
Receive a vm from a directory
@ -960,12 +909,6 @@ def receive(uuid=None, source=None):
ret = {}
vmadm = _check_vmadm()
zfs = _check_zfs()
if uuid is None:
ret['Error'] = 'uuid must be provided'
return ret
if source is None:
ret['Error'] = 'Source must be specified'
return ret
if not os.path.isdir(source):
ret['Error'] = 'Source must be a directory or host'
return ret