From e134f8eb8707aaf72ae203b4d500cdca33afb97a Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 8 Apr 2020 12:32:54 +0800 Subject: [PATCH] qa/tasks/ceph_objectstore_tool.py: use str.startswit in Python3, string module does not offer `string.find()` anymore, let's use `str.find()` method instead. Signed-off-by: Kefu Chai (cherry picked from commit 77ec9ce88df54b7758e56eeef1b3cf3f14952513) Conflicts: qa/tasks/ceph_objectstore_tool.py: trivial resolution --- qa/tasks/ceph_objectstore_tool.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/qa/tasks/ceph_objectstore_tool.py b/qa/tasks/ceph_objectstore_tool.py index 641981ebd36e4..8636fdb6f3f03 100644 --- a/qa/tasks/ceph_objectstore_tool.py +++ b/qa/tasks/ceph_objectstore_tool.py @@ -10,8 +10,6 @@ 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 @@ -288,7 +286,7 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False): log.debug(remote) log.debug(osds.remotes[remote]) for role in osds.remotes[remote]: - if string.find(role, "osd.") != 0: + if not role.startswith("osd."): continue osdid = int(role.split('.')[1]) log.info("process osd.{id} on {remote}". @@ -325,7 +323,7 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False): for remote in osds.remotes.keys(): for role in osds.remotes[remote]: - if string.find(role, "osd.") != 0: + if not role.startswith("osd."): continue osdid = int(role.split('.')[1]) if osdid not in pgs: @@ -415,7 +413,7 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False): for remote in osds.remotes.keys(): for role in osds.remotes[remote]: - if string.find(role, "osd.") != 0: + if not role.startswith("osd."): continue osdid = int(role.split('.')[1]) if osdid not in pgs: @@ -500,7 +498,7 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False): log.info("Test pg info") for remote in osds.remotes.keys(): for role in osds.remotes[remote]: - if string.find(role, "osd.") != 0: + if not role.startswith("osd."): continue osdid = int(role.split('.')[1]) if osdid not in pgs: @@ -523,7 +521,7 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False): log.info("Test pg logging") for remote in osds.remotes.keys(): for role in osds.remotes[remote]: - if string.find(role, "osd.") != 0: + if not role.startswith("osd."): continue osdid = int(role.split('.')[1]) if osdid not in pgs: @@ -554,7 +552,7 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False): EXP_ERRORS = 0 for remote in osds.remotes.keys(): for role in osds.remotes[remote]: - if string.find(role, "osd.") != 0: + if not role.startswith("osd."): continue osdid = int(role.split('.')[1]) if osdid not in pgs: @@ -580,7 +578,7 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False): RM_ERRORS = 0 for remote in osds.remotes.keys(): for role in osds.remotes[remote]: - if string.find(role, "osd.") != 0: + if not role.startswith("osd."): continue osdid = int(role.split('.')[1]) if osdid not in pgs: @@ -605,7 +603,7 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False): for remote in osds.remotes.keys(): for role in osds.remotes[remote]: - if string.find(role, "osd.") != 0: + if not role.startswith("osd."): continue osdid = int(role.split('.')[1]) if osdid not in pgs: -- 2.47.3