RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 01:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

qa/tasks/ceph_objectstore_tool.py: use str.startswit

Browse Source 
in Python3, string module does not offer `string.find()` anymore, let's
use `str.find()` method instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2020-04-08 12:32:54 +08:00
parent 523c623b28
commit 77ec9ce88d
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qa/tasks/ceph_objectstore_tool.py
View File

@ -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: