mgr/cephadm: fix flake8

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit a124f6c47b119a8741f347ea5a809f3fb48d6679)

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 746ab8feebca5861e48f967e2fa8cf061dbe65eb..e86b41e1dffd31cb387ab9ba8b685e20a539d6f3 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -5421,7 +5421,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 cd5936ec69778eb6f89b2e6f932d3067ac269719..9460af1dd7a272fef5e44143481b52a1b4f21149 100644 (file)
--- a/src/pybind/mgr/cephadm/services/ingress.py
+++ b/src/pybind/mgr/cephadm/services/ingress.py
@@ -98,7 +98,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 5c18f5bf0a022bd63cae3f54df55203d63680b86..7a340ff4ae6e55bae935a941697f7f0175ddb440 100644 (file)
--- a/src/pybind/mgr/iostat/module.py
+++ b/src/pybind/mgr/iostat/module.py
@@ -7,13 +7,13 @@ class Module(MgrModule):
 
     def self_test(self):
         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):

diff --git a/src/tools/cephfs/cephfs-shell b/src/tools/cephfs/cephfs-shell
index 3cf5c46e46f7c8064c13ec81d18a9993b92400b7..51bd569e07d15ec1a31a7eee273603def99e7116 100755 (executable)
--- 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):