From 947a74349d2ce1266cb0f3c6a7030605999e21b3 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 24 Mar 2020 16:33:22 +0800 Subject: [PATCH] qa: import with full path to be py3 compatible Signed-off-by: Kefu Chai --- qa/tasks/ceph_objectstore_tool.py | 12 ++++++------ qa/tasks/cephadm.py | 2 +- qa/tasks/cephfs/kernel_mount.py | 2 +- qa/tasks/cephfs/test_acls.py | 2 +- qa/tasks/cephfs/test_failover.py | 2 +- qa/tasks/cephfs/test_openfiletable.py | 2 +- qa/tasks/cephfs/test_quota.py | 2 +- qa/tasks/cram.py | 2 +- qa/tasks/die_on_err.py | 2 +- qa/tasks/divergent_priors.py | 2 +- qa/tasks/divergent_priors2.py | 2 +- qa/tasks/dnsmasq.py | 2 +- qa/tasks/dump_stuck.py | 2 +- qa/tasks/ec_lost_unfound.py | 8 ++++---- qa/tasks/lost_unfound.py | 4 ++-- qa/tasks/mds_creation_failure.py | 2 +- qa/tasks/mds_thrash.py | 2 +- qa/tasks/mgr/dashboard/helper.py | 2 +- qa/tasks/mgr/dashboard/test_auth.py | 2 +- qa/tasks/mgr/dashboard/test_cephfs.py | 2 +- qa/tasks/mgr/dashboard/test_cluster_configuration.py | 2 +- qa/tasks/mgr/dashboard/test_crush_rule.py | 2 +- qa/tasks/mgr/dashboard/test_erasure_code_profile.py | 2 +- qa/tasks/mgr/dashboard/test_ganesha.py | 2 +- qa/tasks/mgr/dashboard/test_health.py | 2 +- qa/tasks/mgr/dashboard/test_host.py | 4 ++-- qa/tasks/mgr/dashboard/test_logs.py | 2 +- qa/tasks/mgr/dashboard/test_mgr_module.py | 2 +- qa/tasks/mgr/dashboard/test_monitor.py | 2 +- qa/tasks/mgr/dashboard/test_orchestrator.py | 2 +- qa/tasks/mgr/dashboard/test_osd.py | 2 +- qa/tasks/mgr/dashboard/test_perf_counters.py | 2 +- qa/tasks/mgr/dashboard/test_pool.py | 2 +- qa/tasks/mgr/dashboard/test_rbd.py | 2 +- qa/tasks/mgr/dashboard/test_rbd_mirroring.py | 2 +- qa/tasks/mgr/dashboard/test_requests.py | 2 +- qa/tasks/mgr/dashboard/test_rgw.py | 2 +- qa/tasks/mgr/dashboard/test_role.py | 2 +- qa/tasks/mgr/dashboard/test_settings.py | 2 +- qa/tasks/mgr/dashboard/test_summary.py | 2 +- qa/tasks/mgr/dashboard/test_user.py | 2 +- qa/tasks/mgr/test_dashboard.py | 2 +- qa/tasks/mgr/test_insights.py | 3 ++- qa/tasks/mgr/test_orchestrator_cli.py | 2 +- qa/tasks/mgr/test_progress.py | 2 +- qa/tasks/mgr/test_prometheus.py | 4 +--- qa/tasks/mon_clock_skew_check.py | 2 +- qa/tasks/mon_recovery.py | 2 +- qa/tasks/multibench.py | 3 ++- qa/tasks/object_source_down.py | 4 ++-- qa/tasks/osd_backfill.py | 2 +- qa/tasks/osd_failsafe_enospc.py | 2 +- qa/tasks/osd_recovery.py | 2 +- qa/tasks/peer.py | 4 ++-- qa/tasks/peering_speed_test.py | 2 +- qa/tasks/qemu.py | 9 ++++----- qa/tasks/radosgw_admin.py | 4 ++-- qa/tasks/radosgw_admin_rest.py | 2 +- qa/tasks/rbd_mirror.py | 2 +- qa/tasks/rebuild_mondb.py | 2 +- qa/tasks/reg11184.py | 2 +- qa/tasks/rep_lost_unfound_delete.py | 7 ++++--- qa/tasks/resolve_stuck_peering.py | 2 +- qa/tasks/rgw_logsocket.py | 2 +- qa/tasks/rgw_multisite.py | 10 +++++----- qa/tasks/rgw_multisite_tests.py | 2 +- qa/tasks/scrub_test.py | 2 +- qa/tasks/tests/test_devstack.py | 2 +- qa/tasks/tests/test_radosgw_admin.py | 2 +- qa/tasks/util/test/test_rados.py | 2 +- qa/tasks/vstart_runner.py | 2 +- qa/tasks/watch_notify_stress.py | 2 +- src/test/rgw/rgw_multi/multisite.py | 2 +- src/test/rgw/rgw_multi/tests.py | 6 +++--- src/test/rgw/rgw_multi/tests_az.py | 4 ++-- src/test/rgw/rgw_multi/tests_es.py | 6 +++--- src/test/rgw/rgw_multi/tests_ps.py | 6 +++--- src/test/rgw/rgw_multi/zone_az.py | 2 +- src/test/rgw/rgw_multi/zone_cloud.py | 4 ++-- src/test/rgw/rgw_multi/zone_es.py | 4 ++-- src/test/rgw/rgw_multi/zone_ps.py | 2 +- src/test/rgw/rgw_multi/zone_rados.py | 2 +- 82 files changed, 116 insertions(+), 116 deletions(-) diff --git a/qa/tasks/ceph_objectstore_tool.py b/qa/tasks/ceph_objectstore_tool.py index 641981ebd36..e08d0d4b3ec 100644 --- a/qa/tasks/ceph_objectstore_tool.py +++ b/qa/tasks/ceph_objectstore_tool.py @@ -4,21 +4,21 @@ ceph_objectstore_tool - Simple test of ceph-objectstore-tool utility from io import BytesIO import contextlib +import json import logging -import ceph_manager -from teuthology import misc as teuthology -import time import os import six import string -from teuthology.orchestra import run import sys import tempfile -import json +import time +from tasks import ceph_manager +from tasks.util.rados import (rados, create_replicated_pool, create_ec_pool) +from teuthology import misc as teuthology +from teuthology.orchestra import run from teuthology.exceptions import CommandFailedError -from util.rados import (rados, create_replicated_pool, create_ec_pool) # from util.rados import (rados, create_ec_pool, # create_replicated_pool, # create_cache_pool) diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index 2b076053a78..7b314471798 100644 --- a/qa/tasks/cephadm.py +++ b/qa/tasks/cephadm.py @@ -12,8 +12,8 @@ import json import re import uuid -from ceph_manager import CephManager from tarfile import ReadError +from tasks.ceph_manager import CephManager from teuthology import misc as teuthology from teuthology import contextutil from teuthology.orchestra import run diff --git a/qa/tasks/cephfs/kernel_mount.py b/qa/tasks/cephfs/kernel_mount.py index 769edd975f1..38d44ab04b9 100644 --- a/qa/tasks/cephfs/kernel_mount.py +++ b/qa/tasks/cephfs/kernel_mount.py @@ -8,7 +8,7 @@ from teuthology import misc from teuthology.orchestra import remote as orchestra_remote from teuthology.orchestra import run from teuthology.contextutil import MaxWhileTries -from .mount import CephFSMount +from tasks.cephfs.mount import CephFSMount log = logging.getLogger(__name__) diff --git a/qa/tasks/cephfs/test_acls.py b/qa/tasks/cephfs/test_acls.py index 39f30c97c63..4f704c0767a 100644 --- a/qa/tasks/cephfs/test_acls.py +++ b/qa/tasks/cephfs/test_acls.py @@ -1,7 +1,7 @@ import logging from io import BytesIO -from xfstests_dev import XFSTestsDev +from tasks.cephfs.xfstests_dev import XFSTestsDev log = logging.getLogger(__name__) diff --git a/qa/tasks/cephfs/test_failover.py b/qa/tasks/cephfs/test_failover.py index 6872319cf3c..13e8d352879 100644 --- a/qa/tasks/cephfs/test_failover.py +++ b/qa/tasks/cephfs/test_failover.py @@ -4,7 +4,7 @@ import logging import operator from random import randint -from cephfs_test_case import CephFSTestCase +from tasks.cephfs.cephfs_test_case import CephFSTestCase from teuthology.exceptions import CommandFailedError from tasks.cephfs.fuse_mount import FuseMount diff --git a/qa/tasks/cephfs/test_openfiletable.py b/qa/tasks/cephfs/test_openfiletable.py index 24f84e842c1..2738fe8c9b4 100644 --- a/qa/tasks/cephfs/test_openfiletable.py +++ b/qa/tasks/cephfs/test_openfiletable.py @@ -1,6 +1,6 @@ import time import logging -from cephfs_test_case import CephFSTestCase +from tasks.cephfs.cephfs_test_case import CephFSTestCase from teuthology.exceptions import CommandFailedError from tasks.cephfs.cephfs_test_case import CephFSTestCase, for_teuthology diff --git a/qa/tasks/cephfs/test_quota.py b/qa/tasks/cephfs/test_quota.py index ee11c586ee3..dcfda5e216e 100644 --- a/qa/tasks/cephfs/test_quota.py +++ b/qa/tasks/cephfs/test_quota.py @@ -1,5 +1,5 @@ -from cephfs_test_case import CephFSTestCase +from tasks.cephfs.cephfs_test_case import CephFSTestCase from teuthology.exceptions import CommandFailedError diff --git a/qa/tasks/cram.py b/qa/tasks/cram.py index a397eb51ff2..d06f09440a6 100644 --- a/qa/tasks/cram.py +++ b/qa/tasks/cram.py @@ -6,7 +6,7 @@ import os import six -from util.workunit import get_refspec_after_overrides +from tasks.util.workunit import get_refspec_after_overrides from teuthology import misc as teuthology from teuthology.parallel import parallel diff --git a/qa/tasks/die_on_err.py b/qa/tasks/die_on_err.py index ee157f4afe4..a6aa4c6322d 100644 --- a/qa/tasks/die_on_err.py +++ b/qa/tasks/die_on_err.py @@ -6,7 +6,7 @@ import logging import time from teuthology.orchestra import run -import ceph_manager +from tasks import ceph_manager from teuthology import misc as teuthology log = logging.getLogger(__name__) diff --git a/qa/tasks/divergent_priors.py b/qa/tasks/divergent_priors.py index b565c774c44..e000bb2bb73 100644 --- a/qa/tasks/divergent_priors.py +++ b/qa/tasks/divergent_priors.py @@ -5,7 +5,7 @@ import logging import time from teuthology import misc as teuthology -from util.rados import rados +from tasks.util.rados import rados log = logging.getLogger(__name__) diff --git a/qa/tasks/divergent_priors2.py b/qa/tasks/divergent_priors2.py index dda358b045f..4d4b07fc418 100644 --- a/qa/tasks/divergent_priors2.py +++ b/qa/tasks/divergent_priors2.py @@ -6,7 +6,7 @@ import time from teuthology.exceptions import CommandFailedError from teuthology import misc as teuthology -from util.rados import rados +from tasks.util.rados import rados import os diff --git a/qa/tasks/dnsmasq.py b/qa/tasks/dnsmasq.py index 2bf3feaf083..717c9f01930 100644 --- a/qa/tasks/dnsmasq.py +++ b/qa/tasks/dnsmasq.py @@ -8,7 +8,7 @@ from teuthology import misc from teuthology.exceptions import ConfigError from teuthology import contextutil from teuthology import packaging -from util import get_remote_for_role +from tasks.util import get_remote_for_role log = logging.getLogger(__name__) diff --git a/qa/tasks/dump_stuck.py b/qa/tasks/dump_stuck.py index 237d9127fc1..4971f1916e1 100644 --- a/qa/tasks/dump_stuck.py +++ b/qa/tasks/dump_stuck.py @@ -4,7 +4,7 @@ Dump_stuck command import logging import time -import ceph_manager +from tasks import ceph_manager from teuthology import misc as teuthology diff --git a/qa/tasks/ec_lost_unfound.py b/qa/tasks/ec_lost_unfound.py index 2360ea92ba4..e12b6901cc4 100644 --- a/qa/tasks/ec_lost_unfound.py +++ b/qa/tasks/ec_lost_unfound.py @@ -1,12 +1,12 @@ """ Lost_unfound """ -from teuthology.orchestra import run import logging -import ceph_manager -from teuthology import misc as teuthology -from util.rados import rados import time +from tasks import ceph_manager +from tasks.util.rados import rados +from teuthology import misc as teuthology +from teuthology.orchestra import run log = logging.getLogger(__name__) diff --git a/qa/tasks/lost_unfound.py b/qa/tasks/lost_unfound.py index d51b9669306..ab17a95dc30 100644 --- a/qa/tasks/lost_unfound.py +++ b/qa/tasks/lost_unfound.py @@ -3,10 +3,10 @@ Lost_unfound """ import logging import time -import ceph_manager +from tasks import ceph_manager +from tasks.util.rados import rados from teuthology import misc as teuthology from teuthology.orchestra import run -from util.rados import rados log = logging.getLogger(__name__) diff --git a/qa/tasks/mds_creation_failure.py b/qa/tasks/mds_creation_failure.py index 29e2c351346..58314086c03 100644 --- a/qa/tasks/mds_creation_failure.py +++ b/qa/tasks/mds_creation_failure.py @@ -3,7 +3,7 @@ import logging import contextlib import time -import ceph_manager +from tasks import ceph_manager from teuthology import misc from teuthology.orchestra.run import CommandFailedError, Raw diff --git a/qa/tasks/mds_thrash.py b/qa/tasks/mds_thrash.py index 07ec039ed9c..224b1cfc60a 100644 --- a/qa/tasks/mds_thrash.py +++ b/qa/tasks/mds_thrash.py @@ -3,7 +3,6 @@ Thrash mds by simulating failures """ import logging import contextlib -import ceph_manager import itertools import random import time @@ -13,6 +12,7 @@ from gevent.greenlet import Greenlet from gevent.event import Event from teuthology import misc as teuthology +from tasks import ceph_manager from tasks.cephfs.filesystem import MDSCluster, Filesystem from tasks.thrasher import Thrasher diff --git a/qa/tasks/mgr/dashboard/helper.py b/qa/tasks/mgr/dashboard/helper.py index 6419d318a8f..1acca15373b 100644 --- a/qa/tasks/mgr/dashboard/helper.py +++ b/qa/tasks/mgr/dashboard/helper.py @@ -11,7 +11,7 @@ import requests import six from teuthology.exceptions import CommandFailedError -from ..mgr_test_case import MgrTestCase +from tasks.mgr.mgr_test_case import MgrTestCase log = logging.getLogger(__name__) diff --git a/qa/tasks/mgr/dashboard/test_auth.py b/qa/tasks/mgr/dashboard/test_auth.py index e76708a9c43..468fe379641 100644 --- a/qa/tasks/mgr/dashboard/test_auth.py +++ b/qa/tasks/mgr/dashboard/test_auth.py @@ -6,7 +6,7 @@ import time import jwt -from .helper import DashboardTestCase, JObj, JLeaf +from tasks.mgr.dashboard.helper import DashboardTestCase, JObj, JLeaf class AuthTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_cephfs.py b/qa/tasks/mgr/dashboard/test_cephfs.py index e6594450f71..291d4d85c93 100644 --- a/qa/tasks/mgr/dashboard/test_cephfs.py +++ b/qa/tasks/mgr/dashboard/test_cephfs.py @@ -4,7 +4,7 @@ from __future__ import absolute_import import six from contextlib import contextmanager -from .helper import DashboardTestCase, JObj, JList, JLeaf +from tasks.mgr.dashboard.helper import DashboardTestCase, JObj, JList, JLeaf class CephfsTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_cluster_configuration.py b/qa/tasks/mgr/dashboard/test_cluster_configuration.py index 61d18000a45..9f134cd876a 100644 --- a/qa/tasks/mgr/dashboard/test_cluster_configuration.py +++ b/qa/tasks/mgr/dashboard/test_cluster_configuration.py @@ -2,7 +2,7 @@ from __future__ import absolute_import import time -from .helper import DashboardTestCase +from tasks.mgr.dashboard.helper import DashboardTestCase class ClusterConfigurationTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_crush_rule.py b/qa/tasks/mgr/dashboard/test_crush_rule.py index a0bca63ff4a..33949925bb0 100644 --- a/qa/tasks/mgr/dashboard/test_crush_rule.py +++ b/qa/tasks/mgr/dashboard/test_crush_rule.py @@ -4,7 +4,7 @@ from __future__ import absolute_import import six -from .helper import DashboardTestCase, JObj, JList +from tasks.mgr.dashboard.helper import DashboardTestCase, JObj, JList class CrushRuleTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_erasure_code_profile.py b/qa/tasks/mgr/dashboard/test_erasure_code_profile.py index 111e37c7e3e..8e93c8ec584 100644 --- a/qa/tasks/mgr/dashboard/test_erasure_code_profile.py +++ b/qa/tasks/mgr/dashboard/test_erasure_code_profile.py @@ -4,7 +4,7 @@ from __future__ import absolute_import import six -from .helper import DashboardTestCase, JObj, JList +from tasks.mgr.dashboard.helper import DashboardTestCase, JObj, JList class ECPTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_ganesha.py b/qa/tasks/mgr/dashboard/test_ganesha.py index cd869a00e40..0311daddaa6 100644 --- a/qa/tasks/mgr/dashboard/test_ganesha.py +++ b/qa/tasks/mgr/dashboard/test_ganesha.py @@ -4,7 +4,7 @@ from __future__ import absolute_import -from .helper import DashboardTestCase +from tasks.mgr.dashboard.helper import DashboardTestCase class GaneshaTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_health.py b/qa/tasks/mgr/dashboard/test_health.py index 05732885deb..f3cf2693f13 100644 --- a/qa/tasks/mgr/dashboard/test_health.py +++ b/qa/tasks/mgr/dashboard/test_health.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import -from .helper import DashboardTestCase, JAny, JLeaf, JList, JObj +from tasks.mgr.dashboard.helper import DashboardTestCase, JAny, JLeaf, JList, JObj class HealthTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_host.py b/qa/tasks/mgr/dashboard/test_host.py index d608dc247ed..407207133e3 100644 --- a/qa/tasks/mgr/dashboard/test_host.py +++ b/qa/tasks/mgr/dashboard/test_host.py @@ -2,8 +2,8 @@ from __future__ import absolute_import import json -from .helper import DashboardTestCase, JList, JObj -from .test_orchestrator import test_data +from tasks.mgr.dashboard.helper import DashboardTestCase, JList, JObj +from tasks.mgr.dashboard.test_orchestrator import test_data class HostControllerTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_logs.py b/qa/tasks/mgr/dashboard/test_logs.py index 17d5d830c99..5108161adad 100644 --- a/qa/tasks/mgr/dashboard/test_logs.py +++ b/qa/tasks/mgr/dashboard/test_logs.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import -from .helper import DashboardTestCase, JList, JObj +from tasks.mgr.dashboard.helper import DashboardTestCase, JList, JObj class LogsTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_mgr_module.py b/qa/tasks/mgr/dashboard/test_mgr_module.py index 080b8b64c23..ec6dbb47f86 100644 --- a/qa/tasks/mgr/dashboard/test_mgr_module.py +++ b/qa/tasks/mgr/dashboard/test_mgr_module.py @@ -4,7 +4,7 @@ from __future__ import absolute_import import logging import requests -from .helper import DashboardTestCase, JAny, JObj, JList, JLeaf +from tasks.mgr.dashboard.helper import DashboardTestCase, JAny, JObj, JList, JLeaf logger = logging.getLogger(__name__) diff --git a/qa/tasks/mgr/dashboard/test_monitor.py b/qa/tasks/mgr/dashboard/test_monitor.py index 0cf7e25a282..1558cdc82af 100644 --- a/qa/tasks/mgr/dashboard/test_monitor.py +++ b/qa/tasks/mgr/dashboard/test_monitor.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import -from .helper import DashboardTestCase +from tasks.mgr.dashboard.helper import DashboardTestCase class MonitorTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_orchestrator.py b/qa/tasks/mgr/dashboard/test_orchestrator.py index 9f4204379ac..4f248a1c3c6 100644 --- a/qa/tasks/mgr/dashboard/test_orchestrator.py +++ b/qa/tasks/mgr/dashboard/test_orchestrator.py @@ -2,7 +2,7 @@ from __future__ import absolute_import import json -from .helper import DashboardTestCase +from tasks.mgr.dashboard.helper import DashboardTestCase test_data = { diff --git a/qa/tasks/mgr/dashboard/test_osd.py b/qa/tasks/mgr/dashboard/test_osd.py index 1bd75e4b094..4f2028d2297 100644 --- a/qa/tasks/mgr/dashboard/test_osd.py +++ b/qa/tasks/mgr/dashboard/test_osd.py @@ -4,7 +4,7 @@ from __future__ import absolute_import import json -from .helper import DashboardTestCase, JObj, JAny, JList, JLeaf, JTuple +from tasks.mgr.dashboard.helper import DashboardTestCase, JObj, JAny, JList, JLeaf, JTuple class OsdTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_perf_counters.py b/qa/tasks/mgr/dashboard/test_perf_counters.py index c3191dc5e94..f1d267ce187 100644 --- a/qa/tasks/mgr/dashboard/test_perf_counters.py +++ b/qa/tasks/mgr/dashboard/test_perf_counters.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import -from .helper import DashboardTestCase, JObj +from tasks.mgr.dashboard.helper import DashboardTestCase, JObj class PerfCountersControllerTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_pool.py b/qa/tasks/mgr/dashboard/test_pool.py index 969318d2a94..327bec6a0c0 100644 --- a/qa/tasks/mgr/dashboard/test_pool.py +++ b/qa/tasks/mgr/dashboard/test_pool.py @@ -6,7 +6,7 @@ import six import time from contextlib import contextmanager -from .helper import DashboardTestCase, JAny, JList, JObj +from tasks.mgr.dashboard.helper import DashboardTestCase, JAny, JList, JObj log = logging.getLogger(__name__) diff --git a/qa/tasks/mgr/dashboard/test_rbd.py b/qa/tasks/mgr/dashboard/test_rbd.py index a3ef00b1b7f..5d82aa3d18e 100644 --- a/qa/tasks/mgr/dashboard/test_rbd.py +++ b/qa/tasks/mgr/dashboard/test_rbd.py @@ -5,7 +5,7 @@ from __future__ import absolute_import import time -from .helper import DashboardTestCase, JObj, JLeaf, JList +from tasks.mgr.dashboard.helper import DashboardTestCase, JObj, JLeaf, JList class RbdTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_rbd_mirroring.py b/qa/tasks/mgr/dashboard/test_rbd_mirroring.py index 39e5f895f11..f8268f3525b 100644 --- a/qa/tasks/mgr/dashboard/test_rbd_mirroring.py +++ b/qa/tasks/mgr/dashboard/test_rbd_mirroring.py @@ -3,7 +3,7 @@ from __future__ import absolute_import -from .helper import DashboardTestCase +from tasks.mgr.dashboard.helper import DashboardTestCase class RbdMirroringTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_requests.py b/qa/tasks/mgr/dashboard/test_requests.py index 0d9f8d9ba83..22376c0a29b 100644 --- a/qa/tasks/mgr/dashboard/test_requests.py +++ b/qa/tasks/mgr/dashboard/test_requests.py @@ -2,7 +2,7 @@ from __future__ import absolute_import -from .helper import DashboardTestCase +from tasks.mgr.dashboard.helper import DashboardTestCase class RequestsTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_rgw.py b/qa/tasks/mgr/dashboard/test_rgw.py index 9cb3504b5ae..0d75e63f5e0 100644 --- a/qa/tasks/mgr/dashboard/test_rgw.py +++ b/qa/tasks/mgr/dashboard/test_rgw.py @@ -10,7 +10,7 @@ from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives.twofactor.totp import TOTP from cryptography.hazmat.primitives.hashes import SHA1 -from .helper import DashboardTestCase, JObj, JList, JLeaf +from tasks.mgr.dashboard.helper import DashboardTestCase, JObj, JList, JLeaf logger = logging.getLogger(__name__) diff --git a/qa/tasks/mgr/dashboard/test_role.py b/qa/tasks/mgr/dashboard/test_role.py index dbfaea9e4f2..d678fa195f5 100644 --- a/qa/tasks/mgr/dashboard/test_role.py +++ b/qa/tasks/mgr/dashboard/test_role.py @@ -2,7 +2,7 @@ from __future__ import absolute_import -from .helper import DashboardTestCase +from tasks.mgr.dashboard.helper import DashboardTestCase class RoleTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_settings.py b/qa/tasks/mgr/dashboard/test_settings.py index 2d890484a3e..4c6ebeacaae 100644 --- a/qa/tasks/mgr/dashboard/test_settings.py +++ b/qa/tasks/mgr/dashboard/test_settings.py @@ -2,7 +2,7 @@ from __future__ import absolute_import -from .helper import DashboardTestCase, JList, JObj, JAny +from tasks.mgr.dashboard.helper import DashboardTestCase, JList, JObj, JAny class SettingsTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_summary.py b/qa/tasks/mgr/dashboard/test_summary.py index a31f8914673..808107a3119 100644 --- a/qa/tasks/mgr/dashboard/test_summary.py +++ b/qa/tasks/mgr/dashboard/test_summary.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -from .helper import DashboardTestCase +from tasks.mgr.dashboard.helper import DashboardTestCase class SummaryTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_user.py b/qa/tasks/mgr/dashboard/test_user.py index ea7beee6d7a..f3606ed8518 100644 --- a/qa/tasks/mgr/dashboard/test_user.py +++ b/qa/tasks/mgr/dashboard/test_user.py @@ -6,7 +6,7 @@ import time from datetime import datetime, timedelta -from .helper import DashboardTestCase, JObj, JLeaf +from tasks.mgr.dashboard.helper import DashboardTestCase, JObj, JLeaf class UserTest(DashboardTestCase): diff --git a/qa/tasks/mgr/test_dashboard.py b/qa/tasks/mgr/test_dashboard.py index 783c492d3f2..44b6602a6da 100644 --- a/qa/tasks/mgr/test_dashboard.py +++ b/qa/tasks/mgr/test_dashboard.py @@ -1,6 +1,6 @@ -from mgr_test_case import MgrTestCase +from tasks.mgr.mgr_test_case import MgrTestCase import logging import requests diff --git a/qa/tasks/mgr/test_insights.py b/qa/tasks/mgr/test_insights.py index c483e3abf76..423a4a8feae 100644 --- a/qa/tasks/mgr/test_insights.py +++ b/qa/tasks/mgr/test_insights.py @@ -2,7 +2,8 @@ import logging import json import datetime import time -from mgr_test_case import MgrTestCase + +from tasks.mgr.mgr_test_case import MgrTestCase log = logging.getLogger(__name__) UUID = 'd5775432-0742-44a3-a435-45095e32e6b2' diff --git a/qa/tasks/mgr/test_orchestrator_cli.py b/qa/tasks/mgr/test_orchestrator_cli.py index 5232af29905..db922632374 100644 --- a/qa/tasks/mgr/test_orchestrator_cli.py +++ b/qa/tasks/mgr/test_orchestrator_cli.py @@ -5,7 +5,7 @@ from time import sleep from teuthology.exceptions import CommandFailedError -from mgr_test_case import MgrTestCase +from tasks.mgr.mgr_test_case import MgrTestCase log = logging.getLogger(__name__) diff --git a/qa/tasks/mgr/test_progress.py b/qa/tasks/mgr/test_progress.py index 18460402efb..40cd3a0cab6 100644 --- a/qa/tasks/mgr/test_progress.py +++ b/qa/tasks/mgr/test_progress.py @@ -3,7 +3,7 @@ import json import logging import time -from mgr_test_case import MgrTestCase +from tasks.mgr.mgr_test_case import MgrTestCase log = logging.getLogger(__name__) diff --git a/qa/tasks/mgr/test_prometheus.py b/qa/tasks/mgr/test_prometheus.py index f91487174db..867d5cd5d6d 100644 --- a/qa/tasks/mgr/test_prometheus.py +++ b/qa/tasks/mgr/test_prometheus.py @@ -1,6 +1,4 @@ - - -from mgr_test_case import MgrTestCase +from tasks.mgr.mgr_test_case import MgrTestCase import json import logging diff --git a/qa/tasks/mon_clock_skew_check.py b/qa/tasks/mon_clock_skew_check.py index f7862cb1354..59d4169d18b 100644 --- a/qa/tasks/mon_clock_skew_check.py +++ b/qa/tasks/mon_clock_skew_check.py @@ -2,8 +2,8 @@ Handle clock skews in monitors. """ import logging -import ceph_manager import time +from tasks import ceph_manager from teuthology import misc as teuthology log = logging.getLogger(__name__) diff --git a/qa/tasks/mon_recovery.py b/qa/tasks/mon_recovery.py index e09e9877b57..a4146b1ffb7 100644 --- a/qa/tasks/mon_recovery.py +++ b/qa/tasks/mon_recovery.py @@ -2,7 +2,7 @@ Monitor recovery """ import logging -import ceph_manager +from tasks import ceph_manager from teuthology import misc as teuthology diff --git a/qa/tasks/multibench.py b/qa/tasks/multibench.py index 53b1aa52123..c2a7299f196 100644 --- a/qa/tasks/multibench.py +++ b/qa/tasks/multibench.py @@ -3,11 +3,12 @@ Multibench testing """ import contextlib import logging -import radosbench import time import copy import gevent +from tasks import radosbench + log = logging.getLogger(__name__) @contextlib.contextmanager diff --git a/qa/tasks/object_source_down.py b/qa/tasks/object_source_down.py index 82ce4326317..e4519bb6f3c 100644 --- a/qa/tasks/object_source_down.py +++ b/qa/tasks/object_source_down.py @@ -2,10 +2,10 @@ Test Object locations going down """ import logging -import ceph_manager import time from teuthology import misc as teuthology -from util.rados import rados +from tasks import ceph_manager +from tasks.util.rados import rados log = logging.getLogger(__name__) diff --git a/qa/tasks/osd_backfill.py b/qa/tasks/osd_backfill.py index 5ad5b799831..b33e1c912ab 100644 --- a/qa/tasks/osd_backfill.py +++ b/qa/tasks/osd_backfill.py @@ -2,8 +2,8 @@ Osd backfill test """ import logging -import ceph_manager import time +from tasks import ceph_manager from teuthology import misc as teuthology diff --git a/qa/tasks/osd_failsafe_enospc.py b/qa/tasks/osd_failsafe_enospc.py index 6aec322ea85..4b2cdb983fc 100644 --- a/qa/tasks/osd_failsafe_enospc.py +++ b/qa/tasks/osd_failsafe_enospc.py @@ -7,7 +7,7 @@ import six import time from teuthology.orchestra import run -from util.rados import rados +from tasks.util.rados import rados from teuthology import misc as teuthology log = logging.getLogger(__name__) diff --git a/qa/tasks/osd_recovery.py b/qa/tasks/osd_recovery.py index a01fe8fea6e..b0623c21ba7 100644 --- a/qa/tasks/osd_recovery.py +++ b/qa/tasks/osd_recovery.py @@ -2,8 +2,8 @@ osd recovery """ import logging -import ceph_manager import time +from tasks import ceph_manager from teuthology import misc as teuthology diff --git a/qa/tasks/peer.py b/qa/tasks/peer.py index e5344a1cea0..6b19096b15a 100644 --- a/qa/tasks/peer.py +++ b/qa/tasks/peer.py @@ -5,9 +5,9 @@ import logging import json import time -import ceph_manager +from tasks import ceph_manager +from tasks.util.rados import rados from teuthology import misc as teuthology -from util.rados import rados log = logging.getLogger(__name__) diff --git a/qa/tasks/peering_speed_test.py b/qa/tasks/peering_speed_test.py index ab532385629..9dc65836184 100644 --- a/qa/tasks/peering_speed_test.py +++ b/qa/tasks/peering_speed_test.py @@ -6,7 +6,7 @@ import time log = logging.getLogger(__name__) -from args import argify +from teuthology.task.args import argify POOLNAME = "POOLNAME" ARGS = [ diff --git a/qa/tasks/qemu.py b/qa/tasks/qemu.py index 2a0cb40fba0..d4ea26154f8 100644 --- a/qa/tasks/qemu.py +++ b/qa/tasks/qemu.py @@ -8,13 +8,12 @@ import os import yaml import time -from teuthology import misc as teuthology -from teuthology import contextutil from tasks import rbd -from teuthology.orchestra import run +from tasks.util.workunit import get_refspec_after_overrides +from teuthology import contextutil +from teuthology import misc as teuthology from teuthology.config import config as teuth_config - -from util.workunit import get_refspec_after_overrides +from teuthology.orchestra import run log = logging.getLogger(__name__) diff --git a/qa/tasks/radosgw_admin.py b/qa/tasks/radosgw_admin.py index 9f9f80e8cc4..820794e284a 100644 --- a/qa/tasks/radosgw_admin.py +++ b/qa/tasks/radosgw_admin.py @@ -28,7 +28,7 @@ import boto.s3.acl import httplib2 -from util.rgw import rgwadmin, get_user_summary, get_user_successful_ops +from tasks.util.rgw import rgwadmin, get_user_summary, get_user_successful_ops log = logging.getLogger(__name__) @@ -196,7 +196,7 @@ def ignore_this_entry(cat, bucket, user, out, b_in, err): pass class requestlog_queue(): def __init__(self, add): - self.q = Queue.Queue(1000) + self.q = queue.Queue(1000) self.adder = add def handle_request_data(self, request, response, error=False): now = datetime.datetime.now() diff --git a/qa/tasks/radosgw_admin_rest.py b/qa/tasks/radosgw_admin_rest.py index 50f88ea8570..377144db440 100644 --- a/qa/tasks/radosgw_admin_rest.py +++ b/qa/tasks/radosgw_admin_rest.py @@ -19,7 +19,7 @@ import time from boto.connection import AWSAuthConnection from teuthology import misc as teuthology -from util.rgw import get_user_summary, get_user_successful_ops, rgwadmin +from tasks.util.rgw import get_user_summary, get_user_successful_ops, rgwadmin log = logging.getLogger(__name__) diff --git a/qa/tasks/rbd_mirror.py b/qa/tasks/rbd_mirror.py index 880ec305828..5d6d1b2b6eb 100644 --- a/qa/tasks/rbd_mirror.py +++ b/qa/tasks/rbd_mirror.py @@ -8,7 +8,7 @@ from teuthology.orchestra import run from teuthology import misc from teuthology.exceptions import ConfigError from teuthology.task import Task -from util import get_remote_for_role +from tasks.util import get_remote_for_role log = logging.getLogger(__name__) diff --git a/qa/tasks/rebuild_mondb.py b/qa/tasks/rebuild_mondb.py index 7877f22ab3e..008e312e2d3 100644 --- a/qa/tasks/rebuild_mondb.py +++ b/qa/tasks/rebuild_mondb.py @@ -8,7 +8,7 @@ import os.path import shutil import tempfile -import ceph_manager +from tasks import ceph_manager from teuthology import misc as teuthology log = logging.getLogger(__name__) diff --git a/qa/tasks/reg11184.py b/qa/tasks/reg11184.py index 1059fda7125..86cfbf39a01 100644 --- a/qa/tasks/reg11184.py +++ b/qa/tasks/reg11184.py @@ -12,7 +12,7 @@ import time from teuthology.exceptions import CommandFailedError from teuthology.orchestra import run from teuthology import misc as teuthology -from util.rados import rados +from tasks.util.rados import rados import os diff --git a/qa/tasks/rep_lost_unfound_delete.py b/qa/tasks/rep_lost_unfound_delete.py index 8ed55145b7b..d422a33bb46 100644 --- a/qa/tasks/rep_lost_unfound_delete.py +++ b/qa/tasks/rep_lost_unfound_delete.py @@ -2,11 +2,12 @@ Lost_unfound """ import logging -from teuthology.orchestra import run -import ceph_manager import time + +from tasks import ceph_manager +from tasks.util.rados import rados from teuthology import misc as teuthology -from util.rados import rados +from teuthology.orchestra import run log = logging.getLogger(__name__) diff --git a/qa/tasks/resolve_stuck_peering.py b/qa/tasks/resolve_stuck_peering.py index 9b383fd683e..d140544c494 100644 --- a/qa/tasks/resolve_stuck_peering.py +++ b/qa/tasks/resolve_stuck_peering.py @@ -5,7 +5,7 @@ import logging import time from teuthology import misc as teuthology -from util.rados import rados +from tasks.util.rados import rados log = logging.getLogger(__name__) diff --git a/qa/tasks/rgw_logsocket.py b/qa/tasks/rgw_logsocket.py index 86d7a19d34b..d76e59d7f66 100644 --- a/qa/tasks/rgw_logsocket.py +++ b/qa/tasks/rgw_logsocket.py @@ -5,7 +5,7 @@ from io import BytesIO from configobj import ConfigObj import contextlib import logging -import s3tests +from tasks import s3tests from teuthology import misc as teuthology from teuthology import contextutil diff --git a/qa/tasks/rgw_multisite.py b/qa/tasks/rgw_multisite.py index 5400020db75..266d0fb694f 100644 --- a/qa/tasks/rgw_multisite.py +++ b/qa/tasks/rgw_multisite.py @@ -6,11 +6,11 @@ import logging import random import string from copy import deepcopy -from util.rgw import rgwadmin, wait_for_radosgw -from util.rados import create_ec_pool, create_replicated_pool -from rgw_multi import multisite -from rgw_multi.zone_rados import RadosZone as RadosZone -from rgw_multi.zone_ps import PSZone as PSZone +from tasks.util.rgw import rgwadmin, wait_for_radosgw +from tasks.util.rados import create_ec_pool, create_replicated_pool +from tasks.rgw_multi import multisite +from tasks.rgw_multi.zone_rados import RadosZone as RadosZone +from tasks.rgw_multi.zone_ps import PSZone as PSZone from teuthology.orchestra import run from teuthology import misc diff --git a/qa/tasks/rgw_multisite_tests.py b/qa/tasks/rgw_multisite_tests.py index dee6bfaa303..53aedf79248 100644 --- a/qa/tasks/rgw_multisite_tests.py +++ b/qa/tasks/rgw_multisite_tests.py @@ -9,7 +9,7 @@ from teuthology.exceptions import ConfigError from teuthology.task import Task from teuthology import misc -from rgw_multi import multisite, tests, tests_ps +from tasks.rgw_multi import multisite, tests, tests_ps log = logging.getLogger(__name__) diff --git a/qa/tasks/scrub_test.py b/qa/tasks/scrub_test.py index bc0b3fc09b0..3d71708edf4 100644 --- a/qa/tasks/scrub_test.py +++ b/qa/tasks/scrub_test.py @@ -7,7 +7,7 @@ import os import time import tempfile -import ceph_manager +from tasks import ceph_manager from teuthology import misc as teuthology log = logging.getLogger(__name__) diff --git a/qa/tasks/tests/test_devstack.py b/qa/tasks/tests/test_devstack.py index 117b3076818..39b94a64c7b 100644 --- a/qa/tasks/tests/test_devstack.py +++ b/qa/tasks/tests/test_devstack.py @@ -1,6 +1,6 @@ from textwrap import dedent -from .. import devstack +from tasks import devstack class TestDevstack(object): diff --git a/qa/tasks/tests/test_radosgw_admin.py b/qa/tasks/tests/test_radosgw_admin.py index 59f357891ca..dbbebf89085 100644 --- a/qa/tasks/tests/test_radosgw_admin.py +++ b/qa/tasks/tests/test_radosgw_admin.py @@ -1,6 +1,6 @@ from mock import Mock -from .. import radosgw_admin +from tasks import radosgw_admin acl_with_version = """fooFoofooFooFULL_CONTROL """ # noqa diff --git a/qa/tasks/util/test/test_rados.py b/qa/tasks/util/test/test_rados.py index ee1cfa62abf..a8f4cb02d3e 100644 --- a/qa/tasks/util/test/test_rados.py +++ b/qa/tasks/util/test/test_rados.py @@ -26,7 +26,7 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. # -from .. import rados +from tasks.util import rados class TestRados(object): diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py index 7055ebb7c9d..7ace1f587a3 100644 --- a/qa/tasks/vstart_runner.py +++ b/qa/tasks/vstart_runner.py @@ -129,7 +129,7 @@ try: from tasks.cephfs.fuse_mount import FuseMount from tasks.cephfs.kernel_mount import KernelMount from tasks.cephfs.filesystem import Filesystem, MDSCluster, CephCluster - from mgr.mgr_test_case import MgrCluster + from tasks.mgr.mgr_test_case import MgrCluster from teuthology.contextutil import MaxWhileTries from teuthology.task import interactive except ImportError: diff --git a/qa/tasks/watch_notify_stress.py b/qa/tasks/watch_notify_stress.py index f3cdf0d5496..e5e380492e0 100644 --- a/qa/tasks/watch_notify_stress.py +++ b/qa/tasks/watch_notify_stress.py @@ -3,10 +3,10 @@ test_stress_watch task """ import contextlib import logging -import proc_thrasher import six from teuthology.orchestra import run +from teuthology.task import proc_thrasher log = logging.getLogger(__name__) diff --git a/src/test/rgw/rgw_multi/multisite.py b/src/test/rgw/rgw_multi/multisite.py index a0a53fe4d5f..464c4d26ef9 100644 --- a/src/test/rgw/rgw_multi/multisite.py +++ b/src/test/rgw/rgw_multi/multisite.py @@ -3,7 +3,7 @@ from six import StringIO import json -from .conn import get_gateway_connection, get_gateway_secure_connection +from tasks.rgw_multi.conn import get_gateway_connection, get_gateway_secure_connection class Cluster: """ interface to run commands against a distinct ceph cluster """ diff --git a/src/test/rgw/rgw_multi/tests.py b/src/test/rgw/rgw_multi/tests.py index 598356dff0e..e0c943063e1 100644 --- a/src/test/rgw/rgw_multi/tests.py +++ b/src/test/rgw/rgw_multi/tests.py @@ -22,10 +22,10 @@ from nose.tools import eq_ as eq from nose.plugins.attrib import attr from nose.plugins.skip import SkipTest -from .multisite import Zone, ZoneGroup, Credentials +from tasks.rgw_multi.multisite import Zone, ZoneGroup, Credentials -from .conn import get_gateway_connection -from .tools import assert_raises +from tasks.rgw_multi.conn import get_gateway_connection +from tasks.rgw_multi.tools import assert_raises class Config: """ test configuration """ diff --git a/src/test/rgw/rgw_multi/tests_az.py b/src/test/rgw/rgw_multi/tests_az.py index 1a1434ae26c..77b23b91727 100644 --- a/src/test/rgw/rgw_multi/tests_az.py +++ b/src/test/rgw/rgw_multi/tests_az.py @@ -5,7 +5,7 @@ from nose.tools import assert_not_equal, assert_equal from boto.s3.deletemarker import DeleteMarker -from .tests import get_realm, \ +from tasks.rgw_multi.tests import get_realm, \ ZonegroupConns, \ zonegroup_meta_checkpoint, \ zone_meta_checkpoint, \ @@ -17,7 +17,7 @@ from .tests import get_realm, \ get_user, \ get_tenant -from .zone_az import print_connection_info +from tasks.rgw_multi.zone_az import print_connection_info # configure logging for the tests module diff --git a/src/test/rgw/rgw_multi/tests_es.py b/src/test/rgw/rgw_multi/tests_es.py index bc9f67b73a0..6100b1e312d 100644 --- a/src/test/rgw/rgw_multi/tests_es.py +++ b/src/test/rgw/rgw_multi/tests_es.py @@ -9,9 +9,9 @@ import dateutil from nose.tools import eq_ as eq -from rgw_multi.multisite import * -from rgw_multi.tests import * -from rgw_multi.zone_es import * +from tasks.rgw_multi.multisite import * +from tasks.rgw_multi.tests import * +from tasks.rgw_multi.zone_es import * log = logging.getLogger(__name__) diff --git a/src/test/rgw/rgw_multi/tests_ps.py b/src/test/rgw/rgw_multi/tests_ps.py index d827ed55f14..190ef4930d9 100644 --- a/src/test/rgw/rgw_multi/tests_ps.py +++ b/src/test/rgw/rgw_multi/tests_ps.py @@ -10,7 +10,7 @@ import socket import time import os from random import randint -from .tests import get_realm, \ +from tasks.rgw_multi.tests import get_realm, \ ZonegroupConns, \ zonegroup_meta_checkpoint, \ zone_meta_checkpoint, \ @@ -21,7 +21,7 @@ from .tests import get_realm, \ gen_bucket_name, \ get_user, \ get_tenant -from .zone_ps import PSTopic, \ +from tasks.rgw_multi.zone_ps import PSTopic, \ PSTopicS3, \ PSNotification, \ PSSubscription, \ @@ -31,7 +31,7 @@ from .zone_ps import PSTopic, \ put_object_tagging, \ get_object_tagging, \ delete_all_objects -from multisite import User +from tasks.rgw_multi.multisite import User from nose import SkipTest from nose.tools import assert_not_equal, assert_equal import boto.s3.tagging diff --git a/src/test/rgw/rgw_multi/zone_az.py b/src/test/rgw/rgw_multi/zone_az.py index aaab3ef74cf..a34fd9b7067 100644 --- a/src/test/rgw/rgw_multi/zone_az.py +++ b/src/test/rgw/rgw_multi/zone_az.py @@ -1,6 +1,6 @@ import logging -from .multisite import Zone +from tasks.rgw_multi.multisite import Zone log = logging.getLogger('rgw_multi.tests') diff --git a/src/test/rgw/rgw_multi/zone_cloud.py b/src/test/rgw/rgw_multi/zone_cloud.py index 83bfae19e6c..51267cd25c9 100644 --- a/src/test/rgw/rgw_multi/zone_cloud.py +++ b/src/test/rgw/rgw_multi/zone_cloud.py @@ -18,8 +18,8 @@ except ImportError: from six.moves.urllib.parse import urlparse -from .multisite import * -from .tools import * +from tasks.rgw_multi.multisite import * +from tasks.rgw_multi.tools import * log = logging.getLogger(__name__) diff --git a/src/test/rgw/rgw_multi/zone_es.py b/src/test/rgw/rgw_multi/zone_es.py index 1f85744a49c..c24048fbc08 100644 --- a/src/test/rgw/rgw_multi/zone_es.py +++ b/src/test/rgw/rgw_multi/zone_es.py @@ -13,8 +13,8 @@ try: except ImportError: from itertools import zip_longest -from .multisite import * -from .tools import * +from tasks.rgw_multi.multisite import * +from tasks.rgw_multi.tools import * log = logging.getLogger(__name__) diff --git a/src/test/rgw/rgw_multi/zone_ps.py b/src/test/rgw/rgw_multi/zone_ps.py index e22200e2665..26b4260d06e 100644 --- a/src/test/rgw/rgw_multi/zone_ps.py +++ b/src/test/rgw/rgw_multi/zone_ps.py @@ -8,7 +8,7 @@ import hashlib import base64 import xmltodict from time import gmtime, strftime -from .multisite import Zone +from tasks.rgw_multi.multisite import Zone import boto3 from botocore.client import Config diff --git a/src/test/rgw/rgw_multi/zone_rados.py b/src/test/rgw/rgw_multi/zone_rados.py index 3b298e8b42f..e73d8f4e95e 100644 --- a/src/test/rgw/rgw_multi/zone_rados.py +++ b/src/test/rgw/rgw_multi/zone_rados.py @@ -8,7 +8,7 @@ except ImportError: from nose.tools import eq_ as eq -from .multisite import * +from tasks.rgw_multi.multisite import * log = logging.getLogger(__name__) -- 2.39.5