diff options
author | Zuul <zuul@review.opendev.org> | 2023-03-02 10:47:11 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2023-03-02 10:47:11 +0000 |
commit | fc01371dfb12088e2a71684c76fdd4055985469f (patch) | |
tree | 1b67b0bd2c231892e0c79b1e693423350f8a6c4c | |
parent | 44bc089ac69c2dd61e789c38985b744dbddb0582 (diff) | |
parent | 3969228eebac197fc9bbb700c5d6999e06dd71c5 (diff) | |
download | nova-fc01371dfb12088e2a71684c76fdd4055985469f.tar.gz |
Merge "Adds a repoducer for post live migration fail" into stable/train
-rw-r--r-- | nova/tests/functional/integrated_helpers.py | 7 | ||||
-rw-r--r-- | nova/tests/functional/regressions/test_bug_1628606.py | 72 |
2 files changed, 76 insertions, 3 deletions
diff --git a/nova/tests/functional/integrated_helpers.py b/nova/tests/functional/integrated_helpers.py index 44d12fdbf6..abe5dad5d2 100644 --- a/nova/tests/functional/integrated_helpers.py +++ b/nova/tests/functional/integrated_helpers.py @@ -386,10 +386,11 @@ class InstanceHelperMixin(object): 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, server_expected_state) + {'os-migrateLive': {'host': None, 'block_migration': 'auto'}}) + server = self._wait_for_state_change( + self.api, server, server_expected_state) self._wait_for_migration_status(server, [migration_expected_state]) + return server def _evacuate_server( self, server, extra_post_args=None, expected_host=None, diff --git a/nova/tests/functional/regressions/test_bug_1628606.py b/nova/tests/functional/regressions/test_bug_1628606.py new file mode 100644 index 0000000000..ba51d2e071 --- /dev/null +++ b/nova/tests/functional/regressions/test_bug_1628606.py @@ -0,0 +1,72 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +import mock +from nova import test +from nova.tests import fixtures as nova_fixtures +from nova.tests.functional.api import client +from nova.tests.functional import fixtures as func_fixtures +from nova.tests.functional import integrated_helpers +from nova.tests.unit.image import fake + + +class PostLiveMigrationFail( + test.TestCase, integrated_helpers.InstanceHelperMixin): + """Regression test for bug 1628606 + """ + + def setUp(self): + super(PostLiveMigrationFail, self).setUp() + self.useFixture(nova_fixtures.NeutronFixture(self)) + fake.stub_out_image_service(self) + self.useFixture(func_fixtures.PlacementFixture()) + self.useFixture(nova_fixtures.HostNameWeigherFixture()) + + self.start_service('conductor') + self.start_service('scheduler') + + api_fixture = self.useFixture(nova_fixtures.OSAPIFixture( + api_version='v2.1')) + + self.admin_api = api_fixture.admin_api + self.api = api_fixture.api + + # retrieve image already so we can set api.microversion as latest + self.image_id = self.api.get_images()[0]['id'] + + self.admin_api.microversion = 'latest' + self.api.microversion = 'latest' + + self.src = self._start_compute(host='host1') + self.dest = self._start_compute(host='host2') + + @mock.patch( + 'nova.compute.manager.ComputeManager' + '._post_live_migration_remove_source_vol_connections') + def test_post_live_migration(self, mock_migration): + server = self.admin_api.post_server( + dict(server=self._build_minimal_create_server_request( + self.api, 'test_post_live_migration', self.image_id, + networks='none'))) + server = self._wait_for_state_change(self.admin_api, server, 'ACTIVE') + self.assertEqual(self.src.host, server['OS-EXT-SRV-ATTR:host']) + + error = client.OpenStackApiException( + "Failed to remove source vol connection post live migration") + mock_migration.side_effect = error + + server = self._live_migrate( + server, migration_expected_state='error', + server_expected_state='ERROR') + # FIXME(amit): this should point to the dest as after migration + # but does not because of bug 1628606 + self.assertEqual(self.src.host, server['OS-EXT-SRV-ATTR:host']) |