Hello community,
here is the log from the commit of package yast2-iscsi-lio-server for
openSUSE:Factory checked in at 2014-07-28 16:21:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2014-05-16 18:18:34.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-iscsi-lio-server.new/yast2-iscsi-lio-server.changes
2014-07-28 16:21:33.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Jul 24 11:59:18 CEST 2014 - [email protected]
+
+- bind all IP addresses to a target if requested by user
+ (bnc #885688)
+- 3.1.8
+
+-------------------------------------------------------------------
Old:
----
yast2-iscsi-lio-server-3.1.7.tar.bz2
New:
----
yast2-iscsi-lio-server-3.1.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-lio-server.spec ++++++
--- /var/tmp/diff_new_pack.ivcMqf/_old 2014-07-28 16:21:34.000000000 +0200
+++ /var/tmp/diff_new_pack.ivcMqf/_new 2014-07-28 16:21:34.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-iscsi-lio-server
-Version: 3.1.7
+Version: 3.1.8
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-iscsi-lio-server-3.1.7.tar.bz2 ->
yast2-iscsi-lio-server-3.1.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-lio-server-3.1.7/package/yast2-iscsi-lio-server.changes
new/yast2-iscsi-lio-server-3.1.8/package/yast2-iscsi-lio-server.changes
--- old/yast2-iscsi-lio-server-3.1.7/package/yast2-iscsi-lio-server.changes
2014-05-15 12:10:47.000000000 +0200
+++ new/yast2-iscsi-lio-server-3.1.8/package/yast2-iscsi-lio-server.changes
2014-07-28 13:30:42.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Jul 24 11:59:18 CEST 2014 - [email protected]
+
+- bind all IP addresses to a target if requested by user
+ (bnc #885688)
+- 3.1.8
+
+-------------------------------------------------------------------
Thu May 15 09:53:44 CEST 2014 - [email protected]
- save configuration on Finish (call lio_dump and tcm_dump)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-lio-server-3.1.7/package/yast2-iscsi-lio-server.spec
new/yast2-iscsi-lio-server-3.1.8/package/yast2-iscsi-lio-server.spec
--- old/yast2-iscsi-lio-server-3.1.7/package/yast2-iscsi-lio-server.spec
2014-05-15 12:10:47.000000000 +0200
+++ new/yast2-iscsi-lio-server-3.1.8/package/yast2-iscsi-lio-server.spec
2014-07-28 13:30:42.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-iscsi-lio-server
-Version: 3.1.7
+Version: 3.1.8
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-lio-server-3.1.7/src/include/iscsi-lio-server/dialogs.rb
new/yast2-iscsi-lio-server-3.1.8/src/include/iscsi-lio-server/dialogs.rb
--- old/yast2-iscsi-lio-server-3.1.7/src/include/iscsi-lio-server/dialogs.rb
2014-05-15 12:10:47.000000000 +0200
+++ new/yast2-iscsi-lio-server-3.1.8/src/include/iscsi-lio-server/dialogs.rb
2014-07-28 13:30:42.000000000 +0200
@@ -139,6 +139,8 @@
),
HWeight(1, InputField(Id(:port), _("Port number"), "3260"))
),
+ VSpacing(0.2),
+ Left(HBox(CheckBox(Id(:add_ip), _("Bind all IP addresses"),
false))),
VSpacing(0.5),
Left(HBox(CheckBox(Id(:auth), _("Use Authentication"), true))),
VSpacing(0.5),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-lio-server-3.1.7/src/include/iscsi-lio-server/widgets.rb
new/yast2-iscsi-lio-server-3.1.8/src/include/iscsi-lio-server/widgets.rb
--- old/yast2-iscsi-lio-server-3.1.7/src/include/iscsi-lio-server/widgets.rb
2014-05-15 12:10:47.000000000 +0200
+++ new/yast2-iscsi-lio-server-3.1.8/src/include/iscsi-lio-server/widgets.rb
2014-07-28 13:30:42.000000000 +0200
@@ -1013,14 +1013,14 @@
)
ip = Convert.to_string(UI.QueryWidget(:ipaddr, :Value))
port = Builtins.tointeger(UI.QueryWidget(:port, :Value))
+ add_all = Convert.to_boolean(UI.QueryWidget(:add_ip, :Value))
+
Builtins.y2milestone("storeModify ip:%1 port:%2 ipp:%3", ip, port, ipp)
- if IP.Check6(ip)
- ip = "[#{ip}]" # brackets needed around IPv6
- end
- np = Builtins.sformat("%1:%2", ip, port)
- if !Builtins.isempty(ip) && np != ipp
+
+ np = IscsiLioData.FormatIpPort(ip, port)
+ if (!ip.empty? && np != ipp) || add_all
chg = true
- if !IscsiLioData.SetNetworkPortal(@curr_target, @curr_tpg, np)
+ if !IscsiLioData.SetNetworkPortal(@curr_target, @curr_tpg, np, port,
add_all)
txt = Builtins.sformat(_("Problem setting network portal to %1"), np)
Popup.Error(txt)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-lio-server-3.1.7/src/modules/IscsiLioData.rb
new/yast2-iscsi-lio-server-3.1.8/src/modules/IscsiLioData.rb
--- old/yast2-iscsi-lio-server-3.1.7/src/modules/IscsiLioData.rb
2014-05-15 12:10:47.000000000 +0200
+++ new/yast2-iscsi-lio-server-3.1.8/src/modules/IscsiLioData.rb
2014-07-28 13:30:42.000000000 +0200
@@ -369,15 +369,21 @@
deep_copy(ret)
end
+ # format ip and port information for use in commands
+ def FormatIpPort(ip, port)
+ # brackets needed around IPv6
+ ip = "[#{ip}]" if IP.Check6(ip)
+ return "#{ip}:#{port}"
+ end
+
def GetNetworkPortal(tgt, tpg)
Builtins.y2milestone("Data: %1, tgt: %2, tpg: %3", @data, tgt, tpg)
ret = Builtins.maplist(
Ops.get_list(@data, ["tgt", tgt, tpg, "ep", "np"], [])
) do |n|
ip = n["ip"] || ""
- ip = "[#{ip}]" if IP.Check6(ip)
- port = n["port"] || 1
- ipp = Builtins.sformat("%1:%2", ip, port )
+ port = n["port"] || 3260
+ ipp = FormatIpPort(ip, port)
end
deep_copy(ret)
end
@@ -399,28 +405,33 @@
deep_copy(ret)
end
- def SetNetworkPortal(tgt, tpg, np)
+ def SetNetworkPortal(tgt, tpg, np, new_port, add_all)
Builtins.y2milestone("SetNetworkPortal tgt:%1 tpg:%2 np:%3", tgt, tpg,
np)
- kt = Ops.add(Ops.add(Ops.add(tgt, " "), tpg), " ")
- if !Builtins.isempty(
- Ops.get_list(@data, ["tgt", tgt, tpg, "ep", "np"], [])
- )
- LogExecCmd(
- Ops.add(
- Ops.add("lio_node --delnp ", kt),
- Builtins.sformat(
- "%1:%2",
- Ops.get_string(@data, ["tgt", tgt, tpg, "ep", "np", 0, "ip"],
""),
- Ops.get_integer(
- @data,
- ["tgt", tgt, tpg, "ep", "np", 0, "port"],
- 1
- )
- )
- )
- )
+
+ target_info = "#{tgt} #{tpg}"
+ ip_list = Ops.get_list(@data, ["tgt", tgt, tpg, "ep", "np"], [])
+
+ if !ip_list.empty? && !add_all
+ ip_list.each do |ipp|
+ ip = ipp["ip"]
+ port = ipp["port"] || 3260
+ if ip
+ LogExecCmd("lio_node --delnp #{target_info} #{FormatIpPort(ip,
port)}")
+ else
+ Builtins.y2error("IP address missing in data #{ipp}")
+ end
+ end
+ end
+
+ if add_all
+ ret = true
+ IscsiLioData.GetIpAddr.each do |ip|
+ success = LogExecCmd("lio_node --addnp #{target_info}
#{FormatIpPort(ip, new_port)}")
+ ret = false if !success
+ end
+ else
+ ret = LogExecCmd("lio_node --addnp #{target_info} #{np}")
end
- ret = LogExecCmd(Ops.add(Ops.add("lio_node --addnp ", kt), np))
ret
end
@@ -1429,7 +1440,7 @@
publish :function => :GetTpgAuth, :type => "boolean (string, integer)"
publish :function => :GetClntList, :type => "list <string> (string,
integer)"
publish :function => :GetClntLun, :type => "map <integer, integer>
(string, integer, string)"
- publish :function => :SetNetworkPortal, :type => "boolean (string,
integer, string)"
+ publish :function => :SetNetworkPortal, :type => "boolean (string,
integer, string, string, boolean)"
publish :function => :GetTargets, :type => "list <list> ()"
publish :function => :GetExportLun, :type => "string (integer, map)"
publish :function => :GetExportAuth, :type => "list <map <string, any>>
(string, integer)"
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
