qa: import CommandFailedError from exceptions not run

Stop importing CommandFailedError from teuthology.orchestra.run, it is
actually defined in teuthology.exception.

Fixes: https://tracker.ceph.com/issues/51226
Signed-off-by: Rishabh Dave <ridave@redhat.com>

diff --git a/qa/tasks/ceph_test_case.py b/qa/tasks/ceph_test_case.py
index 7040853dfb437ff54ccb53031e46b67662d76132..0ce9e81f1c138bef997bf77ae8862d423b4384ac 100644 (file)
--- a/qa/tasks/ceph_test_case.py
+++ b/qa/tasks/ceph_test_case.py
@@ -3,7 +3,7 @@ import unittest
 import time
 import logging
 
-from teuthology.orchestra.run import CommandFailedError
+from teuthology.exceptions import CommandFailedError
 
 if TYPE_CHECKING:
     from tasks.mgr.mgr_test_case import MgrCluster

diff --git a/qa/tasks/cephfs/cephfs_test_case.py b/qa/tasks/cephfs/cephfs_test_case.py
index 6b3460ff248e2b95384bc2b81b6aa9ed6508a649..8383359d5aa7fc77469c208d6efaaaba8fadec5a 100644 (file)
--- a/qa/tasks/cephfs/cephfs_test_case.py
+++ b/qa/tasks/cephfs/cephfs_test_case.py
@@ -9,7 +9,7 @@ from tasks.ceph_test_case import CephTestCase
 
 from teuthology import contextutil
 from teuthology.orchestra import run
-from teuthology.orchestra.run import CommandFailedError
+from teuthology.exceptions import CommandFailedError
 
 log = logging.getLogger(__name__)
 

diff --git a/qa/tasks/cephfs/fuse_mount.py b/qa/tasks/cephfs/fuse_mount.py
index 5f4978e57155dcd2537cf56bcc9ea0f255a7f99a..8ecaab7b78bba0bda546e24d2b950413fe8814e0 100644 (file)
--- a/qa/tasks/cephfs/fuse_mount.py
+++ b/qa/tasks/cephfs/fuse_mount.py
@@ -8,7 +8,7 @@ from textwrap import dedent
 from teuthology.contextutil import MaxWhileTries
 from teuthology.contextutil import safe_while
 from teuthology.orchestra import run
-from teuthology.orchestra.run import CommandFailedError
+from teuthology.exceptions import CommandFailedError
 from tasks.ceph_manager import get_valgrind_args
 from tasks.cephfs.mount import CephFSMount
 

diff --git a/qa/tasks/cephfs/kernel_mount.py b/qa/tasks/cephfs/kernel_mount.py
index 55fdae5d9e84d205e4fca7bd4d73c7e78625b777..9d14f4d749a2cd3ba5d2e93505d2f2e8748e84f6 100644 (file)
--- a/qa/tasks/cephfs/kernel_mount.py
+++ b/qa/tasks/cephfs/kernel_mount.py
@@ -6,7 +6,7 @@ import re
 from io import StringIO
 from textwrap import dedent
 
-from teuthology.orchestra.run import CommandFailedError
+from teuthology.exceptions import CommandFailedError
 from teuthology.orchestra import run
 from teuthology.contextutil import MaxWhileTries
 

diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py
index 6224a7eae7b085a176a7edec6a9d7cdae86742ee..dccac187db6596d2c4d91dfe34b9cae76e16fc15 100644 (file)
--- a/qa/tasks/cephfs/mount.py
+++ b/qa/tasks/cephfs/mount.py
@@ -14,7 +14,8 @@ from IPy import IP
 from teuthology.contextutil import safe_while
 from teuthology.misc import get_file, write_file
 from teuthology.orchestra import run
-from teuthology.orchestra.run import CommandFailedError, ConnectionLostError, Raw
+from teuthology.orchestra.run import Raw
+from teuthology.exceptions import CommandFailedError, ConnectionLostError
 
 from tasks.cephfs.filesystem import Filesystem
 

diff --git a/qa/tasks/cephfs/test_admin.py b/qa/tasks/cephfs/test_admin.py
index aff83b86797bae1debd44900a8c7017250221f8a..d7a083d72ec1f250f464f68f46774572378fa7e9 100644 (file)
--- a/qa/tasks/cephfs/test_admin.py
+++ b/qa/tasks/cephfs/test_admin.py
@@ -6,7 +6,8 @@ import uuid
 from io import StringIO
 from os.path import join as os_path_join
 
-from teuthology.orchestra.run import CommandFailedError, Raw
+from teuthology.orchestra.run import Raw
+from teuthology.exceptions import CommandFailedError
 
 from tasks.cephfs.cephfs_test_case import CephFSTestCase
 from tasks.cephfs.filesystem import FileLayout, FSMissing

diff --git a/qa/tasks/cephfs/test_auto_repair.py b/qa/tasks/cephfs/test_auto_repair.py
index 00c86b68bf60d3c686d6db0b7e748f08e4a287d8..e6f0a8f0bd4cb5d0d5dbdbc7f2796c4a5d2a8d86 100644 (file)
--- a/qa/tasks/cephfs/test_auto_repair.py
+++ b/qa/tasks/cephfs/test_auto_repair.py
@@ -6,7 +6,7 @@ Exercise the MDS's auto repair functions
 import logging
 import time
 
-from teuthology.orchestra.run import CommandFailedError
+from teuthology.exceptions import CommandFailedError
 from tasks.cephfs.cephfs_test_case import CephFSTestCase
 
 

diff --git a/qa/tasks/cephfs/test_cephfs_shell.py b/qa/tasks/cephfs/test_cephfs_shell.py
index 83ee3991196e05a3117a820a5a9c83b1b47bc49f..1ee5c7f84645d74e9d11a1ccd8935726ac1fb431 100644 (file)
--- a/qa/tasks/cephfs/test_cephfs_shell.py
+++ b/qa/tasks/cephfs/test_cephfs_shell.py
@@ -10,7 +10,7 @@ from tempfile import mkstemp as tempfile_mkstemp
 import math
 from time import sleep
 from tasks.cephfs.cephfs_test_case import CephFSTestCase
-from teuthology.orchestra.run import CommandFailedError
+from teuthology.exceptions import CommandFailedError
 
 log = logging.getLogger(__name__)
 

diff --git a/qa/tasks/cephfs/test_client_recovery.py b/qa/tasks/cephfs/test_client_recovery.py
index 24726b369f9fd5ea4ccfcc26395d291a899feda3..eea93939d24b59f1cb74a300ea8f9324dd1e9ccf 100644 (file)
--- a/qa/tasks/cephfs/test_client_recovery.py
+++ b/qa/tasks/cephfs/test_client_recovery.py
@@ -11,7 +11,7 @@ import re
 import os
 
 from teuthology.orchestra import run
-from teuthology.orchestra.run import CommandFailedError
+from teuthology.exceptions import CommandFailedError
 from tasks.cephfs.fuse_mount import FuseMount
 from tasks.cephfs.cephfs_test_case import CephFSTestCase
 from teuthology.packaging import get_package_version

diff --git a/qa/tasks/cephfs/test_data_scan.py b/qa/tasks/cephfs/test_data_scan.py
index dcb7eda40a56df8afb6c6a7a32bceb7fd7115e48..177ffe01eaa082b0aeec572b93aa5629c5303873 100644 (file)
--- a/qa/tasks/cephfs/test_data_scan.py
+++ b/qa/tasks/cephfs/test_data_scan.py
@@ -13,7 +13,7 @@ from io import BytesIO, StringIO
 from collections import namedtuple, defaultdict
 from textwrap import dedent
 
-from teuthology.orchestra.run import CommandFailedError
+from teuthology.exceptions import CommandFailedError
 from tasks.cephfs.cephfs_test_case import CephFSTestCase, for_teuthology
 
 log = logging.getLogger(__name__)

diff --git a/qa/tasks/cephfs/test_exports.py b/qa/tasks/cephfs/test_exports.py
index d2421bedcbbc44be9fa1aa6f3ce65187644fe1fe..4961edb520d015b205fe422b58ed78b7d3b6fa77 100644 (file)
--- a/qa/tasks/cephfs/test_exports.py
+++ b/qa/tasks/cephfs/test_exports.py
@@ -3,7 +3,7 @@ import random
 import time
 from tasks.cephfs.fuse_mount import FuseMount
 from tasks.cephfs.cephfs_test_case import CephFSTestCase
-from teuthology.orchestra.run import CommandFailedError
+from teuthology.exceptions import CommandFailedError
 
 log = logging.getLogger(__name__)
 

diff --git a/qa/tasks/cephfs/test_forward_scrub.py b/qa/tasks/cephfs/test_forward_scrub.py
index 82630e069587b7105c524f93add50e8237eac45b..ab97a6f596ca1d4d615478f563f9994d3cd8ca85 100644 (file)
--- a/qa/tasks/cephfs/test_forward_scrub.py
+++ b/qa/tasks/cephfs/test_forward_scrub.py
@@ -14,7 +14,7 @@ from collections import namedtuple
 from io import BytesIO
 from textwrap import dedent
 
-from teuthology.orchestra.run import CommandFailedError
+from teuthology.exceptions import CommandFailedError
 from tasks.cephfs.cephfs_test_case import CephFSTestCase
 
 import struct

diff --git a/qa/tasks/cephfs/test_full.py b/qa/tasks/cephfs/test_full.py
index 2b7166d6b2be2ccee30c0b2058c862e83057fb60..962a3d036d1fce6658a9fc402a3290d97b2531e2 100644 (file)
--- a/qa/tasks/cephfs/test_full.py
+++ b/qa/tasks/cephfs/test_full.py
@@ -7,7 +7,7 @@ try:
 except:
     # make it work for python2
     pass
-from teuthology.orchestra.run import CommandFailedError
+from teuthology.exceptions import CommandFailedError
 from tasks.cephfs.fuse_mount import FuseMount
 from tasks.cephfs.cephfs_test_case import CephFSTestCase
 

diff --git a/qa/tasks/cephfs/test_misc.py b/qa/tasks/cephfs/test_misc.py
index 85b11cc6ca045b7a52522552efe0250714c84980..0367c141f29ccb0634fe2226b33bf6e9f0cfa9c5 100644 (file)
--- a/qa/tasks/cephfs/test_misc.py
+++ b/qa/tasks/cephfs/test_misc.py
@@ -2,7 +2,7 @@ from io import StringIO
 
 from tasks.cephfs.fuse_mount import FuseMount
 from tasks.cephfs.cephfs_test_case import CephFSTestCase
-from teuthology.orchestra.run import CommandFailedError
+from teuthology.exceptions import CommandFailedError
 import errno
 import time
 import json

diff --git a/qa/tasks/cephfs/test_multifs_auth.py b/qa/tasks/cephfs/test_multifs_auth.py
index 2b28c61ca043e96ebb95c976e3455eee4930632f..6768d57cfc0afc0f7def2fbcd531fb8d24e7c61a 100644 (file)
--- a/qa/tasks/cephfs/test_multifs_auth.py
+++ b/qa/tasks/cephfs/test_multifs_auth.py
@@ -8,7 +8,7 @@ from os.path import join as os_path_join
 # CapsHelper is subclassed from CephFSTestCase
 from tasks.cephfs.caps_helper import CapsHelper
 
-from teuthology.orchestra.run import CommandFailedError
+from teuthology.exceptions import CommandFailedError
 
 
 log = logging.getLogger(__name__)

diff --git a/qa/tasks/cephfs/test_multimds_misc.py b/qa/tasks/cephfs/test_multimds_misc.py
index 3c464e91d0a28a69210f205ab98194b7c198f49e..2bb6257c7eb8ab06a948268e2bec345a9c9f3c5a 100644 (file)
--- a/qa/tasks/cephfs/test_multimds_misc.py
+++ b/qa/tasks/cephfs/test_multimds_misc.py
@@ -2,7 +2,7 @@ import logging
 import errno
 from tasks.cephfs.cephfs_test_case import CephFSTestCase
 from teuthology.contextutil import safe_while
-from teuthology.orchestra.run import CommandFailedError
+from teuthology.exceptions import CommandFailedError
 
 log = logging.getLogger(__name__)
 

diff --git a/qa/tasks/cephfs/test_recovery_pool.py b/qa/tasks/cephfs/test_recovery_pool.py
index 9926b3670cac3b4bd30b2fd6b28d99c4384587c3..5dd5960add1f2c023b5bb36d7d1f4db039eb81bc 100644 (file)
--- a/qa/tasks/cephfs/test_recovery_pool.py
+++ b/qa/tasks/cephfs/test_recovery_pool.py
@@ -6,7 +6,7 @@ import logging
 import traceback
 from collections import namedtuple
 
-from teuthology.orchestra.run import CommandFailedError
+from teuthology.exceptions import CommandFailedError
 from tasks.cephfs.cephfs_test_case import CephFSTestCase
 
 log = logging.getLogger(__name__)

diff --git a/qa/tasks/cephfs/test_snapshots.py b/qa/tasks/cephfs/test_snapshots.py
index fa4d9431fefdfab4a3dfe03898439874d3bf95d9..e651bb1c6b103a3de7130a202dc8f29babddd9bb 100644 (file)
--- a/qa/tasks/cephfs/test_snapshots.py
+++ b/qa/tasks/cephfs/test_snapshots.py
@@ -4,7 +4,8 @@ import signal
 from textwrap import dedent
 from tasks.cephfs.fuse_mount import FuseMount
 from tasks.cephfs.cephfs_test_case import CephFSTestCase
-from teuthology.orchestra.run import CommandFailedError, Raw
+from teuthology.orchestra.run import Raw
+from teuthology.exceptions import CommandFailedError
 
 log = logging.getLogger(__name__)
 

diff --git a/qa/tasks/cephfs/test_strays.py b/qa/tasks/cephfs/test_strays.py
index f8313badd03584c3ab69c112b978972cb7ac7e56..44ca0b013d840a9205948e320034f403293931c1 100644 (file)
--- a/qa/tasks/cephfs/test_strays.py
+++ b/qa/tasks/cephfs/test_strays.py
@@ -5,7 +5,8 @@ from textwrap import dedent
 import datetime
 import gevent
 
-from teuthology.orchestra.run import CommandFailedError, Raw
+from teuthology.exceptions import CommandFailedError
+from teuthology.orchestra.run import Raw
 from tasks.cephfs.cephfs_test_case import CephFSTestCase, for_teuthology
 
 log = logging.getLogger(__name__)

diff --git a/qa/tasks/kclient.py b/qa/tasks/kclient.py
index d7bc9fa835b55ea8817f7ac2b1c26aa164873f7e..2749f01daeef1c10b717f414fdb2e8dca8e0bc9e 100644 (file)
--- a/qa/tasks/kclient.py
+++ b/qa/tasks/kclient.py
@@ -5,7 +5,7 @@ import contextlib
 import logging
 
 from teuthology.misc import deep_merge
-from teuthology.orchestra.run import CommandFailedError
+from teuthology.exceptions import CommandFailedError
 from teuthology import misc
 from teuthology.contextutil import MaxWhileTries
 from tasks.cephfs.kernel_mount import KernelMount

diff --git a/qa/tasks/mds_creation_failure.py b/qa/tasks/mds_creation_failure.py
index 58314086c033756ab9f0609b5decc71a65e966c0..2ab8f70dd9d2fa263e626f7955408b312c300b65 100644 (file)
--- a/qa/tasks/mds_creation_failure.py
+++ b/qa/tasks/mds_creation_failure.py
@@ -5,7 +5,8 @@ import contextlib
 import time
 from tasks import ceph_manager
 from teuthology import misc
-from teuthology.orchestra.run import CommandFailedError, Raw
+from teuthology.exceptions import CommandFailedError
+from teuthology.orchestra.run import Raw
 
 log = logging.getLogger(__name__)
 

diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index eb85d5ab43a2d426b185fbb286d06e5f086072d7..916256495d45478adec8b1c0ea52f7ab5894e5cb 100644 (file)
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -56,7 +56,7 @@ from teuthology.orchestra.remote import Remote
 from teuthology.config import config as teuth_config
 from teuthology.contextutil import safe_while
 from teuthology.contextutil import MaxWhileTries
-from teuthology.orchestra.run import CommandFailedError
+from teuthology.exceptions import CommandFailedError
 try:
     import urllib3
     urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)

diff --git a/qa/tasks/workunit.py b/qa/tasks/workunit.py
index 371d2a2dddb5a19d53b12b6ee73c02ff1f188005..6412c99bc04d076836aecf8c1f7bf2eb096ba09a 100644 (file)
--- a/qa/tasks/workunit.py
+++ b/qa/tasks/workunit.py
@@ -12,7 +12,7 @@ from tasks.util.workunit import get_refspec_after_overrides
 
 from teuthology import misc
 from teuthology.config import config as teuth_config
-from teuthology.orchestra.run import CommandFailedError
+from teuthology.exceptions import CommandFailedError
 from teuthology.parallel import parallel
 from teuthology.orchestra import run