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

27 Feb 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-network -> sle12



## BNC# 865199 : "linuxrc is writing an incorrect ip address/netmask into /etc/sysconfig/network/ifcfg-eth0" (RESOLVED/FIXED)

Changes:
--------

--- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes	2014-02-26 16:43:24.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes	2014-02-27 12:58:24.000000000 +0100
@@ -1,0 +2,14 @@
+Thu Feb 27 10:44:09 UTC 2014 - mfilka@suse.com
+
+- bnc#865199
+  - netmask generated corectly when handling static net
+    configuration provided by install.inf
+- 3.1.26
+
+-------------------------------------------------------------------
+Wed Feb 26 23:00:17 UTC 2014 - mfilka@suse.com
+
+- fixed internal error in save_network client
+- 3.1.25 
+
+-------------------------------------------------------------------

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

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


Old:
----
  yast2-network-3.1.24.tar.bz2

New:
----
  yast2-network-3.1.26.tar.bz2

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

Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.f8PT7J/_old	2014-02-27 16:15:27.000000000 +0100
+++ /var/tmp/diff_new_pack.f8PT7J/_new	2014-02-27 16:15:27.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        3.1.24
+Version:        3.1.26
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-network-3.1.24.tar.bz2 -> yast2-network-3.1.26.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.24/package/yast2-network.changes new/yast2-network-3.1.26/package/yast2-network.changes
--- old/yast2-network-3.1.24/package/yast2-network.changes	2014-02-26 14:49:57.000000000 +0100
+++ new/yast2-network-3.1.26/package/yast2-network.changes	2014-02-27 12:54:59.000000000 +0100
@@ -1,4 +1,18 @@
 -------------------------------------------------------------------
+Thu Feb 27 10:44:09 UTC 2014 - mfilka@suse.com
+
+- bnc#865199
+  - netmask generated corectly when handling static net
+    configuration provided by install.inf
+- 3.1.26
+
+-------------------------------------------------------------------
+Wed Feb 26 23:00:17 UTC 2014 - mfilka@suse.com
+
+- fixed internal error in save_network client
+- 3.1.25 
+
+-------------------------------------------------------------------
 Wed Feb 26 13:19:08 UTC 2014 - mfilka@suse.com
 
 - bnc#859213 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.24/package/yast2-network.spec new/yast2-network-3.1.26/package/yast2-network.spec
--- old/yast2-network-3.1.24/package/yast2-network.spec	2014-02-26 14:49:57.000000000 +0100
+++ new/yast2-network-3.1.26/package/yast2-network.spec	2014-02-27 12:54:59.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        3.1.24
+Version:        3.1.26
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.24/src/clients/save_network.rb new/yast2-network-3.1.26/src/clients/save_network.rb
--- old/yast2-network-3.1.24/src/clients/save_network.rb	2014-02-26 14:49:57.000000000 +0100
+++ new/yast2-network-3.1.26/src/clients/save_network.rb	2014-02-27 12:54:59.000000000 +0100
@@ -31,6 +31,8 @@
   require "network/install_inf_convertor"
 
   class SaveNetworkClient < Client
+    include Logger
+
     def main
       Yast.import "UI"
 
@@ -57,7 +59,7 @@
         save_network
       else
         Builtins.y2milestone("update - skip save_network")
-      end 
+      end
       # EOF
 
       nil
@@ -71,7 +73,7 @@
       log.info("Network based device: #{network_disk}")
 
       # overwrite configuration created during network setup e.g. in InstInstallInfClient
-      if network_disk == :iscsi && 
+      if network_disk == :iscsi &&
         NetworkStorage.getiBFTDevices.include?(
           InstallInfConvertor::InstallInf["Netdevice"]
         )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.24/src/lib/network/install_inf_convertor.rb new/yast2-network-3.1.26/src/lib/network/install_inf_convertor.rb
--- old/yast2-network-3.1.24/src/lib/network/install_inf_convertor.rb	2014-02-26 14:49:57.000000000 +0100
+++ new/yast2-network-3.1.26/src/lib/network/install_inf_convertor.rb	2014-02-27 12:54:59.000000000 +0100
@@ -197,7 +197,8 @@
       # remember domain, use it as fallback below, if there is no DNS search 
       # domain (#476208)
       split = Hostname.SplitFQ(hostname) if !hostname.empty? && !IP.Check(hostname)
-      fqdomain = split[1] if split.size > 1
+      fqdomain = ""
+      fqdomain = split[1].to_s if split
 
       serverlist = nameserver
       # write also secondary and third nameserver when available (bnc#446101)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.24/test/install_inf_convertor_test.rb new/yast2-network-3.1.26/test/install_inf_convertor_test.rb
--- old/yast2-network-3.1.24/test/install_inf_convertor_test.rb	2014-02-26 14:49:57.000000000 +0100
+++ new/yast2-network-3.1.26/test/install_inf_convertor_test.rb	2014-02-27 12:54:59.000000000 +0100
@@ -85,33 +85,33 @@
 
   context "linuxrc provides dhcp configuration" do
 
-    DEVICE = "enp0s3"
-    NETCONFIG = "dhcp"
-
     before(:each) do
+      @device = "enp0s3"
+      @netconfig = "dhcp"
+
       @install_inf_convertor = Yast::InstallInfConvertor.instance
 
       Yast::InstallInfConvertor::InstallInf
         .stub(:[]) { "" }
       Yast::InstallInfConvertor::InstallInf
         .stub(:[])
-        .with("Netdevice") { DEVICE }
+        .with("Netdevice") { @device }
       Yast::InstallInfConvertor::InstallInf
         .stub(:[])
-        .with("NetConfig") { NETCONFIG }
+        .with("NetConfig") { @netconfig }
     end
 
     describe "#dev_name" do
       it "returns expected device name" do
-        expect(@install_inf_convertor.send(:dev_name)).to eql DEVICE
+        expect(@install_inf_convertor.send(:dev_name)).to eql @device
       end
     end
 
     describe "#write_ifcfg" do
-      it "creates ifcfg file for #{DEVICE}" do
+      it "creates ifcfg file for #{@device}" do
         expect(SCR)
           .to receive(:Write)
-          .with(path(".target.string"), /.*-#{DEVICE}/, "") { true }
+          .with(path(".target.string"), /.*-#{@device}/, "") { true }
         expect(@install_inf_convertor.send(:write_ifcfg, "")).to eql true
       end
     end
@@ -126,4 +126,73 @@
     end
   end
 
+  context "linuxrc provides static configuration" do
+
+    before(:each) do
+      Yast.import "Netmask"
+
+      @device = "enp0s3"
+      @ip = "10.121.157.133"
+      @netmask = "255.255.240.0"
+      @netconfig = "static"
+      @nameserver = "10.120.0.1"
+
+      @install_inf_convertor = Yast::InstallInfConvertor.instance
+
+      Yast::InstallInfConvertor::InstallInf
+        .stub(:[]) { "" }
+      Yast::InstallInfConvertor::InstallInf
+        .stub(:[])
+        .with("Netdevice") { @device }
+      Yast::InstallInfConvertor::InstallInf
+        .stub(:[])
+        .with("NetConfig") { @netconfig }
+      Yast::InstallInfConvertor::InstallInf
+        .stub(:[])
+        .with("IP") { @ip }
+      Yast::InstallInfConvertor::InstallInf
+        .stub(:[])
+        .with("Netmask") { @netmask }
+      Yast::InstallInfConvertor::InstallInf
+        .stub(:[])
+        .with("Nameserver") { @nameserver }
+    end
+
+    describe "#create_ifcfg" do
+      it "creates a valid ifcfg for netconfig" do
+        expect(ifcfg = @install_inf_convertor.send(:create_ifcfg)).not_to be_empty
+        expect(ifcfg).to match /BOOTPROTO='static'/
+        expect(ifcfg).to match /IPADDR='#{@ip}\/#{Netmask.ToBits(@netmask)}'/
+      end
+    end
+
+    describe "#write_global_netconfig" do
+      it "writes all expected configuration" do
+        expect(@install_inf_convertor)
+          .to receive(:write_dns)
+        expect(@install_inf_convertor.send(:write_global_netconfig))
+          .to eql nil
+      end
+    end
+
+    describe "#write_dns" do
+      it "updates global netconfig file" do
+        expect(Yast::SCR)
+          .to receive(:Write)
+          .with(
+            path(".sysconfig.network.config"),
+            nil
+          ) { true }
+        expect(Yast::SCR)
+          .to receive(:Write)
+          .with(
+            path(".sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS"),
+            @nameserver
+          ).once { true }
+        expect(@install_inf_convertor.send(:write_dns)).to eql true
+      end
+    end
+
+  end
+
 end

continue with "q"...


Checked in at Thu Feb 27 16:15:48 CET 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)