Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2014-11-24 11:17:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-network (Old) and /work/SRC/openSUSE:Factory/.yast2-network.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2014-10-02 14:13:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2014-11-24 11:18:04.000000000 +0100 @@ -1,0 +2,37 @@ +Fri Oct 17 07:45:24 UTC 2014 - mfilka@suse.com + +- bnc#898250, bnc#899363 + - ignore /etc/install.inf:usessh flag when the file is present in + installed system and always reload / restart network service in + case of updated configuration +- 3.1.109 + +------------------------------------------------------------------- +Thu Oct 10 17:10:42 CEST 2014 - schubi@suse.de + +- AutoYaST Routing Import: Initialize device list correctly. + (bnc#900352) +- 3.1.108 + +------------------------------------------------------------------- +Fri Oct 10 15:20:36 CEST 2014 - locilka@suse.com + +- Do not set default_route to "no" in auto-configuration in + inst-sys, just remove the entry completely (bnc#900466) +- 3.1.107 + +------------------------------------------------------------------- +Thu Oct 9 15:47:14 UTC 2014 - ancor@suse.com + +- Improved help text in "global options" (bnc#892678) +- 3.1.106 + +------------------------------------------------------------------- +Mon Oct 6 09:31:41 UTC 2014 - mfilka@suse.com + +- bnc#889287 + - during autoconfiguration at s390 use linuxrc's OSAHWAddr param + for LLADDR when available. +- 3.1.105 + +------------------------------------------------------------------- Old: ---- yast2-network-3.1.104.tar.bz2 New: ---- yast2-network-3.1.109.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.N4EA7p/_old 2014-11-24 11:18:05.000000000 +0100 +++ /var/tmp/diff_new_pack.N4EA7p/_new 2014-11-24 11:18:05.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.104 +Version: 3.1.109 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.104.tar.bz2 -> yast2-network-3.1.109.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.104/.travis.yml new/yast2-network-3.1.109/.travis.yml --- old/yast2-network-3.1.104/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-3.1.109/.travis.yml 2014-11-18 09:17:13.000000000 +0100 @@ -0,0 +1,16 @@ +language: cpp +compiler: + - gcc +before_install: + # disable rvm, use system Ruby + - rvm reset + - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/tra... + - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 yast2-storage yast2-proxy yast2-country yast2-packager" -g "rspec:2.14.1 yast-rake gettext" +script: + - rake check:syntax + - rake check:pot + - make -f Makefile.cvs + - make + - sudo make install + - make check + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.104/README.md new/yast2-network-3.1.109/README.md --- old/yast2-network-3.1.104/README.md 2014-10-01 17:02:11.000000000 +0200 +++ new/yast2-network-3.1.109/README.md 2014-11-18 09:17:13.000000000 +0100 @@ -1,6 +1,10 @@ YaST Network Module ====================== +[](https://travis-ci.org/yast/yast-network) +[](https://ci.opensuse.org/view/Yast/job/yast-network-master/) +[](https://codeclimate.com/github/yast/yast-network) + The YaST2 Network module manages network configuration including device configuration, DNS, Routing and more @@ -15,8 +19,6 @@ Some features are SuSE Linux specific. -[](https://codeclimate.com/github/yast/yast-network) - Installation ------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.104/package/yast2-network.changes new/yast2-network-3.1.109/package/yast2-network.changes --- old/yast2-network-3.1.104/package/yast2-network.changes 2014-10-01 17:02:11.000000000 +0200 +++ new/yast2-network-3.1.109/package/yast2-network.changes 2014-11-18 09:17:13.000000000 +0100 @@ -1,4 +1,41 @@ ------------------------------------------------------------------- +Fri Oct 17 07:45:24 UTC 2014 - mfilka@suse.com + +- bnc#898250, bnc#899363 + - ignore /etc/install.inf:usessh flag when the file is present in + installed system and always reload / restart network service in + case of updated configuration +- 3.1.109 + +------------------------------------------------------------------- +Thu Oct 10 17:10:42 CEST 2014 - schubi@suse.de + +- AutoYaST Routing Import: Initialize device list correctly. + (bnc#900352) +- 3.1.108 + +------------------------------------------------------------------- +Fri Oct 10 15:20:36 CEST 2014 - locilka@suse.com + +- Do not set default_route to "no" in auto-configuration in + inst-sys, just remove the entry completely (bnc#900466) +- 3.1.107 + +------------------------------------------------------------------- +Thu Oct 9 15:47:14 UTC 2014 - ancor@suse.com + +- Improved help text in "global options" (bnc#892678) +- 3.1.106 + +------------------------------------------------------------------- +Mon Oct 6 09:31:41 UTC 2014 - mfilka@suse.com + +- bnc#889287 + - during autoconfiguration at s390 use linuxrc's OSAHWAddr param + for LLADDR when available. +- 3.1.105 + +------------------------------------------------------------------- Tue Sep 30 10:15:38 UTC 2014 - ancor@suse.com - The "change hostname via DHCP" setting is now configurable via diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.104/package/yast2-network.spec new/yast2-network-3.1.109/package/yast2-network.spec --- old/yast2-network-3.1.104/package/yast2-network.spec 2014-10-01 17:02:11.000000000 +0200 +++ new/yast2-network-3.1.109/package/yast2-network.spec 2014-11-18 09:17:13.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.104 +Version: 3.1.109 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.104/src/include/network/lan/help.rb new/yast2-network-3.1.109/src/include/network/lan/help.rb --- old/yast2-network-3.1.104/src/include/network/lan/help.rb 2014-10-01 17:02:12.000000000 +0200 +++ new/yast2-network-3.1.109/src/include/network/lan/help.rb 2014-11-18 09:17:13.000000000 +0100 @@ -47,18 +47,23 @@ ), "managed" => # Network setup method help - # NetworkManager and ifup are programs + # NetworkManager and wicked are programs _( "<p><b><big>Network Setup Method</big></b></p>\n" + "<p>Use the <b>NetworkManager</b> as a desktop applet\n" + "managing connections for all interfaces. It is well suited\n" + "for switching among wired and wireless networks.</p>\n" ) + - # Network setup method help - # NetworkManager and wicked are programs _( "<p>Use <b>wicked</b> if you do not run a desktop environment\n" + "or need to use multiple interfaces at the same time.</p>\n" + ) + + # For systems not including NetworkManager by default (bnc#892678) + _( + "<p><b>NetworkManager</b> is not part of every base\n" + + "installation repository. For example, to enable it on SUSE\n" + + "Linux Enterprise Server add the Workstation Extension\n" + + "repository and install the 'NetworkManager' package.</p>\n" ), "overview" => _( "<p><b><big>Network Card Overview</big></b><br>\n" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.104/src/lib/network/install_inf_convertor.rb new/yast2-network-3.1.109/src/lib/network/install_inf_convertor.rb --- old/yast2-network-3.1.104/src/lib/network/install_inf_convertor.rb 2014-10-01 17:02:12.000000000 +0200 +++ new/yast2-network-3.1.109/src/lib/network/install_inf_convertor.rb 2014-11-18 09:17:13.000000000 +0100 @@ -346,7 +346,7 @@ end def create_s390_ifcfg(hardware) - hwaddr = InstallInf["HWAddr"] + hwaddr = InstallInf["OSAHWAddr"] return "" if hwaddr.empty? netdevice = dev_name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.104/src/lib/network/network_autoconfiguration.rb new/yast2-network-3.1.109/src/lib/network/network_autoconfiguration.rb --- old/yast2-network-3.1.104/src/lib/network/network_autoconfiguration.rb 2014-10-01 17:02:12.000000000 +0200 +++ new/yast2-network-3.1.109/src/lib/network/network_autoconfiguration.rb 2014-11-18 09:17:13.000000000 +0100 @@ -206,7 +206,7 @@ set_default_route_flag(devname, "yes") if !activate_changes([devname]) - log.warn("Cannot reach reference server via #{devname}") + log.warn("Cannot activate default_route for device #{devname}") return false end @@ -218,7 +218,10 @@ log.info("Release notes can be reached via #{devname}: #{reached}") if !reached - set_default_route_flag(devname, "no") + # bsc#900466: Device is currently used for default route, but the test + # did not work, removing the default_route flag completely. + log.info "Removing default_route flag for device #{devname}" + set_default_route_flag(devname, nil) activate_changes([devname]) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.104/src/modules/Lan.rb new/yast2-network-3.1.109/src/modules/Lan.rb --- old/yast2-network-3.1.104/src/modules/Lan.rb 2014-10-01 17:02:12.000000000 +0200 +++ new/yast2-network-3.1.109/src/modules/Lan.rb 2014-11-18 09:17:13.000000000 +0100 @@ -614,14 +614,8 @@ ) end - if LanItems.force_restart - NetworkService.Restart - else - # If the second installation stage has been called by yast.ssh via - # ssh, we should not restart network cause systemctl - # hangs in that case. (bnc#885640) - NetworkService.ReloadOrRestart if !Linuxrc.usessh - end + activate_network_service + Builtins.sleep(sl) end @@ -1153,6 +1147,24 @@ publish :function => :Packages, :type => "list <string> ()" publish :function => :AutoPackages, :type => "map ()" publish :function => :HaveXenBridge, :type => "boolean ()" + + private + def activate_network_service + if LanItems.force_restart + log.info("Network service activation forced") + NetworkService.Restart + else + log.info( + ("Attempting to reload network service, normal stage %s, ssh: %s") % + [Stage.normal, Linuxrc.usessh] + ) + # If the second installation stage has been called by yast.ssh via + # ssh, we should not restart network cause systemctl + # hangs in that case. (bnc#885640) + NetworkService.ReloadOrRestart if Stage.normal || !Linuxrc.usessh + end + end + end Lan = LanClass.new diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.104/src/modules/Routing.rb new/yast2-network-3.1.109/src/modules/Routing.rb --- old/yast2-network-3.1.104/src/modules/Routing.rb 2014-10-01 17:02:12.000000000 +0200 +++ new/yast2-network-3.1.109/src/modules/Routing.rb 2014-11-18 09:17:13.000000000 +0100 @@ -337,6 +337,11 @@ # @return true if success def Import(settings) settings = deep_copy(settings) + + # Getting a list of devices which have already been imported by Lan.Import + # (bnc#900352) + @devices = NetworkInterfaces.List("") + ip_forward = Ops.get_boolean(settings, "ip_forward", false) ipv4_forward = Ops.get_boolean(settings, "ipv4_forward", ip_forward) ipv6_forward = Ops.get_boolean(settings, "ipv6_forward", ip_forward) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.104/test/ifroute_test.rb new/yast2-network-3.1.109/test/ifroute_test.rb --- old/yast2-network-3.1.104/test/ifroute_test.rb 2014-10-01 17:02:12.000000000 +0200 +++ new/yast2-network-3.1.109/test/ifroute_test.rb 2014-11-18 09:17:14.000000000 +0100 @@ -128,3 +128,55 @@ expect(Routing.write_routes(ROUTES_WITH_DEV)).to be true end end + +describe "Routing#Write" do + AY_ROUTES = [ + # empty AY config + {}, + # some routes + { + "routes" => [ + { + "destination" => "192.168.1.0", + "device" => "eth0", + "gateway" => "10.1.188.1", + "netmask" => "255.255.255.0" + }, + { + "destination" => "10.1.230.0", + "device" => "eth0", + "gateway" => "10.1.18.254", + "netmask" => "255.255.255.0" + }, + { + "destination" => "default", + "device" => "eth0", + "gateway" => "172.24.88.1", + "netmask" => "-" + }, + ] + } + ] + + AY_ROUTES.each_with_index do |ay_test, i| + it "does write route configuration files, ##{i}" do + # Devices which have already been imported by Lan.Import have to be read. + # (bnc#900352) + allow(NetworkInterfaces). + to receive(:List). + with(""). + and_return(["eth0"]) + + Routing.Import(ay_test) + + expect(Routing). + to receive(:write_route_file). + twice. + with(kind_of(String), ay_test.fetch("routes", [])). + and_return true + + Routing.Write + end + end + +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.104/test/install_inf_convertor_test.rb new/yast2-network-3.1.109/test/install_inf_convertor_test.rb --- old/yast2-network-3.1.104/test/install_inf_convertor_test.rb 2014-10-01 17:02:12.000000000 +0200 +++ new/yast2-network-3.1.109/test/install_inf_convertor_test.rb 2014-11-18 09:17:14.000000000 +0100 @@ -283,7 +283,7 @@ expect(Yast::InstallInfConvertor::InstallInf) .to receive(:[]) - .with("HWAddr") + .with("OSAHWAddr") .and_return(HWADDR) expect(Yast::InstallInfConvertor.instance.send(:create_s390_ifcfg, nil).strip!) .to eql ("LLADDR='#{HWADDR}'") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.104/test/lan_test.rb new/yast2-network-3.1.109/test/lan_test.rb --- old/yast2-network-3.1.104/test/lan_test.rb 2014-10-01 17:02:12.000000000 +0200 +++ new/yast2-network-3.1.109/test/lan_test.rb 2014-11-18 09:17:14.000000000 +0100 @@ -84,3 +84,56 @@ end end + +describe "LanClass#activate_network_service" do + + Yast.import "Stage" + Yast.import "NetworkService" + + [0, 1].each do |linuxrc_usessh| + ssh_flag = linuxrc_usessh != 0 + + context "when linuxrc %s usessh flag" % ssh_flag ? "sets" : "doesn't set" do + before(:each) do + allow(Yast::Linuxrc) + .to receive(:usessh) + .and_return(ssh_flag) + end + + context "when asked in normal mode" do + before(:each) do + allow(Yast::Stage) + .to receive(:normal) + .and_return(true) + end + + it "tries to reload network service" do + expect(Yast::NetworkService) + .to receive(:ReloadOrRestart) + + Yast::Lan.send(:activate_network_service) + end + end + + context "when asked during installation" do + before(:each) do + allow(Yast::Stage) + .to receive(:normal) + .and_return(false) + end + + it "updates network service according usessh flag" do + if ssh_flag + expect(Yast::NetworkService) + .not_to receive(:ReloadOrRestart) + else + expect(Yast::NetworkService) + .to receive(:ReloadOrRestart) + end + + Yast::Lan.send(:activate_network_service) + end + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.104/test/network_autoconfiguration_test.rb new/yast2-network-3.1.109/test/network_autoconfiguration_test.rb --- old/yast2-network-3.1.104/test/network_autoconfiguration_test.rb 2014-10-01 17:02:12.000000000 +0200 +++ new/yast2-network-3.1.109/test/network_autoconfiguration_test.rb 2014-11-18 09:17:14.000000000 +0100 @@ -171,7 +171,7 @@ it "configures just one NIC to have a default route" do expect { instance.configure_dhcp }.to_not raise_error result = Yast::NetworkInterfaces.FilterDevices("") - expect(result["eth"]["eth0"]["DHCLIENT_SET_DEFAULT_ROUTE"]).to eq "yes" - expect(result["eth"]["eth1"]["DHCLIENT_SET_DEFAULT_ROUTE"]).to_not eq "yes" + expect(result["eth"]["eth0"]["DHCLIENT_SET_DEFAULT_ROUTE"]).to eq "yes" + expect(result["eth"]["eth1"]["DHCLIENT_SET_DEFAULT_ROUTE"]).to eq nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.104/test/new_device_startmode_test.rb new/yast2-network-3.1.109/test/new_device_startmode_test.rb --- old/yast2-network-3.1.104/test/new_device_startmode_test.rb 2014-10-01 17:02:12.000000000 +0200 +++ new/yast2-network-3.1.109/test/new_device_startmode_test.rb 2014-11-18 09:17:14.000000000 +0100 @@ -1,4 +1,4 @@ -#!rspec +#!/usr/bin/env rspec require_relative "test_helper" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.104/test/routing_test.rb new/yast2-network-3.1.109/test/routing_test.rb --- old/yast2-network-3.1.104/test/routing_test.rb 2014-10-01 17:02:12.000000000 +0200 +++ new/yast2-network-3.1.109/test/routing_test.rb 2014-11-18 09:17:14.000000000 +0100 @@ -242,9 +242,9 @@ exported = Routing.Export expect(exported["ipv4_forward"]) - .to be_equal(ay_test["ipv4_forward"]) if ay_test.has_key?("ipv4_forward") + .to eql(ay_test[:input]["ipv4_forward"]) if ay_test[:input].has_key?("ipv4_forward") expect(exported["ipv6_forward"]) - .to be_equal(ay_test["ipv6_forward"]) if ay_test.has_key?("ipv6_forward") + .to eql(ay_test[:input]["ipv6_forward"]) if ay_test[:input].has_key?("ipv6_forward") end end end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org