openstack/watcher
Code Issues Proposed changes

Merge "Don't revert Migrate action"

Browse Source
This commit is contained in:
Zuul 2019-08-16 06:43:04 +00:00 committed by Gerrit Code Review
commit 1bd580b7a8
2 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
watcher/applier/actions/migration.py
View File

@ -186,7 +186,7 @@ class Migrate(base.BaseAction):
return self.migrate(destination=self.destination_node) return self.migrate(destination=self.destination_node)
def revert(self): def revert(self):
return self.migrate(destination=self.source_node) LOG.info('Migrate action do not revert!')
def abort(self): def abort(self):
nova = nova_helper.NovaHelper(osc=self.osc) nova = nova_helper.NovaHelper(osc=self.osc)

23
watcher/tests/applier/actions/test_migration.py
View File

@ -187,29 +187,6 @@ class TestMigration(base.TestCase):
dest_hostname="compute2-hostname" dest_hostname="compute2-hostname"
) )
def test_revert_live_migration(self):
self.m_helper.find_instance.return_value = self.INSTANCE_UUID
self.action.revert()
self.m_helper_cls.assert_called_once_with(osc=self.m_osc)
self.m_helper.live_migrate_instance.assert_called_once_with(
instance_id=self.INSTANCE_UUID,
dest_hostname="compute1-hostname"
)
def test_revert_cold_migration(self):
self.m_helper.find_instance.return_value = self.INSTANCE_UUID
self.action_cold.revert()
self.m_helper_cls.assert_called_once_with(osc=self.m_osc)
self.m_helper.watcher_non_live_migrate_instance.\
assert_called_once_with(
instance_id=self.INSTANCE_UUID,
dest_hostname="compute1-hostname"
)
def test_abort_live_migrate(self): def test_abort_live_migrate(self):
migration = mock.MagicMock() migration = mock.MagicMock()
migration.id = "2" migration.id = "2"