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

Fixes minor whitespace and comment issues

Browse Source
This commit is contained in:
Oliver Tupman 2016-08-02 09:35:19 +01:00
parent 922163be2a
commit 5b9e618103
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/cloud/clouds/vmware.py
View File

@ -2268,6 +2268,7 @@ def create(vm_):
win_user_fullname = config.get_cloud_config_value(
'win_user_fullname', vm_, __opts__, search_global=False, default='Windows User'
)
container_ref = None
if 'clonefrom' in vm_:
# If datacenter is specified, set the container reference to start search from it instead
@ -2553,7 +2554,7 @@ def create(vm_):
out = salt.utils.cloud.bootstrap(vm_, __opts__)
data = show_instance(vm_name, call='action')
# out is only assigned when it has an ip, deploy and power but not template
if deploy and out is not None:
data['deploy_kwargs'] = out['deploy_kwargs']

17
tests/unit/cloud/clouds/vmware_test.py
View File

@ -803,8 +803,7 @@ class VMwareTestCase(ExtendedTestCase):
def test_no_clonefrom_just_image(self):
'''
Tests that a SaltCloudSystemExit is raised when esxi_host_password is not
specified in the cloud provider configuration when calling add_host.
Tests that the profile is configured correctly when deploying using an image
'''
profile_additions = {
@ -826,8 +825,7 @@ class VMwareTestCase(ExtendedTestCase):
def test_just_clonefrom(self):
'''
Tests that a SaltCloudSystemExit is raised when esxi_host_password is not
specified in the cloud provider configuration when calling add_host.
Tests that the profile is configured correctly when deploying by cloning from a template
'''
profile_additions = {
@ -849,8 +847,7 @@ class VMwareTestCase(ExtendedTestCase):
def test_no_clonefrom_expect_fail(self):
'''
Tests that a SaltCloudSystemExit is raised when esxi_host_password is not
specified in the cloud provider configuration when calling add_host.
Tests that not including the clonefrom property will result in an invalid profile
'''
profile_additions = {}
@ -870,6 +867,10 @@ class VMwareTestCase(ExtendedTestCase):
@patch('salt.cloud.clouds.vmware.randint', return_value=101)
def test_add_new_ide_controller_helper(self, randint_mock):
'''
Tests that creating a new controller, ensuring that it will generate a controller key
if one is not provided
'''
controller_label = 'Some label'
bus_number = 1
spec = vmware._add_new_ide_controller_helper(controller_label, None, bus_number)
@ -884,6 +885,10 @@ class VMwareTestCase(ExtendedTestCase):
def test_manage_devices_just_cd(self):
'''
Tests that when adding IDE/CD drives, controller keys will be in the apparent
safe-range on ESX 5.5 but randomly generated on other versions (i.e. 6)
'''
device_map = {
'ide': {
'IDE 0': {},