From 28b2541d7b259881bca1192851a7d044479e16dc Mon Sep 17 00:00:00 2001 From: Avan Thakkar Date: Mon, 1 Aug 2022 14:53:14 +0530 Subject: [PATCH] mgr/cephadm: fix flake8 Signed-off-by: Avan Thakkar (cherry picked from commit a124f6c47b119a8741f347ea5a809f3fb48d6679) --- src/cephadm/cephadm | 2 +- src/pybind/mgr/cephadm/services/ingress.py | 2 +- src/pybind/mgr/iostat/module.py | 14 +++++++------- src/tools/cephfs/cephfs-shell | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index ecdc6fc5d48b8..d74eea80f33b7 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -6114,7 +6114,7 @@ def _parse_ipv6_route(routes: str, ips: str) -> Dict[str, Dict[str, Set[str]]]: net = [n for n in r.keys() if ipaddress.ip_address(ip) in ipaddress.ip_network(n)] if net and iface in r[net[0]]: - assert(iface) + assert iface r[net[0]][iface].add(ip) return r diff --git a/src/pybind/mgr/cephadm/services/ingress.py b/src/pybind/mgr/cephadm/services/ingress.py index cf735798ba7cf..02fd8141d5b52 100644 --- a/src/pybind/mgr/cephadm/services/ingress.py +++ b/src/pybind/mgr/cephadm/services/ingress.py @@ -99,7 +99,7 @@ class IngressService(CephService): for rank in range(num_ranks): if rank in by_rank: d = by_rank[rank] - assert(d.ports) + assert d.ports servers.append({ 'name': f"{spec.backend_service}.{rank}", 'ip': d.ip or resolve_ip(self.mgr.inventory.get_addr(str(d.hostname))), diff --git a/src/pybind/mgr/iostat/module.py b/src/pybind/mgr/iostat/module.py index 8ec21ca509ca5..b101094abc0c6 100644 --- a/src/pybind/mgr/iostat/module.py +++ b/src/pybind/mgr/iostat/module.py @@ -9,13 +9,13 @@ class Module(MgrModule): def self_test(self) -> None: r = self.get('io_rate') - assert('pg_stats_delta' in r) - assert('stamp_delta' in r['pg_stats_delta']) - assert('stat_sum' in r['pg_stats_delta']) - assert('num_read_kb' in r['pg_stats_delta']['stat_sum']) - assert('num_write_kb' in r['pg_stats_delta']['stat_sum']) - assert('num_write' in r['pg_stats_delta']['stat_sum']) - assert('num_read' in r['pg_stats_delta']['stat_sum']) + assert 'pg_stats_delta' in r + assert 'stamp_delta' in r['pg_stats_delta'] + assert 'stat_sum' in r['pg_stats_delta'] + assert 'num_read_kb' in r['pg_stats_delta']['stat_sum'] + assert 'num_write_kb' in r['pg_stats_delta']['stat_sum'] + assert 'num_write' in r['pg_stats_delta']['stat_sum'] + assert 'num_read' in r['pg_stats_delta']['stat_sum'] @CLIReadCommand('iostat', poll=True) def iostat(self, width: int = 80, print_header: bool = False) -> HandleCommandResult: diff --git a/src/tools/cephfs/cephfs-shell b/src/tools/cephfs/cephfs-shell index 08ca4f3fca3e9..9b2c214ccfb8b 100755 --- a/src/tools/cephfs/cephfs-shell +++ b/src/tools/cephfs/cephfs-shell @@ -135,10 +135,10 @@ def get_chunks(file_size): chunk_start = 0 chunk_size = 0x20000 # 131072 bytes, default max ssl buffer size while chunk_start + chunk_size < file_size: - yield(chunk_start, chunk_size) + yield chunk_start, chunk_size chunk_start += chunk_size final_chunk_size = file_size - chunk_start - yield(chunk_start, final_chunk_size) + yield chunk_start, final_chunk_size def to_bytes(param): -- 2.39.5