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

Protect the vboxapi import more carefully (#33722)

Browse Source 
* Protect the vboxapi import more carefully

Fixes #33720

* Pylint fix
This commit is contained in:
Nicole Thomas 2016-06-13 19:25:19 -04:00 committed by GitHub
parent 5e28dc3158
commit 840102d624
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
salt/cloud/clouds/virtualbox.py
View File

@ -1,8 +1,10 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" '''
A salt cloud provider that lets you use virtualbox on your machine A salt cloud provider that lets you use virtualbox on your machine
and act as a cloud. and act as a cloud.
:depends: vboxapi
For now this will only clone existing VMs. It's best to create a template For now this will only clone existing VMs. It's best to create a template
from which we will clone. from which we will clone.
@ -13,29 +15,43 @@ to create this.
Dicts provided by salt: Dicts provided by salt:
__opts__ : contains the options used to run Salt Cloud, __opts__ : contains the options used to run Salt Cloud,
as well as a set of configuration and environment variables as well as a set of configuration and environment variables
""" '''
from __future__ import absolute_import
# Import python libs # Import python libs
from __future__ import absolute_import
import logging import logging
# Import salt libs # Import salt libs
from salt.exceptions import SaltCloudSystemExit from salt.exceptions import SaltCloudSystemExit
import salt.config as config import salt.config as config
import salt.utils.cloud as cloud import salt.utils.cloud as cloud
from salt.utils.virtualbox import vb_list_machines, vb_clone_vm, HAS_LIBS, vb_machine_exists, vb_destroy_machine, \
vb_get_machine, vb_stop_vm, treat_machine_dict, vb_start_vm, vb_wait_for_network_address # Import Third Party Libs
try:
import vboxapi # pylint: disable=unused-import
from salt.utils.virtualbox import (
vb_list_machines,
vb_clone_vm,
vb_machine_exists,
vb_destroy_machine,
vb_get_machine,
vb_stop_vm,
treat_machine_dict,
vb_start_vm,
vb_wait_for_network_address
)
HAS_VBOX = True
except ImportError:
HAS_VBOX = False
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
""" # The name salt will identify the lib by
The name salt will identify the lib by
"""
__virtualname__ = 'virtualbox' __virtualname__ = 'virtualbox'
def __virtual__(): def __virtual__():
""" '''
This function determines whether or not This function determines whether or not
to make this cloud module available upon execution. to make this cloud module available upon execution.
Most often, it uses get_configured_provider() to determine Most often, it uses get_configured_provider() to determine
@ -46,18 +62,16 @@ def __virtual__():
then that name should be returned instead of True. then that name should be returned instead of True.
@return True|False|str @return True|False|str
""" '''
if not HAS_VBOX:
if not HAS_LIBS: return False, 'The virtualbox driver cannot be loaded: \'vboxapi\' is not installed.'
return False
if get_configured_provider() is False: if get_configured_provider() is False:
return False return False, 'The virtualbox driver cannot be loaded: \'virtualbox\' provider is not configured.'
# If the name of the driver used does not match the filename, # If the name of the driver used does not match the filename,
# then that name should be returned instead of True. # then that name should be returned instead of True.
# return __virtualname__ return __virtualname__
return True
def get_configured_provider(): def get_configured_provider():