openstack/os-brick
Code Issues Proposed changes

mypy: improve utils.py coverage, update format

Browse Source 
Change-Id: If8a6058d0112f10cdad22cd1059fd2906615e0f3
This commit is contained in:
Eric Harney
2022-07-08 09:01:25 -04:00
parent 35bf3cb4a6
commit 02f4dcf658
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
os_brick/initiator/connectors/nvmeof.py
View File

@@ -379,7 +379,7 @@ class Target(object):
if all(p.controller for p in self.portals): # all have been found if all(p.controller for p in self.portals): # all have been found
return return
hostnqn: str = self.host_nqn or utils.get_host_nqn() hostnqn: Optional[str] = self.host_nqn or utils.get_host_nqn()
# List of portal addresses and transports for this target # List of portal addresses and transports for this target
# Unlike "nvme list-subsys -o json" sysfs addr is separated by a comma # Unlike "nvme list-subsys -o json" sysfs addr is separated by a comma

16
os_brick/utils.py
View File

@@ -12,12 +12,14 @@
# #
"""Utilities and helper functions.""" """Utilities and helper functions."""
from __future__ import annotations
import functools import functools
import inspect import inspect
import logging as py_logging import logging as py_logging
import os import os
import time import time
from typing import Any, Callable, Tuple, Type, Union # noqa: H301 from typing import Any, Callable, Optional, Type, Union # noqa: H301
from oslo_concurrency import processutils from oslo_concurrency import processutils
from oslo_log import log as logging from oslo_log import log as logging
@@ -54,7 +56,7 @@ LOG = logging.getLogger(__name__)
class retry_if_exit_code(tenacity.retry_if_exception): class retry_if_exit_code(tenacity.retry_if_exception):
"""Retry on ProcessExecutionError specific exit codes.""" """Retry on ProcessExecutionError specific exit codes."""
def __init__(self, codes: Union[int, Tuple[int, ...]]): def __init__(self, codes: Union[int, tuple[int, ...]]):
self.codes = (codes,) if isinstance(codes, int) else codes self.codes = (codes,) if isinstance(codes, int) else codes
super(retry_if_exit_code, self).__init__(self._check_exit_code) super(retry_if_exit_code, self).__init__(self._check_exit_code)
@@ -66,9 +68,9 @@ class retry_if_exit_code(tenacity.retry_if_exception):
def retry(retry_param: Union[None, def retry(retry_param: Union[None,
Type[Exception], Type[Exception],
Tuple[Type[Exception], ...], tuple[Type[Exception], ...],
int, int,
Tuple[int, ...]], tuple[int, ...]],
interval: float = 1, interval: float = 1,
retries: int = 3, retries: int = 3,
backoff_rate: float = 2, backoff_rate: float = 2,
@@ -217,7 +219,7 @@ def convert_str(text: Union[bytes, str]) -> str:
return text return text
def get_host_nqn(): def get_host_nqn() -> Optional[str]:
try: try:
with open('/etc/nvme/hostnqn', 'r') as f: with open('/etc/nvme/hostnqn', 'r') as f:
host_nqn = f.read().strip() host_nqn = f.read().strip()
@@ -328,7 +330,9 @@ def get_dev_path(connection_properties, device_info):
return convert_str(res) return convert_str(res)
def connect_volume_undo_prepare_result(f=None, unlink_after=False): def connect_volume_undo_prepare_result(
f: Optional[Callable] = None,
unlink_after: bool = False) -> Callable:
"""Decorator that returns the device path to how it was originally. """Decorator that returns the device path to how it was originally.
WARNING: This decorator must be **the first** decorator of the method to WARNING: This decorator must be **the first** decorator of the method to