[yast-commit] [ci_new_pac] JFYI yast2-cluster -> sle12

30 May 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-cluster -> sle12



## BNC# 880491 : "yast2 cluster configured incorrect nodeid" (RESOLVED/FIXED)
## BNC# 880483 : "yast2 cluster crash while click edit button at member list is empty" (RESOLVED/FIXED)
## BNC# 880242 : "yast2 cluster create corosync.conf without setting expected_votes at udp mode" (RESOLVED/FIXED)

Changes:
--------

--- /work/SRC/SUSE:SLE-12:GA/yast2-cluster/yast2-cluster.changes	2014-05-27 18:17:13.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2-cluster/yast2-cluster.changes	2014-05-30 10:17:59.000000000 +0200
@@ -1,0 +2,21 @@
+Fri May 30 06:12:00 UTC 2014 - nwang@suse.com
+
+- BNC#880491. Check nodeid behavior when auto node id is disabled.
+  NodeID must be unique positive interger.
+- Version 3.1.7
+
+-------------------------------------------------------------------
+Thu May 29 08:57:49 UTC 2014 - nwang@suse.com
+
+- BNC#880483. Click edit button when member list is empty
+  will crash the application.
+
+-------------------------------------------------------------------
+Thu May 29 05:31:12 UTC 2014 - nwang@suse.com
+
+- BNC#880242. expected votes must have value when Transport 
+  protocol is using udp. Cluster name should not empty in 
+  any cases.
+- Version 3.1.6
+
+-------------------------------------------------------------------

calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-cluster
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-cluster (Old)
 and      /mounts/work_src_done/SLE12/yast2-cluster (BS:build ID:38728 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-cluster", Maintainer is "yast-commit@opensuse.org"


Old:
----
  yast2-cluster-3.1.5.tar.bz2

New:
----
  yast2-cluster-3.1.7.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-cluster.spec ++++++
--- /var/tmp/diff_new_pack.NZhNaT/_old	2014-05-30 12:16:12.000000000 +0200
+++ /var/tmp/diff_new_pack.NZhNaT/_new	2014-05-30 12:16:12.000000000 +0200
@@ -18,7 +18,7 @@
 
 Name:           yast2-cluster
 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
-Version:        3.1.5
+Version:        3.1.7
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-cluster-3.1.5.tar.bz2 -> yast2-cluster-3.1.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-3.1.5/package/yast2-cluster.changes new/yast2-cluster-3.1.7/package/yast2-cluster.changes
--- old/yast2-cluster-3.1.5/package/yast2-cluster.changes	2014-05-22 11:46:23.000000000 +0200
+++ new/yast2-cluster-3.1.7/package/yast2-cluster.changes	2014-05-30 10:15:18.000000000 +0200
@@ -1,4 +1,25 @@
 -------------------------------------------------------------------
+Fri May 30 06:12:00 UTC 2014 - nwang@suse.com
+
+- BNC#880491. Check nodeid behavior when auto node id is disabled.
+  NodeID must be unique positive interger.
+- Version 3.1.7
+
+-------------------------------------------------------------------
+Thu May 29 08:57:49 UTC 2014 - nwang@suse.com
+
+- BNC#880483. Click edit button when member list is empty
+  will crash the application.
+
+-------------------------------------------------------------------
+Thu May 29 05:31:12 UTC 2014 - nwang@suse.com
+
+- BNC#880242. expected votes must have value when Transport 
+  protocol is using udp. Cluster name should not empty in 
+  any cases.
+- Version 3.1.6
+
+-------------------------------------------------------------------
 Thu May 22 09:45:56 UTC 2014 - nwang@suse.com
 
 - Modify SPEC file to make ibs and github same. Version 3.1.5 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-3.1.5/package/yast2-cluster.spec new/yast2-cluster-3.1.7/package/yast2-cluster.spec
--- old/yast2-cluster-3.1.5/package/yast2-cluster.spec	2014-05-22 11:01:03.000000000 +0200
+++ new/yast2-cluster-3.1.7/package/yast2-cluster.spec	2014-05-30 10:15:18.000000000 +0200
@@ -18,7 +18,7 @@
 
 Name:           yast2-cluster
 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
-Version:        3.1.5
+Version:        3.1.7
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-3.1.5/src/include/cluster/dialogs.rb new/yast2-cluster-3.1.7/src/include/cluster/dialogs.rb
--- old/yast2-cluster-3.1.5/src/include/cluster/dialogs.rb	2014-05-21 09:08:14.000000000 +0200
+++ new/yast2-cluster-3.1.7/src/include/cluster/dialogs.rb	2014-05-30 10:15:18.000000000 +0200
@@ -1,4 +1,4 @@
-# encoding: utf-8
+#encoding: utf-8
 
 # ------------------------------------------------------------------------------
 # Copyright (c) 2006 Novell, Inc. All Rights Reserved.
@@ -25,6 +25,8 @@
 # Authors:	Cong Meng <cmeng@novell.com>
 #
 # $Id: wizards.ycp 27914 2006-02-13 14:32:08Z locilka $
+require 'set'
+
 module Yast
   module ClusterDialogsInclude
     def initialize_cluster_dialogs(include_target)
@@ -123,8 +125,6 @@
         )
       )
 
-
-
       if (autoid)
         UI.ChangeWidget(:mynodeid, :Enabled, false)
       end
@@ -149,6 +149,40 @@
       deep_copy(ret)
     end
 
+    def ValidNodeID
+      if Cluster.memberaddr.size <= 0
+         return true
+      end
+
+      i = 0
+      # Set need to require 'set'
+      idset = Set[]
+
+      Builtins.foreach(Cluster.memberaddr) do |value|
+        if  value[:nodeid].to_i <= 0
+          Popup.Message("Node ID has to be fulfilled with a positive integer")
+          UI.ChangeWidget(:memberaddr, :CurrentItem, i)
+          i = 0
+          raise Break
+        end
+
+        if idset.include?(value[:nodeid].to_i)
+          Popup.Message("Node ID must be unique")
+          UI.ChangeWidget(:memberaddr, :CurrentItem, i)
+          i = 0
+          raise Break
+        end
+
+        idset << value[:nodeid].to_i
+        i = Ops.add(i, 1)
+      end
+
+      if i == 0
+        return false
+      end
+
+      true
+    end
  
     # BNC#871970, change member address struct
     def ValidateCommunication
@@ -159,6 +193,12 @@
         return false
       end
 
+      if UI.QueryWidget(Id(:cluster_name), :Value) == ""
+        Popup.Message("The cluster name has to be fulfilled")
+        UI.SetFocus(:cluster_name)
+        return false
+      end
+
       if UI.QueryWidget(Id(:transport), :Value) == "udpu"
         i = 0
         Builtins.foreach(Cluster.memberaddr) do |value|
@@ -175,6 +215,13 @@
           return false
         end
       else
+        #BNC#880242, expected_votes must have value when "udp"
+        if UI.QueryWidget(Id(:expected_votes), :Value) == ""
+          Popup.Message("The expected votes has to be fulfilled when udp")
+          UI.SetFocus(:expected_votes)
+          return false
+        end
+
         if !IP.Check(Convert.to_string(UI.QueryWidget(Id(:mcastaddr1), :Value)))
           Popup.Message("The Multicast Address has to be fulfilled")
           UI.SetFocus(:mcastaddr1)
@@ -227,7 +274,13 @@
         end
       end
 
-      votes = UI.QueryWidget(Id(:expected_votes), :Value)
+      if !UI.QueryWidget(Id(:autoid), :Value ) && ( UI.QueryWidget(Id(:transport), :Value) == "udpu" )
+        ret = ValidNodeID()
+        if !ret
+           UI.SetFocus(Id(:memberaddr))
+           return false
+        end
+      end
 
       true
     end
@@ -560,10 +613,10 @@
           current = 0
           str = ""
 
-          current = Convert.to_integer(
-            UI.QueryWidget(:memberaddr, :CurrentItem)
-          )
-          ret = addr_input_dialog(Cluster.memberaddr[current] || "" ,UI.QueryWidget(Id(:autoid), :Value, ), UI.QueryWidget(Id(:enable2), :Value))
+          # The value will be nil if the list is empty, however nil.to_i is 0
+          current = UI.QueryWidget(:memberaddr, :CurrentItem).to_i
+
+          ret = addr_input_dialog(Cluster.memberaddr[current] || {} ,UI.QueryWidget(Id(:autoid), :Value ), UI.QueryWidget(Id(:enable2), :Value))
           next if ret == :cancel
           Cluster.memberaddr[current]= ret
         end
@@ -573,6 +626,7 @@
           current = Convert.to_integer(
             UI.QueryWidget(:memberaddr, :CurrentItem)
           )
+          # Notice, current could be "nil" if the list is empty.
           Cluster.memberaddr = Builtins.remove(Cluster.memberaddr, current)
         end
 

continue with "q"...


Checked in at Fri May 30 12:17:18 CEST 2014 by ro

Remember to have fun...

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

ro

tags

participants (1)