diff --git a/system_test/actions/base.py b/system_test/actions/base.py index dd45475e5..14f41c5b6 100644 --- a/system_test/actions/base.py +++ b/system_test/actions/base.py @@ -195,7 +195,6 @@ class BaseActions(PrepareActions, HealthCheckActions, PluginsActions): base_group = None actions_order = None cluster_id = None - assigned_slaves = set() scale_step = 0 def _add_node(self, nodes_list): diff --git a/system_test/tests/base.py b/system_test/tests/base.py index fa7e42e49..c4bc4ff46 100644 --- a/system_test/tests/base.py +++ b/system_test/tests/base.py @@ -22,3 +22,4 @@ class ActionTest(base_test_case.TestBasic, ActionsFactory): def __init__(self, config_file=None): super(ActionTest, self).__init__() self.config_file = config_file + self.assigned_slaves = set() diff --git a/system_test/tests/test_fuel_migration.py b/system_test/tests/test_fuel_migration.py index 4c112b47a..8f3326357 100644 --- a/system_test/tests/test_fuel_migration.py +++ b/system_test/tests/test_fuel_migration.py @@ -40,9 +40,8 @@ class FuelMasterMigrate(ActionTest, BaseActions, FuelMasterActions): 3. Deploy environment 4. Run network checker 5. Migrate Fuel Master to the compute node - 6. Check that containers are up and running on the Fuel Master - 7. Run network checker - 8. Run OSTF + 6. Run network checker + 7. Run OSTF """ actions_order = [ @@ -57,7 +56,6 @@ class FuelMasterMigrate(ActionTest, BaseActions, FuelMasterActions): 'network_check', 'start_fuel_migration', 'check_migration_status', - 'check_containers', 'network_check', 'health_check' ] @@ -129,3 +127,6 @@ class FuelMasterMigrate(ActionTest, BaseActions, FuelMasterActions): wait(lambda: not remote.exists("/notready"), timeout=900, timeout_msg="File wasn't removed in 900 sec") + + self.fuel_web.wait_nodes_get_online_state( + self.env.d_env.nodes().slaves[:2])