[yast-devel] [ci_new_pac] JFYI yast2-iscsi-client -> sle12

27 Jan 2014

Script 'mail_helper' called by ro
Hello packager,

This is just FYI.  Your package was checked in in distribution "sle12"
by autobuild-member: ro.

Here comes the log...

---------------------------%<------------------------------
Hi,

here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-iscsi-client -> sle12



## BNC# 856494 : "YaST defaults to the current portal address instead of the persistent portal address when using iSCSI with load balancing" (ASSIGNED/)

Changes:
--------

--- /work/SRC/SUSE:SLE-12:GA/yast2-iscsi-client/yast2-iscsi-client.changes	2014-01-17 14:16:29.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-iscsi-client/yast2-iscsi-client.changes	2014-01-23 15:49:52.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Jan 22 14:16:37 CET 2014 - gs@suse.de
+
+- detect persistent portal correctly (bnc#856494)
+- 3.1.3
+
+-------------------------------------------------------------------

calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- installation-images
- installation-images-extras
- yast2-iscsi-client
- yast2-schema
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-iscsi-client (Old)
 and      /mounts/work_src_done/SLE12/yast2-iscsi-client (BS:build ID:31190 MAIL:yast-devel@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-iscsi-client", Maintainer is "yast-devel@opensuse.org"


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.wui1oP/_old	2014-01-27 12:49:30.000000000 +0100
+++ /var/tmp/diff_new_pack.wui1oP/_new	2014-01-27 12:49:30.000000000 +0100
@@ -17,28 +17,19 @@
 
 
 Name:           yast2-iscsi-client
-Version:        3.1.2
+Version:        3.1.3
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %{name}-%{version}.tar.bz2
 
+Group:	        System/YaST
+License:        GPL-2.0
 # Service module switched to systemd
-BuildRequires:  docbook-xsl-stylesheets
-BuildRequires:  doxygen
-BuildRequires:  libicu-devel
-BuildRequires:  libxslt
-BuildRequires:  perl-XML-Writer
-BuildRequires:  popt-devel
-BuildRequires:  rubygem-rspec
-BuildRequires:  sgml-skel
-BuildRequires:  update-desktop-files
 BuildRequires:  yast2 >= 2.23.15
-BuildRequires:  yast2-devtools >= 3.0.6
-BuildRequires:  yast2-packagemanager-devel
-BuildRequires:  yast2-packager
-BuildRequires:  yast2-perl-bindings
-BuildRequires:  yast2-testsuite
+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.1.10
+BuildRequires:  rubygem-rspec
 
 Requires:       yast2-packager
 
@@ -47,13 +38,11 @@
 # Wizard::SetDesktopTitleAndIcon
 Requires:       yast2 >= 2.21.22
 
-BuildArch:      noarch
+BuildArchitectures:	noarch
 
 Requires:       yast2-ruby-bindings >= 1.0.0
 
 Summary:        YaST2 - iSCSI Client Configuration
-License:        GPL-2.0
-Group:          System/YaST
 
 %description
 This package contains the YaST2 component for configuration of an iSCSI
@@ -68,6 +57,7 @@
 %install
 %yast_install
 
+
 %files
 %defattr(-,root,root)
 %dir %{yast_yncludedir}/iscsi-client
@@ -81,5 +71,3 @@
 %{yast_scrconfdir}/iscsid.scr
 %doc %{yast_docdir}
 %{yast_schemadir}/autoyast/rnc/iscsi-client.rnc
-
-%changelog

++++++ 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-27 11:37:31.000000000 +0100
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Wed Jan 22 14:16:37 CET 2014 - gs@suse.de
+
+- detect persistent portal correctly (bnc#856494)
+- 3.1.3
+
+-------------------------------------------------------------------
 Wed Nov 27 13:21:24 CET 2013 - gs@suse.de
 
 - 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-27 11:37:31.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-27 11:37:31.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-27 11:37:31.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-27 11:37:31.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
+

continue with "q"...


Checked in at Mon Jan 27 12:50:50 CET 2014 by ro

Remember to have fun...

-- 
To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org
To contact the owner, e-mail: yast-devel+owner@opensuse.org

    

ro

tags

participants (1)