openstack/ironic
Code Issues Proposed changes

Merge "Tune interval for node provision state check"

Browse Source
This commit is contained in:
Jenkins 2016-04-06 10:41:36 +00:00 committed by Gerrit Code Review
commit d805cc639f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ironic_tempest_plugin/tests/scenario/baremetal_manager.py
View File

@ -88,10 +88,10 @@ class BaremetalScenarioTest(manager.ScenarioTest):
(node_id, state_attr, target_states)) (node_id, state_attr, target_states))
raise lib_exc.TimeoutException(msg) raise lib_exc.TimeoutException(msg)
def wait_provisioning_state(self, node_id, state, timeout): def wait_provisioning_state(self, node_id, state, timeout, interval=1):
self._node_state_timeout( self._node_state_timeout(
node_id=node_id, state_attr='provision_state', node_id=node_id, state_attr='provision_state',
target_states=state, timeout=timeout) target_states=state, timeout=timeout, interval=interval)
def wait_power_state(self, node_id, state): def wait_power_state(self, node_id, state):
self._node_state_timeout( self._node_state_timeout(
@ -160,7 +160,8 @@ class BaremetalScenarioTest(manager.ScenarioTest):
self.wait_provisioning_state(self.node['uuid'], self.wait_provisioning_state(self.node['uuid'],
BaremetalProvisionStates.ACTIVE, BaremetalProvisionStates.ACTIVE,
timeout=CONF.baremetal.active_timeout) timeout=CONF.baremetal.active_timeout,
interval=30)
waiters.wait_for_server_status(self.servers_client, waiters.wait_for_server_status(self.servers_client,
self.instance['id'], 'ACTIVE') self.instance['id'], 'ACTIVE')
@ -175,4 +176,5 @@ class BaremetalScenarioTest(manager.ScenarioTest):
self.wait_provisioning_state( self.wait_provisioning_state(
self.node['uuid'], self.node['uuid'],
BaremetalProvisionStates.NOSTATE, BaremetalProvisionStates.NOSTATE,
timeout=CONF.baremetal.unprovision_timeout) timeout=CONF.baremetal.unprovision_timeout,
interval=30)