diff options
| author | Zuul <zuul@review.opendev.org> | 2023-01-24 11:45:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-01-24 11:45:40 +0000 |
| commit | 20a8dce2b4ca3c566ccbc3a3eecd8dac36a0372f (patch) | |
| tree | 0dfd52b6a12f249c8d853dd5e909e42417640c35 | |
| parent | c41c25c9d0539b9d67bcb59369a067d6dbbe9c44 (diff) | |
| parent | 186db1751080effe0c674434bcd2c81b81ab8838 (diff) | |
| download | nova-20a8dce2b4ca3c566ccbc3a3eecd8dac36a0372f.tar.gz | |
Merge "func: Introduce a server_expected_state kwarg to InstanceHelperMixin._live_migrate" into stable/train
| -rw-r--r-- | nova/tests/functional/integrated_helpers.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/tests/functional/integrated_helpers.py b/nova/tests/functional/integrated_helpers.py index 183c983306..44d12fdbf6 100644 --- a/nova/tests/functional/integrated_helpers.py +++ b/nova/tests/functional/integrated_helpers.py @@ -382,13 +382,14 @@ class InstanceHelperMixin(object): self.fail('The line "%(log_line)s" did not appear in the log') - def _live_migrate(self, server, migration_final_status): + def _live_migrate(self, server, migration_expected_state, + server_expected_state='ACTIVE'): self.api.post_server_action( server['id'], {'os-migrateLive': {'host': None, 'block_migration': 'auto'}}) - self._wait_for_state_change(self.api, server, 'ACTIVE') - self._wait_for_migration_status(server, [migration_final_status]) + self._wait_for_state_change(self.api, server, server_expected_state) + self._wait_for_migration_status(server, [migration_expected_state]) def _evacuate_server( self, server, extra_post_args=None, expected_host=None, |