Hello community,
here is the log from the commit of package yast2-iscsi-client for
openSUSE:Factory checked in at 2014-01-27 11:24:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2013-12-02 17:05:45.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-iscsi-client.new/yast2-iscsi-client.changes
2014-01-27 11:24:07.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Jan 22 14:16:37 CET 2014 - [email protected]
+
+- detect persistent portal correctly (bnc#856494)
+- 3.1.3
+
+-------------------------------------------------------------------
Old:
----
yast2-iscsi-client-3.1.2.tar.bz2
New:
----
yast2-iscsi-client-3.1.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-client.spec ++++++
--- /var/tmp/diff_new_pack.6ppkw4/_old 2014-01-27 11:24:07.000000000 +0100
+++ /var/tmp/diff_new_pack.6ppkw4/_new 2014-01-27 11:24:07.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-iscsi-client
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products 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-client
-Version: 3.1.2
+Version: 3.1.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -34,7 +34,7 @@
BuildRequires: sgml-skel
BuildRequires: update-desktop-files
BuildRequires: yast2 >= 2.23.15
-BuildRequires: yast2-devtools >= 3.0.6
+BuildRequires: yast2-devtools >= 3.1.10
BuildRequires: yast2-packagemanager-devel
BuildRequires: yast2-packager
BuildRequires: yast2-perl-bindings
++++++ yast2-iscsi-client-3.1.2.tar.bz2 -> yast2-iscsi-client-3.1.3.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-iscsi-client-3.1.2/VERSION
new/yast2-iscsi-client-3.1.3/VERSION
--- old/yast2-iscsi-client-3.1.2/VERSION 2013-12-02 14:13:04.000000000
+0100
+++ new/yast2-iscsi-client-3.1.3/VERSION 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-3.1.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-client-3.1.2/package/yast2-iscsi-client.changes
new/yast2-iscsi-client-3.1.3/package/yast2-iscsi-client.changes
--- old/yast2-iscsi-client-3.1.2/package/yast2-iscsi-client.changes
2013-12-02 14:13:04.000000000 +0100
+++ new/yast2-iscsi-client-3.1.3/package/yast2-iscsi-client.changes
2014-01-23 15:48:54.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Jan 22 14:16:37 CET 2014 - [email protected]
+
+- detect persistent portal correctly (bnc#856494)
+- 3.1.3
+
+-------------------------------------------------------------------
Wed Nov 27 13:21:24 CET 2013 - [email protected]
- improve IPv6 support: filter out Scope:Link IPv6 addresses
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-client-3.1.2/package/yast2-iscsi-client.spec
new/yast2-iscsi-client-3.1.3/package/yast2-iscsi-client.spec
--- old/yast2-iscsi-client-3.1.2/package/yast2-iscsi-client.spec
2013-12-02 14:13:04.000000000 +0100
+++ new/yast2-iscsi-client-3.1.3/package/yast2-iscsi-client.spec
2014-01-23 15:48:54.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-iscsi-client
-Version: 3.1.2
+Version: 3.1.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -28,7 +28,7 @@
# Service module switched to systemd
BuildRequires: yast2 >= 2.23.15
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer
popt-devel sgml-skel update-desktop-files yast2-packagemanager-devel
yast2-perl-bindings yast2-testsuite libicu-devel yast2-packager
-BuildRequires: yast2-devtools >= 3.0.6
+BuildRequires: yast2-devtools >= 3.1.10
BuildRequires: rubygem-rspec
Requires: yast2-packager
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-client-3.1.2/src/modules/IscsiClientLib.rb
new/yast2-iscsi-client-3.1.3/src/modules/IscsiClientLib.rb
--- old/yast2-iscsi-client-3.1.2/src/modules/IscsiClientLib.rb 2013-12-02
14:13:04.000000000 +0100
+++ new/yast2-iscsi-client-3.1.3/src/modules/IscsiClientLib.rb 2014-01-23
15:48:54.000000000 +0100
@@ -375,7 +375,11 @@
elsif Builtins.search(row, "Portal:") != nil
if Builtins.search(row, "Current Portal:") != nil
portal = Ops.get(Builtins.splitstring(row, " "), 2, "")
- elsif Builtins.search(row, "Persistent Portal:") == nil
+ elsif Builtins.search(row, "Persistent Portal:") != nil
+ # 'Persistent Portal' overwrites current (is used for login)
+ portal = Ops.get(Builtins.splitstring(row, " "), 2, "")
+ else
+ # read 'Portal' (from output of -m node)
portal = Ops.get(Builtins.splitstring(row, " "), 1, "")
end
pos = Builtins.search(portal, ",")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-iscsi-client-3.1.2/test/Makefile.am
new/yast2-iscsi-client-3.1.3/test/Makefile.am
--- old/yast2-iscsi-client-3.1.2/test/Makefile.am 2013-11-28
11:10:04.000000000 +0100
+++ new/yast2-iscsi-client-3.1.3/test/Makefile.am 2014-01-23
15:48:54.000000000 +0100
@@ -1,5 +1,6 @@
TESTS = \
- ipEqual_spec.rb
+ ipEqual_spec.rb \
+ ScanDiscovered_spec.rb
TEST_EXTENSIONS = .rb
RB_LOG_COMPILER = rspec
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-iscsi-client-3.1.2/test/ScanDiscovered_spec.rb
new/yast2-iscsi-client-3.1.3/test/ScanDiscovered_spec.rb
--- old/yast2-iscsi-client-3.1.2/test/ScanDiscovered_spec.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-iscsi-client-3.1.3/test/ScanDiscovered_spec.rb 2014-01-23
15:48:54.000000000 +0100
@@ -0,0 +1,78 @@
+#! /usr/bin/rspec
+require_relative '../src/modules/IscsiClientLib'
+
+describe Yast::IscsiClientLibClass do
+ before :each do
+ @iscsilib = Yast::IscsiClientLibClass.new
+ @iscsilib.main()
+ end
+
+ describe "#ScanDiscovered for iscsiadm -m session -P 1" do
+ context "with Current Portal: and Persistent Portal: differ" do
+ it "returns list of connected targets with IPs of Persistent Portal" do
+ expect(@iscsilib.ScanDiscovered(
+ ["Target:
iqn.2013-10.de.suse:test_file1",
+ "\tCurrent Portal:
10.13.67.182:3260,1",
+ "\tPersistent Portal:
10.120.66.182:3260,1",
+ "\t\t**********",
+ "\t\tInterface:",
+ "\t\t**********",
+ "\t\tIface Name: default",
+ "\t\tIface Transport: tcp",
+ "\t\tIface Initiatorname:
iqn.1996-04.de.suse:01:19eacab02a1d",
+ "\t\tIface IPaddress: <empty>",
+ "\t\tIface HWaddress: <empty>",
+ "\t\tIface Netdev: <empty>",
+ "\t\tSID: 1",
+ "\t\tiSCSI Connection State:
TRANSPORT WAIT",
+ "\t\tiSCSI Session State: FREE",
+ "\t\tInternal iscsid Session State:
REOPEN", "",
+ "Target:
iqn.2013-10.de.suse:test_file2",
+ "\tCurrent Portal:
[2620:113:80c0:890:e051:56:73c7:9171]:3260,1",
+ "\tPersistent Portal:
[2620:113:80c0:8080:e051:f9ea:73c7:9171]:3260,1",
+ "\t\t**********",
+ "\t\tInterface:",
+ "\t\t**********",
+ "\t\tIface Name: default",
+ "\t\tIface Transport: tcp",
+ "\t\tIface Initiatorname:
iqn.1996-04.de.suse:01:19eacab02a1d",
+ "\t\tIface IPaddress: <empty>",
+ "\t\tIface HWaddress: <empty>",
+ "\t\tIface Netdev: <empty>",
+ "\t\tSID: 1",
+ "\t\tiSCSI Connection State:
TRANSPORT WAIT",
+ "\t\tiSCSI Session State: FREE",
+ "\t\tInternal iscsid Session State:
REOPEN", ""
+ ])).to eq(
+ ["10.120.66.182:3260
iqn.2013-10.de.suse:test_file1 default",
+
"[2620:113:80c0:8080:e051:f9ea:73c7:9171]:3260 iqn.2013-10.de.suse:test_file2
default"]
+ )
+ end
+ end
+ end
+
+ describe "#ScanDiscovered for iscsiadm -m node -P 1" do
+ context "with Portal:" do
+ it "returns list of discovered targets with IPs of Portal" do
+ expect(@iscsilib.ScanDiscovered(
+ ["Target:
iqn.2013-10.de.suse:test_file2",
+ "\tPortal:
[fe80::a00:27ff:fe1b:a7fe]:3260,1",
+ "\t\tIface Name: default",
+ "\tPortal:
[2620:113:80c0:8080:e051:f9ea:73c7:9171]:3260,1",
+ "\t\tIface Name: default",
+ "\tPortal: 10.120.66.182:3260,1",
+ "\t\tIface Name: default",
+ "\tPortal:
[2620:113:80c0:8080:a00:27ff:fe1b:a7fe]:3260,1",
+ "\t\tIface Name: default"
+ ])). to eq(
+ [
+
"[2620:113:80c0:8080:e051:f9ea:73c7:9171]:3260 iqn.2013-10.de.suse:test_file2
default",
+ "10.120.66.182:3260
iqn.2013-10.de.suse:test_file2 default",
+
"[2620:113:80c0:8080:a00:27ff:fe1b:a7fe]:3260 iqn.2013-10.de.suse:test_file2
default"]
+ )
+ end
+ end
+ end
+
+end
+
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
