!3 Fix unexpected error raised when adding luns

Merge pull request !3 from wang_yue111/master
This commit is contained in:
openeuler-ci-bot 2020-07-15 19:50:12 +08:00 committed by Gitee
commit d2d2a1edd8
2 changed files with 27 additions and 1 deletions

View File

@ -0,0 +1,22 @@
From 598f988cb90e318a62a164cadb2045f4e6778bda Mon Sep 17 00:00:00 2001
From: Pavel Zakharov <pavel.zakharov@delphix.com>
Date: Tue, 20 Feb 2018 17:53:20 -0500
Subject: [PATCH] MappedLuns and Luns max number is not the same anymore
---
targetcli/ui_target.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/targetcli/ui_target.py b/targetcli/ui_target.py
index 87c5a2a..6895b38 100644
--- a/targetcli/ui_target.py
+++ b/targetcli/ui_target.py
@@ -1141,7 +1141,7 @@ def ui_command_create(self, storage_object, lun=None,
existing_mluns = [mlun.mapped_lun for mlun in acl.mapped_luns]
if mapped_lun in existing_mluns:
mapped_lun = None
- for possible_mlun in six.moves.range(LUN.MAX_LUN):
+ for possible_mlun in six.moves.range(MappedLUN.MAX_LUN):
if possible_mlun not in existing_mluns:
mapped_lun = possible_mlun
break

View File

@ -1,11 +1,12 @@
Name: targetcli Name: targetcli
Version: 2.1.fb48 Version: 2.1.fb48
Release: 9 Release: 10
License: ASL 2.0 License: ASL 2.0
Summary: Generic SCSI target CLI shell Summary: Generic SCSI target CLI shell
URL: https://github.com/open-iscsi/targetcli-fb URL: https://github.com/open-iscsi/targetcli-fb
Source: https://github.com/open-iscsi/targetcli-fb/archive/v2.1.fb48.tar.gz Source: https://github.com/open-iscsi/targetcli-fb/archive/v2.1.fb48.tar.gz
Patch0000: 0000-signed-char.patch Patch0000: 0000-signed-char.patch
Patch0001: MappedLuns-and-Luns-max-number-is-not-the-same-anymore.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: python3-devel python3-setuptools BuildRequires: python3-devel python3-setuptools
Requires: python3-rtslib target-restore python3-configshell python3-six python3-dbus python3-gobject Requires: python3-rtslib target-restore python3-configshell python3-six python3-dbus python3-gobject
@ -43,5 +44,8 @@ install -D -m 644 targetcli.8.gz %{buildroot}%{_mandir}/man8/targetcli.8.gz
%{_mandir}/man8/targetcli.8.gz %{_mandir}/man8/targetcli.8.gz
%changelog %changelog
* Wed Jul 15 2020 wangyue <wangyue92@huawei.com> - 2.1.fb48-10
- fix unexpected error raised when adding luns
* Fri Feb 14 2020 lingsheng <lingsheng@huawei.com> - 2.1.fb48-9 * Fri Feb 14 2020 lingsheng <lingsheng@huawei.com> - 2.1.fb48-9
- Package int - Package int