import 15.2.4

[ceph.git] / ceph / qa / tasks / watch_notify_stress.py

diff --git a/ceph/qa/tasks/watch_notify_stress.py b/ceph/qa/tasks/watch_notify_stress.py
index 6db313fea6de6215efa34677dd117c6fb66161a9..e5e380492e0e8038d6edbcfd63183a88c6698ee8 100644 (file)
--- a/ceph/qa/tasks/watch_notify_stress.py
+++ b/ceph/qa/tasks/watch_notify_stress.py
@@ -3,9 +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__)
 
@@ -36,11 +37,11 @@ def task(ctx, config):
     remotes = []
 
     for role in config.get('clients', ['client.0']):
-        assert isinstance(role, basestring)
+        assert isinstance(role, six.string_types)
         PREFIX = 'client.'
         assert role.startswith(PREFIX)
         id_ = role[len(PREFIX):]
-        (remote,) = ctx.cluster.only(role).remotes.iterkeys()
+        (remote,) = ctx.cluster.only(role).remotes.keys()
         remotes.append(remote)
 
         args =['CEPH_CLIENT_ID={id_}'.format(id_=id_),
@@ -65,5 +66,5 @@ def task(ctx, config):
         yield
     finally:
         log.info('joining watch_notify_stress')
-        for i in testwatch.itervalues():
+        for i in testwatch.values():
             i.join()