From 8597bffe8fb46cf4ed061098d3b176bb7a0fe5c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20L=C3=B3pez=20S=C3=A1nchez?= Date: Thu, 15 Jul 2021 13:31:06 +0000 Subject: [PATCH] refactor: use Taurus Tango device name validator A own method is used. Instead we propose the use of Taurus Tango Device name validator like in other places of the Sardana code base. Related to #1053 --- src/sardana/tango/core/SardanaDevice.py | 26 +++++-------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/src/sardana/tango/core/SardanaDevice.py b/src/sardana/tango/core/SardanaDevice.py index 5539b084b..b3ec8b38f 100644 --- a/src/sardana/tango/core/SardanaDevice.py +++ b/src/sardana/tango/core/SardanaDevice.py @@ -40,6 +40,7 @@ from taurus.core.util.threadpool import ThreadPool from taurus.core.util.log import Logger +from taurus.core.tango.tangovalidator import TangoDeviceNameValidator from sardana.tango.core.util import to_tango_state, NO_DB_MAP @@ -132,27 +133,10 @@ def get_full_name(self): :return: this device full name :rtype: :obj:`str` """ - db = self.get_database() - if db.get_from_env_var(): - db_name = ApiUtil.get_env_var("TANGO_HOST") - else: - if db.is_dbase_used(): - db_name = db.get_db_host() + ":" + db.get_db_port() - else: - db_name = db.get_file_name() - full_name = db_name + "/" + self.get_name() - return full_name - # try to use Taurus 4 to retrieve FQDN - try: - from taurus.core.tango.tangovalidator import \ - TangoAuthorityNameValidator - db_name = "//%s" % db_name - db_name, _, _ = TangoAuthorityNameValidator().getNames(db_name) - # if Taurus3 in use just continue - except ImportError: - pass - full_name = "{0}/{1}".format(db_name, self.get_name()) - return full_name + + validator = TangoDeviceNameValidator() + names = validator.getNames(self.get_name()) + return names[0] def init_device(self): """Initialize the device. Called during startup after :meth:`init` and