From a4b9403d9084389153e6640de8bc4072b92f7b1d Mon Sep 17 00:00:00 2001
From: Dmitry Belyaninov <dbelyaninov@mirantis.com>
Date: Wed, 15 Mar 2017 07:57:58 +0100
Subject: [PATCH] Fix for maintenance mode tests

There is problem with "--force" option for reboot command.
So we should update the test accordingly.
Also deprecated method was replaced.

Change-Id: I87a20e0d06655b982f839cc4e073ca604d437c74
Closes-Bug: 1664487
(cherry picked from commit 7d0f33365d6a2a915f3484c6dcfe3c40a55bdcff)
---
 .../test_cic_maintenance_mode.py              | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/fuelweb_test/tests/tests_strength/test_cic_maintenance_mode.py b/fuelweb_test/tests/tests_strength/test_cic_maintenance_mode.py
index e5c49e9b3..b4e4d4832 100644
--- a/fuelweb_test/tests/tests_strength/test_cic_maintenance_mode.py
+++ b/fuelweb_test/tests/tests_strength/test_cic_maintenance_mode.py
@@ -107,9 +107,10 @@ class CICMaintenanceMode(TestBasic):
         logger.info('Maintenance mode for node-{0}'.format(_id))
         asserts.assert_true('True' in check_available_mode(_ip),
                             "Maintenance mode is not available")
-        self.ssh_manager.execute_on_remote(
+        self.ssh_manager.check_call(
             ip=_ip,
-            cmd="umm on")
+            command="umm on",
+            expected=[-1])
 
         self.fuel_web.wait_node_is_offline(dregular_ctrl)
 
@@ -123,9 +124,9 @@ class CICMaintenanceMode(TestBasic):
         asserts.assert_true('True' in check_auto_mode(_ip),
                             "Maintenance mode is not switched on")
 
-        self.ssh_manager.execute_on_remote(
+        self.ssh_manager.check_call(
             ip=_ip,
-            cmd="umm off")
+            command="umm off")
 
         self.fuel_web.wait_node_is_online(dregular_ctrl)
 
@@ -200,11 +201,9 @@ class CICMaintenanceMode(TestBasic):
         logger.info('Unexpected reboot on node-{0}'
                     .format(_id))
 
-        command = 'reboot --force >/dev/null & '
-
-        self.ssh_manager.execute_on_remote(
+        self.ssh_manager.check_call(
             ip=_ip,
-            cmd=command)
+            command='reboot >/dev/null & ')
 
         wait(lambda:
              not checkers.check_ping(self.env.get_admin_node_ip(),
@@ -228,9 +227,9 @@ class CICMaintenanceMode(TestBasic):
                             "Maintenance mode is not switched on")
 
         logger.info('turn off Maintenance mode')
-        self.ssh_manager.execute_on_remote(
+        self.ssh_manager.check_call(
             ip=_ip,
-            cmd="umm off")
+            command="umm off")
         time.sleep(30)
 
         change_config(_ip)
@@ -303,9 +302,9 @@ class CICMaintenanceMode(TestBasic):
 
         asserts.assert_true('True' in check_available_mode(_ip),
                             "Maintenance mode is not available")
-        self.ssh_manager.execute_on_remote(
+        self.ssh_manager.check_call(
             ip=_ip,
-            cmd="umm disable")
+            command="umm disable")
 
         asserts.assert_false('True' in check_available_mode(_ip),
                              "Maintenance mode should not be available")
@@ -313,10 +312,10 @@ class CICMaintenanceMode(TestBasic):
         logger.info('Try to execute maintenance mode '
                     'for node-{0}'.format(_id))
 
-        self.ssh_manager.execute_on_remote(
+        self.ssh_manager.check_call(
             ip=_ip,
-            cmd="umm on",
-            assert_ec_equal=[1])
+            command="umm on",
+            expected=[1])
 
         # If we don't disable maintenance mode,
         # the node would have gone to reboot, so we just expect
@@ -375,14 +374,12 @@ class CICMaintenanceMode(TestBasic):
         asserts.assert_false('True' in check_available_mode(_ip),
                              "Maintenance mode should not be available")
 
-        command = 'reboot --force >/dev/null & '
-
         logger.info('Unexpected reboot on node-{0}'
                     .format(_id))
 
-        self.ssh_manager.execute_on_remote(
+        self.ssh_manager.check_call(
             ip=_ip,
-            cmd=command)
+            command='reboot >/dev/null & ')
 
         wait(lambda:
              not checkers.check_ping(self.env.get_admin_node_ip(),
@@ -392,7 +389,7 @@ class CICMaintenanceMode(TestBasic):
                  dregular_ctrl.name))
 
         # Node don't have enough time for set offline status
-        # after reboot --force
+        # after reboot
         # Just waiting
 
         asserts.assert_true(