From 0a46347f680314c060e89b5fd0d1d9f16b0f59db 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) --- qa/tasks/ceph_objectstore_tool.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/qa/tasks/ceph_objectstore_tool.py b/qa/tasks/ceph_objectstore_tool.py index 94b9d19e913fc..2199266e78da4 100644 --- a/qa/tasks/ceph_objectstore_tool.py +++ b/qa/tasks/ceph_objectstore_tool.py @@ -8,7 +8,6 @@ import json import logging import os import six -import string import sys import tempfile import time @@ -288,7 +287,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 +324,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 +414,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 +499,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 +522,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 +553,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 +579,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 +604,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.39.5