targetcli 3.0.0.dev0__py3-none-any.whl → 3.0.1__py3-none-any.whl

targetcli/targetcli_shell.py

@@ -26,8 +26,8 @@ import struct
 import sys
 from os import getenv, getuid
 
-from configshell_fb import ConfigShell, ExecutionError
-from rtslib_fb import RTSLibError
+from configshell import ConfigShell, ExecutionError
+from rtslib import RTSLibError
 
 from targetcli import __version__ as targetcli_version
 from targetcli.ui_root import UIRoot
@@ -308,11 +308,11 @@ def main():
     if not is_root:
         shell.con.display("You are not root, disabling privileged commands.\n")
 
-    try:
-        while not shell._exit:
+    while not shell._exit:
+        try:
             shell.run_interactive()
-    except (RTSLibError, ExecutionError) as msg:
-        shell.log.error(str(msg))
+        except (RTSLibError, ExecutionError) as msg:  # noqa: PERF203 - would otherwise exit shell
+            shell.log.error(str(msg))
 
     if shell.prefs['auto_save_on_exit'] and is_root:
         shell.log.info("Global pref auto_save_on_exit=true")

targetcli/targetclid.py

@@ -31,7 +31,7 @@ from os import getenv, getuid
 from pathlib import Path
 from threading import Thread
 
-from configshell_fb import ConfigShell
+from configshell import ConfigShell
 
 from targetcli import __version__ as targetcli_version
 from targetcli.ui_root import UIRoot

targetcli/ui_backstore.py

@@ -26,9 +26,9 @@ import stat
 import struct
 from pathlib import Path
 
-from configshell_fb import ExecutionError
+from configshell import ExecutionError
 from gi.repository import Gio
-from rtslib_fb import (
+from rtslib import (
     ALUATargetPortGroup,
     BlockStorageObject,
     FileIOStorageObject,
@@ -38,7 +38,7 @@ from rtslib_fb import (
     RTSRoot,
     UserBackedStorageObject,
 )
-from rtslib_fb.utils import get_block_type
+from rtslib.utils import get_block_type
 
 from .ui_node import UINode, UIRTSLibNode
 

targetcli/ui_node.py

@@ -18,7 +18,7 @@ under the License.
 '''
 
 
-from configshell_fb import ConfigNode, ExecutionError
+from configshell import ConfigNode, ExecutionError
 
 
 class UINode(ConfigNode):

targetcli/ui_root.py

@@ -26,9 +26,9 @@ from datetime import datetime
 from glob import glob
 from pathlib import Path, PurePosixPath
 
-from configshell_fb import ExecutionError
-from rtslib_fb import RTSRoot
-from rtslib_fb.utils import ignored
+from configshell import ExecutionError
+from rtslib import RTSRoot
+from rtslib.utils import ignored
 
 from targetcli import __version__
 

targetcli/ui_target.py

@@ -24,8 +24,8 @@ except ImportError:
     ethtool = None
 import stat
 
-from configshell_fb import ExecutionError
-from rtslib_fb import (
+from configshell import ExecutionError
+from rtslib import (
     LUN,
     TPG,
     MappedLUN,
@@ -43,6 +43,7 @@ from .ui_node import UINode, UIRTSLibNode
 auth_params = ('userid', 'password', 'mutual_userid', 'mutual_password')
 int_params = ('enable',)
 discovery_params = auth_params + int_params
+default_portal_listen = "::0"
 
 class UIFabricModule(UIRTSLibNode):
     '''
@@ -340,10 +341,10 @@ class UIMultiTPGTarget(UIRTSLibNode):
 
         if tpg.has_feature("nps") and self.shell.prefs['auto_add_default_portal']:
             try:
-                NetworkPortal(tpg, "0.0.0.0")
+                NetworkPortal(tpg, f"[{default_portal_listen}]")
                 self.shell.log.info("Global pref auto_add_default_portal=true")
                 self.shell.log.info("Created default portal listening on all IPs"
-                                    " (0.0.0.0), port 3260.")
+                                    f" ({default_portal_listen}), port 3260.")
             except RTSLibError:
                 self.shell.log.info("Default portal not created, TPGs within a target cannot share ip:port.")
 
@@ -1280,9 +1281,9 @@ class UIPortals(UINode):
         Creates a Network Portal with the specified IP address and
         port.  If the port is omitted, the default port for
         the target fabric will be used. If the IP address is omitted,
-        INADDR_ANY (0.0.0.0) will be used.
+        IN6ADDR_ANY (::0) will be used.
 
-        Choosing IN6ADDR_ANY (::0) will listen on all IPv6 interfaces
+        The default IN6ADDR_ANY (::0) will listen on all IPv6 interfaces
         as well as IPv4, assuming IPV6_V6ONLY sockopt has not been
         set.
 
@@ -1298,12 +1299,12 @@ class UIPortals(UINode):
         # FIXME: Add a specfile parameter to determine default port
         default_port = 3260
         ip_port = self.ui_eval_param(ip_port, 'number', default_port)
-        ip_address = self.ui_eval_param(ip_address, 'string', "0.0.0.0")
+        ip_address = self.ui_eval_param(ip_address, 'string', default_portal_listen)
 
         if ip_port == default_port:
             self.shell.log.info("Using default IP port %d" % ip_port)
-        if ip_address == "0.0.0.0":
-            self.shell.log.info("Binding to INADDR_ANY (0.0.0.0)")
+        if ip_address == default_portal_listen:
+            self.shell.log.info(f"Binding to INADDR_ANY ({default_portal_listen})")
 
         portal = NetworkPortal(self.tpg, self._canonicalize_ip(ip_address),
                                ip_port, mode='create')

{targetcli-3.0.0.dev0.dist-info → targetcli-3.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: targetcli
-Version: 3.0.0.dev0
+Version: 3.0.1
 Summary: A command shell for managing the Linux LIO kernel target
 Project-URL: Homepage, http://github.com/open-iscsi/targetcli-fb
 Author-email: Andy Grover <agrover@redhat.com>
@@ -50,10 +50,10 @@ Contribute
 ----------
 targetcli complies with PEP 621 and as such can be built and installed with tools like `build` and `pip`.
 
-For development, consider using [Hatch](https://hatch.pypa.io):
-`hatch shell` to create and enter a Python virtualenv with the project installed in editable mode
-`pre-commit install` to enable pre-commit hooks
-`hatch build` to create tarball and wheel
+For development, consider using [Hatch](https://hatch.pypa.io):  
+`hatch shell` to create and enter a Python virtualenv with the project installed in editable mode  
+`pre-commit install` to enable pre-commit hooks  
+`hatch build` to create tarball and wheel  
 
 "fb" -- "free branch"
 ---------------------

targetcli-3.0.1.dist-info/RECORD

@@ -0,0 +1,12 @@
+targetcli/__init__.py,sha256=iZNlmonorHvJu0UpZfsv5etvmnrS2d-HkAF3b96HNZc,687
+targetcli/targetcli_shell.py,sha256=FKElbb1kpMNfxPjDxA5IgJM_hESJie4lGH_goenbsVQ,10536
+targetcli/targetclid.py,sha256=7yuNy_nSmjEdabQYMIozse94wZ5cfFcuXKTXLeSjCKk,8084
+targetcli/ui_backstore.py,sha256=bR413k_nHFiK1yvkWCwwXO4nl74Mmht3spk7oUjmihY,28819
+targetcli/ui_node.py,sha256=qN_RlwwAXrIa7pqkj6IGtoWnlvldglwdg8xyFDYAC8s,8061
+targetcli/ui_root.py,sha256=rhUMSA9cw7Jva0ygd3N2OsRjhafkKbKY_srLBSAibjI,11592
+targetcli/ui_target.py,sha256=S2Lb3d-PyeRHP1d9x8N_las5TnFE_dfknDNEu49YiV4,52702
+targetcli-3.0.1.dist-info/METADATA,sha256=HDPc5-yVKyxExstYYIY02CjMO8wxA9ptN5Kba-9UOYY,2723
+targetcli-3.0.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+targetcli-3.0.1.dist-info/entry_points.txt,sha256=MtQd0tPfd29i4LpVFHz5L6FNO6JiWE3_q4Ae8d4486Y,100
+targetcli-3.0.1.dist-info/licenses/COPYING,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
+targetcli-3.0.1.dist-info/RECORD,,

targetcli-3.0.0.dev0.dist-info/RECORD

@@ -1,12 +0,0 @@
-targetcli/__init__.py,sha256=iZNlmonorHvJu0UpZfsv5etvmnrS2d-HkAF3b96HNZc,687
-targetcli/targetcli_shell.py,sha256=w_ZLBafghcmUJRnIFFKrpL_LPlh72xyNhSoFUdihxcs,10488
-targetcli/targetclid.py,sha256=FnkZDqEauojbFwmykykoMe7QF11Fzqxm1M_H2DlO4Io,8087
-targetcli/ui_backstore.py,sha256=HdC424T-qH4oGvPGnVAYXpKFkJj8wqY39df-gf5WRBE,28828
-targetcli/ui_node.py,sha256=4wv8DOZBY1xcCB4gtdV7aGE4q3-In6dzxw8l_c5e1XE,8064
-targetcli/ui_root.py,sha256=nBwMpjPFeTbro8-6-1jYFby8Ya7THO9OGfrw2hv3CGU,11601
-targetcli/ui_target.py,sha256=yYi-5YCUATWyhBt_9b-iFvWtEHrnM81Q0Kzfm9bySUw,52601
-targetcli-3.0.0.dev0.dist-info/METADATA,sha256=3gt23WiuZnaPvCPpmD-3SNOjGhh5QLYfjzRSpA8O8wI,2720
-targetcli-3.0.0.dev0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-targetcli-3.0.0.dev0.dist-info/entry_points.txt,sha256=MtQd0tPfd29i4LpVFHz5L6FNO6JiWE3_q4Ae8d4486Y,100
-targetcli-3.0.0.dev0.dist-info/licenses/COPYING,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
-targetcli-3.0.0.dev0.dist-info/RECORD,,