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

Resolves issue where no image or clonefrom gives image log error, along with a test for it

Browse Source
This commit is contained in:
Oliver Tupman 2016-08-03 12:16:26 +01:00
parent b198fca88d
commit af0e0ac165
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/config/__init__.py
View File

@ -2852,7 +2852,7 @@ def is_profile_configured(opts, provider, profile_name, vm_=None):
non_size_drivers.append('linode')
# If cloning on VMware, specifying image is not necessary.
if driver == 'vmware' and 'image' not in list(profile_key.keys()) and 'clonefrom' in list(profile_key.keys()):
if driver == 'vmware' and 'image' not in list(profile_key.keys()):
non_image_drivers.append('vmware')
if driver not in non_image_drivers:

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

@ -829,7 +829,8 @@ class VMwareTestCase(ExtendedTestCase):
'''
profile_additions = {
'clonefrom': 'test-template'
'clonefrom': 'test-template',
'image': 'should ignore image'
}
provider_config = deepcopy(PROVIDER_CONFIG)
@ -845,7 +846,8 @@ class VMwareTestCase(ExtendedTestCase):
self.assertEqual(config.is_profile_configured(vmware.__opts__, 'vcenter01:vmware',
'base-gold', vm_=vm_), True)
def test_no_clonefrom_expect_fail(self):
@patch('salt.config.log')
def test_no_clonefrom_or_image_expect_fail(self, log_mock):
'''
Tests that not including the clonefrom property will result in an invalid profile
'''
@ -861,9 +863,14 @@ class VMwareTestCase(ExtendedTestCase):
}
provider_config['vcenter01']['vmware'].update(provider_config_additions)
vm_ = {'profile': profile}
with patch.dict(vmware.__opts__, {'providers': provider_config}, clean=True):
self.assertEqual(config.is_profile_configured(vmware.__opts__, 'vcenter01:vmware',
'base-gold', vm_=vm_), False)
self.assertEqual(log_mock.error.call_args[0][0],
"The required '{0}' configuration setting is missing from "
"the '{1}' profile, which is configured under the '{2}' "
'alias.'.format('clonefrom', 'base-gold', 'vcenter01'))
@patch('salt.cloud.clouds.vmware.randint', return_value=101)
def test_add_new_ide_controller_helper(self, randint_mock):