targetcli 3.0.1__py3-none-any.whl → 3.0.2__py3-none-any.whl

targetcli/targetclid.py

@@ -153,7 +153,7 @@ class TargetCLI:
                 connection.close()
                 still_listen = False
             else:
-                self.con._stdout = self.con._stderr = f = tempfile.NamedTemporaryFile(mode='w', delete=False)
+                self.con._stdout = self.con._stderr = f = tempfile.NamedTemporaryFile(mode='w', delete=False)  # noqa: SIM115
                 try:
                     # extract multiple commands delimited with '%'
                     list_data = data.decode().split('%')

targetcli/ui_backstore.py

@@ -516,7 +516,9 @@ class UIFileIOBackstore(UIBackstore):
         '''
         if current_param != 'file_or_dev':
             return []
-        completions = complete_path(text, lambda x: stat.S_ISREG(x) or stat.S_ISBLK(x))
+        completions = complete_path(
+            text, lambda x: stat.S_ISREG(x) or stat.S_ISBLK(x),
+        ) if text else []
         if len(completions) == 1 and not completions[0].endswith('/'):
             completions = [completions[0] + ' ']
         return completions
@@ -545,11 +547,10 @@ class UIBlockBackstore(UIBackstore):
             return False
 
         os.close(f)
-        if struct.unpack('I', buf)[0] == 0:
-            return False
-        return True
+        return struct.unpack('I', buf)[0] != 0
 
-    def ui_command_create(self, name, dev, readonly=None, wwn=None):
+    def ui_command_create(self, name, dev, readonly=None, wwn=None,
+                          exclusive=None):
         '''
         Creates an Block Storage object. "dev" is the path to the TYPE_DISK
         block device to use.
@@ -561,7 +562,11 @@ class UIBlockBackstore(UIBackstore):
 
         wwn = self.ui_eval_param(wwn, 'string', None)
 
-        so = BlockStorageObject(name, dev, readonly=readonly, wwn=wwn)
+        excl_string = self.ui_eval_param(exclusive, 'string', None)
+        exclusive = True if excl_string is None else self.ui_eval_param(exclusive, "bool", True)
+
+        so = BlockStorageObject(name, dev, readonly=readonly, wwn=wwn,
+                                exclusive=exclusive)
         ui_so = UIBlockStorageObject(so, self)
         self.setup_model_alias(so)
         self.shell.log.info(f"Created block storage object {name} using {dev}.")
@@ -573,7 +578,7 @@ class UIBlockBackstore(UIBackstore):
         '''
         if current_param != 'dev':
             return []
-        completions = complete_path(text, stat.S_ISBLK)
+        completions = complete_path(text, stat.S_ISBLK) if text else []
         if len(completions) == 1 and not completions[0].endswith('/'):
             completions = [completions[0] + ' ']
         return completions

targetcli/ui_root.py

@@ -155,8 +155,7 @@ class UIRoot(UINode):
                     prefs = Path(universal_prefs_file).read_text()
                     backups = [line for line in prefs.splitlines() if re.match(
                         r'^max_backup_files\s*=', line)]
-                    if max_backup_files < int(backups[0].split('=')[1].strip()):
-                        max_backup_files = int(backups[0].split('=')[1].strip())
+                    max_backup_files = max(max_backup_files, int(backups[0].split('=')[1].strip()))
                 except:
                     self.shell.log.debug(f"No universal prefs file '{universal_prefs_file}'.")
 
@@ -200,8 +199,7 @@ class UIRoot(UINode):
         savefile = os.path.expanduser(savefile)
 
         if not os.path.isfile(savefile):
-            self.shell.log.info(f"Restore file {savefile} not found")
-            return
+            raise ExecutionError(f"Restore file {savefile} not found")
 
         target = self.ui_eval_param(target, 'string', None)
         storage_object = self.ui_eval_param(storage_object, 'string', None)
@@ -320,7 +318,7 @@ class UIRoot(UINode):
         else:
             printed_sessions = list(self.rtsroot.sessions)
 
-        if len(printed_sessions):
+        if printed_sessions:
             for session in printed_sessions:
                 print_session(session)
         elif sid is None:

targetcli/ui_target.py

@@ -939,11 +939,15 @@ class UINodeACL(UIRTSLibNode):
         if current_param == 'tpg_lun_or_backstore':
             completions = []
             for backstore in self.get_node('/backstores').children:
-                completions = [storage_object.path for storage_object in backstore.children]
+                completions.extend(storage_object.path
+                                   for storage_object in backstore.children)
 
-            completions.extend(lun.name for lun in self.parent.parent.get_node("luns").children)
+            completions.extend(lun.name
+                               for lun in self.parent.parent.get_node("luns").children)
 
-            completions.extend(complete_path(text, lambda x: stat.S_ISREG(x) or stat.S_ISBLK(x)))
+            if text:
+                completions.extend(complete_path(text,
+                                                 lambda x: stat.S_ISREG(x) or stat.S_ISBLK(x)))
 
             completions = [c for c in completions if c.startswith(text)]
         else:
@@ -1151,10 +1155,13 @@ class UILUNs(UINode):
         if current_param == 'storage_object':
             storage_objects = []
             for backstore in self.get_node('/backstores').children:
-                storage_objects = [storage_object.path for storage_object in backstore.children]
+                storage_objects.extend(storage_object.path
+                                       for storage_object in backstore.children)
             completions = [so for so in storage_objects if so.startswith(text)]
 
-            completions.extend(complete_path(text, lambda x: stat.S_ISREG(x) or stat.S_ISBLK(x)))
+            if text:
+                completions.extend(complete_path(text,
+                                                 lambda x: stat.S_ISREG(x) or stat.S_ISBLK(x)))
         else:
             completions = []
 

{targetcli-3.0.1.dist-info → targetcli-3.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: targetcli
-Version: 3.0.1
+Version: 3.0.2
 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>

targetcli-3.0.2.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=C8rPwJrQ7BFVuMTZRCuguUBU4q6wRb1GFQMdN1fffCU,8100
+targetcli/ui_backstore.py,sha256=jvySMVhE0ACKk3JDraIGAtTO38CSAmGqu-uLivfDcAU,29093
+targetcli/ui_node.py,sha256=qN_RlwwAXrIa7pqkj6IGtoWnlvldglwdg8xyFDYAC8s,8061
+targetcli/ui_root.py,sha256=GK6LYsTfLlOqXpOEZA551j5INqFe_dVqX9sYAg5DnJM,11507
+targetcli/ui_target.py,sha256=1llp6TD13sJ6qhF4aA_xeSO04phsym3akbIijXJ0zNw,52963
+targetcli-3.0.2.dist-info/METADATA,sha256=CN2trxlb0KXPmAfFcMSCZvP-i0bi7sOFXcLL5Qm7nRI,2723
+targetcli-3.0.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+targetcli-3.0.2.dist-info/entry_points.txt,sha256=MtQd0tPfd29i4LpVFHz5L6FNO6JiWE3_q4Ae8d4486Y,100
+targetcli-3.0.2.dist-info/licenses/COPYING,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
+targetcli-3.0.2.dist-info/RECORD,,

{targetcli-3.0.1.dist-info → targetcli-3.0.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any

targetcli-3.0.1.dist-info/RECORD

@@ -1,12 +0,0 @@
-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,,