Merge pull request #2693 from Yingshun/adj_modular_daemon

Adjust to the modular daemon environment checking change

virttest/env_process.py

@@ -37,8 +37,7 @@ from virttest import storage
 from virttest import utils_libguestfs
 from virttest import qemu_storage
 from virttest import utils_libvirtd
-from virttest import libvirtd_decorator
-from virttest import libvirt_version as libvirtd_ver
+from virttest import utils_split_daemons
 from virttest import remote
 from virttest import data_dir
 from virttest import utils_net
@@ -1287,8 +1286,7 @@ def preprocess(test, params, env):
         # work on connect_uri as default behavior.
         os.environ['LIBVIRT_DEFAULT_URI'] = connect_uri
         if params.get("setup_libvirt_polkit") == "yes":
-            if (libvirtd_ver.version_compare(5, 6, 0) and
-               libvirtd_decorator.get_libvirtd_split_enable_bit()):
+            if utils_split_daemons.is_modular_daemon():
                 params.update({"conf_path": "/etc/libvirt/virtqemud.conf"})
             pol = test_setup.LibvirtPolkitConfig(params)
             try:

virttest/test_setup.py

@@ -36,7 +36,7 @@ from virttest import utils_config
 from virttest import utils_package
 from virttest import kernel_interface
 from virttest import libvirt_version
-from virttest import libvirtd_decorator
+from virttest import utils_split_daemons
 from virttest.staging import service
 from virttest.staging import utils_memory
 
@@ -2429,8 +2429,7 @@ class LibvirtdDebugLog(object):
             "daemon": utils_libvirtd.Libvirtd("virtqemud"),
             "conf": utils_config.LibvirtdConfig(),
             "backupfile": "%s.backup" % utils_config.LibvirtdConfig().conf_path}
-        if (libvirt_version.version_compare(5, 6, 0) and
-           libvirtd_decorator.get_libvirtd_split_enable_bit()):
+        if utils_split_daemons.is_modular_daemon():
             self.daemons_dict["libvirtd"]["conf"] = utils_config.VirtQemudConfig()
             self.daemons_dict["libvirtd"]["backupfile"] = utils_config.VirtQemudConfig().conf_path
             self.daemons_dict["virtnetworkd"] = {

virttest/utils_conn.py

@@ -15,7 +15,7 @@ from virttest import propcan, remote, utils_libvirtd
 from virttest import data_dir
 from virttest import utils_package
 from virttest import libvirt_version
-from virttest import libvirtd_decorator
+from virttest import utils_split_daemons
 
 
 class ConnectionError(Exception):
@@ -687,8 +687,7 @@ class TCPConnection(ConnectionBase):
         init_dict['sasl_allowed_users'] = init_dict.get('sasl_allowed_users')
         super(TCPConnection, self).__init__(init_dict)
 
-        if (libvirtd_decorator.get_libvirt_version_compare(5, 6, 0) and
-           libvirtd_decorator.get_libvirtd_split_enable_bit()):
+        if utils_split_daemons.is_modular_daemon():
             self.daemon_conf = "/etc/libvirt/virtproxyd.conf"
             self.daemon_socket_conf = "/usr/lib/systemd/system/virtproxyd-tcp.socket"
         else:
@@ -1008,8 +1007,7 @@ class TLSConnection(ConnectionBase):
             port='22',
             remote_path='/etc/sysconfig/libvirtd')
 
-        if (libvirtd_decorator.get_libvirt_version_compare(5, 6, 0) and
-           libvirtd_decorator.get_libvirtd_split_enable_bit()):
+        if utils_split_daemons.is_modular_daemon():
             self.daemon_conf = "/etc/libvirt/virtproxyd.conf"
             self.daemon_socket_conf = "/usr/lib/systemd/system/virtproxyd-tls.socket"
         else:

virttest/utils_libvirtd.py

@@ -10,7 +10,7 @@ from avocado.utils import process
 from avocado.utils import wait
 
 from virttest import libvirt_version
-from virttest import libvirtd_decorator
+from virttest import utils_split_daemons
 
 from . import remote
 from . import utils_misc
@@ -57,7 +57,7 @@ class Libvirtd(object):
         self.service_name = "libvirtd" if not service_name else service_name
 
         if libvirt_version.version_compare(5, 6, 0, self.session):
-            if libvirtd_decorator.get_libvirtd_split_enable_bit():
+            if utils_split_daemons.is_modular_daemon(session=self.session):
                 if self.service_name in ["libvirtd", "libvirtd.service"]:
                     self.service_list = ['virtqemud', 'virtproxyd',
                                          'virtnetworkd', 'virtinterfaced',