Hello community,
here is the log from the commit of package yast2-iscsi-lio-server for
openSUSE:Factory checked in at 2016-05-08 10:45:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-iscsi-lio-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-iscsi-lio-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-iscsi-lio-server"
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-iscsi-lio-server/yast2-iscsi-lio-server.changes
2015-06-12 20:31:10.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-iscsi-lio-server.new/yast2-iscsi-lio-server.changes
2016-05-08 10:46:14.000000000 +0200
@@ -1,0 +2,16 @@
+Wed May 4 12:32:45 CEST 2016 - [email protected]
+
+- replace iSCSI "client" by "initiator" in labels, popups and
+ help text (fate#319293)
+- add hint to use different user and password for incoming and
+ outgoing authentication (bsc#977173)
+- 3.1.17
+
+-------------------------------------------------------------------
+Wed Jul 15 12:40:08 CEST 2015 - [email protected]
+
+- add info about the tpg status to targets overview
+ (partial bug-fix for bnc#920380)
+- 3.1.16
+
+-------------------------------------------------------------------
Old:
----
yast2-iscsi-lio-server-3.1.15.tar.bz2
New:
----
yast2-iscsi-lio-server-3.1.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-lio-server.spec ++++++
--- /var/tmp/diff_new_pack.ACrFOS/_old 2016-05-08 10:46:15.000000000 +0200
+++ /var/tmp/diff_new_pack.ACrFOS/_new 2016-05-08 10:46:15.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-iscsi-lio-server
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: yast2-iscsi-lio-server
-Version: 3.1.15
+Version: 3.1.17
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-iscsi-lio-server-3.1.15.tar.bz2 ->
yast2-iscsi-lio-server-3.1.17.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-iscsi-lio-server-3.1.15/.travis.yml
new/yast2-iscsi-lio-server-3.1.17/.travis.yml
--- old/yast2-iscsi-lio-server-3.1.15/.travis.yml 2015-06-11
14:35:24.000000000 +0200
+++ new/yast2-iscsi-lio-server-3.1.17/.travis.yml 2016-05-05
10:37:56.000000000 +0200
@@ -5,7 +5,7 @@
# disable rvm, use system Ruby
- rvm reset
- wget
https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
- - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2" -g
"rspec:2.14.1 yast-rake gettext"
+ - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2" -g
"rspec:3.3.0 yast-rake gettext"
script:
- rake check:syntax
- rake check:pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-lio-server-3.1.15/package/yast2-iscsi-lio-server.changes
new/yast2-iscsi-lio-server-3.1.17/package/yast2-iscsi-lio-server.changes
--- old/yast2-iscsi-lio-server-3.1.15/package/yast2-iscsi-lio-server.changes
2015-06-11 14:35:24.000000000 +0200
+++ new/yast2-iscsi-lio-server-3.1.17/package/yast2-iscsi-lio-server.changes
2016-05-05 10:37:56.000000000 +0200
@@ -1,4 +1,20 @@
-------------------------------------------------------------------
+Wed May 4 12:32:45 CEST 2016 - [email protected]
+
+- replace iSCSI "client" by "initiator" in labels, popups and
+ help text (fate#319293)
+- add hint to use different user and password for incoming and
+ outgoing authentication (bsc#977173)
+- 3.1.17
+
+-------------------------------------------------------------------
+Wed Jul 15 12:40:08 CEST 2015 - [email protected]
+
+- add info about the tpg status to targets overview
+ (partial bug-fix for bnc#920380)
+- 3.1.16
+
+-------------------------------------------------------------------
Wed May 27 15:45:03 CET 2015 - [email protected]
- remove ":" in target name when identifier is empty (bnc#932170)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-lio-server-3.1.15/package/yast2-iscsi-lio-server.spec
new/yast2-iscsi-lio-server-3.1.17/package/yast2-iscsi-lio-server.spec
--- old/yast2-iscsi-lio-server-3.1.15/package/yast2-iscsi-lio-server.spec
2015-06-11 14:35:24.000000000 +0200
+++ new/yast2-iscsi-lio-server-3.1.17/package/yast2-iscsi-lio-server.spec
2016-05-05 10:37:56.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-iscsi-lio-server
-Version: 3.1.15
+Version: 3.1.17
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-lio-server-3.1.15/src/include/iscsi-lio-server/dialogs.rb
new/yast2-iscsi-lio-server-3.1.17/src/include/iscsi-lio-server/dialogs.rb
--- old/yast2-iscsi-lio-server-3.1.15/src/include/iscsi-lio-server/dialogs.rb
2015-06-11 14:35:24.000000000 +0200
+++ new/yast2-iscsi-lio-server-3.1.17/src/include/iscsi-lio-server/dialogs.rb
2016-05-05 10:37:56.000000000 +0200
@@ -190,7 +190,8 @@
),
Table(
Id(:clnt_table),
- Header(_("Client"), _("Lun Mapping"), _("Auth")),
+ # table header (Initiator: iSCSI client, LUN Mapping:
logical unit client/target mapping, Auth: authorization)
+ Header(_("Initiator"), _("LUN Mapping"), _("Auth")),
[]
),
Left(
@@ -317,7 +318,7 @@
"custom_widget" => VBox(
Table(
Id(:server),
- Header(_("Targets"), Right(_("Portal group"))),
+ Header(_("Targets"), Right(_("Portal group")), Right(_("TPG
Status"))),
[]
),
Left(
@@ -501,10 +502,11 @@
deep_copy(ret)
end
- # discovery authentication dialog
+ # dialog for modifying initiator setup for a target
+ # (includes authentication)
def AuthDialog
@current_tab = "targets"
- caption = _("Modify iSCSI Target Client Setup")
+ caption = _("Modify iSCSI Target Initiator Setup")
w = CWM.CreateWidgets(["target-clnt"], @widgets)
contents = VBox(
VStretch(),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-lio-server-3.1.15/src/include/iscsi-lio-server/helps.rb
new/yast2-iscsi-lio-server-3.1.17/src/include/iscsi-lio-server/helps.rb
--- old/yast2-iscsi-lio-server-3.1.15/src/include/iscsi-lio-server/helps.rb
2015-06-11 14:35:24.000000000 +0200
+++ new/yast2-iscsi-lio-server-3.1.17/src/include/iscsi-lio-server/helps.rb
2016-05-05 10:37:56.000000000 +0200
@@ -122,18 +122,19 @@
),
# target client setup.
"target-clnt" => _(
- "<p>Use <b>Add</b> to give a client access for a LUN imported from
target portal group." +
- " Specify which client is allowed to access it (client name is
<i>InitiatorName</i> in" +
- " '/etc/iscsi/initiatorname.iscsi' on iscsi initiator).
<b>Delete</b> will remove the" +
- " client access to the LUN.</p>"
+ "<p>Use <b>Add</b> to give an initiator (iSCSI client) access to a
LUN imported from\n" +
+ " target portal group. Specify which initiator is allowed to
connect (use <i>InitiatorName</i>\n" +
+ " from '/etc/iscsi/initiatorname.iscsi' on iSCSI initiator).
<b>Delete</b> will remove the" +
+ " initiator access to the LUN.</p>"
) +
_(
"<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please
note that LUN target number" +
" must be unique.<br>After pressing <b>Edit Auth</b>, select the
type of authentication." +
" Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then
insert <b>User</b> and <b>Password</b>." +
+ " Please make sure to set different values for incoming and
outgoing authentication.\n" +
" If <b>Use Authentication</b> is disabled in previous dialog,
<b>Edit Auth</b> is disabled here.</p>"
) +
- _( "<p><b>Copy</b> offers the possibility to give an additional client
access to the LUN.</p>"),
+ _( "<p><b>Copy</b> offers the possibility to give an additional
initiator access to the LUN.</p>"),
# target dialog
"server_table" => _(
"List of offered targets and target portal groups. Create a new
target by clicking <b>Add</b>.\n" +
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-lio-server-3.1.15/src/include/iscsi-lio-server/widgets.rb
new/yast2-iscsi-lio-server-3.1.17/src/include/iscsi-lio-server/widgets.rb
--- old/yast2-iscsi-lio-server-3.1.15/src/include/iscsi-lio-server/widgets.rb
2015-06-11 14:35:24.000000000 +0200
+++ new/yast2-iscsi-lio-server-3.1.17/src/include/iscsi-lio-server/widgets.rb
2016-05-05 10:37:56.000000000 +0200
@@ -248,7 +248,7 @@
end)
Builtins.y2milestone("CheckLun other:%1", other)
Builtins.y2milestone("CheckLun l:%1 ret:%2", l, ret)
- Popup.Error(_("Selected Lun is already in use!")) if !ret && !silent
+ Popup.Error(_("Selected LUN is already in use!")) if !ret && !silent
ret
end
@@ -433,7 +433,7 @@
Table(
Id(:lun),
Opt(:keepSorting, :immediate, :notify, :notifyContextMenu),
- Header(_("Client Lun"), _("Target LUN")),
+ Header(_("Initiator LUN"), _("Target LUN")),
items
)
),
@@ -616,7 +616,7 @@
4,
1,
VBox(
- Left(Label(_("Client name:"))),
+ Left(Label(_("Initiator name:"))),
MinWidth(50, InputField(Id(:clnt), Opt(:hstretch), "", "")),
VSpacing(0.5),
Left(CheckBox(Id(:import), _("Import LUNs from TPG"), true))
@@ -635,15 +635,15 @@
if sym == :ok
txt = ""
s = Convert.to_string(UI.QueryWidget(Id(:clnt), :Value))
- txt = _("Client name must not be empty!") if Builtins.isempty(s)
- Builtins.y2milestone("Changed_lun: %1 new client name: %2",
@changed_lun, s)
+ txt = _("Initiator name must not be empty!") if Builtins.isempty(s)
+ Builtins.y2milestone("Changed_lun: %1 new initiator name: %2",
@changed_lun, s)
# Don't check IscsiLioData.GetClntList(@curr_target, @curr_tpg) for
existing
- # client name. It's allowed to have several LUNs accessable for same
client.
+ # initiator name. It's allowed to have several LUNs accessable for
same initiator.
# TODO: verify whether it's necessary to check @changed_lun here?
if @changed_lun.has_key?(s)
- txt = _("Client name already exists!")
+ txt = _("Initiator name already exists!")
end
- # TODO: check client name for valid chars (depends on solution for
fate #318406)
+ # TODO: check initiator name for valid chars (depends on solution
for fate #318406)
if !Builtins.isempty(txt)
sym = :again
UI.SetFocus(Id(:clnt))
@@ -664,7 +664,7 @@
end
#
- # Copy exisiting LUN, i.e. give additional client access to the LUN
+ # Copy exisiting LUN, i.e. give additional initiator access to the LUN
# (which is allowed, makes sense e.g. with multipath)
#
def CopyClntDialog
@@ -675,7 +675,7 @@
4,
1,
VBox(
- Left(Label(_("New client name:"))),
+ Left(Label(_("New initiator name:"))),
MinWidth(50, InputField(Id(:clnt), Opt(:hstretch), "", ""))
)
),
@@ -692,13 +692,13 @@
if sym == :ok
txt = ""
s = Convert.to_string(UI.QueryWidget(Id(:clnt), :Value))
- txt = _("Client name must not be empty!") if Builtins.isempty(s)
+ txt = _("Initiator name must not be empty!") if Builtins.isempty(s)
if Builtins.haskey(@changed_lun, s) ||
Builtins.contains(
IscsiLioData.GetClntList(@curr_target, @curr_tpg),
s
)
- txt = _("Client name already exists!")
+ txt = _("Initiator name already exists!")
end
if !Builtins.isempty(txt)
sym = :again
@@ -775,24 +775,26 @@
# create items from targets
tgt = IscsiLioData.GetTargets
cur = 0
- Builtins.foreach(tgt) do |l|
+ tgt.each do |target|
inc_items = Builtins.add(
inc_items,
Item(
Id(count),
- Ops.get_string(l, 0, ""),
- Builtins.tostring(Ops.get_integer(l, 1, 0))
+ target[0] || "",
+ Builtins.tostring(target[1] || 0),
+ target[2] ? _("Enabled") : _("Disabled")
)
)
Builtins.y2milestone(
- "tgt:%1 tpg:%2 ctgt:%3 ctpg:%4",
- Ops.get_string(l, 0, ""),
- Ops.get_integer(l, 1, 0),
+ "tgt:%1 tpg:%2 enabled:%3 ctgt:%4 ctpg:%5",
+ target[0] || "",
+ target[1] || 0,
+ target[2] || false,
@curr_target,
@curr_tpg
)
- if @curr_target == Ops.get_string(l, 0, "") &&
- @curr_tpg == Ops.get_integer(l, 1, 1)
+ if @curr_target == (target[0] || "") &&
+ @curr_tpg == (target[1] || 1)
cur = count
end
count = Ops.add(count, 1)
@@ -1447,11 +1449,11 @@
if !clients.nil? && clients.empty?
continue = Popup.YesNoHeadline( Label.WarningMsg,
- _("There isn't any client
specified.\n" +
- "To allow a client login to the
target, please\n" +
+ _("There isn't any initiator
specified.\n" +
+ "To allow an initiator login to the
target, please\n" +
"use the 'Add' button and enter the
name\n" +
"(see /etc/iscsi/initiatorname.iscsi
on initiator).\n" +
- "Really want to continue without
client access?"
+ "Really want to continue without
initiator access?"
))
end
continue
@@ -1461,7 +1463,7 @@
ret = IscsiLioData.DoRemoveClntLun(tgt, tpg, clnt, lun)
if !ret
txt = Builtins.sformat(
- _("Problem removing lun %4 for client %3 in %1:%2"),
+ _("Problem removing LUN %4 for initiator %3 in %1:%2"),
tgt,
tpg,
clnt,
@@ -1476,7 +1478,7 @@
ret = IscsiLioData.DoCreateClntLun(tgt, tpg, clnt, lun, tlun)
if !ret
txt = Builtins.sformat(
- _("Problem adding lun %4:%5 for client %3 in %1:%2"),
+ _("Problem adding LUN %4:%5 for initiator %3 in %1:%2"),
tgt,
tpg,
clnt,
@@ -1497,7 +1499,7 @@
chg = true
if !IscsiLioData.DoRemoveClnt(@curr_target, @curr_tpg, c)
txt = Builtins.sformat(
- _("Problem removing client %3 from %1:%2"),
+ _("Problem removing initiator %3 from %1:%2"),
@curr_target,
@curr_tpg,
c
@@ -1521,7 +1523,7 @@
chg = true
if !IscsiLioData.DoCreateClnt(@curr_target, @curr_tpg, c)
txt = Builtins.sformat(
- _("Problem creating client %3 for %1:%2"),
+ _("Problem creating initiator %3 for %1:%2"),
@curr_target,
@curr_tpg,
c
@@ -1556,7 +1558,7 @@
Ops.get_list(m, "outgoing", [])
)
txt = Builtins.sformat(
- _("Problem changing auth for client %3 in %1:%2"),
+ _("Problem changing auth for initiator %3 in %1:%2"),
@curr_target,
@curr_tpg,
c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-lio-server-3.1.15/src/modules/IscsiLioData.rb
new/yast2-iscsi-lio-server-3.1.17/src/modules/IscsiLioData.rb
--- old/yast2-iscsi-lio-server-3.1.15/src/modules/IscsiLioData.rb
2015-06-11 14:35:24.000000000 +0200
+++ new/yast2-iscsi-lio-server-3.1.17/src/modules/IscsiLioData.rb
2016-05-05 10:37:56.000000000 +0200
@@ -445,10 +445,14 @@
def GetTargets
ret = []
- Builtins.foreach(Ops.get_map(@data, "tgt", {})) do |key, m|
- Builtins.foreach(m) do |tpg, dummy|
- ret = Builtins.add(ret, [key, tpg])
- Builtins.y2milestone("GetTargets key:%1 tpg:%2", key, tpg)
+ target_info = @data["tgt"] || {}
+
+ target_info.each do |target, data|
+ data.each do |tpg, tpg_info|
+ end_point = tpg_info["ep"] || { }
+ status = end_point["enabled"] || false
+ ret << [target, tpg, status]
+ Builtins.y2milestone("GetTargets target:%1 tpg:%2 enabled:%3",
target, tpg, status)
Builtins.y2milestone("GetTargets ret:%1", ret)
end
end
