From 4e1e929f7520005eb6a21a91fae8493daa5e916f Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Thu, 7 Aug 2014 08:24:59 -0600 Subject: [PATCH] Update module references Signed-off-by: Zack Cerza --- tasks/admin_socket.py | 2 +- tasks/autotest.py | 2 +- tasks/blktrace.py | 2 +- tasks/ceph.py | 2 +- tasks/ceph_client.py | 2 +- tasks/ceph_deploy.py | 6 +++--- tasks/ceph_fuse.py | 4 ++-- tasks/ceph_manager.py | 6 +++--- tasks/cephfs/filesystem.py | 4 ++-- tasks/cephfs/fuse_mount.py | 4 ++-- tasks/cephfs/kernel_mount.py | 2 +- tasks/chef.py | 4 ++-- tasks/cifs_mount.py | 4 ++-- tasks/cram.py | 2 +- tasks/devstack.py | 6 +++--- tasks/die_on_err.py | 2 +- tasks/divergent_priors.py | 2 +- tasks/ec_lost_unfound.py | 2 +- tasks/filestore_idempotent.py | 2 +- tasks/kclient.py | 2 +- tasks/locktest.py | 2 +- tasks/lost_unfound.py | 2 +- tasks/manypools.py | 2 +- tasks/mds_client_recovery.py | 4 ++-- tasks/mds_journal_migration.py | 4 ++-- tasks/object_source_down.py | 2 +- tasks/omapbench.py | 2 +- tasks/osd_failsafe_enospc.py | 4 ++-- tasks/peer.py | 2 +- tasks/qemu.py | 4 ++-- tasks/rados.py | 2 +- tasks/radosbench.py | 2 +- tasks/radosgw_admin.py | 4 ++-- tasks/radosgw_agent.py | 4 ++-- tasks/rbd.py | 2 +- tasks/rep_lost_unfound_delete.py | 2 +- tasks/rest_api.py | 4 ++-- tasks/restart.py | 2 +- tasks/rgw.py | 6 +++--- tasks/s3readwrite.py | 6 +++--- tasks/s3roundtrip.py | 6 +++--- tasks/s3tests.py | 8 ++++---- tasks/samba.py | 4 ++-- tasks/thrashosds.py | 2 +- tasks/util/rgw.py | 2 +- tasks/watch_notify_stress.py | 2 +- tasks/workunit.py | 2 +- 47 files changed, 75 insertions(+), 75 deletions(-) diff --git a/tasks/admin_socket.py b/tasks/admin_socket.py index 20a670122a9b6..71f631ad7e582 100644 --- a/tasks/admin_socket.py +++ b/tasks/admin_socket.py @@ -8,7 +8,7 @@ import logging import os import time -from ..orchestra import run +from teuthology.orchestra import run from teuthology import misc as teuthology from teuthology.parallel import parallel diff --git a/tasks/autotest.py b/tasks/autotest.py index 24a7675df277f..efa972123d250 100644 --- a/tasks/autotest.py +++ b/tasks/autotest.py @@ -7,7 +7,7 @@ import os from teuthology import misc as teuthology from teuthology.parallel import parallel -from ..orchestra import run +from teuthology.orchestra import run log = logging.getLogger(__name__) diff --git a/tasks/blktrace.py b/tasks/blktrace.py index 208bfd533cee4..401f9e39f6431 100644 --- a/tasks/blktrace.py +++ b/tasks/blktrace.py @@ -6,7 +6,7 @@ import logging from teuthology import misc as teuthology from teuthology import contextutil -from ..orchestra import run +from teuthology.orchestra import run log = logging.getLogger(__name__) blktrace = '/usr/sbin/blktrace' diff --git a/tasks/ceph.py b/tasks/ceph.py index 458f86f484820..6d99f92ae246f 100644 --- a/tasks/ceph.py +++ b/tasks/ceph.py @@ -14,7 +14,7 @@ import time from teuthology import misc as teuthology from teuthology import contextutil -from ..orchestra import run +from teuthology.orchestra import run import ceph_client as cclient from teuthology.orchestra.run import CommandFailedError from teuthology.orchestra.daemon import DaemonGroup diff --git a/tasks/ceph_client.py b/tasks/ceph_client.py index 8935fc8719304..d7cfd00be3e4c 100644 --- a/tasks/ceph_client.py +++ b/tasks/ceph_client.py @@ -4,7 +4,7 @@ Set up client keyring import logging from teuthology import misc as teuthology -from ..orchestra import run +from teuthology.orchestra import run log = logging.getLogger(__name__) diff --git a/tasks/ceph_deploy.py b/tasks/ceph_deploy.py index 9964bab996ecb..1e97828a85713 100644 --- a/tasks/ceph_deploy.py +++ b/tasks/ceph_deploy.py @@ -10,9 +10,9 @@ import logging from teuthology import misc as teuthology from teuthology import contextutil -from ..config import config as teuth_config -import install as install_fn -from ..orchestra import run +from teuthology.config import config as teuth_config +from teuthology.task import install as install_fn +from teuthology.orchestra import run log = logging.getLogger(__name__) diff --git a/tasks/ceph_fuse.py b/tasks/ceph_fuse.py index 306a4f111217a..507fc7ce27f4a 100644 --- a/tasks/ceph_fuse.py +++ b/tasks/ceph_fuse.py @@ -6,8 +6,8 @@ import contextlib import logging from teuthology import misc as teuthology -from ..orchestra import run -from teuthology.task.cephfs.fuse_mount import FuseMount +from teuthology.orchestra import run +from cephfs.fuse_mount import FuseMount log = logging.getLogger(__name__) diff --git a/tasks/ceph_manager.py b/tasks/ceph_manager.py index 951fdc3cba8e0..f0b23183bd500 100644 --- a/tasks/ceph_manager.py +++ b/tasks/ceph_manager.py @@ -8,9 +8,9 @@ import gevent import json import threading from teuthology import misc as teuthology -from teuthology.task import ceph as ceph_task -from teuthology.task.scrub import Scrubber -from teuthology.task_util.rados import cmd_erasure_code_profile +from . import ceph as ceph_task +from tasks.scrub import Scrubber +from util.rados import cmd_erasure_code_profile class Thrasher: """ diff --git a/tasks/cephfs/filesystem.py b/tasks/cephfs/filesystem.py index 1b83d81554da4..e78680146460f 100644 --- a/tasks/cephfs/filesystem.py +++ b/tasks/cephfs/filesystem.py @@ -6,7 +6,7 @@ import time from teuthology import misc from teuthology.parallel import parallel -from teuthology.task import ceph_manager +from tasks import ceph_manager log = logging.getLogger(__name__) @@ -218,4 +218,4 @@ class Filesystem(object): )) else: time.sleep(1) - elapsed += 1 \ No newline at end of file + elapsed += 1 diff --git a/tasks/cephfs/fuse_mount.py b/tasks/cephfs/fuse_mount.py index 98980573bf293..9adba1c47295c 100644 --- a/tasks/cephfs/fuse_mount.py +++ b/tasks/cephfs/fuse_mount.py @@ -6,9 +6,9 @@ import os import logging from teuthology import misc -from ...orchestra import run +from teuthology.orchestra import run from teuthology.orchestra.run import CommandFailedError -from teuthology.task.cephfs.mount import CephFSMount +from .mount import CephFSMount log = logging.getLogger(__name__) diff --git a/tasks/cephfs/kernel_mount.py b/tasks/cephfs/kernel_mount.py index c319084697d08..cb9c1bdedcc86 100644 --- a/tasks/cephfs/kernel_mount.py +++ b/tasks/cephfs/kernel_mount.py @@ -2,7 +2,7 @@ import logging import os from teuthology.orchestra import run -from teuthology.task.cephfs.mount import CephFSMount +from .mount import CephFSMount log = logging.getLogger(__name__) diff --git a/tasks/chef.py b/tasks/chef.py index db793c3939070..62ca8846212fb 100644 --- a/tasks/chef.py +++ b/tasks/chef.py @@ -3,8 +3,8 @@ Chef-solo task """ import logging -from ..orchestra import run -from .. import misc +from teuthology.orchestra import run +from teuthology import misc log = logging.getLogger(__name__) diff --git a/tasks/cifs_mount.py b/tasks/cifs_mount.py index ac58f31cc0a28..b282b0b7dfb52 100644 --- a/tasks/cifs_mount.py +++ b/tasks/cifs_mount.py @@ -6,7 +6,7 @@ import logging import os from teuthology import misc as teuthology -from ..orchestra import run +from teuthology.orchestra import run log = logging.getLogger(__name__) @@ -61,7 +61,7 @@ def task(ctx, config): clients = list(teuthology.get_clients(ctx=ctx, roles=config.keys())) - from teuthology.task.samba import get_sambas + from .samba import get_sambas samba_roles = ['samba.{id_}'.format(id_=id_) for id_ in teuthology.all_roles_of_type(ctx.cluster, 'samba')] sambas = list(get_sambas(ctx=ctx, roles=samba_roles)) (ip, _) = sambas[0][1].ssh.get_transport().getpeername() diff --git a/tasks/cram.py b/tasks/cram.py index 05824d26ab0e6..b4539d497d5c5 100644 --- a/tasks/cram.py +++ b/tasks/cram.py @@ -6,7 +6,7 @@ import os from teuthology import misc as teuthology from teuthology.parallel import parallel -from ..orchestra import run +from teuthology.orchestra import run log = logging.getLogger(__name__) diff --git a/tasks/devstack.py b/tasks/devstack.py index c676acea17c9f..c5cd41b06bd8f 100644 --- a/tasks/devstack.py +++ b/tasks/devstack.py @@ -6,9 +6,9 @@ import textwrap from configparser import ConfigParser import time -from ..orchestra import run -from .. import misc -from ..contextutil import nested +from teuthology.orchestra import run +from teuthology import misc +from teuthology.contextutil import nested log = logging.getLogger(__name__) diff --git a/tasks/die_on_err.py b/tasks/die_on_err.py index 1dfd37073628d..bf422ae547d7a 100644 --- a/tasks/die_on_err.py +++ b/tasks/die_on_err.py @@ -4,7 +4,7 @@ Raise exceptions on osd coredumps or test err directories import contextlib import logging import time -from ..orchestra import run +from teuthology.orchestra import run import ceph_manager from teuthology import misc as teuthology diff --git a/tasks/divergent_priors.py b/tasks/divergent_priors.py index 432614f233cb1..e10f67547ca0e 100644 --- a/tasks/divergent_priors.py +++ b/tasks/divergent_priors.py @@ -6,7 +6,7 @@ import time import ceph_manager from teuthology import misc as teuthology -from teuthology.task_util.rados import rados +from util.rados import rados log = logging.getLogger(__name__) diff --git a/tasks/ec_lost_unfound.py b/tasks/ec_lost_unfound.py index 6c155abd10c10..66912ca036f65 100644 --- a/tasks/ec_lost_unfound.py +++ b/tasks/ec_lost_unfound.py @@ -4,7 +4,7 @@ Lost_unfound import logging import ceph_manager from teuthology import misc as teuthology -from teuthology.task_util.rados import rados +from util.rados import rados log = logging.getLogger(__name__) diff --git a/tasks/filestore_idempotent.py b/tasks/filestore_idempotent.py index 1689a3764b203..af53d295b0b92 100644 --- a/tasks/filestore_idempotent.py +++ b/tasks/filestore_idempotent.py @@ -2,7 +2,7 @@ Filestore/filejournal handler """ import logging -from ..orchestra import run +from teuthology.orchestra import run import random from teuthology import misc as teuthology diff --git a/tasks/kclient.py b/tasks/kclient.py index 96f421f9abcd2..7386b9a00a2f8 100644 --- a/tasks/kclient.py +++ b/tasks/kclient.py @@ -5,7 +5,7 @@ import contextlib import logging from teuthology import misc -from teuthology.task.cephfs.kernel_mount import KernelMount +from cephfs.kernel_mount import KernelMount log = logging.getLogger(__name__) diff --git a/tasks/locktest.py b/tasks/locktest.py index d896e18ffa9c9..9de5ba40c5ba9 100755 --- a/tasks/locktest.py +++ b/tasks/locktest.py @@ -3,7 +3,7 @@ locktests """ import logging -from ..orchestra import run +from teuthology.orchestra import run from teuthology import misc as teuthology log = logging.getLogger(__name__) diff --git a/tasks/lost_unfound.py b/tasks/lost_unfound.py index 674fe123ced49..e9beac7c3764a 100644 --- a/tasks/lost_unfound.py +++ b/tasks/lost_unfound.py @@ -4,7 +4,7 @@ Lost_unfound import logging import ceph_manager from teuthology import misc as teuthology -from teuthology.task_util.rados import rados +from util.rados import rados log = logging.getLogger(__name__) diff --git a/tasks/manypools.py b/tasks/manypools.py index 32b9d562bf46a..1ddcba5c8a90c 100644 --- a/tasks/manypools.py +++ b/tasks/manypools.py @@ -2,7 +2,7 @@ Force pg creation on all osds """ from teuthology import misc as teuthology -from ..orchestra import run +from teuthology.orchestra import run import logging log = logging.getLogger(__name__) diff --git a/tasks/mds_client_recovery.py b/tasks/mds_client_recovery.py index 903a70a5b0a6f..1032616977a80 100644 --- a/tasks/mds_client_recovery.py +++ b/tasks/mds_client_recovery.py @@ -11,8 +11,8 @@ import unittest from teuthology import misc from teuthology.orchestra.run import CommandFailedError from teuthology.task import interactive -from teuthology.task.cephfs.filesystem import Filesystem -from teuthology.task.ceph_fuse import get_client_configs, FuseMount +from cephfs.filesystem import Filesystem +from tasks.ceph_fuse import get_client_configs, FuseMount log = logging.getLogger(__name__) diff --git a/tasks/mds_journal_migration.py b/tasks/mds_journal_migration.py index 0d2bf09cf5ce7..a3eaca798d2b3 100644 --- a/tasks/mds_journal_migration.py +++ b/tasks/mds_journal_migration.py @@ -3,8 +3,8 @@ import contextlib import logging from teuthology import misc -from teuthology.task.ceph import write_conf -from teuthology.task.cephfs.filesystem import Filesystem +from tasks.ceph import write_conf +from cephfs.filesystem import Filesystem log = logging.getLogger(__name__) diff --git a/tasks/object_source_down.py b/tasks/object_source_down.py index 1696c55214aac..17b9449066884 100644 --- a/tasks/object_source_down.py +++ b/tasks/object_source_down.py @@ -4,7 +4,7 @@ Test Object locations going down import logging import ceph_manager from teuthology import misc as teuthology -from teuthology.task_util.rados import rados +from util.rados import rados log = logging.getLogger(__name__) diff --git a/tasks/omapbench.py b/tasks/omapbench.py index 7d2535453231a..e026c74dbc0a2 100644 --- a/tasks/omapbench.py +++ b/tasks/omapbench.py @@ -4,7 +4,7 @@ Run omapbench executable within teuthology import contextlib import logging -from ..orchestra import run +from teuthology.orchestra import run from teuthology import misc as teuthology log = logging.getLogger(__name__) diff --git a/tasks/osd_failsafe_enospc.py b/tasks/osd_failsafe_enospc.py index 8f5da5877804d..bf089988022ad 100644 --- a/tasks/osd_failsafe_enospc.py +++ b/tasks/osd_failsafe_enospc.py @@ -6,8 +6,8 @@ import logging import time import ceph_manager -from ..orchestra import run -from teuthology.task_util.rados import rados +from teuthology.orchestra import run +from util.rados import rados from teuthology import misc as teuthology log = logging.getLogger(__name__) diff --git a/tasks/peer.py b/tasks/peer.py index 8006c3812ad7a..f1789cf12d6ea 100644 --- a/tasks/peer.py +++ b/tasks/peer.py @@ -6,7 +6,7 @@ import json import ceph_manager from teuthology import misc as teuthology -from teuthology.task_util.rados import rados +from util.rados import rados log = logging.getLogger(__name__) diff --git a/tasks/qemu.py b/tasks/qemu.py index a05b4dba0ac67..eec0324a0ebc1 100644 --- a/tasks/qemu.py +++ b/tasks/qemu.py @@ -9,8 +9,8 @@ import os from teuthology import misc as teuthology from teuthology import contextutil -from teuthology.task import rbd -from ..orchestra import run +from tasks import rbd +from teuthology.orchestra import run log = logging.getLogger(__name__) diff --git a/tasks/rados.py b/tasks/rados.py index 28cccf259f775..537deac0f25dc 100644 --- a/tasks/rados.py +++ b/tasks/rados.py @@ -7,7 +7,7 @@ import gevent from ceph_manager import CephManager from teuthology import misc as teuthology -from ..orchestra import run +from teuthology.orchestra import run log = logging.getLogger(__name__) diff --git a/tasks/radosbench.py b/tasks/radosbench.py index 53a54f6e088c6..f1cbb74d75e8f 100644 --- a/tasks/radosbench.py +++ b/tasks/radosbench.py @@ -4,7 +4,7 @@ Rados benchmarking import contextlib import logging -from ..orchestra import run +from teuthology.orchestra import run from teuthology import misc as teuthology log = logging.getLogger(__name__) diff --git a/tasks/radosgw_admin.py b/tasks/radosgw_admin.py index c57b55203a8ea..3101f288cddc8 100644 --- a/tasks/radosgw_admin.py +++ b/tasks/radosgw_admin.py @@ -18,10 +18,10 @@ import boto.exception import boto.s3.connection import boto.s3.acl -import teuthology.task_util.rgw as rgw_utils +import util.rgw as rgw_utils from teuthology import misc as teuthology -from teuthology.task_util.rgw import rgwadmin +from util.rgw import rgwadmin log = logging.getLogger(__name__) diff --git a/tasks/radosgw_agent.py b/tasks/radosgw_agent.py index 2ebccae5cb19e..47d5054c739da 100644 --- a/tasks/radosgw_agent.py +++ b/tasks/radosgw_agent.py @@ -5,9 +5,9 @@ import contextlib import logging import argparse -from ..orchestra import run +from teuthology.orchestra import run from teuthology import misc as teuthology -import teuthology.task_util.rgw as rgw_utils +import util.rgw as rgw_utils log = logging.getLogger(__name__) diff --git a/tasks/rbd.py b/tasks/rbd.py index fb93a0599d0a4..8c63251307732 100644 --- a/tasks/rbd.py +++ b/tasks/rbd.py @@ -6,7 +6,7 @@ import logging import os from cStringIO import StringIO -from ..orchestra import run +from teuthology.orchestra import run from teuthology import misc as teuthology from teuthology import contextutil from teuthology.parallel import parallel diff --git a/tasks/rep_lost_unfound_delete.py b/tasks/rep_lost_unfound_delete.py index cac8d4f1984ce..b36d260b12224 100644 --- a/tasks/rep_lost_unfound_delete.py +++ b/tasks/rep_lost_unfound_delete.py @@ -4,7 +4,7 @@ Lost_unfound import logging import ceph_manager from teuthology import misc as teuthology -from teuthology.task_util.rados import rados +from util.rados import rados log = logging.getLogger(__name__) diff --git a/tasks/rest_api.py b/tasks/rest_api.py index de09df46460d9..0956d00be51d2 100644 --- a/tasks/rest_api.py +++ b/tasks/rest_api.py @@ -7,8 +7,8 @@ import time from teuthology import misc as teuthology from teuthology import contextutil -from ..orchestra import run -from ..orchestra.daemon import DaemonGroup +from teuthology.orchestra import run +from teuthology.orchestra.daemon import DaemonGroup log = logging.getLogger(__name__) diff --git a/tasks/restart.py b/tasks/restart.py index 85e053a72546a..bd5f9519cf8a8 100644 --- a/tasks/restart.py +++ b/tasks/restart.py @@ -7,7 +7,7 @@ import pipes from teuthology import misc as teuthology from teuthology.orchestra import run as tor -from ..orchestra import run +from teuthology.orchestra import run log = logging.getLogger(__name__) def restart_daemon(ctx, config, role, id_, *args): diff --git a/tasks/rgw.py b/tasks/rgw.py index afa464d52096b..5cf72dc3065b4 100644 --- a/tasks/rgw.py +++ b/tasks/rgw.py @@ -9,11 +9,11 @@ import os from cStringIO import StringIO -from ..orchestra import run +from teuthology.orchestra import run from teuthology import misc as teuthology from teuthology import contextutil -from teuthology.task_util.rgw import rgwadmin -from teuthology.task_util.rados import (rados, create_ec_pool, +from util.rgw import rgwadmin +from util.rados import (rados, create_ec_pool, create_replicated_pool, create_cache_pool) diff --git a/tasks/s3readwrite.py b/tasks/s3readwrite.py index 476015d76b59c..9f1507ef8167d 100644 --- a/tasks/s3readwrite.py +++ b/tasks/s3readwrite.py @@ -12,9 +12,9 @@ import yaml from teuthology import misc as teuthology from teuthology import contextutil -from ..config import config as teuth_config -from ..orchestra import run -from ..orchestra.connection import split_user +from teuthology.config import config as teuth_config +from teuthology.orchestra import run +from teuthology.orchestra.connection import split_user log = logging.getLogger(__name__) diff --git a/tasks/s3roundtrip.py b/tasks/s3roundtrip.py index 5a7093d6f4304..4c17144dbae40 100644 --- a/tasks/s3roundtrip.py +++ b/tasks/s3roundtrip.py @@ -12,9 +12,9 @@ import yaml from teuthology import misc as teuthology from teuthology import contextutil -from ..config import config as teuth_config -from ..orchestra import run -from ..orchestra.connection import split_user +from teuthology.config import config as teuth_config +from teuthology.orchestra import run +from teuthology.orchestra.connection import split_user log = logging.getLogger(__name__) diff --git a/tasks/s3tests.py b/tasks/s3tests.py index abbacb9bfaa3a..cd4bd6fda3a0d 100644 --- a/tasks/s3tests.py +++ b/tasks/s3tests.py @@ -10,13 +10,13 @@ import os import random import string -import teuthology.task_util.rgw as rgw_utils +import util.rgw as rgw_utils from teuthology import misc as teuthology from teuthology import contextutil -from ..config import config as teuth_config -from ..orchestra import run -from ..orchestra.connection import split_user +from teuthology.config import config as teuth_config +from teuthology.orchestra import run +from teuthology.orchestra.connection import split_user log = logging.getLogger(__name__) diff --git a/tasks/samba.py b/tasks/samba.py index 6e0932f283339..e9528d163275b 100644 --- a/tasks/samba.py +++ b/tasks/samba.py @@ -7,8 +7,8 @@ import sys import time from teuthology import misc as teuthology -from ..orchestra import run -from ..orchestra.daemon import DaemonGroup +from teuthology.orchestra import run +from teuthology.orchestra.daemon import DaemonGroup log = logging.getLogger(__name__) diff --git a/tasks/thrashosds.py b/tasks/thrashosds.py index ba166ed8e396c..eec82b2e2deaa 100644 --- a/tasks/thrashosds.py +++ b/tasks/thrashosds.py @@ -120,7 +120,7 @@ def task(ctx, config): for t, key in ctx.config['targets'].iteritems(): host = t.split('@')[-1] shortname = host.split('.')[0] - from ..orchestra import remote as oremote + from teuthology.orchestra import remote as oremote console = oremote.getRemoteConsole( name=host, ipmiuser=ctx.teuthology_config['ipmi_user'], diff --git a/tasks/util/rgw.py b/tasks/util/rgw.py index cbe3071fbe5f4..ef61a3fd7cde4 100644 --- a/tasks/util/rgw.py +++ b/tasks/util/rgw.py @@ -4,7 +4,7 @@ import json import requests from urlparse import urlparse -from ..orchestra.connection import split_user +from teuthology.orchestra.connection import split_user from teuthology import misc as teuthology log = logging.getLogger(__name__) diff --git a/tasks/watch_notify_stress.py b/tasks/watch_notify_stress.py index ab611c3dd4a70..6db313fea6de6 100644 --- a/tasks/watch_notify_stress.py +++ b/tasks/watch_notify_stress.py @@ -5,7 +5,7 @@ import contextlib import logging import proc_thrasher -from ..orchestra import run +from teuthology.orchestra import run log = logging.getLogger(__name__) diff --git a/tasks/workunit.py b/tasks/workunit.py index e79b551ea3fc3..cdd0320b93ef0 100644 --- a/tasks/workunit.py +++ b/tasks/workunit.py @@ -8,7 +8,7 @@ import os from teuthology import misc from teuthology.orchestra.run import CommandFailedError from teuthology.parallel import parallel -from ..orchestra import run +from teuthology.orchestra import run log = logging.getLogger(__name__) -- 2.39.5