From c522e881b1ba02f4b97d9de9d58fabd4ce884249 Mon Sep 17 00:00:00 2001
From: licanwei <li.canwei2@zte.com.cn>
Date: Tue, 13 Aug 2019 14:09:59 +0800
Subject: [PATCH] Don't revert Migrate action

If Migrate action succeed, don't revert instance when the actionplan failed.

Change-Id: Ic1c1151a3152e632ad90c6f006e8c7d5abded223
Closes-Bug: #1839909
---
 watcher/applier/actions/migration.py          |  2 +-
 .../tests/applier/actions/test_migration.py   | 23 -------------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/watcher/applier/actions/migration.py b/watcher/applier/actions/migration.py
index 781f378cd..4a6bc2683 100644
--- a/watcher/applier/actions/migration.py
+++ b/watcher/applier/actions/migration.py
@@ -186,7 +186,7 @@ class Migrate(base.BaseAction):
         return self.migrate(destination=self.destination_node)
 
     def revert(self):
-        return self.migrate(destination=self.source_node)
+        LOG.info('Migrate action do not revert!')
 
     def abort(self):
         nova = nova_helper.NovaHelper(osc=self.osc)
diff --git a/watcher/tests/applier/actions/test_migration.py b/watcher/tests/applier/actions/test_migration.py
index d7078320b..c0a951df0 100644
--- a/watcher/tests/applier/actions/test_migration.py
+++ b/watcher/tests/applier/actions/test_migration.py
@@ -187,29 +187,6 @@ class TestMigration(base.TestCase):
                 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):
         migration = mock.MagicMock()
         migration.id = "2"