openinfra/python-tempestconf
Code Issues Proposed changes

Merge "Set compute/min_compute_nodes"

Browse Source
This commit is contained in:
Zuul 2019-11-13 02:03:35 +00:00 committed by Gerrit Code Review
commit 2c471c212f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config_tempest/services/compute.py
View File

@ -30,12 +30,16 @@ class ComputeService(VersionedService):
def set_default_tempest_options(self, conf): def set_default_tempest_options(self, conf):
conf.set('compute-feature-enabled', 'console_output', 'True') conf.set('compute-feature-enabled', 'console_output', 'True')
num_compute = self._get_number_of_hosts()
# set min_compute_nodes to enable migration tests in env
# with multiple compute nodes
conf.set('compute', 'min_compute_nodes', str(num_compute))
# Resize only works if it has at least 2 compute nodes # Resize only works if it has at least 2 compute nodes
# or if nova has the option allow_resize_to_same_host # or if nova has the option allow_resize_to_same_host
# set to true. Unfortunately we can't get this info from # set to true. Unfortunately we can't get this info from
# nova api, so we only set it when we know there's 2 # nova api, so we only set it when we know there's 2
# compute nodes # compute nodes
if self._get_number_of_hosts() >= 2: if num_compute >= 2:
conf.set('compute-feature-enabled', 'resize', 'True') conf.set('compute-feature-enabled', 'resize', 'True')
# set microversions # set microversions
m_versions = self.filter_api_microversions() m_versions = self.filter_api_microversions()

3
config_tempest/tests/services/test_compute.py
View File

@ -43,6 +43,9 @@ class TestComputeService(BaseServiceTest):
mock_get_number_of_hosts.return_value = 2 mock_get_number_of_hosts.return_value = 2
conf = TempestConf() conf = TempestConf()
self.Service.set_default_tempest_options(conf) self.Service.set_default_tempest_options(conf)
self.assertEqual(
conf.get('compute',
'min_compute_nodes'), '2')
self.assertEqual( self.assertEqual(
conf.get('compute-feature-enabled', conf.get('compute-feature-enabled',
'resize'), 'True') 'resize'), 'True')