Update formatting for Black 24.4.0

Avoids incorrect reporting if cache/buffers exceeds normal.

client-cli/pvc/cli/cli.py

@@ -671,9 +671,9 @@ def cli_cluster_maintenance_off():
 @format_opt(
     {
         "pretty": cli_cluster_task_format_pretty,
-        "raw": lambda d: "\n".join([t["id"] for t in d])
+        "raw": lambda d: (
-        if isinstance(d, list)
+            "\n".join([t["id"] for t in d]) if isinstance(d, list) else d["state"]
-        else d["state"],
+        ),
         "json": lambda d: jdumps(d),
         "json-pretty": lambda d: jdumps(d, indent=2),
     }
@@ -892,6 +892,7 @@ def cli_node_ready(
     "--lines",
     "lines",
     default=None,
+    type=int,
     show_default=False,
     help="Display this many log lines from the end of the log buffer.  [default: 1000; with follow: 10]",
 )
@@ -2516,6 +2517,7 @@ def cli_vm_volume_remove(domain, volume, live_flag, restart_flag):
     "--lines",
     "lines",
     default=None,
+    type=int,
     show_default=False,
     help="Display this many log lines from the end of the log buffer.  [default: 1000; with follow: 10]",
 )

client-cli/pvc/cli/formatters.py

@@ -580,9 +580,11 @@ def cli_cluster_fault_list_format_long(CLI_CONFIG, fault_data):
                 fault_id=fault["id"],
                 fault_status=fault["status"].title(),
                 fault_health_delta=f"-{fault['health_delta']}%",
-                fault_acknowledged_at=fault["acknowledged_at"]
+                fault_acknowledged_at=(
-                if fault["acknowledged_at"] != ""
+                    fault["acknowledged_at"]
-                else "N/A",
+                    if fault["acknowledged_at"] != ""
+                    else "N/A"
+                ),
                 fault_last_reported=fault["last_reported"],
                 fault_first_reported=fault["first_reported"],
             )

client-cli/pvc/lib/vm.py

@@ -1765,9 +1765,9 @@ def format_info(config, domain_information, long_output):
                     tags_name=tag["name"],
                     tags_type=tag["type"],
                     tags_protected=str(tag["protected"]),
-                    tags_protected_colour=ansiprint.green()
+                    tags_protected_colour=(
-                    if tag["protected"]
+                        ansiprint.green() if tag["protected"] else ansiprint.blue()
-                    else ansiprint.blue(),
+                    ),
                     end=ansiprint.end(),
                 )
             )

daemon-common/ceph.py

@@ -320,7 +320,11 @@ def get_list_osd(zkhandler, limit=None, is_fuzzy=True):
 #
 def getPoolInformation(zkhandler, pool):
     # Parse the stats data
-    (pool_stats_raw, tier, pgs,) = zkhandler.read_many(
+    (
+        pool_stats_raw,
+        tier,
+        pgs,
+    ) = zkhandler.read_many(
         [
             ("pool.stats", pool),
             ("pool.tier", pool),

daemon-common/config.py

@@ -244,9 +244,9 @@ def get_parsed_configuration(config_file):
                     ]
                 ][0]
 
-            config_cluster_networks_specific[
+            config_cluster_networks_specific[f"{network_type}_dev_ip"] = (
-                f"{network_type}_dev_ip"
+                f"{list(network.hosts())[address_id]}/{network.prefixlen}"
-            ] = f"{list(network.hosts())[address_id]}/{network.prefixlen}"
+            )
 
             config = {**config, **config_cluster_networks_specific}
 

node-daemon/pvcnoded/objects/NetstatsInstance.py

@@ -231,7 +231,7 @@ class NetstatsInstance(object):
         # Get a list of all active interfaces
         net_root_path = "/sys/class/net"
         all_ifaces = list()
-        for (_, dirnames, _) in walk(net_root_path):
+        for _, dirnames, _ in walk(net_root_path):
             all_ifaces.extend(dirnames)
         all_ifaces.sort()
 

node-daemon/pvcnoded/objects/NodeInstance.py

@@ -521,7 +521,7 @@ class NodeInstance(object):
         self.logger.out("Acquired write lock for synchronization phase F", state="o")
         time.sleep(0.2)  # Time fir reader to acquire the lock
         # 4. Add gateway IPs
-        for network in self.d_network:
+        for network in self.d_network.copy():
             self.d_network[network].createGateways()
         self.logger.out("Releasing write lock for synchronization phase F", state="i")
         self.zkhandler.write([("base.config.primary_node.sync_lock", "")])

node-daemon/pvcnoded/util/keepalive.py

@@ -743,7 +743,7 @@ def node_keepalive(logger, config, zkhandler, this_node, netstats):
     # Get node performance statistics
     this_node.memtotal = int(psutil.virtual_memory().total / 1024 / 1024)
     this_node.memused = int(psutil.virtual_memory().used / 1024 / 1024)
-    this_node.memfree = int(psutil.virtual_memory().free / 1024 / 1024)
+    this_node.memfree = int(psutil.virtual_memory().available / 1024 / 1024)
     this_node.cpuload = round(os.getloadavg()[0], 2)
 
     # Get node network statistics via netstats instance