Hello community,
here is the log from the commit of package yast2-iscsi-client for
openSUSE:Factory checked in at 2014-09-19 13:55:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-iscsi-client (Old)
and /work/SRC/openSUSE:Factory/.yast2-iscsi-client.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-iscsi-client"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-iscsi-client/yast2-iscsi-client.changes
2014-09-07 11:10:03.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-iscsi-client.new/yast2-iscsi-client.changes
2014-09-19 13:56:11.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Sep 18 09:39:02 CEST 2014 - [email protected]
+
+- Add IP and port to 'isns' discovery command (bnc #897247)
+- 3.1.17
+
+-------------------------------------------------------------------
Old:
----
yast2-iscsi-client-3.1.16.tar.bz2
New:
----
yast2-iscsi-client-3.1.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-client.spec ++++++
--- /var/tmp/diff_new_pack.KDWlw6/_old 2014-09-19 13:56:12.000000000 +0200
+++ /var/tmp/diff_new_pack.KDWlw6/_new 2014-09-19 13:56:12.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-iscsi-client
-Version: 3.1.16
+Version: 3.1.17
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-iscsi-client-3.1.16.tar.bz2 -> yast2-iscsi-client-3.1.17.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-iscsi-client-3.1.16/MAINTAINER
new/yast2-iscsi-client-3.1.17/MAINTAINER
--- old/yast2-iscsi-client-3.1.16/MAINTAINER 2014-09-04 16:37:23.000000000
+0200
+++ new/yast2-iscsi-client-3.1.17/MAINTAINER 2014-09-18 17:17:12.000000000
+0200
@@ -1 +1 @@
-Gabriele Mohr <[email protected]>
+Deprecated file. Use `osc maintainer yast2-iscsi-client` instead.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-client-3.1.16/package/yast2-iscsi-client.changes
new/yast2-iscsi-client-3.1.17/package/yast2-iscsi-client.changes
--- old/yast2-iscsi-client-3.1.16/package/yast2-iscsi-client.changes
2014-09-04 16:37:23.000000000 +0200
+++ new/yast2-iscsi-client-3.1.17/package/yast2-iscsi-client.changes
2014-09-18 17:17:12.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Sep 18 09:39:02 CEST 2014 - [email protected]
+
+- Add IP and port to 'isns' discovery command (bnc #897247)
+- 3.1.17
+
+-------------------------------------------------------------------
Thu Sep 4 12:21:49 UTC 2014 - [email protected]
- Use a more flexible rubygem requirement syntax (bnc#895069)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-client-3.1.16/package/yast2-iscsi-client.spec
new/yast2-iscsi-client-3.1.17/package/yast2-iscsi-client.spec
--- old/yast2-iscsi-client-3.1.16/package/yast2-iscsi-client.spec
2014-09-04 16:37:23.000000000 +0200
+++ new/yast2-iscsi-client-3.1.17/package/yast2-iscsi-client.spec
2014-09-18 17:17:12.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-iscsi-client
-Version: 3.1.16
+Version: 3.1.17
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-client-3.1.16/src/include/iscsi-client/widgets.rb
new/yast2-iscsi-client-3.1.17/src/include/iscsi-client/widgets.rb
--- old/yast2-iscsi-client-3.1.16/src/include/iscsi-client/widgets.rb
2014-09-04 16:37:23.000000000 +0200
+++ new/yast2-iscsi-client-3.1.17/src/include/iscsi-client/widgets.rb
2014-09-18 17:17:12.000000000 +0200
@@ -301,7 +301,7 @@
address = Convert.to_string(UI.QueryWidget(:isns_address, :Value))
port = Convert.to_string(UI.QueryWidget(:isns_port, :Value))
return true if Builtins.size(address) == 0 && Builtins.size(port) == 0
- if !IP.Check4(address)
+ if !IP.Check(address)
Popup.Error(_("No valid IP address"))
UI.SetFocus(:isns_address)
return false
@@ -575,8 +575,9 @@
# *******************Server Location ***********************
def initServerLocation(key)
- Builtins.y2internal("is iSNS %1", IscsiClientLib.useISNS)
- if IscsiClientLib.useISNS
+ isns_info = IscsiClientLib.useISNS()
+ Builtins.y2milestone("is iSNS %1", isns_info["use"])
+ if isns_info["use"]
UI.ChangeWidget(:hostname, :Enabled, false)
UI.ChangeWidget(:port, :Enabled, false)
end
@@ -592,9 +593,10 @@
ip.strip!
port = Builtins.tostring(UI.QueryWidget(:port, :Value))
# validate IP address
- if !IscsiClientLib.useISNS
+ isns_info = IscsiClientLib.useISNS()
+ if !isns_info["use"]
if Ops.greater_than(Builtins.size(ip), 0)
- if !IP.Check4(ip) && !IP.Check6(ip)
+ if !IP.Check(ip)
# check for valid host name (take only first line of 'host'
# output because with IPv6 there might be several lines)
output = Convert.convert(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-client-3.1.16/src/modules/IscsiClientLib.rb
new/yast2-iscsi-client-3.1.17/src/modules/IscsiClientLib.rb
--- old/yast2-iscsi-client-3.1.16/src/modules/IscsiClientLib.rb 2014-09-04
16:37:23.000000000 +0200
+++ new/yast2-iscsi-client-3.1.17/src/modules/IscsiClientLib.rb 2014-09-18
17:17:12.000000000 +0200
@@ -281,14 +281,18 @@
# do we use iSNS for targets?
def useISNS
- use = false
+ isns_info = {"use" => false, "address" => "", "port" => "3205"}
+ # validateISNS checks for not empty address and port,
+ # storeISNS adds values to config
Builtins.foreach(getConfig) do |row|
- if Ops.get_string(row, "name", "") == "isns.address" ||
- Ops.get_string(row, "name", "") == "isns.port"
- use = true
+ if row["name"] == "isns.address"
+ isns_info["address"] = row["value"]
+ isns_info["use"] = true
+ elsif row["name"] == "isns.port"
+ isns_info["port"] = row["value"]
end
end
- use
+ isns_info
end
@@ -1613,8 +1617,9 @@
def GetDiscoveryCmd(ip, port, fw)
Builtins.y2milestone("GetDiscoveryCmd ip:%1 port:%2 fw:%3", ip, port, fw)
command = "-m discovery -P 1"
- if useISNS
- command = Ops.add(command, " -t isns")
+ isns_info = useISNS()
+ if isns_info["use"]
+ command << " -t isns -p #{isns_info["address"]}:#{isns_info["port"]}"
else
ifs = GetDiscIfaces()
Builtins.y2milestone("ifs=%1", ifs)
@@ -1653,7 +1658,7 @@
publish :function => :SetStartService, :type => "void (boolean)"
publish :function => :getConfig, :type => "list <map <string, any>> ()"
publish :function => :setConfig, :type => "void (list)"
- publish :function => :useISNS, :type => "boolean ()"
+ publish :function => :useISNS, :type => "map <string, any> ()"
publish :function => :oldConfig, :type => "void ()"
publish :function => :getNode, :type => "map <string, any> ()"
publish :function => :saveConfig, :type => "void (string, string, string,
string)"
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
