diff --git a/fuelweb_test/helpers/metaclasses.py b/fuelweb_test/helpers/metaclasses.py index 6e1e79bcf..f84787bb3 100644 --- a/fuelweb_test/helpers/metaclasses.py +++ b/fuelweb_test/helpers/metaclasses.py @@ -12,6 +12,16 @@ # License for the specific language governing permissions and limitations # under the License. +from warnings import warn + +warn( + 'fuelweb_test.helpers.metaclasses.SingletonMeta is deprected:' + 'class is moved to devops.helpers.metaclasses.\n' + 'Due to it was single metaclass in file, this file will be deleted in a' + 'short time!', + DeprecationWarning +) + class SingletonMeta(type): """Metaclass for Singleton diff --git a/fuelweb_test/helpers/os_actions.py b/fuelweb_test/helpers/os_actions.py index 8a08b7e30..518be5ce9 100644 --- a/fuelweb_test/helpers/os_actions.py +++ b/fuelweb_test/helpers/os_actions.py @@ -378,6 +378,9 @@ class OpenStackActions(common.Common): '{}'.format("".join(traceback.format_stack()))) warn(msg, DeprecationWarning) logger.warning(msg) + logger.critical( + 'This method could be deleted on 01.09.2016 ' + 'without any announcement!') if not creds: creds = ( SSH_IMAGE_CREDENTIALS['username'], diff --git a/fuelweb_test/helpers/ssh_manager.py b/fuelweb_test/helpers/ssh_manager.py index dfed1630f..1e55551c4 100644 --- a/fuelweb_test/helpers/ssh_manager.py +++ b/fuelweb_test/helpers/ssh_manager.py @@ -20,6 +20,7 @@ import traceback from warnings import warn from devops.helpers.helpers import wait +from devops.helpers.metaclasses import SingletonMeta from devops.models.node import SSHClient from paramiko import RSAKey from paramiko.ssh_exception import AuthenticationException @@ -27,13 +28,11 @@ import six import yaml from fuelweb_test import logger -from fuelweb_test.helpers.metaclasses import SingletonMeta from fuelweb_test.settings import SSH_FUEL_CREDENTIALS from fuelweb_test.settings import SSH_SLAVE_CREDENTIALS -@six.add_metaclass(SingletonMeta) -class SSHManager(object): +class SSHManager(six.with_metaclass(SingletonMeta, object)): def __init__(self): logger.debug('SSH_MANAGER: Run constructor SSHManager') diff --git a/fuelweb_test/helpers/utils.py b/fuelweb_test/helpers/utils.py index ad08475bd..78c9b7ad4 100644 --- a/fuelweb_test/helpers/utils.py +++ b/fuelweb_test/helpers/utils.py @@ -16,6 +16,7 @@ from __future__ import division import copy # pylint: disable=no-name-in-module +# noinspection PyUnresolvedReferences from distutils import version # pylint: enable=no-name-in-module import inspect @@ -466,6 +467,8 @@ def run_on_remote(*args, **kwargs): '{}'.format("".join(traceback.format_stack()))) warn(msg, DeprecationWarning) logger.warning(msg) + logger.critical( + 'This method could be deleted on 01.09.2016 without any announcement!') if 'jsonify' in kwargs: if kwargs['jsonify']: return run_on_remote_get_results(*args, **kwargs)['stdout_json'] @@ -497,6 +500,8 @@ def run_on_remote_get_results(remote, cmd, clear=False, err_msg=None, '{}'.format("".join(traceback.format_stack()))) warn(msg, DeprecationWarning) logger.warning(msg) + logger.critical( + 'This method could be deleted on 01.09.2016 without any announcement!') if assert_ec_equal is None: assert_ec_equal = [0] orig_result = remote.check_call( diff --git a/fuelweb_test/models/environment.py b/fuelweb_test/models/environment.py index 1a75f78de..12bec4704 100644 --- a/fuelweb_test/models/environment.py +++ b/fuelweb_test/models/environment.py @@ -21,6 +21,7 @@ from warnings import warn from devops.helpers.helpers import tcp_ping_ from devops.helpers.helpers import wait_pass from devops.helpers.helpers import wait +from devops.helpers.metaclasses import SingletonMeta from devops.helpers.ntp import sync_time from devops.models import Environment from keystoneauth1 import exceptions @@ -31,7 +32,6 @@ import six from fuelweb_test.helpers.decorators import revert_info from fuelweb_test.helpers.decorators import update_rpm_packages from fuelweb_test.helpers.decorators import upload_manifests -from fuelweb_test.helpers.metaclasses import SingletonMeta from fuelweb_test.helpers.eb_tables import Ebtables from fuelweb_test.helpers.fuel_actions import AdminActions from fuelweb_test.helpers.fuel_actions import BaseActions @@ -54,8 +54,7 @@ from fuelweb_test import QuietLogger from fuelweb_test import logger -@six.add_metaclass(SingletonMeta) -class EnvironmentModel(object): +class EnvironmentModel(six.with_metaclass(SingletonMeta, object)): """EnvironmentModel.""" # TODO documentation def __init__(self, config=None): @@ -750,6 +749,9 @@ class EnvironmentModel(object): '{}'.format("".join(traceback.format_stack()))) warn(msg, DeprecationWarning) logger.warning(msg) + logger.critical( + 'This method could be deleted on 01.09.2016 ' + 'without any announcement!') result = remote.check_call( command=cmd, expected=[exit_code], diff --git a/system_test/core/repository.py b/system_test/core/repository.py index ea7a2f66b..fdf298aa2 100644 --- a/system_test/core/repository.py +++ b/system_test/core/repository.py @@ -14,12 +14,12 @@ import re +from devops.helpers.metaclasses import SingletonMeta import proboscis.core from proboscis import factory from proboscis.decorators import DEFAULT_REGISTRY from six import add_metaclass -from fuelweb_test.helpers.metaclasses import SingletonMeta from system_test.tests import ActionTest from system_test.core.discover import config_filter